perf(desktop): show the previous shell while the renderer boots

The first window now loads its document the moment Electron is ready: the same index.html without its module scripts, plus a sanitized copy of the shell captured at the end of the previous run. The renderer process, the stylesheet and the fonts are ready while the main bundle and the layers load, and the scripts are added when the window is adopted. The renderer asks for its RPC MessagePort instead of receiving one on did-finish-load, since that event fires before the scripts exist. The startup splash and its 300 ms fade are skipped when a snapshot is present; the snapshot is removed when the interface would have been revealed, and re-captured once idle and after route changes.
2026-09-22 08:37:36 +00:00 · 2026-09-19 13:49:56 +10:00
303 changed files with 2571 additions and 7997 deletions
@@ -32,7 +32,7 @@
    },
    "packages/ai": {
      "name": "@opencode/ai",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode/schema": "workspace:*",
@@ -54,7 +54,7 @@
    },
    "packages/app": {
      "name": "@opencode/app",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
@@ -111,7 +111,7 @@
    },
    "packages/cli": {
      "name": "@opencode/cli",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "bin": {
        "opencode2": "./bin/opencode2.cjs",
      },
@@ -175,7 +175,7 @@
    },
    "packages/client": {
      "name": "@opencode/client",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/protocol": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -201,10 +201,11 @@
    },
    "packages/codemode": {
      "name": "@opencode/codemode",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
+        "typescript": "catalog:",
      },
      "devDependencies": {
        "@tsconfig/bun": "catalog:",
@@ -214,7 +215,7 @@
    },
    "packages/console/app": {
      "name": "@opencode/console-app",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -250,7 +251,7 @@
    },
    "packages/console/core": {
      "name": "@opencode/console-core",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -277,7 +278,7 @@
    },
    "packages/console/function": {
      "name": "@opencode/console-function",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@openauthjs/openauth": "0.0.0-20250322224806",
        "@opencode/console-core": "workspace:*",
@@ -294,7 +295,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode/console-mail",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -318,7 +319,7 @@
    },
    "packages/console/support": {
      "name": "@opencode/console-support",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode/console-core": "workspace:*",
@@ -338,7 +339,7 @@
    },
    "packages/core": {
      "name": "@opencode/core",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@ai-sdk/cohere": "3.0.27",
        "@ai-sdk/gateway": "3.0.104",
@@ -406,10 +407,10 @@
    },
    "packages/desktop": {
      "name": "@opencode/desktop",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
-        "electron-context-menu": "5.0.0",
+        "electron-context-menu": "4.1.2",
        "electron-log": "^5",
        "electron-updater": "6.8.9",
        "lighthouse": "13.4.1",
@@ -436,7 +437,7 @@
        "drizzle-kit": "catalog:",
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
-        "electron": "44.4.3",
+        "electron": "42.10.1",
        "electron-builder": "26.15.7",
        "electron-vite": "6.0.0-beta.1",
        "puppeteer-core": "25.9.0",
@@ -455,7 +456,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode/enterprise",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/sdk": "1.18.21",
@@ -492,7 +493,7 @@
    },
    "packages/function": {
      "name": "@opencode/function",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -508,7 +509,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode/http-recorder",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@effect/platform-node-shared": "4.0.0-rc.112",
      },
@@ -527,7 +528,7 @@
    },
    "packages/httpapi-codegen": {
      "name": "@opencode/httpapi-codegen",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "effect": "catalog:",
        "prettier": "3.6.2",
@@ -540,7 +541,7 @@
    },
    "packages/latex": {
      "name": "@opencode/latex",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -554,7 +555,7 @@
    },
    "packages/merman": {
      "name": "@opencode/merman",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -569,7 +570,7 @@
    },
    "packages/plugin": {
      "name": "@opencode/plugin",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode/ai": "workspace:*",
@@ -608,7 +609,7 @@
    },
    "packages/plugin-browser": {
      "name": "@opencode/plugin-browser",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -638,7 +639,7 @@
    },
    "packages/protocol": {
      "name": "@opencode/protocol",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/schema": "workspace:*",
        "effect": "catalog:",
@@ -653,7 +654,7 @@
    },
    "packages/schema": {
      "name": "@opencode/schema",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@standard-schema/spec": "catalog:",
        "effect": "catalog:",
@@ -677,7 +678,7 @@
    },
    "packages/sdk": {
      "name": "@opencode/sdk",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -698,7 +699,7 @@
    },
    "packages/server": {
      "name": "@opencode/server",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "@effect/platform-node-shared": "catalog:",
@@ -720,7 +721,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode/session-ui",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode/client": "workspace:*",
@@ -755,7 +756,7 @@
    },
    "packages/simulation": {
      "name": "@opencode/simulation",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/ai": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -775,7 +776,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode/stats-app",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@kobalte/core": "catalog:",
@@ -809,7 +810,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode/stats-core",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -828,7 +829,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode/stats-server",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -874,7 +875,7 @@
    },
    "packages/theme": {
      "name": "@opencode/theme",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opentui/core": "catalog:",
        "effect": "catalog:",
@@ -888,7 +889,7 @@
    },
    "packages/tui": {
      "name": "@opencode/tui",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -923,7 +924,7 @@
    },
    "packages/ui": {
      "name": "@opencode/ui",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -958,7 +959,7 @@
    },
    "packages/util": {
      "name": "@opencode/util",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@effect/opentelemetry": "catalog:",
        "@effect/platform-node": "catalog:",
@@ -991,7 +992,7 @@
    },
    "packages/web": {
      "name": "@opencode/web",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1032,7 +1033,7 @@
    },
    "services/update": {
      "name": "@opencode/update",
-      "version": "2.0.12",
+      "version": "2.0.8",
      "dependencies": {
        "jose": "6.0.11",
        "semver": "catalog:",
@@ -3880,13 +3881,13 @@

    "ejs": ["ejs@3.1.10", "", { "dependencies": { "jake": "^10.8.5" }, "bin": { "ejs": "bin/cli.js" } }, "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="],

-    "electron": ["electron@44.4.3", "", { "dependencies": { "@electron-internal/extract-zip": "^1.0.1", "@electron/get": "^5.0.0", "@types/node": "^24.9.0" }, "bin": { "electron": "cli.js", "install-electron": "install.js" } }, "sha512-LTpSFTB40qVCXIX5xMo+cgHI/Jjkbjw7VpB26PccEbroqOn72LBukeaDwPVo1fBYzSzs0c9iPuAucFCO7Tw81Q=="],
+    "electron": ["electron@42.10.1", "", { "dependencies": { "@electron-internal/extract-zip": "^1.0.1", "@electron/get": "^5.0.0", "@types/node": "^24.9.0" }, "bin": { "electron": "cli.js", "install-electron": "install.js" } }, "sha512-ITc1HPeoDzsxCCaH6MFsN67Nq2nUiJf5N9pBWxzhUpFfKJF0IwiAkKT3emg1lPbvC4OfFE+Cdwe4vhgdOZ1YKg=="],

    "electron-builder": ["electron-builder@26.15.7", "", { "dependencies": { "app-builder-lib": "26.15.7", "builder-util": "26.15.3", "builder-util-runtime": "9.7.0", "chalk": "^4.1.2", "ci-info": "^4.2.0", "dmg-builder": "26.15.7", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "simple-update-notifier": "2.0.0", "yargs": "^17.6.2" }, "bin": { "electron-builder": "./cli.js", "install-app-deps": "./install-app-deps.js" } }, "sha512-DBpaNzxsPs1BvEblzFoNriSbzsBqDCy/gseIngeEhYzQG1IxfB7Hvc2tBBVmpWE2BTQGP9J1RrAvDT+Vc/uAxg=="],

    "electron-builder-squirrel-windows": ["electron-builder-squirrel-windows@26.15.7", "", { "dependencies": { "app-builder-lib": "26.15.7", "builder-util": "26.15.3", "electron-winstaller": "5.4.0" } }, "sha512-B4uvn2NzFSuf084udWqugludFull6CRJiWe2dLzMnZLl6G5hdAGk0fsBMGlBSpKjvQCJn8IPc+S7OnJ+GXqwLA=="],

-    "electron-context-menu": ["electron-context-menu@5.0.0", "", { "dependencies": { "cli-truncate": "^4.0.0", "electron-dl": "^4.0.0", "electron-is-dev": "^3.0.1" } }, "sha512-rgFpRtwY0/rhsRCoz9rE6VM4WueEsLbIpca7ucOhERVrbGB2dQrxa9xwBNLplU54jRgPuv6nTEbxoplE5bzy2A=="],
+    "electron-context-menu": ["electron-context-menu@4.1.2", "", { "dependencies": { "cli-truncate": "^4.0.0", "electron-dl": "^4.0.0", "electron-is-dev": "^3.0.1" } }, "sha512-9xYTUV0oRqKL50N9W71IrXNdVRB0LuBp3R1zkUdUc2wfIa2/QZwYYj5RLuO7Tn7ZSLVIaO3X6u+EIBK+cBvzrQ=="],

    "electron-dl": ["electron-dl@4.0.0", "", { "dependencies": { "ext-name": "^5.0.0", "pupa": "^3.1.0", "unused-filename": "^4.0.1" } }, "sha512-USiB9816d2JzKv0LiSbreRfTg5lDk3lWh0vlx/gugCO92ZIJkHVH0UM18EHvKeadErP6Xn4yiTphWzYfbA2Ong=="],

@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-/jah4P2a0aGJNJ0aMdlFEbGHAXx33lqxHbc7UmpLFDg=",
-    "aarch64-linux": "sha256-L3SoZ24qNXicsE2FK6LATQjOmjPxY679RjugrUyO/1Y=",
-    "aarch64-darwin": "sha256-pI9NT8KWUPi+JCk6DYMqIAYmBqTbi13uL4VdNV3WS6Y=",
-    "x86_64-darwin": "sha256-rMAGhTTz46KA5Ya7E5J0af7Bn1QzTDhTaNfNJm8qfsw="
+    "x86_64-linux": "sha256-TRfKunG6/UE8rQFyRkx/pX+pe7GT542IJWLEKcFFfAY=",
+    "aarch64-linux": "sha256-JxCYBQoHeJVuEMEe4Ef5f6UxxUCAuhPo96jqMT047Fc=",
+    "aarch64-darwin": "sha256-UEgjeQMivNC7JVsLEDlNbuqp9LJH84f9nHgLHTZ2zDI=",
+    "x86_64-darwin": "sha256-jEs/Oadjf2LVAinY0xyFna0V+NTwoCKXiXmQ83OchF8="
  }
 }
@@ -2,7 +2,7 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
-  "version": "2.0.12",
+  "version": "2.0.8",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.4.2",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.12",
+  "version": "2.0.8",
  "name": "@opencode/ai",
  "type": "module",
  "license": "MIT",
@@ -73,6 +73,11 @@ const driver = (options: Options, body: string): WebSocketChannelDriver => {
          )
        if (event.type === "error") {
          terminal = true
+          yield* OpenResponses.decodeKnownErrorEvent(event).pipe(
+            Effect.mapError((cause) =>
+              ProviderShared.eventError(options.id, `${options.name} returned a malformed error event`, frame, cause),
+            ),
+          )
          return {
            type: "provider-failure",
            error: OpenResponses.providerFailure(event, `${options.name} stream error`, frame),
@@ -108,7 +108,7 @@ const incremental = (
  return input.slice(baseline.length)
 }

-const code = (event: OpenResponses.Event) => OpenResponses.errorDetail(event).code
+const code = (event: OpenResponses.Event) => event.code || event.error?.code || event.response?.error?.code || undefined

 const rejected = (
  observation: Extract<ChannelObservation, { readonly type: "provider-failure" }>,
@@ -1,4 +1,4 @@
-import { Effect, Option, Schema } from "effect"
+import { Effect, Option, Schema, SchemaGetter } from "effect"
 import type { Content } from "@opencode/schema/tool"
 import { HttpTransport } from "../route/transport/index.js"
 import { Protocol } from "../route/protocol.js"
@@ -333,13 +333,53 @@ export const StreamItem = Schema.StructWithRest(
 export type StreamItem = Schema.Schema.Type<typeof StreamItem>
 export type OutputItem = StreamItem & { readonly id: string }

-// Responses-compatible providers put error details at the top level, under `error`, or under
-// `response.error`, and gateways reshape them freely: strings, numeric codes, extra fields. Those
-// fields decode as opaque values and `errorDetail` reads them defensively, so an error frame can
-// only fail on invalid JSON and otherwise always classifies with the raw body as the fallback.
+// Responses-compatible providers put streaming error details at the top level or
+// under `error`, and response failures under `response.error`. Accept all three shapes.
 // https://www.openresponses.org/specification
-const asText = (value: unknown) =>
-  typeof value === "string" && value.length > 0 ? value : typeof value === "number" ? String(value) : undefined
+const OpenResponsesErrorObject = Schema.Struct({
+  type: optionalNull(Schema.String),
+  code: optionalNull(Schema.String),
+  message: optionalNull(Schema.String),
+  param: optionalNull(Schema.String),
+})
+const OpenResponsesErrorPayload = Schema.Union([Schema.String, OpenResponsesErrorObject]).pipe(
+  Schema.decodeTo(OpenResponsesErrorObject, {
+    decode: SchemaGetter.transform((error) => (typeof error === "string" ? { message: error } : error)),
+    encode: SchemaGetter.passthrough(),
+  }),
+)
+type OpenResponsesErrorPayload = Schema.Schema.Type<typeof OpenResponsesErrorPayload>
+
+const WebSocketErrorHeader = Schema.Union([Schema.String, Schema.Number, Schema.Boolean])
+export const WebSocketErrorEvent = Schema.StructWithRest(
+  Schema.Struct({
+    type: Schema.tag("error"),
+    status: Schema.optional(Schema.Number),
+    status_code: Schema.optional(Schema.Number),
+    code: optionalNull(Schema.String),
+    message: Schema.optional(Schema.String),
+    param: optionalNull(Schema.String),
+    error: optionalNull(OpenResponsesErrorPayload),
+    headers: Schema.optional(Schema.Record(Schema.String, WebSocketErrorHeader)),
+  }),
+  [Schema.Record(Schema.String, Schema.Unknown)],
+)
+const decodeWebSocketErrorEvent = Schema.decodeUnknownEffect(WebSocketErrorEvent)
+
+export const decodeKnownErrorEvent = (event: Event) =>
+  decodeWebSocketErrorEvent({
+    ...event,
+    status: typeof event.status === "number" ? event.status : undefined,
+    status_code: typeof event.status_code === "number" ? event.status_code : undefined,
+    headers: ProviderShared.isRecord(event.headers)
+      ? Object.fromEntries(
+          Object.entries(event.headers).filter(
+            (entry): entry is [string, string | number | boolean] =>
+              typeof entry[1] === "string" || typeof entry[1] === "number" || typeof entry[1] === "boolean",
+          ),
+        )
+      : undefined,
+  })

 export const Event = Schema.StructWithRest(
  Schema.Struct({
@@ -360,18 +400,31 @@ export const Event = Schema.StructWithRest(
          incomplete_details: optionalNull(Schema.Struct({ reason: Schema.optional(Schema.String) })),
          output: Schema.optional(Schema.Array(StreamItem)),
          usage: optionalNull(OpenResponsesUsage),
-          error: Schema.optional(Schema.Unknown),
+          error: optionalNull(OpenResponsesErrorPayload),
        }),
        [Schema.Record(Schema.String, Schema.Unknown)],
      ),
    ),
-    code: Schema.optional(Schema.Unknown),
-    message: Schema.optional(Schema.Unknown),
-    error: Schema.optional(Schema.Unknown),
+    code: optionalNull(Schema.String),
+    message: Schema.optional(Schema.String),
+    param: optionalNull(Schema.String),
+    error: optionalNull(OpenResponsesErrorPayload),
    status: Schema.optional(Schema.Unknown),
    status_code: Schema.optional(Schema.Unknown),
+    headers: Schema.optional(Schema.Unknown),
  }),
  [Schema.Record(Schema.String, Schema.Unknown)],
+).pipe(
+  Schema.decode({
+    decode: SchemaGetter.transform((event) => {
+      if (event.type !== "error" || event.error != null) return event
+      const { code, message, param, ...rest } = event
+      if (code === undefined && message === undefined && param === undefined) return event
+      // Flat errors (for example, Meta's) can also arrive through generic Responses endpoints.
+      return { ...rest, error: { code, message, param } }
+    }),
+    encode: SchemaGetter.passthrough(),
+  }),
 )
 export type Event = Schema.Schema.Type<typeof Event>
 export type NormalizedEvent = Event & { readonly item?: OutputItem | null }
@@ -380,15 +433,16 @@ const decodeEventValue = Schema.decodeUnknownEffect(Event)
 const decodeFrame = Schema.decodeUnknownEffect(ProviderShared.Json)

 /**
- * Decodes one WebSocket frame. Some providers and gateways answer a rejected `response.create` with a bare
- * `{ "error": ... }` envelope and no event type; that reads as an error event so it classifies instead of
- * failing decoding.
+ * Decodes one WebSocket frame. xAI answers a rejected `response.create` with `{ "error": { "message", "type" } }` and no
+ * event type; that envelope reads as an error event so the failure classifies instead of failing decoding.
 */
 export const decodeChannelEvent = (frame: string) =>
  decodeFrame(frame).pipe(
    Effect.flatMap((value) =>
      decodeEventValue(
-        ProviderShared.isRecord(value) && value.type === undefined && value.error != null
+        ProviderShared.isRecord(value) &&
+          value.type === undefined &&
+          (typeof value.error === "string" || ProviderShared.isRecord(value.error))
          ? { ...value, type: "error" }
          : value,
      ),
@@ -1368,21 +1422,22 @@ const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (
  return [{ ...current, lifecycle }, events] satisfies StepResult
 })

-/** Error code and message from wherever the frame put them; top-level fields win over nested ones. */
-export const errorDetail = (event: Event) => {
-  const raw = event.error ?? event.response?.error
-  const nested = typeof raw === "string" ? { message: raw } : ProviderShared.isRecord(raw) ? raw : undefined
-  return {
-    message: asText(event.message) ?? asText(nested?.message),
-    code: asText(event.code) ?? asText(nested?.code),
-  }
+// Build the prettiest summary available from whatever the provider supplied.
+// When both code and message are present, prefix the code so consumers see
+// the failure mode (e.g. `rate_limit_exceeded: Slow down`) instead of just
+// the bare message — production rate limits and context-length failures used
+// to be indistinguishable from generic stream drops. Returns undefined when
+// the payload carries no usable summary.
+const providerErrorMessage = (event: Event, nested: OpenResponsesErrorPayload | undefined): string | undefined => {
+  const message = event.message || nested?.message || undefined
+  const code = event.code || nested?.code || undefined
+  if (message && code) return `${code}: ${message}`
+  return message || code
 }

-// Prefix the code when both are present (`rate_limit_exceeded: Slow down`) so the failure mode is
-// visible; fall back to the raw frame rather than a generic message when neither decodes.
 export const providerFailure = (event: Event, fallback: string, body = ProviderShared.encodeJson(event)) => {
-  const detail = errorDetail(event)
-  const summary = detail.message && detail.code ? `${detail.code}: ${detail.message}` : (detail.message ?? detail.code)
+  const nested = event.error ?? event.response?.error ?? undefined
+  const summary = providerErrorMessage(event, nested)
  const message = summary ?? (body === "{}" ? fallback : body)
  const status =
    typeof event.status === "number"
@@ -1465,7 +1520,18 @@ export const step = (state: ParserState, event: NormalizedEvent) => {
  if (event.type === "response.output_item.done") return onOutputItemDone(state, event.item)
  if (event.type === "response.completed" || event.type === "response.incomplete") return onResponseFinish(state, event)
  if (event.type === "response.failed") return providerFailure(event, `${state.name} response failed`)
-  if (event.type === "error") return providerFailure(event, `${state.name} stream error`)
+  if (event.type === "error")
+    return decodeKnownErrorEvent(event).pipe(
+      Effect.mapError((cause) =>
+        ProviderShared.eventError(
+          state.id,
+          `${state.name} returned a malformed error event`,
+          ProviderShared.encodeJson(event),
+          cause,
+        ),
+      ),
+      Effect.flatMap(() => providerFailure(event, `${state.name} stream error`)),
+    )
  return Effect.succeed<StepResult>([state, NO_EVENTS])
 }

@@ -215,9 +215,7 @@ export const fromWebSocket = (
 ): Effect.Effect<WebSocketConnection, AIError> =>
  Effect.gen(function* () {
    yield* waitOpen(ws, input)
-    // The socket pushes frames synchronously and cannot be paused, so the hand-off to the consumer
-    // fiber must absorb whole read buffers. Bun delivers over a thousand small frames in one tick.
-    const messages = yield* Queue.unbounded<string | Uint8Array, AIError | Cause.Done<void>>()
+    const messages = yield* Queue.bounded<string | Uint8Array, AIError | Cause.Done<void>>(128)

    const oversized = (message: string | Uint8Array) =>
      typeof message === "string" ? new Blob([message]).size > MAX_FRAME_BYTES : message.byteLength > MAX_FRAME_BYTES
@@ -240,7 +238,19 @@ export const fromWebSocket = (
    }
    const offer = (message: string | Uint8Array) => {
      if (rejectOversized(message)) return
-      Queue.offerUnsafe(messages, message)
+      if (Queue.offerUnsafe(messages, message)) return
+      Queue.failCauseUnsafe(
+        messages,
+        Cause.fail(
+          transportError("WebSocket inbound queue overflow", {
+            body: typeof message === "string" ? message : new TextDecoder().decode(message),
+            url: input.url,
+            operation: "read",
+            code: "queue-overflow",
+            phase: "receive",
+          }),
+        ),
+      )
    }

    const onMessage = (event: MessageEvent) => {
@@ -11,78 +11,66 @@ import { sseEvents } from "../lib/sse.js"

 const decodeEvent = Schema.decodeUnknownEffect(OpenResponses.protocol.stream.event)

-it.effect("decodes error frames verbatim in shared SSE and WebSocket decoding", () =>
+it.effect("normalizes flat errors in shared SSE and WebSocket decoding", () =>
  Effect.gen(function* () {
+    const frame = {
+      type: "error",
+      sequence_number: 4,
+      code: "server_shutting_down",
+      message: "Server is shutting down. Please retry your request.",
+      param: null,
+    }
    for (const decode of [decodeEvent, OpenResponses.decodeChannelEvent]) {
-      for (const frame of [
-        { type: "error", sequence_number: 4, code: "server_shutting_down", message: "Shutting down", param: null },
+      const event = yield* decode(JSON.stringify(frame))
+      expect(event).toEqual({
+        type: "error",
+        sequence_number: 4,
+        error: { code: frame.code, message: frame.message, param: null },
+      })
+
+      for (const unchanged of [
+        event,
        { type: "error" },
-        { type: "error", error: "Gateway failed" },
-        { type: "error", error: { code: 429, message: "slow down" } },
-        { type: "error", error: 42 },
-        { type: "error", code: 500, message: ["not", "a", "string"] },
-        { type: "response.failed", response: { id: "resp_failed", error: "Gateway failed" } },
-        { type: "response.failed", response: { id: "resp_failed", error: ["weird"] } },
        {
          type: "response.failed",
          response: { id: "resp_failed", error: { code: "server_error", message: "Internal server error" } },
        },
        { type: "response.output_text.delta", item_id: "msg_text", delta: "Hello" },
      ]) {
-        expect(yield* decode(JSON.stringify(frame))).toEqual(frame)
+        expect(yield* decode(JSON.stringify(unchanged))).toEqual(unchanged)
      }
    }
  }),
 )

-it.effect("reads bare WebSocket error envelopes as error events", () =>
+it.effect("continues to normalize untyped xAI WebSocket errors", () =>
  Effect.gen(function* () {
    const message = "gRPC error: Response with id=resp_missing not found"
-    for (const error of [{ type: "api_error", message }, message, 42]) {
-      expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify({ error }))).toEqual({ type: "error", error })
-    }
-    for (const frame of [{ error: null }, { message }]) {
-      expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame)).pipe(Effect.flip)).toBeDefined()
+    for (const error of [{ type: "api_error", message }, message]) {
+      expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify({ error }))).toEqual({
+        type: "error",
+        error: typeof error === "string" ? { message } : error,
+      })
    }
  }),
 )

-it.effect("extracts error details from every shape and falls back to the raw frame", () =>
+it.effect("normalizes string errors in shared SSE and WebSocket decoding", () =>
  Effect.gen(function* () {
-    const cases: Array<[frame: Record<string, unknown>, message: string, tag: string]> = [
-      [
-        { type: "error", code: "server_shutting_down", message: "Shutting down" },
-        "server_shutting_down: Shutting down",
-        "UnknownProvider",
-      ],
-      [{ type: "error", error: "Gateway failed" }, "Gateway failed", "UnknownProvider"],
-      [{ type: "error", error: { code: 429, message: "slow down" } }, "429: slow down", "UnknownProvider"],
-      [{ type: "error", error: { message: "slow down" }, status: 429 }, "slow down", "RateLimit"],
-      [{ type: "error", code: 500, message: ["not", "a", "string"] }, "500", "UnknownProvider"],
-      [
-        { type: "response.failed", response: { id: "resp_failed", error: "Gateway failed" } },
-        "Gateway failed",
-        "UnknownProvider",
-      ],
-    ]
-    for (const [frame, message, tag] of cases) {
-      const event = yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame))
-      const error = OpenResponses.providerFailure(event, "fallback", JSON.stringify(frame))
-      expect(error.message).toBe(message)
-      expect(error.reason._tag).toBe(tag)
-      expect(error.reason.body).toBe(JSON.stringify(frame))
+    for (const decode of [decodeEvent, OpenResponses.decodeChannelEvent]) {
+      expect(yield* decode(JSON.stringify({ type: "error", error: "Gateway failed" }))).toEqual({
+        type: "error",
+        error: { message: "Gateway failed" },
+      })
+      expect(
+        yield* decode(
+          JSON.stringify({ type: "response.failed", response: { id: "resp_failed", error: "Gateway failed" } }),
+        ),
+      ).toEqual({
+        type: "response.failed",
+        response: { id: "resp_failed", error: { message: "Gateway failed" } },
+      })
    }
-    for (const frame of [
-      { type: "error", error: 42 },
-      { type: "response.failed", response: { id: "resp_failed", error: ["weird"] } },
-    ]) {
-      const event = yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame))
-      const error = OpenResponses.providerFailure(event, "fallback", JSON.stringify(frame))
-      expect(error.message).toBe(JSON.stringify(frame))
-      expect(error.reason._tag).toBe("UnknownProvider")
-    }
-    expect(OpenResponses.providerFailure({ type: "error" }, "fallback", "{}").message).toBe("fallback")
-    expect(OpenResponses.providerFailure({ type: "error" }, "fallback", "{}").reason._tag).toBe("ProviderInternal")
  }),
 )

@@ -19,13 +19,6 @@ export function mountBrowserPane() {
      session: "Alpha",
      mounted: true,
      visible: true,
-      url: undefined as string | undefined,
-      loading: false,
-      generation: 0,
-      delayNavigation: false,
-      pendingURL: undefined as string | undefined,
-      loadErrors: {} as Record<string, string | undefined>,
-      error: undefined as string | undefined,
      layouts: {} as Record<string, BrowserPaneLayout | undefined>,
    })
    const tabs = ["Alpha", "Beta"].map((name) => ({
@@ -54,33 +47,13 @@ export function mountBrowserPane() {
      opened: () => !!registrations.get(store.session),
      state: () => ({ tabs: tabs.filter((tab) => tab.title === store.session), focusedTabID: null }),
      tabs: () => tabs.filter((tab) => tab.title === store.session),
-      active: () => {
-        const tab = tabs.find((tab) => tab.title === store.session) ?? tabs[0]
-        return {
-          ...tab,
-          url: store.url ?? tab.url,
-          loading: store.loading,
-          generation: store.generation,
-          loadError: store.loadErrors[store.session],
-        }
-      },
+      active: () => tabs.find((tab) => tab.title === store.session) ?? tabs[0],
      registration: () => registrations.get(store.session),
-      error: () => store.error ?? (store.loadErrors[store.session] ? "Request failed" : undefined),
+      error: () => undefined,
      suspended: () => false,
      close: () => undefined,
      open: () => undefined,
-      command: (command) => {
-        setStore("error", undefined)
-        if (command.type === "navigate" || command.type === "reload") setStore("loadErrors", store.session, undefined)
-        if (command.type === "navigate") {
-          if (store.delayNavigation) {
-            setStore("pendingURL", command.url)
-            return
-          }
-          setStore({ url: command.url, loading: false, generation: store.generation + 1 })
-        }
-        if (command.type === "stop") setStore("loading", false)
-      },
+      command: () => undefined,
    }
    return (
      <>
@@ -91,32 +64,6 @@ export function mountBrowserPane() {
            {(name) => <button onClick={() => setStore({ session: name, mounted: name !== "Empty" })}>{name}</button>}
          </For>
          <button onClick={() => setStore("mounted", false)}>Unmount pane</button>
-          <button onClick={() => setStore({ url: "about:blank", loading: false })}>Blank page</button>
-          <button onClick={() => setStore({ url: "about:blank", loading: true })}>Loading page</button>
-          <button
-            onClick={() =>
-              setStore({ loading: true, generation: store.generation + 1, loadErrors: { [store.session]: undefined } })
-            }
-          >
-            Load current page
-          </button>
-          <button onClick={() => setStore("loadErrors", store.session, "ERR_CONNECTION_REFUSED")}>Failed page</button>
-          <button onClick={() => setStore("delayNavigation", true)}>Delay navigation</button>
-          <button onClick={() => setStore({ error: "ERR_BLOCKED_BY_CLIENT", pendingURL: undefined })}>
-            Block navigation
-          </button>
-          <button
-            onClick={() =>
-              setStore({
-                url: store.pendingURL,
-                pendingURL: undefined,
-                loading: false,
-                generation: store.generation + 1,
-              })
-            }
-          >
-            Complete navigation
-          </button>
          <button onClick={() => setStore("visible", (visible) => !visible)}>Toggle Review tab</button>
        </nav>
        <div style={{ width: "640px", height: "360px", border: "1px solid #555" }}>
@@ -57,153 +57,3 @@ story("hides the native view immediately while the pane stays mounted", async ({
  await toggle.click()
  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
 })
-
-story("shows the empty state over a blank native page and restores navigation", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Blank page", exact: true }).click()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeVisible()
-  await expect(root.getByText('Or prompt "Open in the app browser"', { exact: true })).toBeVisible()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-  await expect(root.getByRole("button", { name: "Reload", exact: true })).toBeDisabled()
-
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("https://example.com/")
-  await expect(root.getByText("Enter URL", { exact: true })).toBeVisible()
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeHidden()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(root.getByRole("button", { name: "Reload", exact: true })).toBeEnabled()
-})
-
-story("keeps Stop available and hides the empty state while a blank page loads", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Loading page", exact: true }).click()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeHidden()
-  await root.getByRole("button", { name: "Stop", exact: true }).click()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeVisible()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-})
-
-story("keeps the submitted URL visible until the browser reports navigation", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Blank page", exact: true }).click()
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("https://example.com/")
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await expect(address).toHaveValue("https://example.com/")
-  await expect(root.getByText("Enter URL", { exact: true })).toBeHidden()
-
-  await root.getByRole("button", { name: "Complete navigation", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(address).toHaveValue("https://example.com/")
-
-  await address.fill("https://unsubmitted.example/")
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-  await expect(address).toHaveValue("https://example.com/")
-})
-
-story("restores the current URL when a submitted navigation is blocked", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("https://blocked.example/")
-  await address.press("Enter")
-  await expect(address).toHaveValue("https://blocked.example/")
-  await root.getByRole("button", { name: "Block navigation", exact: true }).click()
-  await expect(root.getByText("ERR_BLOCKED_BY_CLIENT", { exact: true })).toBeVisible()
-  await expect(address).toHaveValue("https://alpha.example/")
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-})
-
-story("shows a themed failure state for only the failed tab and allows retry", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Failed page", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeVisible()
-  await expect(root.getByText("Check the URL and your connection, then try again.", { exact: true })).toBeVisible()
-  await expect(root.getByText("Request failed", { exact: true })).toBeHidden()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-  await expect(root.getByRole("textbox", { name: "Browser address", exact: true })).toHaveValue(
-    "https://alpha.example/",
-  )
-
-  await root.getByRole("button", { name: "Beta", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeHidden()
-  await expect(root.getByTestId("native-Beta")).toHaveAttribute("data-visible", "true")
-  await root.getByRole("button", { name: "Alpha", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeVisible()
-
-  await root.getByRole("button", { name: "Reload", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeHidden()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-})
-
-story("returns a failed tab to the empty state when an empty URL is submitted", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Failed page", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeVisible()
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("")
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await expect(address).toHaveValue("")
-  await root.getByRole("button", { name: "Load current page", exact: true }).click()
-  await expect(root.getByRole("button", { name: "Stop", exact: true })).toBeEnabled()
-  await root.getByRole("button", { name: "Complete navigation", exact: true }).click()
-  await expect(root.getByText("URL can't be reached", { exact: true })).toBeHidden()
-  await expect(root.getByText("Enter URL", { exact: true })).toBeVisible()
-  await expect(root.getByRole("button", { name: "Reload", exact: true })).toBeDisabled()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-})
-
-story("selects the full URL when the address field gains focus", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.click()
-  await expect(address).toHaveJSProperty("selectionStart", 0)
-  await expect(address).toHaveJSProperty("selectionEnd", "https://alpha.example/".length)
-  await address.pressSequentially("https://example.com/")
-  await expect(address).toHaveValue("https://example.com/")
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await address.focus()
-  await expect(address).toHaveJSProperty("selectionStart", 0)
-  await expect(address).toHaveJSProperty("selectionEnd", "https://example.com/".length)
-  await address.press("ArrowRight")
-  await address.click()
-  await expect(address).toHaveJSProperty("selectionStart", 0)
-  await expect(address).toHaveJSProperty("selectionEnd", "https://example.com/".length)
-})
-
-story("keeps the current page visible while a submitted URL loads", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  await root.getByRole("button", { name: "Delay navigation", exact: true }).click()
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("https://example.com/")
-  await address.press("Enter")
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(address).toHaveValue("https://example.com/")
-
-  await root.getByRole("button", { name: "Load current page", exact: true }).click()
-  await expect(root.getByRole("button", { name: "Stop", exact: true })).toBeEnabled()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await root.getByRole("button", { name: "Complete navigation", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(address).toHaveValue("https://example.com/")
-})
-
-story("keeps the current page and restores its URL when an empty address is submitted", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
-  const address = root.getByRole("textbox", { name: "Browser address", exact: true })
-  await address.fill("")
-  await address.press("Enter")
-  await expect(address).not.toBeFocused()
-  await expect(address).toHaveValue("https://alpha.example/")
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(root.getByText("Enter URL", { exact: true })).toBeHidden()
-  await expect(root.getByRole("button", { name: "Reload", exact: true })).toBeEnabled()
-})
@@ -17,12 +17,14 @@ const milestones = [
  "electronSpawnStarted",
  "debugEndpointReady",
  "electronStarted",
-  "layersReady",
-  "windowVisible",
  "serviceEnsureStarted",
  "serviceSpawnRequested",
  "serviceReady",
+  "backgroundLoadingReady",
  "rendererViteConnected",
+  "rendererInitializationStarted",
+  "rendererInitializationReady",
+  "windowVisible",
  "homeReady",
 ] as const
 const phases = [
@@ -126,12 +128,14 @@ const milestonePatterns: ReadonlyArray<{ name: Milestone; text: string }> = [
  { name: "electronSpawnStarted", text: "starting electron app..." },
  { name: "debugEndpointReady", text: "DevTools listening on ws://" },
  { name: "electronStarted", text: "app starting" },
-  { name: "layersReady", text: "layers ready" },
-  { name: "windowVisible", text: "main window visible" },
  { name: "serviceEnsureStarted", text: "starting v2 background service" },
  { name: "serviceSpawnRequested", text: "v2 CLI background service starting" },
  { name: "serviceReady", text: "v2 CLI background service ready" },
+  { name: "backgroundLoadingReady", text: "loading task finished" },
  { name: "rendererViteConnected", text: "[vite] connected." },
+  { name: "rendererInitializationStarted", text: "awaiting server ready" },
+  { name: "rendererInitializationReady", text: "server ready" },
+  { name: "windowVisible", text: "main window visible" },
 ]

 async function createColdProfile() {
@@ -400,12 +404,14 @@ function requireMilestones(observed: Partial<Record<Milestone, number>>) {
    electronSpawnStarted: get("electronSpawnStarted"),
    debugEndpointReady: get("debugEndpointReady"),
    electronStarted: get("electronStarted"),
-    layersReady: get("layersReady"),
-    windowVisible: get("windowVisible"),
    serviceEnsureStarted: get("serviceEnsureStarted"),
    serviceSpawnRequested: get("serviceSpawnRequested"),
    serviceReady: get("serviceReady"),
+    backgroundLoadingReady: get("backgroundLoadingReady"),
    rendererViteConnected: get("rendererViteConnected"),
+    rendererInitializationStarted: get("rendererInitializationStarted"),
+    rendererInitializationReady: get("rendererInitializationReady"),
+    windowVisible: get("windowVisible"),
    homeReady: get("homeReady"),
  }
 }
@@ -20,12 +20,14 @@ describe("desktop startup benchmark", () => {
      ["electronSpawnStarted", "starting electron app..."],
      ["debugEndpointReady", "DevTools listening on ws://"],
      ["electronStarted", "app starting"],
-      ["layersReady", "layers ready"],
-      ["windowVisible", "main window visible"],
      ["serviceEnsureStarted", "starting v2 background service"],
      ["serviceSpawnRequested", "v2 CLI background service starting"],
      ["serviceReady", "v2 CLI background service ready"],
+      ["backgroundLoadingReady", "loading task finished"],
      ["rendererViteConnected", "[vite] connected."],
+      ["rendererInitializationStarted", "awaiting server ready"],
+      ["rendererInitializationReady", "server ready"],
+      ["windowVisible", "main window visible"],
    ] as const
    cases.forEach(([milestone, line]) => {
      expect(milestoneForLine(`\u001b[32m${line}\u001b[39m`)).toBe(milestone)
@@ -56,12 +58,14 @@ function sample(run: number, commandToHomeReadyMs: number): DesktopStartupSample
    electronSpawnStarted: 7,
    debugEndpointReady: 8,
    electronStarted: 9,
-    layersReady: 10,
-    windowVisible: 11,
-    serviceEnsureStarted: 12,
-    serviceSpawnRequested: 13,
-    serviceReady: 14,
-    rendererViteConnected: 15,
+    serviceEnsureStarted: 10,
+    serviceSpawnRequested: 11,
+    serviceReady: 12,
+    backgroundLoadingReady: 13,
+    rendererViteConnected: 14,
+    rendererInitializationStarted: 15,
+    rendererInitializationReady: 16,
+    windowVisible: 17,
    homeReady: commandToHomeReadyMs,
  }
  return {
@@ -76,8 +80,8 @@ function sample(run: number, commandToHomeReadyMs: number): DesktopStartupSample
      electronStartup: 2,
      serviceSpawnWait: 1,
      serviceProcessStartup: 1,
-      rendererStartup: commandToHomeReadyMs - 15,
-      visibleWindowToHome: commandToHomeReadyMs - 11,
+      rendererStartup: commandToHomeReadyMs - 14,
+      visibleWindowToHome: commandToHomeReadyMs - 17,
    },
    service: { version: "2.0.0-local-test", url: "http://127.0.0.1:3000", pid: run },
  }
@@ -1,110 +0,0 @@
-import { expect, test, type Locator, type Page } from "@playwright/test"
-import { fixture, pageMessages } from "../smoke/session-timeline.fixture"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-test.use({ viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true })
-
-test.beforeEach(async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    sessions: fixture.sessions,
-    provider: fixture.provider,
-    directory: fixture.directory,
-    project: fixture.project,
-    pageMessages,
-  })
-  await page.addInitScript(
-    ({ directory, server, sessions }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({ projects: { local: [{ worktree: directory, expanded: true }] } }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify(sessions.map((session) => ({ type: "session", server, sessionId: session.id }))),
-      )
-    },
-    { directory: fixture.directory, server: fixture.serverKey, sessions: fixture.sessions },
-  )
-  await page.goto("/")
-  await page.locator('[data-slot="mobile-tabs-trigger"]').click()
-  await expect(page.locator('[data-slot="mobile-tabs-drawer"]')).toBeVisible()
-  const drawer = page.locator('[data-slot="mobile-drawer-content"]')
-  await expect
-    .poll(() => drawer.evaluate((element) => new DOMMatrixReadOnly(getComputedStyle(element).transform).m42))
-    .toBe(0)
-  await expect(drawer).not.toHaveAttribute("data-transitioning")
-})
-
-test("reorders session tabs with touch", async ({ page }) => {
-  const tabs = page.locator('[data-slot="vertical-tabs"] a')
-  await expect(tabs).toContainText([fixture.expected.sourceTitle, fixture.expected.targetTitle])
-
-  const target = tabs.filter({ hasText: fixture.expected.targetTitle })
-  const source = tabs.filter({ hasText: fixture.expected.sourceTitle })
-  const targetBox = await target.boundingBox()
-  const sourceBox = await source.boundingBox()
-  expect(targetBox).not.toBeNull()
-  expect(sourceBox).not.toBeNull()
-
-  await touchDrag(page, source, {
-    from: { x: sourceBox!.x + sourceBox!.width / 2, y: sourceBox!.y + sourceBox!.height / 2 },
-    to: { x: targetBox!.x + targetBox!.width / 2, y: targetBox!.y + targetBox!.height / 2 },
-  })
-
-  await expect(tabs).toContainText([fixture.expected.targetTitle, fixture.expected.sourceTitle])
-})
-
-test("dismisses a touch context menu by tapping outside", async ({ page }) => {
-  const drawer = page.locator('[data-slot="mobile-tabs-drawer"]')
-  const tab = drawer.locator('[data-slot="tab-link"]').filter({ hasText: fixture.expected.sourceTitle })
-  const home = drawer.getByRole("button", { name: "Home", exact: true })
-  const homeBox = await home.boundingBox()
-  const box = await tab.boundingBox()
-  expect(homeBox).not.toBeNull()
-  expect(box).not.toBeNull()
-  const point = { x: box!.x + box!.width / 2, y: box!.y + box!.height / 2 }
-
-  await tab.dispatchEvent("pointerdown", {
-    pointerType: "touch",
-    pointerId: 1,
-    isPrimary: true,
-    clientX: point.x,
-    clientY: point.y,
-  })
-  const rename = page.getByRole("menuitem", { name: "Rename", exact: true })
-  await expect(rename).toBeVisible()
-  await expect(drawer).toBeVisible()
-  await tab.filter({ visible: true }).dispatchEvent("pointerup", {
-    pointerType: "touch",
-    pointerId: 1,
-    isPrimary: true,
-    clientX: point.x,
-    clientY: point.y,
-  })
-
-  await page.touchscreen.tap(homeBox!.x + homeBox!.width / 2, homeBox!.y + homeBox!.height / 2)
-  await expect(rename).toBeHidden()
-  await expect(drawer).toBeVisible()
-})
-
-async function touchDrag(
-  page: Page,
-  source: Locator,
-  input: { from: { x: number; y: number }; to: { x: number; y: number } },
-) {
-  const client = await page.context().newCDPSession(page)
-  await client.send("Input.dispatchTouchEvent", {
-    type: "touchStart",
-    touchPoints: [{ ...input.from, id: 1 }],
-  })
-  await client.send("Input.dispatchTouchEvent", {
-    type: "touchMove",
-    touchPoints: [{ x: (input.from.x + input.to.x) / 2, y: (input.from.y + input.to.y) / 2, id: 1 }],
-  })
-  await expect(source).toHaveCount(2)
-  await client.send("Input.dispatchTouchEvent", {
-    type: "touchMove",
-    touchPoints: [{ ...input.to, id: 1 }],
-  })
-  await client.send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] })
-}
@@ -71,7 +71,7 @@ for (const direction of ["ltr", "rtl"] as const) {
    const shifted = await content.evaluate((element) => getComputedStyle(element).translate)
    await content.evaluate((element) => element.setAttribute("data-summary-motion", ""))
    // Keep issuing resize events before the idle timer expires, including crossing the width cutoff.
-    for (const width of [1520, 1280, 1800]) {
+    for (const width of [1520, 1280, 1600]) {
      await page.setViewportSize({ width, height: 900 })
      await expect(panel).toHaveAttribute("data-summary-resizing", "true")
      await page.clock.runFor(100)
@@ -84,7 +84,6 @@ for (const direction of ["ltr", "rtl"] as const) {
    await expect(content).toHaveAttribute("data-summary-motion", "transitionrun,transitionend,")
    await expect(content).not.toHaveCSS("translate", shifted)
    await page.setViewportSize({ width: 1440, height: 900 })
-    await expect(panel).toHaveAttribute("data-summary-resizing", "false")
    await expect(content).toHaveCSS("translate", shifted)

    await content.evaluate((element) => element.setAttribute("data-summary-motion", ""))
@@ -113,8 +112,7 @@ for (const direction of ["ltr", "rtl"] as const) {
    await expect(summary).toBeVisible()

    await page.setViewportSize({ width: 1800, height: 900 })
-    await expect(panel).toHaveAttribute("data-summary-resizing", "false")
-    await expect(content).toHaveCSS("translate", "none")
+    await expect(content).toHaveCSS("translate", "0px")
    await expect(summary).toBeVisible()

    await page.emulateMedia({ reducedMotion: "reduce" })
@@ -166,45 +166,6 @@ test.describe("session timeline projection", () => {
    await expect(longNotice.locator("[title]")).toHaveAttribute("title", `Switched to ${longName}`)
    await expect.poll(() => longNotice.evaluate((element) => element.scrollWidth <= element.clientWidth)).toBe(true)
  })
-
-  test("does not repeat a review comment file as an attachment", async ({ page }) => {
-    const message = userMessage([
-      userText("what's goin on here", { id: "prt_user_review_comment" }),
-      {
-        id: "prt_user_review_file",
-        type: "file",
-        mime: "text/plain",
-        filename: "LiveRuntime.ts",
-        url: "file:///repo/LiveRuntime.ts?start=14&end=32",
-      },
-      {
-        id: "prt_user_unrelated_file",
-        type: "file",
-        mime: "text/plain",
-        filename: "notes.txt",
-        url: "data:text/plain;base64,bm90ZXM=",
-      },
-    ])
-    message.metadata = {
-      displayText: "what's goin on here",
-      comments: [
-        {
-          path: "LiveRuntime.ts",
-          comment: "what's goin on here",
-          selection: { startLine: 14, startChar: 0, endLine: 32, endChar: 0 },
-          origin: "review",
-        },
-      ],
-    }
-
-    await setupTimeline(page, { messages: [message, assistantMessage()] })
-
-    const user = page.locator('[data-component="user-message"]')
-    await expect(user.getByText("LiveRuntime.ts:14-32", { exact: true })).toBeVisible()
-    const attachments = user.locator('[data-slot="user-message-attachments"]')
-    await expect(attachments.getByText("LiveRuntime.ts", { exact: true })).toHaveCount(0)
-    await expect(attachments.getByText("notes.txt", { exact: true })).toBeVisible()
-  })
 })

 function patchFile(file: string, status: "added" | "modified" | "deleted") {
@@ -116,7 +116,7 @@ test("single-server settings expose scoped pages without a server picker", async
  await expect(connection.getByRole("heading", { name: "Connection", exact: true })).toBeVisible()
  await expect(connection.locator('[data-component="settings-list"]')).toHaveCSS("padding-left", "16px")
  await expect(connection.locator(".settings-servers-row")).toHaveCSS("padding-top", "20px")
-  await expect(connection.locator(".settings-servers-lead")).toHaveCSS("column-gap", "10px")
+  await expect(connection.locator(".settings-servers-lead")).toHaveCSS("column-gap", "4px")
  await expect(connection.locator(".settings-servers-copy")).toHaveCSS("row-gap", "6px")
  await expect(settings.getByRole("heading", { name: "Preferences", exact: true })).toBeVisible()
  await expect(settings.getByText("Terminal shell", { exact: true })).toBeVisible()
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/app",
-  "version": "2.0.12",
+  "version": "2.0.8",
  "description": "",
  "type": "module",
  "exports": {
@@ -65,14 +65,14 @@
  }

  /* Keep the 1000px conversation intact, with 320px for the summary and its gutters.
-     When they overlap, center the conversation in the space that remains beside the summary. */
-  @container session-chat (min-width: 1320px) and (width < 1640px) {
+     Move only as far as needed; wider panels already have enough space in the margin. */
+  @container session-chat (min-width: 1320px) {
    [data-slot="session-chat-panel"][data-summary-open="true"]
      :is([data-timeline-virtual-content], [data-component="session-composer-dock"] > div) {
-      --session-summary-translate: -160px;
+      --session-summary-translate: min(0px, calc(50cqi - 820px));

      &:dir(rtl) {
-        --session-summary-translate: 160px;
+        --session-summary-translate: max(0px, calc(820px - 50cqi));
      }
    }
  }
@@ -625,16 +625,6 @@ export const dict = {
  "toast.file.loadFailed.title": "Failed to load file",
  "file.error.notFound": "File not found: {{name}}",
  "toast.file.listFailed.title": "Failed to list files",
-  "file.view.preview": "Preview",
-  "file.view.source": "Source",
-  "file.view.openInBrowser": "Open in browser",
-  "file.view.binary": "Binary file · {{size}}",
-  "file.view.table.rows.one": "{{count}} row",
-  "file.view.table.rows.other": "{{count}} rows",
-  "file.view.table.columns.one": "{{count}} column",
-  "file.view.table.columns.other": "{{count}} columns",
-  "file.view.table.truncated": "Showing the first {{shown}} of {{total}} rows.",
-  "file.view.fontSample": "Sphinx of black quartz, judge my vow.",

  "toast.context.noLineSelection.title": "No line selection",
  "toast.context.noLineSelection.description": "Select a line range in a file tab first.",
@@ -916,10 +906,6 @@ export const dict = {
  "session.browser.replaced": "Browser control moved to another desktop window.",
  "session.browser.suspended": "Browser suspended. Interact with this session to reconnect.",
  "session.browser.address.placeholder": "Enter URL",
-  "session.browser.empty.title": "Enter URL",
-  "session.browser.empty.description": 'Or prompt "Open in the app browser"',
-  "session.browser.failed.title": "URL can't be reached",
-  "session.browser.failed.description": "Check the URL and your connection, then try again.",

  "titlebar.update": "Update",
  "titlebar.tabs": "Tabs",
@@ -19,7 +19,6 @@ export type BrowserPaneCommand = Browser.Action
 export type BrowserPaneState = Browser.State | null
 export type BrowserPaneEvent =
  | { type: "focus"; tabID: Browser.TabID }
-  | { type: "preview"; path: string }
  | { type: "state"; state: BrowserPaneState; error?: string }

 export type BrowserPaneRegistration = {
@@ -33,8 +33,6 @@ export type FileContent = {
  }
  encoding?: "base64"
  mimeType?: string
-  /** On-disk size when the bytes themselves are not retained. */
-  size?: number
 }

 export type Path = {
@@ -1,15 +1,14 @@
-import { batch, createEffect, createMemo, createRoot, getOwner, on, onCleanup, runWithOwner } from "solid-js"
+import { createEffect, createMemo, getOwner, on, onCleanup, runWithOwner } from "solid-js"
 import { createStore, reconcile } from "solid-js/store"
 import { createSimpleContext } from "@opencode/ui/context"
+import type { Browser } from "@opencode/plugin-browser/rpc"
 import { useLanguage } from "@/runtime/i18n/language"
 import type { BrowserPaneCommand } from "@/runtime/platform/browser-pane"
 import { usePlatform } from "@/runtime/platform/platform"
 import type { useServer } from "@/runtime/server/current"
-import type { SessionStateKey } from "@/runtime/server/scope"
 import { useSettings } from "@/settings/model"
 import { findSessionTab, tabKey, useTabs } from "@/shell/tabs/tabs"
-import { useCurrentRoute, useLayout } from "@/shell/state/layout"
-import { sessionBrowserTab } from "@/shell/state/session-tabs"
+import { useCurrentRoute } from "@/shell/state/layout"
 import { createEventListener } from "@solid-primitives/event-listener"
 import { createBrowserConnection, type BrowserConnectionState } from "./connection"

@@ -36,14 +35,13 @@ export const { use: useBrowserAttachments, provider: BrowserAttachmentsProvider
    const settings = useSettings()
    const language = useLanguage()
    const shellTabs = useTabs()
-    const layout = useLayout()
    const route = useCurrentRoute()
    const owner = getOwner()
    const [store, setStore] = createStore<Record<string, BrowserAttachment | undefined>>({})
    // Servers whose plugin lacks the browser RPC; sessions on them stop retrying.
    const [unsupported, setUnsupported] = createStore<Record<string, true | undefined>>({})
    const live = new Map<string, Live>()
-    const preview = new Map<string, Set<(path: string) => void>>()
+    const focus = new Map<string, Set<(tabID: Browser.TabID) => void>>()
    const key = (server: Server, sessionID: string) => `${server.key}\n${sessionID}`
    const enabled = createMemo(
      () => !!platform.browserPane && settings.ready() && settings.general.experimentalBrowser(),
@@ -89,14 +87,11 @@ export const { use: useBrowserAttachments, provider: BrowserAttachmentsProvider
      enabled,
      supported: (server: Server) => !unsupported[server.key],
      state: (server: Server, sessionID: string) => store[key(server, sessionID)],
-      attach(server: Server, sessionID: string, sessionKey: SessionStateKey) {
+      attach(server: Server, sessionID: string) {
        const id = key(server, sessionID)
        if (live.has(id)) return
        const pane = platform.browserPane
        if (!pane || !enabled() || unsupported[server.key] || server.health?.incompatible) return
-        // Focus requests write to the owning session's layout even while another shell tab is routed,
-        // so the Review pane and browser tab are already selected when the user returns to it.
-        const tabs = createRoot((dispose) => ({ dispose, layout: layout.tabs(sessionKey) }), owner)
        const connection = createBrowserConnection({
          pane,
          // Resolve the current port at every wake, including after sidecar replacement.
@@ -105,15 +100,7 @@ export const { use: useBrowserAttachments, provider: BrowserAttachmentsProvider
            sessionID,
            endpoint: { ...server.conn.http, url: server.ctx.sdk.url },
          }),
-          focus: (tabID) => {
-            const tab = sessionBrowserTab(tabID)
-            batch(() => {
-              shellTabs.setPane(findSessionTab(shellTabs.store, server.key, sessionID), "review", true)
-              if (!tabs.layout.all().includes(tab)) tabs.layout.setAll([...tabs.layout.all(), tab])
-              tabs.layout.setActive(tab)
-            })
-          },
-          preview: (path) => preview.get(id)?.forEach((listener) => listener(path)),
+          focus: (tabID) => focus.get(id)?.forEach((listener) => listener(tabID)),
          change: (state) => {
            if (state.error === "browser.pane.unsupported") {
              setUnsupported(server.key, true)
@@ -151,18 +138,17 @@ export const { use: useBrowserAttachments, provider: BrowserAttachmentsProvider
        entry.dispose = () => {
          unsubscribe?.forEach((dispose) => dispose())
          connection.dispose()
-          tabs.dispose()
        }
      },
-      /** Agent requests to show a file in this session's Review pane. */
-      onPreview(server: Server, sessionID: string, listener: (path: string) => void) {
+      /** Desktop focus requests for a mounted session route; nothing is replayed to routes mounted later. */
+      onFocus(server: Server, sessionID: string, listener: (tabID: Browser.TabID) => void) {
        const id = key(server, sessionID)
-        const listeners = preview.get(id) ?? new Set()
+        const listeners = focus.get(id) ?? new Set()
        listeners.add(listener)
-        preview.set(id, listeners)
+        focus.set(id, listeners)
        return () => {
          listeners.delete(listener)
-          if (!listeners.size) preview.delete(id)
+          if (!listeners.size) focus.delete(id)
        }
      },
      command(server: Server, sessionID: string, command: BrowserPaneCommand) {
@@ -28,12 +28,10 @@ function fixture() {
    commands: Browser.Action[]
  }[] = []
  const endpoint = { url: "http://localhost:4096" }
-  const previews: string[] = []
  const connection = createBrowserConnection({
    target: () => ({ serverKey: "browser-test", sessionID: "ses_browser", endpoint: { ...endpoint } }),
    change: (state) => states.push(state),
    focus: () => {},
-    preview: (path) => previews.push(path),
    pane: {
      register(target, emit) {
        const call = { target, emit, closed: false, commands: [] as Browser.Action[] }
@@ -52,21 +50,9 @@ function fixture() {
  })
  connection.wake()
  calls[0].emit({ type: "state", state: browser })
-  return { connection, calls, states, endpoint, previews }
+  return { connection, calls, states, endpoint }
 }

-test("preview requests reach the session without touching connection state", () => {
-  const app = fixture()
-  try {
-    const before = app.states.length
-    app.calls[0].emit({ type: "preview", path: "docs/report.pdf" })
-    expect(app.previews).toEqual(["docs/report.pdf"])
-    expect(app.states).toHaveLength(before)
-  } finally {
-    app.connection.dispose()
-  }
-})
-
 test("suspension retains tabs and reconnects once on demand using the current endpoint", async () => {
  const app = fixture()
  try {
@@ -19,7 +19,6 @@ export function createBrowserConnection(input: {
  target: () => BrowserPaneTarget
  change: (state: BrowserConnectionState) => void
  focus: (tabID: Browser.TabID) => void
-  preview: (path: string) => void
 }) {
  const state: BrowserConnectionState = { browser: null, suspended: false }
  let disposed = false
@@ -34,7 +33,6 @@ export function createBrowserConnection(input: {
      (event) => {
        if (disposed || state.registration !== registration) return
        if (event.type === "focus") return input.focus(event.tabID)
-        if (event.type === "preview") return input.preview(event.path)
        if (event.error === "browser.pane.unsupported" || event.error === "browser.pane.replaced") {
          blocked = true
          registration.close()
@@ -1,4 +1,4 @@
-import { batch, createEffect, createMemo, on } from "solid-js"
+import { batch, createEffect, createMemo, on, onCleanup } from "solid-js"
 import type { Browser } from "@opencode/plugin-browser/rpc"
 import { createStore } from "solid-js/store"
 import { useLanguage } from "@/runtime/i18n/language"
@@ -33,6 +33,13 @@ export function createSessionBrowser(session: SessionModel) {
      attachment()?.browser?.tabs.filter((tab) => session.layout.tabs().all().includes(sessionBrowserTab(tab.id))) ??
      [],
  )
+  const focus = (tabID: Browser.TabID) => {
+    session.layout.view().reviewPanel.open()
+    const tabs = session.layout.tabs()
+    const key = sessionBrowserTab(tabID)
+    if (!tabs.all().includes(key)) tabs.setAll([...tabs.all(), key])
+    tabs.setActive(key)
+  }
  const command = (command: BrowserPaneCommand) => {
    const sessionID = session.identity.sessionID()
    if (!sessionID) return
@@ -59,7 +66,8 @@ export function createSessionBrowser(session: SessionModel) {
  createEffect(() => {
    const sessionID = session.identity.sessionID()
    if (!sessionID) return
-    if (attachments.enabled()) attachments.attach(server, sessionID, session.layout.sessionKey())
+    if (attachments.enabled()) attachments.attach(server, sessionID)
+    onCleanup(attachments.onFocus(server, sessionID, focus))
  })
  createEffect(
    on(
@@ -20,18 +20,13 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
  const command = useCommand()
  const state = props.browser.active
  const address = () => (state()?.url === "about:blank" ? "" : (state()?.url ?? ""))
-  const failed = () => !!state()?.loadError
  const registration = props.browser.registration
  const button = { variant: "ghost", size: "large" } as const
  const [store, setStore] = createStore({
    address: "",
    editing: false,
-    submitted: false,
-    // A submitted navigation the browser has not reported yet; keeps the empty state hidden meanwhile.
-    navigating: false,
    visible: typeof document === "undefined" || document.visibilityState === "visible",
  })
-  const empty = () => !address() && !state()?.loading && !store.navigating
  let surface: HTMLDivElement | undefined
  let addressDisplay: HTMLDivElement | undefined
  let frame: number | undefined
@@ -48,7 +43,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
      title: language.t("command.browser.reload"),
      category: language.t("command.category.view"),
      keybind: "f5",
-      disabled: !props.visible || !address(),
+      disabled: !props.visible || !state(),
      onSelect: () => {
        const tab = state()
        if (tab) props.browser.command({ type: "reload", tabID: tab.id })
@@ -76,9 +71,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
    const top = Math.round(rect.top * zoom)
    const right = Math.round(rect.right * zoom)
    const bottom = Math.round(rect.bottom * zoom)
-    // The desktop page hides blank and loading documents itself; only hide here
-    // while the pane shows its own empty or failed state over the surface.
-    const visible = props.visible && store.visible && !empty() && !failed() && !dialog.active && !covered(rect)
+    const visible = props.visible && store.visible && !dialog.active && !covered(rect)
    // The cutout exposes the app backdrop outside the rounded Review card,
    // not the browser surface inside it.
    const color = getComputedStyle(
@@ -114,25 +107,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
    if (frame === undefined) frame = requestAnimationFrame(tick)
  }

-  createEffect(on([() => state()?.id, address], () => !store.editing && setStore("address", address())))
-  // Any reported movement, including a rejected or blocked request, ends the submitted navigation.
-  createEffect(
-    on(
-      [() => state()?.id, () => state()?.generation, () => state()?.loading, () => props.browser.error()],
-      () => setStore("navigating", false),
-      { defer: true },
-    ),
-  )
-  // A blocked or rejected submission leaves the page where it was; show that page's URL again.
-  createEffect(
-    on(
-      () => props.browser.error(),
-      (error) => {
-        if (error && !store.editing) setStore("address", address())
-      },
-      { defer: true },
-    ),
-  )
+  createEffect(() => !store.editing && setStore("address", address()))
  createEffect(
    on(registration, (current) => {
      // Session routes can change before this pane unmounts. Hide the registration
@@ -148,8 +123,6 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
        () => store.visible,
        () => props.visible,
        () => state()?.id,
-        empty,
-        failed,
        registration,
      ],
      () => {
@@ -184,7 +157,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes

  return (
    <aside id="browser-panel" class="relative size-full min-w-0 overflow-hidden bg-v2-background-bg-base flex flex-col">
-      <div class="h-10 shrink-0 flex items-center gap-1 px-3 border-b border-v2-border-border-muted">
+      <div class="h-10 shrink-0 flex items-center gap-1 px-2 border-b border-v2-border-border-muted">
        <For each={["back", "forward"] as const}>
          {(direction) => (
            <Tooltip placement="top" value={language.t(direction === "back" ? "common.goBack" : "common.goForward")}>
@@ -220,7 +193,7 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
        >
          <IconButton
            {...button}
-            disabled={!state()?.loading && !address()}
+            disabled={!state()}
            aria-label={language.t(state()?.loading ? "prompt.action.stop" : "error.page.action.reload")}
            onClick={() => {
              const tab = state()
@@ -239,13 +212,8 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
          onSubmit={(event) => {
            event.preventDefault()
            const tab = state()
-            const url = store.address.trim()
-            if (!tab) return
-            if (url || failed()) {
-              setStore({ submitted: true, address: url, navigating: true })
-              props.browser.command({ type: "navigate", tabID: tab.id, url: url || "about:blank" })
-            }
-            event.currentTarget.querySelector("input")?.blur()
+            if (tab && store.address.trim())
+              props.browser.command({ type: "navigate", tabID: tab.id, url: store.address })
          }}
        >
          <input
@@ -256,14 +224,8 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
            disabled={!state()}
            placeholder={language.t("session.browser.address.placeholder")}
            aria-label={language.t("session.browser.address")}
-            onFocus={(event) => {
-              setStore("editing", true)
-              event.currentTarget.select()
-            }}
-            onClick={(event) => event.currentTarget.select()}
-            onBlur={() =>
-              setStore({ editing: false, address: store.submitted ? store.address : address(), submitted: false })
-            }
+            onFocus={() => setStore("editing", true)}
+            onBlur={() => setStore({ editing: false, address: address() })}
            onInput={(event) => setStore("address", event.currentTarget.value)}
            onScroll={(event) => {
              if (addressDisplay) addressDisplay.scrollLeft = event.currentTarget.scrollLeft
@@ -281,27 +243,12 @@ export function SessionBrowserPane(props: { browser: ReturnType<typeof createSes
          </div>
        </form>
      </div>
-      <Show when={props.browser.error() && !failed()}>
+      <Show when={props.browser.error()}>
        <div class="shrink-0 px-3 py-1.5 text-12-regular text-text-danger-base border-b border-v2-border-border-muted">
          {props.browser.error()}
        </div>
      </Show>
      <div ref={surface} class="min-h-0 flex-1 bg-v2-background-bg-base flex items-center justify-center">
-        <Show when={(empty() || failed()) && !props.browser.suspended()}>
-          {/* Add the 40px toolbar to the file empty state's 160px bottom padding to align their centers. */}
-          <div
-            dir="auto"
-            class="flex size-full flex-col items-center justify-center gap-2 p-6 pb-[200px] text-center text-text-weak"
-          >
-            <Icon name="globe" size="large" class="mb-2 shrink-0" />
-            <div class="text-[13px] font-medium leading-[var(--line-height-compact)] text-text-strong">
-              {language.t(failed() ? "session.browser.failed.title" : "session.browser.empty.title")}
-            </div>
-            <div class="text-13-regular leading-[var(--line-height-base)]">
-              {language.t(failed() ? "session.browser.failed.description" : "session.browser.empty.description")}
-            </div>
-          </div>
-        </Show>
        <Show when={props.browser.suspended()}>
          <p class="px-6 text-center text-13-regular text-v2-text-text-subtle" role="status">
            {language.t("session.browser.suspended")}
@@ -1,94 +0,0 @@
-/* The control defaults to a fixed 232px with equal segments; here it hugs its two labels. */
-[data-slot="artifact-toolbar"] [data-slot="segmented-control-v2"] {
-  width: auto;
-}
-
-[data-slot="artifact-toolbar"] [data-slot="segmented-control-v2-item"] {
-  flex: 0 0 auto;
-  padding: 0 14px;
-}
-
-/* Shrink-wrapped segments round the label box down a fraction; the ellipsis overflow then clips glyph edges. */
-[data-slot="artifact-toolbar"] [data-slot="segmented-control-v2-item-label"] {
-  overflow: visible;
-  max-width: none;
-}
-
-[data-slot="artifact-stage"] {
-  --artifact-check: color-mix(in oklch, var(--v2-text-text-base) 5%, transparent);
-  background-color: var(--v2-background-bg-deep);
-}
-
-[data-slot="artifact-stage"][data-checker] {
-  background-image:
-    linear-gradient(45deg, var(--artifact-check) 25%, transparent 25%),
-    linear-gradient(-45deg, var(--artifact-check) 25%, transparent 25%),
-    linear-gradient(45deg, transparent 75%, var(--artifact-check) 75%),
-    linear-gradient(-45deg, transparent 75%, var(--artifact-check) 75%);
-  background-size: 16px 16px;
-  background-position:
-    0 0,
-    0 8px,
-    8px -8px,
-    -8px 0;
-}
-
-[data-slot="artifact-media"] {
-  display: block;
-  border-radius: 4px;
-  box-shadow:
-    0 0 0 0.5px var(--v2-border-border-base),
-    0 12px 32px -12px color-mix(in oklch, var(--v2-text-text-base) 25%, transparent);
-}
-
-[data-slot="artifact-stage"][data-zoom="fit"] [data-slot="artifact-media"] {
-  max-width: 100%;
-  max-height: 100%;
-  object-fit: contain;
-}
-
-[data-slot="artifact-stage"][data-zoom="fit"][data-overflow] [data-slot="artifact-media"] {
-  cursor: zoom-in;
-}
-
-[data-slot="artifact-stage"][data-zoom="actual"] [data-slot="artifact-media"] {
-  cursor: zoom-out;
-}
-
-[data-slot="artifact-table"] {
-  border-collapse: separate;
-  border-spacing: 0;
-  font-variant-numeric: tabular-nums;
-}
-
-[data-slot="artifact-table"] th,
-[data-slot="artifact-table"] td {
-  padding: 5px 12px;
-  border-bottom: 1px solid var(--v2-border-border-muted);
-  border-inline-end: 1px solid var(--v2-border-border-muted);
-  white-space: pre;
-  max-width: 40ch;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  text-align: start;
-  line-height: var(--line-height-compact);
-}
-
-[data-slot="artifact-table"] th {
-  position: sticky;
-  top: 0;
-  z-index: 1;
-  background: var(--v2-background-bg-layer-01);
-  font-weight: var(--font-weight-medium);
-  color: var(--v2-text-text-muted);
-}
-
-[data-slot="artifact-table"] tbody tr:hover td {
-  background: color-mix(in oklch, var(--v2-text-text-base) 3%, transparent);
-}
-
-[data-slot="artifact-table"] td[data-index] {
-  color: var(--v2-text-text-faint);
-  text-align: end;
-  user-select: none;
-}
@@ -1,454 +0,0 @@
-import { createEffect, createMemo, For, Match, on, onCleanup, Show, Switch, type JSX } from "solid-js"
-import { createStore } from "solid-js/store"
-import { createResizeObserver } from "@solid-primitives/resize-observer"
-import { Button } from "@opencode/ui/button"
-import { FileIcon } from "@opencode/ui/file-icon"
-import { SegmentedControl, SegmentedControlItem } from "@opencode/ui/segmented-control"
-import { ScrollView } from "@opencode/ui/scroll-view"
-import { Markdown } from "@opencode/session-ui/markdown"
-import { MarkdownProvider, useMarkdown } from "@opencode/session-ui/context/markdown"
-import { getDirectory, getFilename } from "@opencode/util/path"
-import type { FileContent } from "@/runtime/server/types"
-import { useLanguage } from "@/runtime/i18n/language"
-import {
-  artifactKind,
-  blobUrlFromContent,
-  contentBytes,
-  parseDelimited,
-  resolveArtifactPath,
-  type ArtifactKind,
-} from "@/workspaces/files/artifact"
-import { useArtifactOpener } from "@/session/files/open-artifact"
-import "./artifact-view.css"
-
-type ArtifactMode = "preview" | "source"
-
-/** Facts a viewer learns from the decoded media, shown in the toolbar. */
-type ArtifactInfo = { width?: number; height?: number; duration?: number; rows?: number; columns?: number }
-
-type MediaProps = {
-  path: string
-  content: FileContent
-  onInfo: (info: ArtifactInfo) => void
-  /** The browser could not decode the bytes; the host falls back to the binary placeholder. */
-  onError: () => void
-}
-
-/** Kinds that render a preview from their text and can toggle back to highlighted source. */
-const previewableKinds = new Set<ArtifactKind>(["svg", "html", "markdown", "mermaid", "table"])
-
-/**
- * Renders a loaded non-text file: media, documents, and data get a dedicated viewer with a toolbar;
- * previewable text kinds can switch to `source`, which the host supplies (its code view).
- */
-export function ArtifactView(props: { path: string; content: FileContent; cacheKey?: string; source: JSX.Element }) {
-  const language = useLanguage()
-  const [state, setState] = createStore({
-    mode: "preview" as ArtifactMode,
-    info: {} as ArtifactInfo,
-    // Media the browser could not decode falls back to the binary placeholder.
-    undecodable: false,
-  })
-  createEffect(
-    on(
-      () => props.content,
-      () => setState({ mode: "preview", info: {}, undecodable: false }),
-      { defer: true },
-    ),
-  )
-
-  const kind = createMemo<ArtifactKind | "binary">(() => {
-    if (props.content.type === "binary" && !props.content.mimeType) return "binary"
-    if (state.undecodable) return "binary"
-    return artifactKind(props.path)
-  })
-  const previewable = createMemo(() => {
-    const value = kind()
-    return value !== "binary" && previewableKinds.has(value)
-  })
-  const meta = createMemo(() => {
-    const info = state.info
-    return [
-      info.width && info.height ? `${info.width} × ${info.height}` : undefined,
-      info.duration ? formatDuration(info.duration) : undefined,
-      info.rows !== undefined ? language.plural("file.view.table.rows", Math.max(0, info.rows - 1)) : undefined,
-      info.columns !== undefined ? language.plural("file.view.table.columns", info.columns) : undefined,
-      formatBytes(language.intl(), contentBytes(props.content)),
-    ].filter((item): item is string => !!item)
-  })
-
-  const media = { onInfo: (info: ArtifactInfo) => setState("info", info), onError: () => setState("undecodable", true) }
-  const rendered = () => (
-    <ScrollView class="min-h-0 flex-1">
-      <Show
-        when={kind() === "markdown"}
-        fallback={<ArtifactMermaid text={props.content.content} cacheKey={props.cacheKey} />}
-      >
-        <ArtifactMarkdown path={props.path} text={props.content.content} cacheKey={props.cacheKey} />
-      </Show>
-    </ScrollView>
-  )
-
-  return (
-    <>
-      <ArtifactToolbar
-        mode={state.mode}
-        onModeChange={previewable() ? (mode) => setState("mode", mode) : undefined}
-        meta={meta()}
-        actions={
-          <Show when={kind() === "html"}>
-            <OpenInBrowserButton path={props.path} />
-          </Show>
-        }
-      />
-      <Show when={!previewable() || state.mode === "preview"} fallback={props.source}>
-        <Switch>
-          <Match when={kind() === "image" || kind() === "svg"}>
-            <ArtifactImage path={props.path} content={props.content} {...media} />
-          </Match>
-          <Match when={kind() === "video"}>
-            <ArtifactVideo path={props.path} content={props.content} {...media} />
-          </Match>
-          <Match when={kind() === "audio"}>
-            <ArtifactAudio path={props.path} content={props.content} {...media} />
-          </Match>
-          <Match when={kind() === "pdf" || kind() === "html"}>
-            <ArtifactFrame path={props.path} content={props.content} kind={kind() === "pdf" ? "pdf" : "html"} />
-          </Match>
-          <Match when={kind() === "font"}>
-            <ArtifactFont path={props.path} content={props.content} />
-          </Match>
-          <Match when={kind() === "table"}>
-            <ArtifactTable path={props.path} text={props.content.content} onInfo={media.onInfo} />
-          </Match>
-          <Match when={kind() === "markdown" || kind() === "mermaid"}>{rendered()}</Match>
-          <Match when={kind() === "binary"}>
-            <ArtifactBinary path={props.path} size={formatBytes(language.intl(), contentBytes(props.content))} />
-          </Match>
-        </Switch>
-      </Show>
-    </>
-  )
-}
-
-function formatBytes(locale: string, bytes: number) {
-  const units = ["byte", "kilobyte", "megabyte", "gigabyte"] as const
-  const index = Math.min(units.length - 1, bytes > 0 ? Math.floor(Math.log10(bytes) / 3) : 0)
-  const value = bytes / 1000 ** index
-  return new Intl.NumberFormat(locale, {
-    style: "unit",
-    unit: units[index],
-    // "short" bytes render as the singular "byte"; the long form pluralizes correctly.
-    unitDisplay: index === 0 ? "long" : "short",
-    maximumFractionDigits: value >= 100 || index === 0 ? 0 : 1,
-  }).format(value)
-}
-
-function formatDuration(seconds: number) {
-  const total = Math.round(seconds)
-  const minutes = Math.floor(total / 60)
-  return `${minutes}:${String(total % 60).padStart(2, "0")}`
-}
-
-function ArtifactToolbar(props: {
-  mode?: ArtifactMode
-  onModeChange?: (mode: ArtifactMode) => void
-  meta: string[]
-  actions?: JSX.Element
-}) {
-  const language = useLanguage()
-  return (
-    <div data-slot="artifact-toolbar" class="flex h-10 shrink-0 items-center gap-3 px-4">
-      <Show when={props.onModeChange}>
-        <SegmentedControl
-          value={props.mode ?? "preview"}
-          onChange={(value) => {
-            if (value === "preview" || value === "source") props.onModeChange?.(value)
-          }}
-        >
-          <SegmentedControlItem value="preview">{language.t("file.view.preview")}</SegmentedControlItem>
-          <SegmentedControlItem value="source">{language.t("file.view.source")}</SegmentedControlItem>
-        </SegmentedControl>
-      </Show>
-      <div class="ms-auto flex min-w-0 items-center gap-3">
-        <div class="flex min-w-0 items-center gap-2 text-12-regular text-text-weak">
-          <For each={props.meta}>
-            {(item, index) => (
-              <>
-                <Show when={index() > 0}>
-                  <span aria-hidden class="text-text-faint">
-                    ·
-                  </span>
-                </Show>
-                <span class="truncate tabular-nums">{item}</span>
-              </>
-            )}
-          </For>
-        </div>
-        {props.actions}
-      </div>
-    </div>
-  )
-}
-
-function OpenInBrowserButton(props: { path: string }) {
-  const language = useLanguage()
-  const artifacts = useArtifactOpener()
-  return (
-    <Show when={artifacts.canOpenInBrowser(props.path)}>
-      <Button size="small" variant="ghost" icon="globe" onClick={() => artifacts.openInBrowser(props.path)}>
-        {language.t("file.view.openInBrowser")}
-      </Button>
-    </Show>
-  )
-}
-
-function createBlobUrl(content: () => FileContent) {
-  return createMemo(() => {
-    const value = blobUrlFromContent(content())
-    onCleanup(() => URL.revokeObjectURL(value))
-    return value
-  })
-}
-
-/** Images and SVG previews: fit the pane, click to inspect at 1:1 when the image is larger. */
-function ArtifactImage(props: MediaProps) {
-  const url = createBlobUrl(() => props.content)
-  const [state, setState] = createStore({ zoom: "fit" as "fit" | "actual", overflow: false, width: 0, height: 0 })
-  let stage: HTMLDivElement | undefined
-  const measure = () => {
-    if (!stage) return
-    setState("overflow", state.width > stage.clientWidth - 48 || state.height > stage.clientHeight - 48)
-  }
-  createResizeObserver(
-    () => stage,
-    () => measure(),
-  )
-  createEffect(() => {
-    url()
-    setState({ zoom: "fit", overflow: false })
-  })
-  return (
-    <div
-      ref={stage}
-      data-slot="artifact-stage"
-      data-checker
-      data-zoom={state.zoom}
-      data-overflow={state.overflow || undefined}
-      class="relative min-h-0 flex-1 overflow-auto"
-    >
-      <div
-        classList={{
-          "absolute inset-0 flex items-center justify-center p-6": state.zoom === "fit",
-          "flex min-h-full min-w-full w-max items-center justify-center p-6": state.zoom === "actual",
-        }}
-      >
-        <img
-          data-slot="artifact-media"
-          src={url()}
-          alt={getFilename(props.path)}
-          draggable={false}
-          onError={() => props.onError()}
-          onLoad={(event) => {
-            const image = event.currentTarget
-            setState({ width: image.naturalWidth, height: image.naturalHeight })
-            props.onInfo({ width: image.naturalWidth, height: image.naturalHeight })
-            measure()
-          }}
-          onClick={() => {
-            if (!state.overflow && state.zoom === "fit") return
-            setState("zoom", state.zoom === "fit" ? "actual" : "fit")
-          }}
-        />
-      </div>
-    </div>
-  )
-}
-
-function ArtifactVideo(props: MediaProps) {
-  const url = createBlobUrl(() => props.content)
-  return (
-    <div data-slot="artifact-stage" data-zoom="fit" class="relative min-h-0 flex-1 overflow-hidden">
-      <div class="absolute inset-0 flex items-center justify-center p-6">
-        <video
-          data-slot="artifact-media"
-          class="w-full bg-black"
-          controls
-          preload="metadata"
-          playsinline
-          onError={() => props.onError()}
-          src={url()}
-          onLoadedMetadata={(event) => {
-            const video = event.currentTarget
-            props.onInfo({ width: video.videoWidth, height: video.videoHeight, duration: video.duration })
-          }}
-        />
-      </div>
-    </div>
-  )
-}
-
-function ArtifactAudio(props: MediaProps) {
-  const url = createBlobUrl(() => props.content)
-  return (
-    <div data-slot="artifact-stage" class="relative min-h-0 flex-1 overflow-auto">
-      <div class="absolute inset-0 flex items-center justify-center p-6">
-        <div class="flex w-full max-w-lg flex-col items-center gap-5 rounded-xl border border-v2-border-border-muted bg-v2-background-bg-base px-8 py-8 shadow-[var(--v2-elevation-raised)]">
-          <div class="flex size-14 items-center justify-center rounded-full bg-v2-background-bg-layer-02">
-            <FileIcon node={{ path: props.path, type: "file" }} class="size-7" />
-          </div>
-          <div class="max-w-full truncate text-14-medium text-text-strong">{getFilename(props.path)}</div>
-          <audio
-            class="w-full"
-            onError={() => props.onError()}
-            controls
-            preload="metadata"
-            src={url()}
-            onLoadedMetadata={(event) => props.onInfo({ duration: event.currentTarget.duration })}
-          />
-        </div>
-      </div>
-    </div>
-  )
-}
-
-function ArtifactFrame(props: { path: string; content: FileContent; kind: "pdf" | "html" }) {
-  const url = createBlobUrl(() => props.content)
-  // PDF Open Parameters: start with the thumbnail pane closed and the page fitted to the pane width.
-  const src = () => (props.kind === "pdf" ? `${url()}#navpanes=0&view=FitH` : url())
-  return (
-    <iframe
-      class="block h-full w-full flex-1 border-0 bg-white"
-      title={getFilename(props.path)}
-      src={src()}
-      // The PDF viewer is Chromium's own and does not run in a sandboxed frame. HTML runs as an
-      // opaque origin: no app storage, cookies, or credentialed requests reach it.
-      sandbox={props.kind === "html" ? "allow-scripts allow-popups allow-forms allow-modals" : undefined}
-      referrerPolicy="no-referrer"
-    />
-  )
-}
-
-function ArtifactMarkdown(props: { path: string; text: string; cacheKey?: string }) {
-  const parent = useMarkdown()
-  const artifacts = useArtifactOpener()
-  // getDirectory yields "/" for a root-level file, which would make relative links absolute.
-  const dir = createMemo(() => (props.path.includes("/") || props.path.includes("\\") ? getDirectory(props.path) : ""))
-  // Absolute references bypass the file's directory; relative ones resolve against it.
-  const resolve = (href: string) => (/^([a-z]:)?\//i.test(href) ? href : (resolveArtifactPath(dir(), href) ?? href))
-  return (
-    <MarkdownProvider
-      readImage={(src, signal) => parent?.readImage?.(resolve(src), signal) ?? Promise.resolve(undefined)}
-      openLocalFile={(href) => artifacts.open(href, dir())}
-    >
-      <div class="mx-auto w-full max-w-3xl px-8 py-6">
-        <Markdown text={props.text} cacheKey={props.cacheKey} class="select-text" />
-      </div>
-    </MarkdownProvider>
-  )
-}
-
-/** Mermaid sources render through the same fenced-block pipeline the timeline uses. */
-function ArtifactMermaid(props: { text: string; cacheKey?: string }) {
-  return (
-    <div class="mx-auto w-full max-w-4xl px-8 py-6">
-      <Markdown text={`\`\`\`mermaid\n${props.text}\n\`\`\``} cacheKey={props.cacheKey} class="select-text" />
-    </div>
-  )
-}
-
-function ArtifactTable(props: { path: string; text: string; onInfo: (info: ArtifactInfo) => void }) {
-  const language = useLanguage()
-  const parsed = createMemo(() => parseDelimited(props.text, props.path.toLowerCase().endsWith(".tsv") ? "\t" : ","))
-  createEffect(() => props.onInfo({ rows: parsed().total, columns: parsed().columns }))
-  // Pad the header to the widest row so no data column is dropped.
-  const header = () => Array.from({ length: parsed().columns }, (_, index) => parsed().rows[0]?.[index] ?? "")
-  const body = () => parsed().rows.slice(1)
-  return (
-    <div class="min-h-0 flex-1 overflow-auto">
-      <table data-slot="artifact-table" class="min-w-full text-13-regular text-text-base">
-        <thead>
-          <tr>
-            <th data-index />
-            <For each={header()}>{(cell) => <th>{cell}</th>}</For>
-          </tr>
-        </thead>
-        <tbody>
-          <For each={body()}>
-            {(row, index) => (
-              <tr>
-                <td data-index>{index() + 1}</td>
-                <For each={header()}>{(_, column) => <td>{row[column()] ?? ""}</td>}</For>
-              </tr>
-            )}
-          </For>
-        </tbody>
-      </table>
-      <Show when={parsed().total > parsed().rows.length}>
-        <div class="px-4 py-3 text-12-regular text-text-weak">
-          {language.t("file.view.table.truncated", { shown: parsed().rows.length - 1, total: parsed().total - 1 })}
-        </div>
-      </Show>
-    </div>
-  )
-}
-
-const specimenSizes = [12, 16, 24, 40, 64]
-
-function ArtifactFont(props: { path: string; content: FileContent }) {
-  const language = useLanguage()
-  const url = createBlobUrl(() => props.content)
-  const family = createMemo(() => `artifact-${Math.random().toString(36).slice(2)}`)
-  createEffect(() => {
-    const face = new FontFace(family(), `url(${url()})`)
-    document.fonts.add(face)
-    void face.load().catch(() => undefined)
-    onCleanup(() => document.fonts.delete(face))
-  })
-  return (
-    <div class="min-h-0 flex-1 overflow-auto">
-      <div class="mx-auto flex w-full max-w-3xl flex-col gap-6 px-8 py-8" style={{ "font-family": `"${family()}"` }}>
-        <div class="text-text-strong" style={{ "font-size": "56px", "line-height": "1.1" }}>
-          {getFilename(props.path).replace(/\.[^.]+$/, "")}
-        </div>
-        <div class="break-all text-text-base" style={{ "font-size": "22px", "line-height": "1.4" }}>
-          ABCDEFGHIJKLMNOPQRSTUVWXYZ
-          <br />
-          abcdefghijklmnopqrstuvwxyz
-          <br />
-          0123456789 !?&@#%(){}[]
-        </div>
-        <div class="flex flex-col gap-3 border-t border-v2-border-border-muted pt-6">
-          <For each={specimenSizes}>
-            {(size) => (
-              <div class="flex items-baseline gap-4">
-                <span
-                  class="w-8 shrink-0 text-12-regular text-text-faint tabular-nums"
-                  style={{ "font-family": "var(--font-family-mono)" }}
-                >
-                  {size}
-                </span>
-                <span class="text-text-base" style={{ "font-size": `${size}px`, "line-height": "1.25" }}>
-                  {language.t("file.view.fontSample")}
-                </span>
-              </div>
-            )}
-          </For>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-function ArtifactBinary(props: { path: string; size: string }) {
-  const language = useLanguage()
-  return (
-    <div data-slot="artifact-stage" class="relative min-h-0 flex-1">
-      <div class="absolute inset-0 flex flex-col items-center justify-center gap-3 p-6 text-center">
-        <FileIcon node={{ path: props.path, type: "file" }} class="size-8 text-text-weak" />
-        <div class="text-14-medium text-text-strong">{getFilename(props.path)}</div>
-        <div class="text-13-regular text-text-weak">{language.t("file.view.binary", { size: props.size })}</div>
-      </div>
-    </div>
-  )
-}
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, createSignal, Match, on, onCleanup, Show, Switch } from "solid-js"
+import { createEffect, createMemo, createSignal, Match, on, onCleanup, Switch } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Dynamic } from "solid-js/web"
 import { makeEventListener } from "@solid-primitives/event-listener"
@@ -11,9 +11,8 @@ import { LineCommentOverflowIcon } from "@opencode/ui/line-comment"
 import { Menu } from "@opencode/ui/menu"
 import { Tabs } from "@opencode/ui/tabs"
 import { ScrollView } from "@opencode/ui/scroll-view"
+import { showToast } from "@/shell/notifications/toast"
 import { selectionFromLines, useFile, type FileSelection, type SelectedLineRange } from "@/workspaces/files/model"
-import { artifactKind } from "@/workspaces/files/artifact"
-import { ArtifactView } from "@/session/files/artifact-view"
 import { useComments } from "@/composer/comments"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useComposerState } from "@/composer/persistence"
@@ -206,11 +205,6 @@ export function SessionFileView(props: SessionFileViewProps) {
  })
  const contents = createMemo(() => state()?.content?.content ?? "")
  const cacheKey = createMemo(() => sampledChecksum(contents()))
-  // Plain text keeps the code view; every other kind is rendered by ArtifactView.
-  const artifact = createMemo(() => {
-    const content = state()?.content
-    return content?.type === "binary" || artifactKind(path() ?? "") !== "text"
-  })
  const selectedLines = createMemo<SelectedLineRange | null>(() => {
    const p = path()
    if (!p) return null
@@ -439,42 +433,39 @@ export function SessionFileView(props: SessionFileViewProps) {
        }}
        search={search}
        class="select-text"
-        // Media and previews have their own viewers below; the code view only ever shows text.
-        media={{ mode: "off" }}
+        media={{
+          mode: "auto",
+          path: path(),
+          current: state()?.content,
+          onLoad: scrollSync.queueRestore,
+          onError: (args: { kind: "image" | "audio" | "svg" }) => {
+            if (args.kind !== "svg") return
+            showToast({
+              variant: "error",
+              title: language.t("toast.file.loadFailed.title"),
+            })
+          },
+        }}
      />
    </div>
  )

-  // The code view scrolls inside ScrollView so line state and scroll position persist per tab.
-  const codeView = (source: string) => (
-    <ScrollView class="min-h-0 flex-1" viewportRef={scrollSync.setViewport} onScroll={scrollSync.handleScroll}>
-      {renderFile(source)}
-    </ScrollView>
-  )
-
  const content = () => (
-    <div class="mt-3 relative h-full min-h-0 flex flex-col">
-      <Switch>
-        <Match when={state()?.loaded ? state()?.content : undefined}>
-          {(value) => (
-            <Show when={artifact()} fallback={codeView(value().content)}>
-              <ArtifactView
-                path={path() ?? ""}
-                content={value()}
-                cacheKey={cacheKey()}
-                source={codeView(value().content)}
-              />
-            </Show>
-          )}
-        </Match>
-        <Match when={state()?.loading}>
-          <div class="px-6 py-4 text-text-weak">{language.t("common.loading")}…</div>
-        </Match>
-        <Match when={state()?.notFound ? state()?.name : undefined}>
-          {(name) => <div class="px-6 py-4 text-text-weak">{language.t("file.error.notFound", { name: name() })}</div>}
-        </Match>
-        <Match when={state()?.error}>{(err) => <div class="px-6 py-4 text-text-weak">{err()}</div>}</Match>
-      </Switch>
+    <div class="mt-3 relative h-full min-h-0">
+      <ScrollView class="h-full" viewportRef={scrollSync.setViewport} onScroll={scrollSync.handleScroll}>
+        <Switch>
+          <Match when={state()?.loaded}>{renderFile(contents())}</Match>
+          <Match when={state()?.loading}>
+            <div class="px-6 py-4 text-text-weak">{language.t("common.loading")}…</div>
+          </Match>
+          <Match when={state()?.notFound ? state()?.name : undefined}>
+            {(name) => (
+              <div class="px-6 py-4 text-text-weak">{language.t("file.error.notFound", { name: name() })}</div>
+            )}
+          </Match>
+          <Match when={state()?.error}>{(err) => <div class="px-6 py-4 text-text-weak">{err()}</div>}</Match>
+        </Switch>
+      </ScrollView>
    </div>
  )

@@ -1,105 +0,0 @@
-import { createEffect, onCleanup, type ParentProps } from "solid-js"
-import { createSimpleContext } from "@opencode/ui/context"
-import { MarkdownProvider, useMarkdown } from "@opencode/session-ui/context/markdown"
-import { useBrowserAttachments } from "@/session/browser/attachments"
-import type { SessionModel } from "@/session/model"
-import { useFile } from "@/workspaces/files/model"
-import { artifactKind, resolveArtifactPath } from "@/workspaces/files/artifact"
-import { encodeFilePath } from "@/workspaces/files/path"
-import { useWorkspaceLocation } from "@/workspaces/location"
-import { useServer } from "@/runtime/server/current"
-import { ServerConnection } from "@/runtime/server/registry"
-import { useSessionLayout } from "@/session/session-layout"
-import { createOpenSessionFileTab } from "@/session/helpers"
-import type { createSessionBrowser } from "@/session/browser/model"
-
-/** Routes local links in timeline markdown to the artifact opener while keeping image loading. */
-export function ArtifactMarkdownProvider(props: ParentProps) {
-  const markdown = useMarkdown()
-  const artifacts = useArtifactOpener()
-  return (
-    <MarkdownProvider readImage={markdown?.readImage} openLocalFile={(path) => artifacts.open(path)}>
-      {props.children}
-    </MarkdownProvider>
-  )
-}
-
-/**
- * Opens files the agent references as side-panel tabs, inside or outside the workspace, or as
- * a browser tab for HTML when the desktop can load the file directly.
- */
-export const { use: useArtifactOpener, provider: ArtifactOpenerProvider } = createSimpleContext({
-  name: "ArtifactOpener",
-  init: (props: { session: SessionModel; browser: ReturnType<typeof createSessionBrowser> }) => {
-    const file = useFile()
-    const server = useServer()
-    const location = useWorkspaceLocation()
-    const attachments = useBrowserAttachments()
-    const { tabs, view } = useSessionLayout()
-
-    const root = () => location().directory.replaceAll("\\", "/").replace(/\/+$/, "")
-
-    /**
-     * Turn a link into a path `useFile` can load: workspace-relative when it is under the root,
-     * otherwise absolute. Relative links resolve against `base`; ones that climb past the root
-     * become absolute too, so a `../../shared/report.pdf` still opens.
-     */
-    const resolve = (href: string, base?: string) => {
-      // Agents cite locations as path:line or path:line:col; the file is what opens.
-      const value = href.replaceAll("\\", "/").replace(/:\d+(?::\d+)?$/, "")
-      if (/^[a-z]:\//i.test(value) || value.startsWith("/")) return file.normalize(value)
-      const relative = resolveArtifactPath(base ?? "", value)
-      if (relative !== undefined) return file.normalize(relative)
-      // Climbing past the workspace root: resolve from the referencing folder's absolute location.
-      const dir = base ? `${root()}/${base.replace(/\/+$/, "")}` : root()
-      return file.normalize(resolveArtifactPath(dir, value) ?? value)
-    }
-
-    const showTab = createOpenSessionFileTab({
-      normalizeTab: (tab) => tab,
-      openTab: (tab) => tabs().open(tab),
-      pathFromTab: file.pathFromTab,
-      loadFile: () => undefined,
-      openReviewPanel: () => {
-        if (!view().reviewPanel.opened()) view().reviewPanel.open()
-      },
-      setActive: (tab) => tabs().setActive(tab),
-    })
-
-    // Inline paths are guessed from text, so confirm the file exists before a tab appears for it.
-    const openTab = (path: string) => {
-      void file.load(path).then(() => {
-        if (file.get(path)?.loaded) showTab(file.tab(path))
-      })
-    }
-
-    // The desktop's own sidecar shares this disk, and its browser pane accepts file:// URLs inside the
-    // session workspace only. Forwarded loopback servers do not qualify, matching the desktop policy.
-    const canOpenInBrowser = (path?: string) =>
-      ServerConnection.builtin(server.conn) &&
-      props.browser.available() &&
-      props.browser.attached() &&
-      (path === undefined || !file.absolute(path))
-
-    const openInBrowser = (path: string) => {
-      props.browser.command({ type: "tabs.open", url: `file://${encodeFilePath(`${root()}/${path}`)}` })
-    }
-
-    /** Open `href` as referenced from `base` (a workspace-relative directory, "" for the root). */
-    const open = (href: string, base?: string) => {
-      const path = resolve(href, base)
-      if (!path) return
-      if (artifactKind(path) === "html" && canOpenInBrowser(path)) return openInBrowser(path)
-      openTab(path)
-    }
-
-    // The agent's browser.preview tool arrives through the desktop browser pane attachment.
-    createEffect(() => {
-      const sessionID = props.session.identity.sessionID()
-      if (!sessionID) return
-      onCleanup(attachments.onPreview(server, sessionID, (path) => open(path)))
-    })
-
-    return { canOpenInBrowser, openInBrowser, open }
-  },
-})
@@ -173,9 +173,7 @@ export function SessionFileBrowserTab(props: {
          <SessionFilePanelV2Empty>
            <div class="flex flex-col items-center gap-2 text-center text-text-weak">
              <Icon name="file-tree" size="large" class="mb-2" />
-              <div class="text-[13px] font-medium leading-[13px] text-text-strong">
-                {language.t("command.file.open")}
-              </div>
+              <div class="text-[13px] font-medium leading-[13px] text-text-strong">{language.t("command.file.open")}</div>
              <div class="h-5 text-13-regular leading-5">{language.t("session.files.selectToOpen")}</div>
            </div>
          </SessionFilePanelV2Empty>
@@ -1,8 +1,6 @@
 import { children, createMemo, Show } from "solid-js"
 import type { JSX } from "solid-js"
 import { useSortable } from "@dnd-kit/solid/sortable"
-import { Icon } from "@opencode/ui/icon"
-import { IconButton } from "@opencode/ui/icon-button"
 import { Keybind } from "@opencode/ui/keybind"
 import { Tooltip } from "@opencode/ui/tooltip"
 import { Tabs } from "@opencode/ui/tabs"
@@ -71,19 +69,9 @@ export function SortableTab(props: {
              placement="bottom"
              gutter={10}
            >
-              <IconButton
-                size="small"
-                variant="ghost-muted"
-                onPointerDown={(event) => {
-                  event.preventDefault()
-                  event.stopPropagation()
-                }}
-                onClick={(event) => {
-                  event.preventDefault()
-                  event.stopPropagation()
-                  props.onTabClose(props.tab)
-                }}
-                icon={<Icon name="xmark-small" />}
+              <Tabs.CloseButton
+                class="h-5 w-5"
+                onClick={() => props.onTabClose(props.tab)}
                aria-label={language.t("common.closeTab")}
              />
            </Tooltip>
@@ -137,7 +137,6 @@ export function useSessionModel() {
      tabs: layout.tabs,
      view: layout.view,
      tabKey: layout.tabKey,
-      sessionKey: layout.sessionKey,
    },
    ownership: createSessionOwnership(layout.sessionKey),
    tabs: {
@@ -155,9 +155,6 @@ export function createSessionReview(input: {
  const count = () => diffs().length
  const hasChanges = () => count() > 0
  const ready = () => {
-    // A project without VCS never enables vcsQuery, so its status stays "pending" forever.
-    const project = input.session.project()
-    if (project && !project.vcs) return true
    if (mode() === "git" || mode() === "branch") return !vcsQuery.isPending
    return true
  }
@@ -249,7 +249,7 @@ function ReviewTitle(props: { review: SessionReviewModel }) {
 function ReviewEmpty(props: { review: SessionReviewModel; loadingClass: string }) {
  const language = useLanguage()
  const loading = () => (props.review.mode() === "git" || props.review.mode() === "branch") && !props.review.ready()
-  const noGit = () => props.review.noGit()
+  const noGit = () => props.review.mode() === "turn" && props.review.noGit()
  const text = () => {
    if (props.review.mode() === "git") return language.t("session.review.noUncommittedChanges")
    if (props.review.mode() === "branch") return language.t("session.review.noBranchChanges")
@@ -282,7 +282,7 @@ function ReviewEmpty(props: { review: SessionReviewModel; loadingClass: string }
 function ReviewPanelEmpty(props: { review: SessionReviewModel }) {
  const language = useLanguage()
  const loading = () => (props.review.mode() === "git" || props.review.mode() === "branch") && !props.review.ready()
-  const noGit = () => props.review.noGit()
+  const noGit = () => props.review.mode() === "turn" && props.review.noGit()
  return (
    <Switch>
      <Match when={loading()}>
@@ -38,7 +38,6 @@ import { SessionReviewToggle } from "./header/session-header-actions"
 import { createAnimatedPresence } from "@/runtime/animated-presence"
 import { createSessionBrowser } from "./browser/model"
 import { createTimelineCache } from "./timeline/cache"
-import { ArtifactMarkdownProvider, ArtifactOpenerProvider } from "./files/open-artifact"

 const SessionMobileFiles = lazy(async () => {
  const { SessionMobileFiles } = await import("./files/session-mobile-files")
@@ -51,26 +50,14 @@ const SessionSummaryPanel = lazy(async () => {
 })

 export function SessionScreen(props: { session: SessionModel }) {
-  // The timeline cache captures its owner when created, so link handling must be provided above it.
-  const browser = createSessionBrowser(props.session)
-  return (
-    <ArtifactOpenerProvider session={props.session} browser={browser}>
-      <ArtifactMarkdownProvider>
-        <SessionScreenContent session={props.session} browser={browser} />
-      </ArtifactMarkdownProvider>
-    </ArtifactOpenerProvider>
-  )
-}
-
-function SessionScreenContent(props: { session: SessionModel; browser: ReturnType<typeof createSessionBrowser> }) {
  const session = props.session
-  const browser = props.browser
  const server = useServer()
  const detailsProject = createMemo(() => {
    const info = session.data.info()
    return info ? projectForSession(info, server.ctx.sync.data.project) : undefined
  })
  const isDesktop = session.isDesktop
+  const browser = createSessionBrowser(session)
  const screen = createSessionScreenLayout(session)
  const timeline = createSessionTimelineInteraction(session)
  const timelineSearch = createTimelineSearchController({
@@ -1,8 +1,7 @@
-import { For, Show, createEffect, createMemo, on, onCleanup } from "solid-js"
+import { For, Show, createEffect, createMemo, lazy, on, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import { Button } from "@opencode/ui/button"
-import { Icon } from "@opencode/ui/icon"
 import { IconButton } from "@opencode/ui/icon-button"
 import { TextInput } from "@opencode/ui/text-input"
 import { showToast } from "@/shell/notifications/toast"
@@ -18,6 +17,8 @@ import { useLanguage } from "@/runtime/i18n/language"
 import { useSettings } from "@/settings/model"
 import { SettingsList } from "@/settings/list"

+const Icon = lazy(() => import("@opencode/ui/icon").then((module) => ({ default: module.Icon })))
+
 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
 const PALETTE_ID = "command.palette"

@@ -1102,6 +1102,10 @@
  padding-block: 20px;
 }

+.settings-server-connection .settings-servers-lead {
+  gap: 4px;
+}
+
 .settings-servers-row:not(:last-child) {
  padding-bottom: 16px;
  margin-bottom: 16px;
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { canOpenTabRename, forwardTabRef, isTabCloseTarget } from "./tab-gesture"
+import { canOpenTabRename, canStartTabDrag, forwardTabRef, isTabCloseTarget } from "./tab-gesture"

 describe("titlebar tab gestures", () => {
  test("excludes close controls from tab gestures", () => {
@@ -24,4 +24,10 @@ describe("titlebar tab gestures", () => {
    expect(canOpenTabRename(false, false, false)).toBe(true)
    expect(canOpenTabRename(false, false, true)).toBe(false)
  })
+
+  test("preserves native panning for touch pointers", () => {
+    expect(canStartTabDrag("mouse")).toBe(true)
+    expect(canStartTabDrag("pen")).toBe(true)
+    expect(canStartTabDrag("touch")).toBe(false)
+  })
 })
@@ -4,6 +4,10 @@ export function isTabCloseTarget(target: EventTarget | null) {
  return target instanceof Element && !!target.closest('[data-slot="tab-close"]')
 }

+export function canStartTabDrag(pointerType: string) {
+  return pointerType !== "touch"
+}
+
 export function forwardTabRef(ref: Ref<HTMLDivElement> | undefined, element: HTMLDivElement) {
  if (typeof ref === "function") ref(element)
 }
@@ -9,8 +9,7 @@
  justify-content: center;
 }

-[data-titlebar-tab],
-[data-titlebar-tab-action] {
+[data-titlebar-tab] {
  --tab-base: var(--v2-background-bg-deep);
  --tab-overlay: transparent;
  background: linear-gradient(var(--tab-overlay), var(--tab-overlay)), var(--tab-base);
@@ -69,14 +68,6 @@
  --tab-overlay: var(--v2-overlay-simple-overlay-pressed);
 }

-[data-titlebar-tab-action]:is(:hover, :focus-visible) {
-  --tab-overlay: var(--v2-overlay-simple-overlay-hover);
-}
-
-[data-titlebar-tab-action]:is(:active, [data-state="pressed"]) {
-  --tab-overlay: var(--v2-overlay-simple-overlay-pressed);
-}
-
 [data-titlebar-tab]:is(:hover, [data-state="pressed"]) [data-slot="tab-close"] {
  background: linear-gradient(var(--tab-overlay), var(--tab-overlay)), var(--tab-base);
 }
@@ -328,7 +328,6 @@ export function TabNavItem(props: {

  return (
    <Menu.Context
-      modal={false}
      onOpenChange={(open) => {
        setMenu("open", open)
        if (open) setPopoverOpen(false)
@@ -16,7 +16,7 @@ import { useTabs } from "@/shell/tabs/tabs"
 import { createTabComposerState } from "@/composer/persistence"
 import { base64Encode } from "@opencode/util/encode"
 import { showToast } from "@/shell/notifications/toast"
-import { isTabCloseTarget } from "./tab-gesture"
+import { canStartTabDrag, isTabCloseTarget } from "./tab-gesture"
 import { adjacentTabKey, mergeVisibleTabOrder } from "./tab-order"
 import type { SessionInfo } from "@opencode/client/promise"

@@ -292,11 +292,9 @@ export function TitlebarTabStrip(props: {
        <DragDropProvider
          sensors={[
            PointerSensor.configure({
-              activationConstraints: (event) =>
-                event.pointerType === "touch"
-                  ? [new PointerActivationConstraints.Distance({ value: 8 })]
-                  : [new PointerActivationConstraints.Distance({ value: 4 })],
+              activationConstraints: [new PointerActivationConstraints.Distance({ value: 4 })],
              preventActivation: (event) =>
+                !canStartTabDrag(event.pointerType) ||
                isTabCloseTarget(event.target) ||
                (event.target instanceof Element && !!event.target.closest('[contenteditable="true"]')),
            }),
@@ -315,7 +313,6 @@ export function TitlebarTabStrip(props: {
            if (!source) return
            const tab = props.tabs.find((item) => tabKey(item) === source.id.toString())
            if (!tab) return
-            if (vertical()) return
            const tabEl = source.element?.querySelector<HTMLDivElement>("[data-titlebar-tab]")
            props.onNavigate(tab, tabEl ?? undefined)
          }}
@@ -351,10 +351,9 @@ export function Titlebar(props: {
              >
                <button
                  type="button"
-                  data-titlebar-tab-action
                  data-action="vertical-tabs-home"
                  data-state={layout.route().type === "home" ? "pressed" : undefined}
-                  class="group mb-1 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:text-v2-text-text-base data-[state=pressed]:text-v2-text-text-base"
+                  class="group mb-1 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base data-[state=pressed]:bg-v2-background-bg-layer-02 data-[state=pressed]:text-v2-text-text-base"
                  onClick={toggleHome}
                  aria-label={language.t("home.title")}
                  aria-pressed={layout.route().type === "home"}
@@ -651,9 +650,8 @@ export function Titlebar(props: {
                            {homeButton(true)}
                            <button
                              type="button"
-                              data-titlebar-tab-action
                              data-action="vertical-tabs-new-session"
-                              class="group flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:text-v2-text-text-base"
+                              class="group flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] ps-1.5 pe-2 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base"
                              onClick={openNewTab}
                              aria-label={language.t("command.session.new")}
                            >
@@ -1,118 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import {
-  artifactKind,
-  bytesToBase64,
-  contentBytes,
-  fileContentFromBytes,
-  MAX_MEDIA_BYTES,
-  parseDelimited,
-  resolveArtifactPath,
-} from "./artifact"
-
-describe("artifactKind", () => {
-  test.each([
-    ["shot.PNG", "image"],
-    ["logo.svg", "svg"],
-    ["song.mp3", "audio"],
-    ["demo.mp4", "video"],
-    ["clip.webm", "video"],
-    ["paper.pdf", "pdf"],
-    ["out/index.html", "html"],
-    ["README.md", "markdown"],
-    ["flow.mmd", "mermaid"],
-    ["data.csv", "table"],
-    ["data.tsv", "table"],
-    ["Inter.woff2", "font"],
-    ["src/app.ts", "text"],
-    ["Makefile", "text"],
-    [".env", "text"],
-    ["archive.tar.gz", "text"],
-  ] as const)("classifies %s as %s", (path, kind) => {
-    expect(artifactKind(path)).toBe(kind)
-  })
-})
-
-describe("fileContentFromBytes", () => {
-  test("keeps media as base64 with a mime type", () => {
-    const content = fileContentFromBytes("a.png", new Uint8Array([137, 80, 78, 71]))
-    expect(content).toEqual({ type: "binary", content: "iVBORw==", encoding: "base64", mimeType: "image/png" })
-  })
-
-  test("decodes text and svg with a mime type", () => {
-    expect(fileContentFromBytes("a.svg", new TextEncoder().encode("<svg/>"))).toEqual({
-      type: "text",
-      content: "<svg/>",
-      mimeType: "image/svg+xml",
-    })
-    expect(fileContentFromBytes("a.ts", new TextEncoder().encode("const a = 1"))).toEqual({
-      type: "text",
-      content: "const a = 1",
-      mimeType: undefined,
-    })
-  })
-
-  test("keeps only the size of media above the cap", () => {
-    const content = fileContentFromBytes("big.mp4", new Uint8Array(MAX_MEDIA_BYTES + 1))
-    expect(content).toEqual({ type: "binary", content: "", size: MAX_MEDIA_BYTES + 1 })
-  })
-
-  test("marks unknown binaries without keeping bytes", () => {
-    expect(fileContentFromBytes("a.bin", new Uint8Array([1, 0, 2]))).toEqual({ type: "binary", content: "", size: 3 })
-  })
-
-  test("encodes large buffers in chunks", () => {
-    const bytes = new Uint8Array(70_000).fill(65)
-    expect(bytesToBase64(bytes)).toBe(Buffer.from(bytes).toString("base64"))
-  })
-})
-
-describe("contentBytes", () => {
-  test("recovers byte counts from base64 and text", () => {
-    expect(contentBytes({ type: "binary", content: "iVBORw==", encoding: "base64" })).toBe(4)
-    expect(contentBytes({ type: "binary", content: "iVBORwA=", encoding: "base64" })).toBe(5)
-    expect(contentBytes({ type: "text", content: "héllo" })).toBe(6)
-  })
-})
-
-describe("parseDelimited", () => {
-  test("handles quotes, embedded delimiters, newlines, and CRLF", () => {
-    const parsed = parseDelimited('name,note\r\n"Smith, J","says ""hi""\nand more"\nplain,\n', ",")
-    expect(parsed.rows).toEqual([
-      ["name", "note"],
-      ["Smith, J", 'says "hi"\nand more'],
-      ["plain", ""],
-    ])
-    expect(parsed.total).toBe(3)
-    expect(parsed.columns).toBe(2)
-  })
-
-  test("counts rows past the limit without keeping them", () => {
-    const parsed = parseDelimited("a\tb\n1\t2\n3\t4\n5\t6", "\t", 2)
-    expect(parsed.rows).toHaveLength(2)
-    expect(parsed.total).toBe(4)
-  })
-})
-
-describe("resolveArtifactPath", () => {
-  test.each([
-    ["docs", "guide.md", "docs/guide.md"],
-    ["docs", "./img/a.png", "docs/img/a.png"],
-    ["docs/api", "../index.md", "docs/index.md"],
-    ["", "src/app.ts", "src/app.ts"],
-    ["docs", "sub\\win.md", "docs/sub/win.md"],
-    ["", "docs/guide.md", "docs/guide.md"],
-    ["/tmp/notes/", "../out/a.pdf", "/tmp/out/a.pdf"],
-    ["C:/tmp/notes/", "img.png", "C:/tmp/notes/img.png"],
-    ["/repo", "../shared/report.pdf", "/shared/report.pdf"],
-  ])("resolves %s + %s", (base, href, expected) => {
-    expect(resolveArtifactPath(base, href)).toBe(expected)
-  })
-
-  test.each([
-    ["docs", "../../etc/passwd"],
-    ["", "../x"],
-    ["docs", "/abs/path"],
-  ])("rejects %s + %s", (base, href) => {
-    expect(resolveArtifactPath(base, href)).toBeUndefined()
-  })
-})
@@ -1,211 +0,0 @@
-import type { FileContent } from "@/runtime/server/types"
-
-export type ArtifactKind =
-  | "image"
-  | "svg"
-  | "audio"
-  | "video"
-  | "pdf"
-  | "html"
-  | "markdown"
-  | "mermaid"
-  | "table"
-  | "font"
-  | "text"
-
-const mimes = new Map([
-  ["png", "image/png"],
-  ["jpg", "image/jpeg"],
-  ["jpeg", "image/jpeg"],
-  ["gif", "image/gif"],
-  ["webp", "image/webp"],
-  ["avif", "image/avif"],
-  ["bmp", "image/bmp"],
-  ["ico", "image/x-icon"],
-  ["tif", "image/tiff"],
-  ["tiff", "image/tiff"],
-  ["heic", "image/heic"],
-  ["svg", "image/svg+xml"],
-  ["mp3", "audio/mpeg"],
-  ["wav", "audio/wav"],
-  ["ogg", "audio/ogg"],
-  ["oga", "audio/ogg"],
-  ["m4a", "audio/mp4"],
-  ["aac", "audio/aac"],
-  ["flac", "audio/flac"],
-  ["opus", "audio/ogg"],
-  ["weba", "audio/webm"],
-  ["mp4", "video/mp4"],
-  ["m4v", "video/mp4"],
-  ["webm", "video/webm"],
-  ["mov", "video/quicktime"],
-  ["ogv", "video/ogg"],
-  ["mkv", "video/x-matroska"],
-  ["pdf", "application/pdf"],
-  ["html", "text/html"],
-  ["htm", "text/html"],
-  ["md", "text/markdown"],
-  ["markdown", "text/markdown"],
-  ["mdx", "text/markdown"],
-  ["mmd", "text/vnd.mermaid"],
-  ["mermaid", "text/vnd.mermaid"],
-  ["csv", "text/csv"],
-  ["tsv", "text/tab-separated-values"],
-  ["ttf", "font/ttf"],
-  ["otf", "font/otf"],
-  ["woff", "font/woff"],
-  ["woff2", "font/woff2"],
-])
-
-export function artifactExtension(path: string) {
-  const name = path.split(/[\\/]/).pop() ?? ""
-  const index = name.lastIndexOf(".")
-  if (index <= 0) return ""
-  return name.slice(index + 1).toLowerCase()
-}
-
-export function artifactMime(path: string) {
-  return mimes.get(artifactExtension(path))
-}
-
-export function artifactKind(path: string): ArtifactKind {
-  const mime = artifactMime(path)
-  if (!mime) return "text"
-  if (mime === "image/svg+xml") return "svg"
-  if (mime === "application/pdf") return "pdf"
-  if (mime === "text/html") return "html"
-  if (mime === "text/markdown") return "markdown"
-  if (mime === "text/vnd.mermaid") return "mermaid"
-  if (mime === "text/csv" || mime === "text/tab-separated-values") return "table"
-  if (mime.startsWith("image/")) return "image"
-  if (mime.startsWith("audio/")) return "audio"
-  if (mime.startsWith("font/")) return "font"
-  return "video"
-}
-
-/** Kinds whose bytes are kept as base64 so media elements can play them without a text round trip. */
-const binaryKinds = new Set<ArtifactKind>(["image", "audio", "video", "pdf", "font"])
-
-/** Text files never contain NUL; a NUL in the first 8 KiB marks an unknown binary. */
-function isBinaryBytes(bytes: Uint8Array) {
-  return bytes.subarray(0, 8192).includes(0)
-}
-
-export function bytesToBase64(bytes: Uint8Array) {
-  const parts: string[] = []
-  for (let index = 0; index < bytes.length; index += 0x8000) {
-    parts.push(String.fromCharCode(...bytes.subarray(index, index + 0x8000)))
-  }
-  return btoa(parts.join(""))
-}
-
-/** Media above this stays a placeholder: base64 encoding on the main thread and the LRU budget both suffer. */
-export const MAX_MEDIA_BYTES = 25 * 1024 * 1024
-
-export function fileContentFromBytes(path: string, bytes: Uint8Array): FileContent {
-  const kind = artifactKind(path)
-  const mimeType = artifactMime(path)
-  if (binaryKinds.has(kind)) {
-    if (bytes.length > MAX_MEDIA_BYTES) return { type: "binary", content: "", size: bytes.length }
-    return { type: "binary", content: bytesToBase64(bytes), encoding: "base64", mimeType }
-  }
-  // Unknown binaries keep no bytes: the viewer only shows a placeholder for them.
-  if (kind === "text" && isBinaryBytes(bytes)) return { type: "binary", content: "", size: bytes.length }
-  return { type: "text", content: new TextDecoder().decode(bytes), mimeType }
-}
-
-/** Approximate on-disk size of loaded content. */
-export function contentBytes(content: FileContent) {
-  if (content.size !== undefined) return content.size
-  if (content.encoding === "base64") {
-    const padding = content.content.endsWith("==") ? 2 : content.content.endsWith("=") ? 1 : 0
-    return Math.floor((content.content.length * 3) / 4) - padding
-  }
-  return new TextEncoder().encode(content.content).length
-}
-
-/**
- * Parse RFC 4180 style delimited text. Quoted fields may contain the delimiter, newlines, and
- * doubled quotes. Rows beyond `limit` are counted but not returned.
- */
-export function parseDelimited(text: string, delimiter: string, limit = 1000) {
-  const rows: string[][] = []
-  let row: string[] = []
-  let field = ""
-  let quoted = false
-  let total = 0
-  const endRow = () => {
-    row.push(field)
-    field = ""
-    const blank = row.length === 1 && row[0] === ""
-    if (!blank) {
-      total++
-      if (rows.length < limit) rows.push(row)
-    }
-    row = []
-  }
-  for (let index = 0; index < text.length; index++) {
-    const char = text[index]!
-    if (quoted) {
-      if (char !== '"') {
-        field += char
-        continue
-      }
-      if (text[index + 1] === '"') {
-        field += '"'
-        index++
-        continue
-      }
-      quoted = false
-      continue
-    }
-    if (char === '"' && field === "") {
-      quoted = true
-      continue
-    }
-    if (char === delimiter) {
-      row.push(field)
-      field = ""
-      continue
-    }
-    if (char === "\r") continue
-    if (char === "\n") {
-      endRow()
-      continue
-    }
-    field += char
-  }
-  if (field !== "" || row.length > 0) endRow()
-  const columns = rows.reduce((max, current) => Math.max(max, current.length), 0)
-  return { rows, total, columns }
-}
-
-/** Build a blob URL from loaded content. Callers revoke it when the viewer unmounts. */
-export function blobUrlFromContent(content: FileContent) {
-  const type = content.mimeType ?? "application/octet-stream"
-  if (content.encoding !== "base64") return URL.createObjectURL(new Blob([content.content], { type }))
-  const raw = atob(content.content)
-  const bytes = Uint8Array.from(raw, (char) => char.charCodeAt(0))
-  return URL.createObjectURL(new Blob([bytes], { type }))
-}
-
-/**
- * Resolve a relative link against a directory. A relative base yields a workspace-relative path and
- * an absolute base an absolute one; undefined when the link climbs past the base's root.
- */
-export function resolveArtifactPath(base: string, href: string) {
-  const target = href.replaceAll("\\", "/")
-  if (target.startsWith("/")) return undefined
-  const dir = base.replaceAll("\\", "/")
-  const segments = [...dir.split("/").filter(Boolean)]
-  for (const segment of target.split("/")) {
-    if (!segment || segment === ".") continue
-    if (segment !== "..") {
-      segments.push(segment)
-      continue
-    }
-    if (segments.length === 0) return undefined
-    segments.pop()
-  }
-  return `${dir.startsWith("/") ? "/" : ""}${segments.join("/")}`
-}
@@ -5,12 +5,11 @@ import { createSimpleContext } from "@opencode/ui/context"
 import { showToast } from "@/shell/notifications/toast"
 import { useParams } from "@solidjs/router"
 import { base64Encode } from "@opencode/util/encode"
-import { getDirectory, getFilename } from "@opencode/util/path"
+import { getFilename } from "@opencode/util/path"
 import { useWorkspaceLocation } from "@/workspaces/location"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useLayout } from "@/shell/state/layout"
 import { createPathHelpers } from "./path"
-import { fileContentFromBytes } from "./artifact"
 import {
  approxBytes,
  evictContentLru,
@@ -186,17 +185,14 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({

      setLoading(file)

-      // Files outside the workspace are read from their own directory, like markdown images.
-      // The trailing separator from getDirectory keeps "/" and "C:/" valid, like readLocalImage.
-      const request = path.absolute(file)
-        ? { path: getFilename(file), location: { directory: getDirectory(file) } }
-        : { path: file, location: { directory } }
      const promise = serverSDK.api.file
-        .read(request)
+        .read({ path: file, location: { directory } })
        .then((data) => {
          if (scope() !== directory) return
-          const content = fileContentFromBytes(file, data)
+          const content = { type: "text" as const, content: new TextDecoder().decode(data) }
          setLoaded(file, content)
+
+          if (!content) return
          touchFileContent(file, approxBytes(content))
          evictContent(new Set([file]))
        })
@@ -285,7 +281,6 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
    return {
      ready: () => view().ready(),
      normalize: path.normalize,
-      absolute: path.absolute,
      tab: path.tab,
      pathFromTab: path.pathFromTab,
      tree: {
@@ -21,24 +21,6 @@ describe("file path helpers", () => {
    expect(path.normalize("c:\\repo\\src\\app.ts")).toBe("src\\app.ts")
  })

-  test("keeps files outside the workspace absolute and round-trips them through tabs", () => {
-    const posix = createPathHelpers(() => "/repo")
-    expect(posix.normalize("/tmp/out/report.pdf")).toBe("/tmp/out/report.pdf")
-    expect(posix.absolute("/tmp/out/report.pdf")).toBe(true)
-    expect(posix.absolute("src/app.ts")).toBe(false)
-    expect(posix.tab("/tmp/out/report.pdf")).toBe("file:///tmp/out/report.pdf")
-    expect(posix.pathFromTab("file:///tmp/out/report.pdf")).toBe("/tmp/out/report.pdf")
-    expect(posix.normalize("/repository/x.ts")).toBe("/repository/x.ts")
-
-    const windows = createPathHelpers(() => "C:\\repo")
-    expect(windows.normalize("C:\\tmp\\font.ttf")).toBe("C:\\tmp\\font.ttf")
-    expect(windows.normalize("file:///C:/tmp/font.ttf")).toBe("C:/tmp/font.ttf")
-    expect(windows.absolute("C:/tmp/font.ttf")).toBe(true)
-    expect(windows.tab("C:/tmp/font.ttf")).toBe("file:///C:/tmp/font.ttf")
-    expect(windows.pathFromTab("file:///C:/tmp/font.ttf")).toBe("C:/tmp/font.ttf")
-    expect(windows.pathFromTab("file:///C:/repo/src/app.ts")).toBe("src/app.ts")
-  })
-
  test("normalizes Windows directory separators", () => {
    const path = createPathHelpers(() => "C:\\repo")
    expect(path.normalizeDir("frontend\\")).toBe("frontend")
@@ -105,11 +105,7 @@ export function createPathHelpers(scope: () => string) {
  const normalize = (input: string) => {
    const root = scope()

-    // file:///C:/dir becomes /C:/dir once the protocol is gone; restore the drive form.
-    let path = unquoteGitPath(decodeFilePath(stripQueryAndHash(stripFileProtocol(input)))).replace(
-      /^[/\\]([A-Za-z]:)/,
-      "$1",
-    )
+    let path = unquoteGitPath(decodeFilePath(stripQueryAndHash(stripFileProtocol(input))))

    // Separator-agnostic prefix stripping for Cygwin/native Windows compatibility
    // Only case-insensitive on Windows (drive letter or UNC paths)
@@ -120,21 +116,20 @@ export function createPathHelpers(scope: () => string) {
      canonPath.startsWith(canonRoot) &&
      (canonRoot.endsWith("/") || canonPath === canonRoot || canonPath[canonRoot.length] === "/")
    ) {
-      // Slice from original path to preserve native separators, then drop the separator itself.
-      path = path.slice(root.length).replace(/^[/\\]/, "")
+      // Slice from original path to preserve native separators
+      path = path.slice(root.length)
    }

    if (path.startsWith("./") || path.startsWith(".\\")) {
      path = path.slice(2)
    }

-    // An absolute path that is not under the root stays absolute; it is a file outside the workspace.
+    if (path.startsWith("/") || path.startsWith("\\")) {
+      path = path.slice(1)
+    }
    return path
  }

-  /** Whether a normalized path points outside the workspace root. */
-  const absolute = (path: string) => /^[A-Za-z]:[/\\]/.test(path) || path.startsWith("/") || path.startsWith("\\\\")
-
  const tab = (input: string) => {
    const path = normalize(input)
    return `file://${encodeFilePath(path)}`
@@ -154,7 +149,6 @@ export function createPathHelpers(scope: () => string) {

  return {
    normalize,
-    absolute,
    tab,
    pathFromTab,
    normalizeDir,
@@ -1,5 +1,4 @@
 import { readFileSync } from "node:fs"
-import { createRequire } from "node:module"
 import solidPlugin from "vite-plugin-solid"
 import tailwindcss from "@tailwindcss/vite"
 import { fileURLToPath } from "url"
@@ -18,24 +17,6 @@ if (tailwindGenerate && typeof tailwindHotUpdate === "function") {
  }
 }

-// The markdown worker imports these directly, so they are served unbundled to keep worker startup
-// stable. Vite applies `exclude` to every import inside a pre-bundle too, which would leave a bare
-// `import "marked"` in mermaid's chunk that the browser cannot resolve from this package.
-const workerDeps = ["@shikijs/stream", "marked", "marked-shiki", "remend"]
-
-/** @type {import("rolldown").Plugin} */
-const bundleNestedWorkerDeps = {
-  name: "opencode-desktop:bundle-nested-worker-deps",
-  resolveId(id, importer) {
-    if (!importer || !workerDeps.includes(id) || !importer.includes("node_modules")) return
-    try {
-      return createRequire(importer).resolve(id)
-    } catch {
-      return
-    }
-  },
-}
-
 export const channel = (() => {
  const raw = process.env.OPENCODE_CHANNEL
  if (raw === "local" || raw === "dev" || raw === "beta" || raw === "prod") return raw
@@ -63,9 +44,8 @@ export default [
          format: "es",
        },
        optimizeDeps: {
-          exclude: workerDeps,
+          exclude: ["@shikijs/stream", "marked", "marked-shiki", "remend"],
          include: ["@opencode/session-ui > mermaid", "@opencode/session-ui > mermaid > katex"],
-          rolldownOptions: { plugins: [bundleNestedWorkerDeps] },
        },
      }
    },
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/cli",
-  "version": "2.0.12",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -1,120 +0,0 @@
-#!/usr/bin/env bun
-import { Script } from "@opencode/script"
-import { $ } from "bun"
-import { mkdir, rm } from "node:fs/promises"
-import path from "node:path"
-import { fileURLToPath } from "node:url"
-import { UpdateArtifact } from "../../../script/update-artifact"
-
-if (Script.channel !== "beta" && Script.channel !== "latest") {
-  throw new Error("Homebrew publishing requires the beta or latest channel")
-}
-const valid =
-  Script.channel === "beta"
-    ? /^\d+\.\d+\.\d+-beta[.-]\d+(?:\.\d+)?$/.test(Script.version)
-    : /^\d+\.\d+\.\d+$/.test(Script.version)
-if (!valid) throw new Error(`Expected a ${Script.channel} release version`)
-
-const dir = fileURLToPath(new URL("..", import.meta.url))
-const root = path.resolve(process.env.OPENCODE_CLI_DIST ?? path.join(dir, "dist"))
-const outdir = path.join(root, "homebrew-tap")
-const dryRun = process.argv.includes("--dry-run")
-const name = Script.channel === "beta" ? "opencode-beta" : "opencode-v2"
-const formulaClass = Script.channel === "beta" ? "OpencodeBeta" : "OpencodeV2"
-
-const targets = await Promise.all(
-  [
-    { name: "darwin-arm64", archive: "zip" },
-    { name: "darwin-x64-baseline", archive: "zip" },
-    { name: "linux-arm64", archive: "tar.gz" },
-    { name: "linux-x64-baseline", archive: "tar.gz" },
-  ].map(async (target) => {
-    const filename = `opencode-${target.name}.${target.archive}`
-    const file = Bun.file(path.join(root, filename))
-    if (!(await file.exists()) || !file.size) throw new Error(`Missing Homebrew archive: ${filename}`)
-    const sha256 = new Bun.CryptoHasher("sha256")
-    for await (const chunk of file.stream()) sha256.update(chunk)
-    return {
-      ...target,
-      url: `https://opencode.ai/files/bin/${encodeURIComponent(Script.version)}/${filename}`,
-      sha256: sha256.digest("hex"),
-    }
-  }),
-)
-
-await rm(outdir, { recursive: true, force: true })
-if (dryRun) await mkdir(outdir, { recursive: true })
-if (!dryRun) {
-  const token = process.env.GITHUB_TOKEN
-  if (!token) throw new Error("GITHUB_TOKEN is required to update the Homebrew tap")
-  await $`git clone ${`https://x-access-token:${token}@github.com/anomalyco/homebrew-tap.git`} ${outdir}`
-  await $`git checkout -B master`.cwd(outdir)
-}
-
-const target = (name: string) => {
-  const result = targets.find((item) => item.name === name)
-  if (!result) throw new Error(`Missing Homebrew target: ${name}`)
-  return result
-}
-const macArm = target("darwin-arm64")
-const macIntel = target("darwin-x64-baseline")
-const linuxArm = target("linux-arm64")
-const linuxIntel = target("linux-x64-baseline")
-
-await Bun.write(
-  path.join(outdir, `${name}.rb`),
-  [
-    "# typed: false",
-    "# frozen_string_literal: true",
-    "",
-    `class ${formulaClass} < Formula`,
-    `  desc "OpenCode V2${Script.channel === "beta" ? " beta" : ""} - the AI coding agent for the terminal"`,
-    '  homepage "https://github.com/anomalyco/opencode"',
-    `  version "${Script.version}"`,
-    '  license "MIT"',
-    "",
-    '  depends_on "ripgrep"',
-    '  conflicts_with "opencode", because: "both install an opencode binary"',
-    "",
-    "  on_macos do",
-    "    if Hardware::CPU.arm?",
-    `      url "${macArm.url}"`,
-    `      sha256 "${macArm.sha256}"`,
-    "    else",
-    `      url "${macIntel.url}"`,
-    `      sha256 "${macIntel.sha256}"`,
-    "    end",
-    "  end",
-    "",
-    "  on_linux do",
-    "    if Hardware::CPU.arm?",
-    `      url "${linuxArm.url}"`,
-    `      sha256 "${linuxArm.sha256}"`,
-    "    else",
-    `      url "${linuxIntel.url}"`,
-    `      sha256 "${linuxIntel.sha256}"`,
-    "    end",
-    "  end",
-    "",
-    "  def install",
-    '    bin.install "opencode"',
-    "  end",
-    "end",
-    "",
-  ].join("\n"),
-)
-console.log(`Prepared ${name} ${Script.version} in ${outdir}`)
-if (dryRun) process.exit(0)
-
-await $`git add ${name + ".rb"}`.cwd(outdir)
-if ((await $`git diff --cached --quiet`.cwd(outdir).nothrow()).exitCode !== 0) {
-  await $`git commit -m ${`chore: update ${name} to ${Script.version}`}`.cwd(outdir)
-  await $`git push origin master`.cwd(outdir)
-}
-await UpdateArtifact.publish({
-  channel: Script.channel,
-  name: "cli",
-  distribution: "homebrew",
-  version: Script.version,
-  metadata: { package: `anomalyco/tap/${name}` },
-})
@@ -149,10 +149,6 @@ if (Script.channel === "latest" && Script.release && !dryRun) {

 if ((Script.channel === "beta" || Script.channel === "latest") && Script.release) {
  await $`bun ./script/publish-aur.ts ${dryRun ? ["--dry-run"] : []}`.env({ ...process.env, OPENCODE_CLI_DIST: root })
-  await $`bun ./script/publish-homebrew.ts ${dryRun ? ["--dry-run"] : []}`.env({
-    ...process.env,
-    OPENCODE_CLI_DIST: root,
-  })
 }

 async function archive(bin: string, target: string, binary: string, directory: string) {
@@ -5,77 +5,34 @@ import { Runtime } from "../../framework/runtime"
 import { Updater } from "../../services/updater"
 import { handlePromptErrors } from "../../ui/prompt"
 import { OPENCODE_VERSION } from "../../version"
-import { stripVTControlCharacters } from "node:util"

 export default Runtime.handler(
  Commands.commands.upgrade,
-  Effect.fn("cli.upgrade")(
-    function* (input) {
-      intro("Upgrade")
-      const updater = yield* Updater.Service
-      const method = Option.getOrUndefined(input.method) ?? (yield* updater.method())
-      if (!method)
-        return yield* Effect.fail(
-          new Error("Could not detect the installation method. Pass --method to choose how to upgrade OpenCode."),
-        )
-
-      log.info(`Using method: ${method}`)
-      const target = Option.getOrUndefined(input.target) ?? (yield* updater.latest())
-      const version = target.trim().replace(/^v/, "")
-      if (version === OPENCODE_VERSION) {
-        log.warn(`OpenCode upgrade skipped: ${version} is already installed`)
-        outro("Done")
-        return
-      }
-
-      log.info(`From ${OPENCODE_VERSION} → ${version}`)
-      const progress = spinner()
-      progress.start("Upgrading...")
-      yield* updater.upgrade(method, target).pipe(
-        Effect.tap(() => Effect.sync(() => progress.stop("Upgrade complete"))),
-        Effect.tapCause(() => Effect.sync(() => progress.stop("Upgrade failed", 1))),
+  Effect.fn("cli.upgrade")(function* (input) {
+    intro("Upgrade")
+    const updater = yield* Updater.Service
+    const method = Option.getOrUndefined(input.method) ?? (yield* updater.method())
+    if (!method)
+      return yield* Effect.fail(
+        new Error("Could not detect the installation method. Pass --method to choose how to upgrade OpenCode."),
      )
+
+    log.info(`Using method: ${method}`)
+    const target = Option.getOrUndefined(input.target) ?? (yield* updater.latest())
+    const version = target.trim().replace(/^v/, "")
+    if (version === OPENCODE_VERSION) {
+      log.warn(`OpenCode upgrade skipped: ${version} is already installed`)
      outro("Done")
-    },
-    (effect) =>
-      handlePromptErrors(
-        effect.pipe(
-          Effect.mapError((error) =>
-            error instanceof Updater.UpgradeError ? new Error(formatUpgradeError(error), { cause: error }) : error,
-          ),
-        ),
-      ),
-  ),
+      return
+    }
+
+    log.info(`From ${OPENCODE_VERSION} → ${version}`)
+    const progress = spinner()
+    progress.start("Upgrading...")
+    yield* updater.upgrade(method, target).pipe(
+      Effect.tap(() => Effect.sync(() => progress.stop("Upgrade complete"))),
+      Effect.tapCause(() => Effect.sync(() => progress.stop("Upgrade failed", 1))),
+    )
+    outro("Done")
+  }, handlePromptErrors),
 )
-
-function formatUpgradeError(error: Updater.UpgradeError) {
-  const clean = (value: string) => stripVTControlCharacters(value).replaceAll("\r", "").trim()
-  const line = (value: string) => clean(value).replace(/\s+/g, " ")
-  const detail = wrap(clean(error.detail), Math.max(24, (process.stdout.columns ?? 80) - 7)).join("\n")
-  return [
-    line(error.title),
-    "",
-    detail,
-    ...(error.command ? ["", field("Command", line(error.command))] : []),
-    field("Retry", line(error.retry)),
-  ].join("\n")
-}
-
-function field(label: string, value: string) {
-  const prefix = label.padEnd(9)
-  const width = Math.max(24, Math.min(61, (process.stdout.columns ?? 80) - prefix.length - 10))
-  const lines = wrap(value, width)
-  return lines.map((line, index) => `${index === 0 ? prefix : " ".repeat(prefix.length)}${line}`).join("\n")
-}
-
-function wrap(value: string, width: number) {
-  return value.split("\n").flatMap((source) => {
-    if (source.length <= width) return [source]
-    return source.split(/\s+/).reduce<string[]>((result, word) => {
-      const index = result.length - 1
-      if (index < 0 || result[index].length + word.length + 1 > width) result.push(word)
-      else result[index] += ` ${word}`
-      return result
-    }, [])
-  })
-}
@@ -1,8 +1,7 @@
 #!/usr/bin/env bun

 import { NodeRuntime, NodeServices } from "@effect/platform-node"
-import { Cause, Effect } from "effect"
-import { getErrorReported } from "effect/Runtime"
+import { Effect } from "effect"
 import { Commands } from "./commands/commands"
 import { Runtime } from "./framework/runtime"
 import { Observability } from "@opencode/util/observability"
@@ -131,15 +130,5 @@ Effect.gen(function* () {
  Effect.provide(NodeServices.layer),
  Effect.scoped,
  Effect.tap(() => Effect.sync(() => process.exit(process.exitCode ?? 0))),
-  // runMain's default reporter logs the fatal cause to stdout. Write it to stderr instead: the
-  // desktop and `Service.ensure` only capture stderr from `serve --service`, so this is the only
-  // channel through which a startup failure's reason reaches the user.
-  Effect.tapCause((cause) =>
-    Effect.sync(() => {
-      if (Cause.hasInterruptsOnly(cause)) return
-      if (!getErrorReported(Cause.squash(cause))) return
-      process.stderr.write(Cause.pretty(cause) + "\n")
-    }),
-  ),
-  NodeRuntime.runMain({ disableErrorReporting: true }),
+  NodeRuntime.runMain,
 )
@@ -1,96 +1,17 @@
 import { Global } from "@opencode/util/global"
 import { AppProcess } from "@opencode/util/process"
 import { OPENCODE_ARTIFACT, OPENCODE_CHANNEL, OPENCODE_LOCAL, OPENCODE_VERSION } from "../version"
-import { Context, Duration, Effect, FileSystem, Layer, Option, Ref, Schema } from "effect"
+import { Context, Duration, Effect, FileSystem, Layer, Ref } from "effect"
 import { ChildProcess } from "effect/unstable/process"
 import { parse, type ParseError } from "jsonc-parser"
 import path from "node:path"
-import { stripVTControlCharacters } from "node:util"
 import { action, parseReleaseVersion, type Policy } from "./updater-action"
-import { errorMessage } from "../util/error"
-
-export const methods = ["curl", "npm", "pnpm", "bun", "yarn", "vp", "brew"] as const

+export const methods = ["curl", "npm", "pnpm", "bun", "yarn"] as const
 export type Method = (typeof methods)[number]
 export type RunResult = { readonly type: "available" | "installed"; readonly version: string }
 export type CheckResult = RunResult | { readonly type: "unavailable"; readonly message: string }

-export class UpgradeError extends Error {
-  readonly title: string
-  readonly detail: string
-  readonly command?: string
-  readonly retry: string
-
-  constructor(
-    input: {
-      readonly title: string
-      readonly detail: string
-      readonly command?: string
-      readonly retry: string
-    },
-    options?: ErrorOptions,
-  ) {
-    super(input.detail, options)
-    this.name = "UpgradeError"
-    this.title = input.title
-    this.detail = input.detail
-    this.command = input.command
-    this.retry = input.retry
-  }
-}
-
-const decodeVpPackages = Schema.decodeUnknownOption(
-  Schema.fromJsonString(Schema.Array(Schema.Struct({ name: Schema.String }))),
-)
-
-const installNames: Record<Method, string> = {
-  curl: "The OpenCode installer",
-  npm: "npm",
-  pnpm: "pnpm",
-  bun: "Bun",
-  yarn: "Yarn",
-  vp: "Vite+",
-  brew: "Homebrew",
-}
-
-function conciseDetail(input: string) {
-  const lines = stripVTControlCharacters(input)
-    .trim()
-    .replaceAll("\r", "\n")
-    .split("\n")
-    .map((line) => line.trimEnd())
-    .filter((line) => line.trim().length > 0)
-  const tail = lines.slice(-12).join("\n")
-  const clipped = tail.length > 2_000
-  const detail = clipped ? `…${tail.slice(-1_999)}` : tail
-  if (!detail) return
-  if (lines.length <= 12 && !clipped) return detail
-  return `${detail}\n\nOutput shortened to the last 12 lines.`
-}
-
-function errorDetail(cause: unknown): string {
-  if (cause instanceof AppProcess.AppProcessError) {
-    const stderr = conciseDetail(cause.stderr ?? "")
-    if (stderr) return stderr
-    if (cause.cause !== undefined) return errorDetail(cause.cause)
-    return cause.message
-  }
-  if (cause instanceof Error) {
-    const detail = cause.cause === undefined ? undefined : errorDetail(cause.cause)
-    if (!detail || detail === cause.message) return cause.message
-    return `${cause.message}: ${detail}`
-  }
-  return errorMessage(cause)
-}
-
-function resultDetail(result: { code: number; stdout: string; stderr: string }) {
-  return (
-    conciseDetail(result.stderr) ??
-    conciseDetail(result.stdout) ??
-    `The command exited with code ${result.code} without any error output.`
-  )
-}
-
 export interface Interface {
  readonly run: (onInstall?: (version: string) => void) => Effect.Effect<RunResult | undefined>
  readonly check: () => Effect.Effect<CheckResult | undefined, Error>
@@ -98,9 +19,9 @@ export interface Interface {
  readonly method: () => Effect.Effect<Method | undefined>
  readonly latest: () => Effect.Effect<string, Error>
  readonly upgrade: (method: Method, version: string) => Effect.Effect<void, Error>
-  readonly removal: (
-    method: Method,
-  ) => { readonly command: ReadonlyArray<string>; readonly run: Effect.Effect<void, Error> } | undefined
+  readonly removal: (method: Method) =>
+    | { readonly command: ReadonlyArray<string>; readonly run: Effect.Effect<void, Error> }
+    | undefined
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/cli/Updater") {}
@@ -163,6 +84,7 @@ const make = Effect.gen(function* () {
          stdout: result.stdout.toString("utf8"),
          stderr: result.stderr.toString("utf8"),
        })),
+        Effect.orElseSucceed(() => ({ code: 1, stdout: "", stderr: "" })),
      )
  })

@@ -174,13 +96,6 @@ const make = Effect.gen(function* () {
      process.platform === "win32" ? "opencode.exe" : "opencode",
    )
    if (path.resolve(process.execPath) === path.resolve(binary)) return "curl"
-    const executable = yield* fs.realPath(process.execPath).pipe(Effect.orElseSucceed(() => process.execPath))
-    if (
-      ["opencode-beta", "opencode-v2"].some((name) =>
-        executable.includes(`${path.sep}Cellar${path.sep}${name}${path.sep}`),
-      )
-    )
-      return "brew"
    if (!installedPackage) return

    const checks: ReadonlyArray<{ method: Method; command: string[] }> = [
@@ -188,149 +103,72 @@ const make = Effect.gen(function* () {
      { method: "pnpm", command: ["pnpm", "list", "-g", "--depth=0", installedPackage] },
      { method: "bun", command: ["bun", "pm", "ls", "-g"] },
      { method: "yarn", command: ["yarn", "global", "list"] },
-      { method: "vp", command: ["vp", "list", "-g", "--json", installedPackage] },
    ]
    const results = yield* Effect.forEach(
      checks,
-      (check) =>
-        exec(check.command).pipe(
-          Effect.orElseSucceed(() => ({ code: 1, stdout: "", stderr: "" })),
-          Effect.map((result) => ({ check, result })),
-        ),
+      (check) => exec(check.command).pipe(Effect.map((result) => ({ check, result }))),
      { concurrency: "unbounded" },
    )
-    return results.find((result) => {
-      if (result.check.method !== "vp") return result.result.stdout.includes(installedPackage)
-      // Vite+ repeats the filter in its successful no-match message, so substring detection would be a false positive.
-      return Option.exists(decodeVpPackages(result.result.stdout), (packages) =>
-        packages.some((item) => item.name === installedPackage),
-      )
-    })?.check.method
+    return results.find((result) => result.result.stdout.includes(installedPackage))?.check.method
  })

  const removal = (method: Method) => {
-    if (method === "curl" || method === "brew" || !installedPackage) return undefined
+    if (method === "curl" || !installedPackage) return undefined
    const commands = {
      npm: ["npm", "uninstall", "--global", installedPackage],
      pnpm: ["pnpm", "remove", "--global", installedPackage],
      bun: ["bun", "remove", "--global", installedPackage],
      yarn: ["yarn", "global", "remove", installedPackage],
-      vp: ["vp", "uninstall", "-g", installedPackage],
    }
    const command = commands[method]
    return {
      command,
      run: exec(command, "5 minutes").pipe(
-        Effect.flatMap((result) => (result.code === 0 ? Effect.void : Effect.fail(new Error(resultDetail(result))))),
+        Effect.flatMap((result) =>
+          result.code === 0
+            ? Effect.void
+            : Effect.fail(new Error(result.stderr.trim() || `Failed to uninstall with ${method}`)),
+        ),
      ),
    }
  }

-  const release = Effect.fnUntraced(function* (method?: Method) {
-    const distribution = method === "brew" ? "homebrew" : "npm"
+  const release = Effect.fnUntraced(function* () {
    const response = yield* Effect.tryPromise({
      try: (signal) =>
        fetch(
-          `https://opencode.ai/update/api/${encodeURIComponent(channel)}/${encodeURIComponent(OPENCODE_ARTIFACT)}/${distribution}?current=${encodeURIComponent(OPENCODE_VERSION)}`,
+          `https://opencode.ai/update/api/${encodeURIComponent(channel)}/${encodeURIComponent(OPENCODE_ARTIFACT)}/npm?current=${encodeURIComponent(OPENCODE_VERSION)}`,
          {
            signal: AbortSignal.any([signal, AbortSignal.timeout(10_000)]),
          },
        ),
-      catch: (cause) =>
-        new UpgradeError(
-          {
-            title: "Could not check for OpenCode updates",
-            detail: errorDetail(cause),
-            retry: "Check your network, then run opencode upgrade again.",
-          },
-          { cause },
-        ),
+      catch: (cause) => new Error("Failed to check for updates", { cause }),
    })
-    if (!response.ok)
-      return yield* Effect.fail(
-        new UpgradeError({
-          title: "Could not check for OpenCode updates",
-          detail: `The update service returned HTTP ${response.status}.`,
-          retry: "Try again in a few minutes.",
-        }),
-      )
+    if (!response.ok) return yield* Effect.fail(new Error(`Update check failed with status ${response.status}`))
    const data: { version: string; metadata?: { package?: string } } = yield* Effect.tryPromise({
      try: () => response.json(),
-      catch: (cause) =>
-        new UpgradeError(
-          {
-            title: "Could not read the OpenCode update information",
-            detail: errorDetail(cause),
-            retry: "Try again in a few minutes.",
-          },
-          { cause },
-        ),
+      catch: (cause) => new Error("Failed to read update information", { cause }),
    })
-    if (!data.metadata?.package)
-      return yield* Effect.fail(
-        new UpgradeError({
-          title: "Could not read the OpenCode update information",
-          detail: "The update service returned incomplete release information.",
-          retry: "Try again in a few minutes.",
-        }),
-      )
+    if (!data.metadata?.package) return yield* Effect.fail(new Error("Update information did not include a package"))
    return { package: data.metadata.package, version: data.version }
  })

-  const latest = () =>
-    method().pipe(
-      Effect.flatMap(release),
-      Effect.map((data) => data.version),
-    )
+  const latest = () => release().pipe(Effect.map((data) => data.version))

  const temporaryDirectory = (prefix: string) =>
    Effect.acquireRelease(fs.makeTempDirectory({ directory: global.cache, prefix }), (directory) =>
      fs.remove(directory, { recursive: true, force: true }).pipe(Effect.ignore),
    )

-  const runUpgrade = (input: {
-    readonly method: Method
-    readonly command: string[]
-    readonly displayCommand?: string[]
-    readonly title?: string
-    readonly retry?: string
-  }) => {
-    const failure = (detail: string, cause?: unknown) =>
-      new UpgradeError(
-        {
-          title: input.title ?? `${installNames[input.method]} could not install OpenCode`,
-          detail,
-          command: (input.displayCommand ?? input.command).join(" "),
-          retry: input.retry ?? "Fix the issue above, then run opencode upgrade again.",
-        },
-        cause === undefined ? undefined : { cause },
-      )
-    return exec(input.command, "5 minutes").pipe(
-      Effect.flatMap((result) =>
-        result.code === 0 ? Effect.succeed(result) : Effect.fail(failure(resultDetail(result))),
-      ),
-      Effect.mapError((cause) =>
-        cause instanceof UpgradeError
-          ? cause
-          : failure(
-              cause instanceof AppProcess.AppProcessError && cause.stderr === undefined && cause.cause === undefined
-                ? `Failed to update with ${input.method}`
-                : errorDetail(cause),
-              cause,
-            ),
-      ),
-    )
-  }
-
  const upgrade = Effect.fnUntraced(function* (method: Method, input: string) {
    if (!parseReleaseVersion(input)) return yield* Effect.fail(new Error(`Invalid version: ${input}`))
    const version = input.trim().replace(/^v/, "")
-    const packageName = (yield* release(method)).package
+    const packageName = (yield* release()).package
    const target = `${packageName}@${version}`
    if (installedPackage && packageName !== installedPackage && (method === "pnpm" || method === "yarn")) {
      return yield* Effect.fail(new Error(`Reinstall ${target} with ${method} to migrate from ${installedPackage}.`))
    }
-    const commands: Record<Exclude<Method, "bun" | "curl" | "brew">, string[]> = {
+    const commands: Record<Exclude<Method, "bun" | "curl">, string[]> = {
      // Keep the old package: uninstalling it can unlink the replacement command.
      npm: [
        "npm",
@@ -344,59 +182,31 @@ const make = Effect.gen(function* () {
      ],
      pnpm: ["pnpm", "add", "--global", `--allow-build=${packageName}`, target],
      yarn: ["yarn", "global", "add", target],
-      vp:
-        installedPackage && packageName !== installedPackage
-          ? ["vp", "install", "-g", "--force", target]
-          : ["vp", "update", "-g", target],
    }
-    yield* Effect.scoped(
+    const result = yield* Effect.scoped(
      Effect.gen(function* () {
        if (method === "bun") {
          // Bun does not prune old versions from its shared package cache.
          yield* fs.makeDirectory(global.cache, { recursive: true })
          const cache = yield* temporaryDirectory("update-")
-          return yield* runUpgrade({
-            method,
-            command: ["bun", "install", "--global", "--trust", "--cache-dir", cache, target],
-            displayCommand: ["bun", "install", "--global", "--trust", target],
-          })
+          return yield* exec(["bun", "install", "--global", "--trust", "--cache-dir", cache, target], "5 minutes")
        }
        if (method === "curl") {
          yield* fs.makeDirectory(global.cache, { recursive: true })
          const directory = yield* temporaryDirectory("update-")
          const installer = path.join(directory, "install")
-          yield* runUpgrade({
-            method,
-            command: ["curl", "-fsSL", "-o", installer, "https://opencode.ai/v2/install"],
-            displayCommand: ["curl", "-fsSL", "https://opencode.ai/v2/install"],
-            title: "Could not download the OpenCode installer",
-            retry: "Check your network, then run opencode upgrade again.",
-          })
-          return yield* runUpgrade({
-            method,
-            command: ["bash", installer, "--version", version, "--no-modify-path"],
-            displayCommand: ["opencode", "upgrade", version, "--method", "curl"],
-            title: "The OpenCode installer failed",
-          })
+          const download = yield* exec(
+            ["curl", "-fsSL", "-o", installer, "https://opencode.ai/v2/install"],
+            "5 minutes",
+          )
+          if (download.code !== 0) return download
+          return yield* exec(["bash", installer, "--version", version, "--no-modify-path"], "5 minutes")
        }
-        if (method === "brew") return yield* runUpgrade({ method, command: ["brew", "upgrade", packageName] })
-        return yield* runUpgrade({ method, command: commands[method] })
+        return yield* exec(commands[method], "5 minutes")
      }),
-    ).pipe(
-      Effect.mapError((cause) =>
-        cause instanceof UpgradeError
-          ? cause
-          : new UpgradeError(
-              {
-                title: "Could not prepare the OpenCode upgrade",
-                detail: errorDetail(cause),
-                retry: "Fix the issue above, then run opencode upgrade again.",
-              },
-              { cause },
-            ),
-      ),
-      Effect.asVoid,
-    )
+    ).pipe(Effect.mapError((cause) => new Error(`Failed to update with ${method}`, { cause })))
+    if (result.code === 0) return
+    return yield* Effect.fail(new Error(result.stderr.trim() || `Failed to update with ${method}`))
  })

  const inspect = Effect.fnUntraced(function* () {
@@ -19,7 +19,6 @@ function fixture(
  } = () => ({}),
  name = "@opencode/cli",
  failCleanup = false,
-  releasePackage = name,
 ) {
  return Effect.gen(function* () {
    const fs = yield* FileSystem.FileSystem
@@ -35,7 +34,7 @@ function fixture(
    yield* Effect.acquireRelease(
      Effect.sync(() =>
        spyOn(globalThis, "fetch").mockImplementation(
-          Object.assign(async () => Response.json({ version: "2.3.4", metadata: { package: releasePackage } }), {
+          Object.assign(async () => Response.json({ version: "2.3.4", metadata: { package: name } }), {
            preconnect: fetch.preconnect,
          }),
        ),
@@ -107,7 +106,6 @@ const installs = [
    command: ["pnpm", "add", "--global", "--allow-build=@opencode/cli", "@opencode/cli@2.3.4-beta.1"],
  },
  { method: "yarn", command: ["yarn", "global", "add", "@opencode/cli@2.3.4-beta.1"] },
-  { method: "vp", command: ["vp", "update", "-g", "@opencode/cli@2.3.4-beta.1"] },
 ] as const

 installs.forEach(({ method, command }) => {
@@ -119,25 +117,6 @@ installs.forEach(({ method, command }) => {
    }),
  )
 })
-
-it.live("vp force-installs a renamed V2 package that replaces the existing binary owner", () =>
-  Effect.gen(function* () {
-    const test = yield* fixture(() => ({}), "@opencode/cli", false, "@opencode/cli-node")
-    yield* test.updater.upgrade("vp", "v2.3.4-beta.1")
-    expect(test.commands).toEqual([["vp", "install", "-g", "--force", "@opencode/cli-node@2.3.4-beta.1"]])
-  }),
-)
-
-it.live("vp removes the package from its managed global store", () =>
-  Effect.gen(function* () {
-    const test = yield* fixture()
-    const removal = test.updater.removal("vp")
-    if (!removal) return yield* Effect.die("Expected vp removal command")
-    expect(removal.command).toEqual(["vp", "uninstall", "-g", "@opencode/cli"])
-    yield* removal.run
-    expect(test.commands).toEqual([["vp", "uninstall", "-g", "@opencode/cli"]])
-  }),
-)
 ;[0, 1].forEach((exitCode) => {
  it.live(`bun isolates and removes its install cache after exit ${exitCode}`, () =>
    Effect.gen(function* () {
@@ -221,19 +200,11 @@ it.live("install failures expose stderr and process errors do not report success
    expect(missing.commands).toHaveLength(1)
  }),
 )
-;(["npm", "pnpm", "bun", "yarn", "vp", undefined] as const).forEach((method) => {
+;(["npm", "pnpm", "bun", "yarn", undefined] as const).forEach((method) => {
  it.live(`method detection identifies ${method ?? "an unknown installation"} using the V2 package`, () =>
    Effect.gen(function* () {
      const test = yield* fixture((command) => ({
-        stdout: Buffer.from(
-          command.command === method
-            ? method === "vp"
-              ? JSON.stringify([{ name: "@opencode/cli", version: "2.3.4" }])
-              : "@opencode/cli@2.3.4"
-            : command.command === "vp"
-              ? "[]"
-              : "opencode-ai@1.0.0",
-        ),
+        stdout: Buffer.from(command.command === method ? "@opencode/cli@2.3.4" : "opencode-ai@1.0.0"),
      }))
      expect(yield* test.updater.method()).toBe(method)
      expect(test.commands).toEqual([
@@ -241,7 +212,6 @@ it.live("install failures expose stderr and process errors do not report success
        ["pnpm", "list", "-g", "--depth=0", "@opencode/cli"],
        ["bun", "pm", "ls", "-g"],
        ["yarn", "global", "list"],
-        ["vp", "list", "-g", "--json", "@opencode/cli"],
      ])
    }),
  )
@@ -255,16 +225,7 @@ it.live("method detection tolerates unavailable package managers", () =>
        : { error: new AppProcess.AppProcessError({ command: command.command }) },
    )
    expect(yield* test.updater.method()).toBe("yarn")
-    expect(test.commands).toHaveLength(5)
-  }),
-)
-
-it.live("vp detection ignores no-match output that repeats the package name", () =>
-  Effect.gen(function* () {
-    const test = yield* fixture((command) => ({
-      stdout: Buffer.from(command.command === "vp" ? "No global packages matching '@opencode/cli'." : ""),
-    }))
-    expect(yield* test.updater.method()).toBeUndefined()
+    expect(test.commands).toHaveLength(4)
  }),
 )

@@ -304,16 +265,13 @@ if (typeof OPENCODE_CLI_NAME === "string" && OPENCODE_CLI_NAME === "opencode2-no
      expect(yield* test.updater.method()).toBe("npm")
      yield* test.updater.upgrade("npm", "v2.3.4")
      yield* test.updater.upgrade("pnpm", "v2.3.4")
-      yield* test.updater.upgrade("vp", "v2.3.4")
      expect(test.commands).toEqual([
        ["npm", "list", "-g", "--depth=0", "@opencode/cli-node"],
        ["pnpm", "list", "-g", "--depth=0", "@opencode/cli-node"],
        ["bun", "pm", "ls", "-g"],
        ["yarn", "global", "list"],
-        ["vp", "list", "-g", "--json", "@opencode/cli-node"],
        ["npm", "install", "--global", "@opencode/cli-node@2.3.4"],
        ["pnpm", "add", "--global", "--allow-build=@opencode/cli-node", "@opencode/cli-node@2.3.4"],
-        ["vp", "update", "-g", "@opencode/cli-node@2.3.4"],
      ])
    }),
  )
@@ -35,12 +35,6 @@ describe("upgrade command", () => {
    expect(result.events).toEqual([{ method: "bun", version: "2.0.0" }])
  })

-  test("accepts vp as an explicit installation method", async () => {
-    const result = await cli(["2.0.0", "--method", "vp"])
-    expect(result.exitCode).toBe(0)
-    expect(result.events).toEqual([{ method: "vp", version: "2.0.0" }])
-  })
-
  test("skips the already installed version", async () => {
    const result = await cli(["v0.0.0-beta-old"])
    expect(result.exitCode).toBe(0)
@@ -56,7 +50,7 @@ describe("upgrade command", () => {
  })

  test("rejects unsupported methods before attempting an upgrade", async () => {
-    const result = await cli(["--method", "apt"])
+    const result = await cli(["--method", "brew"])
    expect(result.exitCode).not.toBe(0)
    expect(result.events).toEqual([])
  })
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/client",
-  "version": "2.0.12",
+  "version": "2.0.8",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -456,10 +456,6 @@ export type V2EventServerConnected = {
  data: {}
 }

-export type ModelSettings = { compaction?: ProviderCompaction } & { [x: string]: any }
-
-export type ConfigModelSettings = { compaction?: ProviderCompaction } & { [x: string]: JsonValue | null }
-
 export type ProviderSettings = {
  timeout?: number | false
  chunkTimeout?: number
@@ -1660,19 +1656,19 @@ export type SessionInboxMove = {
  payload: SessionInboxMovePayload
 }

-export type ModelVariant = {
-  id: string
-  settings?: ModelSettings
-  headers?: { [x: string]: string }
-  body?: { [x: string]: any }
-}
-
 export type ProviderRequest = {
  settings: ProviderSettings
  headers: { [x: string]: string }
  body: { [x: string]: any }
 }

+export type ModelVariant = {
+  id: string
+  settings?: ProviderSettings
+  headers?: { [x: string]: string }
+  body?: { [x: string]: any }
+}
+
 export type ProviderInfo = {
  id: string
  canonical?: string
@@ -1902,7 +1898,7 @@ export type ModelInfo = {
  name: string
  compatibility?: ModelCompatibility
  package?: string
-  settings?: ModelSettings
+  settings?: ProviderSettings
  headers?: { [x: string]: string }
  body?: { [x: string]: any }
  capabilities: ModelCapabilities
@@ -2111,13 +2107,13 @@ export type ConfigEntry =
                name?: string
                compatibility?: ModelCompatibility
                package?: string
-                settings?: ConfigModelSettings
+                settings?: ConfigProviderSettings
                headers?: { [x: string]: string }
                body?: { [x: string]: JsonValue }
                capabilities?: ModelCapabilities
                variants?: Array<{
                  id: string
-                  settings?: ConfigModelSettings
+                  settings?: ConfigProviderSettings
                  headers?: { [x: string]: string }
                  body?: { [x: string]: JsonValue }
                }>
@@ -6,8 +6,6 @@
 - Tool schemas are the model-facing Interface. Keep arguments minimal and natural to the operation; never add unrelated IDs as ambient capability tokens.
 - State model-visible diagnostics, logs, tool descriptions, and instructions directly. The execution context is already clear; do not repeat `Code Mode` or `CodeMode` unless the distinction is necessary.
 - When interpreter behavior or support changes, update `interpreter-support.md` and direct tests in the same PR.
- Program values are `Value` (`src/interpreter/objects.ts`); host values are `unknown` and are copied in at the boundaries (`fromHost`, `fromJson`). Do not widen program-facing signatures back to `unknown`.
- A built-in kind of object is one `Obj` subclass (`Wrapper` for host-backed data such as Date or Map, `Opaque` for machinery such as functions and promises) that overrides `tag`, `toString`, `toPrimitive`, `inspect`, `toHost`, and `iterator` as needed. Do not add `instanceof` ladders over the built-in classes elsewhere; ask the object.

 ## OpenAPI

@@ -13,8 +13,8 @@ The idea of code mode was originally introduced by Cloudflare. See

 ## How it differs from JavaScript

- **Only supported APIs are available.** Programs can use the provided tools, supported JavaScript built-ins, and the
-  globals the host adds through extensions. Timers, `process`, filesystem access, imports, and modules are unavailable.
+- **Only supported APIs are available.** Programs can use the provided tools and supported JavaScript built-ins. APIs
+  such as `fetch`, timers, `process`, filesystem access, imports, and modules are unavailable.
 - **Unfinished work is interrupted.** Tool calls and async functions start when called. When the program finishes,
  anything still running is interrupted. Unhandled rejections from un-awaited promises are returned as warnings.
 - **REPL-style results.** Without an explicit `return`, the final top-level expression becomes the result. `undefined`
@@ -94,19 +94,11 @@ receive `{ extension, name, args }`. An `after` hook also receives how the call
 `failure` with its error, or `interrupted`). A failing `before` hook denies the call, and the program catches the
 failure as a thrown error.

-### `Extension.make`
+### `Values`

-Extensions are host functions a program calls directly as globals, such as `fetch`. Unlike tools they are not in the
-catalog, not counted against `maxToolCalls`, and not described to the model; the host decides what they mean.
-
-```ts
-const web = Extension.make({ name: "web", globals: { fetch: (url: string) => globalThis.fetch(url) } })
-const runtime = CodeMode.make({ tools, extensions: [web] })
-```
-
-Every value crossing in either direction is converted, never shared: arguments come in as copies, results go out as
-copies, and a function inside a result is callable the same way. A global that shadows a built-in or another
-extension throws at `CodeMode.make`.
+`Values` exports the runtime's non-JSON value classes: `Values.URL`, `Values.URLSearchParams`, `Values.Date`,
+`Values.RegExp`, `Values.Map`, `Values.Set`, and `Values.Promise`. The interpreter recognizes these by class; a
+program's `new URL(...)` is a `Values.URL` wrapping the host `URL`. `Values.isValue` narrows to the data-like kinds.

 ### OpenAPI tools

@@ -15,7 +15,8 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 ## Source and execution model

 - [x] JavaScript parsed with the latest syntax accepted by Acorn, then restricted by the interpreter allowlist.
-      TypeScript-only syntax is rejected rather than stripped before execution.
+- [x] Erasable TypeScript syntax, including type annotations, type declarations, assertions, and non-null assertions.
+      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] The host boundary is `JSON.stringify` plus a short table. The program result and tool arguments cross as
@@ -24,11 +25,11 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      and Map, RegExp, and generators serialize as `{}`. A bare `undefined` result is `null`.
      Tool results come back the way `JSON.parse(JSON.stringify(result))` would. The table, where a value cannot
      be JSON but what the program meant is clear: a promise is awaited (a rejection fails the program), a Set
-      crosses as an array, a URLSearchParams as its query string, an Error as `{ name, message, ...own enumerable }`, a
+      crosses as an array, a URLSearchParams as its query string, an Error as `{ name, message, ...own }`, a
      Uint8Array is rejected with a hint to encode as text, and own `__proto__` keys are dropped so merging tool
      inputs or results cannot replace a prototype. In-program `JSON.stringify` keeps JS behavior except for the
      Error form and a promise, which is a `TypeError` with an await hint rather than a silent `{}`.
- [x] Live Date, RegExp, Map, Set, URL, URLSearchParams, Headers, and Uint8Array values inside CodeMode.
+- [x] Live Date, RegExp, Map, Set, URL, URLSearchParams, and Uint8Array 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.
@@ -38,17 +39,16 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      10,000,000 elements (`Array(n)`, `length =`, `Array.from`, `split`, `matchAll`, `concat`, `flat`; below the JS
      maximum of 2^32 - 1), and 10,000 pending promises at once. Exceeding one throws a `RangeError`. A single regular
      expression match can still run long on a pathological pattern; the host regex engine has no interrupt hook.
- [x] A trailing comma after a rest parameter is a syntax error, with or without `"use strict"`.
- [x] A program that begins with `"use strict"` rejects `yield` as an identifier and duplicate parameter names at
-      parse time. Without it, `yield` is an ordinary binding.
- [ ] Duplicate parameter names in non-strict code throw when the function is called, instead of binding the last
-      parameter as JavaScript does.
+- [ ] Strict-mode early errors: duplicate parameter names, `yield` as an identifier, and a trailing comma after a
+      rest parameter are accepted unless the program itself begins with `"use strict"`.
+- [ ] Valid JavaScript rejected by TypeScript transpilation before interpretation, such as `in` inside a destructuring
+      default in a `for...of` head and Unicode-escaped keywords.

 ## 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, URLSearchParams, Headers, custom
-      synchronous iterators, and synchronous generators.
+- [x] Array literals, including holes and spread from arrays, strings, Maps, Sets, URLSearchParams, custom synchronous
+      iterators, and synchronous generators.
 - [x] Object literals with shorthand, computed string/number keys, and spread following ToObject: data objects and
      arrays copy own enumerable keys, strings copy index keys, and other values contribute nothing.
 - [x] Template literals with interpolation.
@@ -56,7 +56,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] `NaN` and `Infinity` globals.
 - [ ] BigInt literals and in-interpreter BigInt arithmetic; BigInt remains invalid at JSON-like host boundaries.
 - [ ] Arbitrary Symbol primitive values and symbol-keyed properties. The confined `Symbol.iterator` and
-      `Symbol.asyncIterator` keys are available only for the iterator protocols.
+      `Symbol.asyncIterator` keys are available only for custom iterator protocols.
 - [ ] Tagged-template calls.
 - [ ] Getter and setter definitions in object literals.

@@ -87,6 +87,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Destructuring reads through the prototype chain like member access: `const { constructor } = error` and
      `const { slice } = values` find the inherited built-in.
 - [ ] Member expressions as `for...in` targets (`for (x.y in obj)`).
+- [ ] `IteratorClose` during destructuring should throw a `TypeError` when `return()` yields a non-object.

 ## Statements and control flow

@@ -94,10 +95,9 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] `if`/`else` and conditional expressions.
 - [x] `switch`, including default clauses and fallthrough.
 - [x] `for`, `while`, and `do...while`.
- [x] `for...of` over arrays, strings, Maps, Sets, URLSearchParams, Headers, Uint8Arrays, built-in iterators, custom
-      synchronous iterators, and confined synchronous generators. Abrupt completion invokes the iterator's optional `return()`.
- [x] `for...in` over own keys of plain objects, arrays, strings, and tool references. `null`, `undefined`, and other
-      non-objects iterate nothing. An un-awaited promise throws rather than iterating.
+- [x] `for...of` over arrays, strings, Maps, Sets, URLSearchParams, custom synchronous iterators, and confined
+      synchronous generators. Abrupt completion invokes the iterator's optional `return()`.
+- [x] `for...in` over own keys of plain objects, arrays, strings, and tool references; other values iterate nothing.
 - [x] Unlabeled `break` and `continue`.
 - [x] `try`, `catch`, optional catch bindings, and `finally`.
 - [x] `throw` with arbitrary values.
@@ -111,8 +111,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 ## Functions and callbacks

 - [x] Function declarations, function expressions, and arrow functions.
- [x] Synchronous and `async` functions. A line break between `function` and the name is allowed, as in JavaScript;
-      a line break between `async` and `function` is not an async function.
+- [x] Synchronous and `async` functions.
 - [x] Closures, recursion, default parameters, rest parameters, and destructured parameters.
 - [x] A call depth limit of 10000: deeper nesting throws a catchable `RangeError: Maximum call stack size exceeded`
      at the overflowing call instead of running until the timeout. Callbacks invoked by built-ins count below the
@@ -128,7 +127,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      string). A detached method loses its receiver, as in JS: `values.filter("abc".includes)` is a `TypeError`
      because `includes` is called without a string `this`.
 - [x] Constructors work as callbacks with JS call semantics: `Error` types construct (`messages.map(Error)`),
-      and new-requiring constructors (`Map`, `Set`, `URL`, `URLSearchParams`, `Headers`, `Promise`) throw a `TypeError`,
+      and new-requiring constructors (`Map`, `Set`, `URL`, `URLSearchParams`, `Promise`) throw a `TypeError`,
      like JS.
 - [x] Tool references and detached `Promise` statics are rejected as callbacks with a hint to wrap them in an
      arrow function.
@@ -147,6 +146,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      `Array.prototype.push.name === "push"`).
 - [ ] A named function expression's name is not bound inside its own body.
 - [ ] Redeclaring a function in the same scope is rejected; in JavaScript the last declaration wins.
+- [ ] A line terminator between `async function` and the function name.
 - [ ] Generator and async generator functions evaluate parameter defaults and destructuring at the first `next()`
      rather than at the call, so their errors are not thrown synchronously.
 - [x] Synchronous and async generator declarations/expressions, `yield`, and `yield*`, including lazy bodies,
@@ -161,8 +161,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      rejected by every synchronous consumer.
 - [x] Synchronous iterator acquisition and result validation follow `IteratorClose` boundaries: consumer errors and
      intentional early stops invoke `return()`, acquisition/`next()` failures do not, and an original consumer error
-      wins over a cleanup failure. A generator's `return()` is an intentional stop, so a `return()` that throws or
-      yields a non-object surfaces from it as a `TypeError`. Async iterator consumption remains limited to `for await...of` and async `yield*`.
+      wins over a cleanup failure. Async iterator consumption remains limited to `for await...of` and async `yield*`.
 - [x] Portable generator protocol coverage is adapted from pinned Test262 cases for suspended-start, suspended-yield,
      and completed states; sync and async `next`/`return`/`throw`; finally yields and completion overrides; rejected
      yielded promises; mixed async request queues; sync and async `yield*` forwarding; malformed methods/results;
@@ -180,12 +179,11 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Sequence expressions (the comma operator).
 - [x] `await` for CodeMode promises and callable thenables; 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, Headers, and Promise. `new`
-      on any other value throws a catchable `TypeError` naming the callee: other built-in functions such as `Number`
-      say `new` is unsupported and point at the plain call, user-defined functions report the constructor gap below,
-      and non-callable values are not constructors. Error constructors take the ES2022 options object, so
-      `new Error(message, { cause })` installs a non-enumerable `cause` when the option is present. `Error.isError`
-      is true for every Error value.
+- [x] `new` for Array, Object, Error types, Date, RegExp, Map, Set, URL, URLSearchParams, and Promise. `new` on any
+      other value throws a catchable `TypeError` naming the callee: other built-in functions such as `Number` say
+      `new` is unsupported and point at the plain call, user-defined functions report the constructor gap below, and
+      non-callable values are not constructors. Error constructors take the ES2022 options object, so
+      `new Error(message, { cause })` installs a non-enumerable `cause` when the option is present.
 - [x] Arithmetic operators: `+`, `-`, `*`, `/`, `%`, and `**`.
 - [x] Equality and ordering: `==`, `!=`, `===`, `!==`, `<`, `<=`, `>`, and `>=`.
 - [x] Bitwise operators: `&`, `|`, `^`, `~`, `<<`, `>>`, and `>>>`.
@@ -238,10 +236,6 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      resolving with the promise itself rejects with a `TypeError`. Resolver callables work anywhere callbacks are
      accepted, including `.then`/`.catch` handlers and collection callbacks, and vanish at the data boundary like
      any function.
- [x] `Promise.withResolvers()`: the same promise and resolver callables as the constructor, as a `{ promise, resolve,
-    reject }` object.
- [x] `Promise.try(fn, ...args)`: calls `fn` synchronously; a throw rejects, a return fulfils, and a returned promise or
-      thenable is adopted.
 - [x] Recursive assimilation of objects with an own callable `then` field across `Promise.resolve`, combinators,
      constructors, reactions, `finally`, `await`, and async returns. Thenable methods run deferred, receive
      first-call-wins resolve/reject functions, and ignore throws after settlement. Inherited/accessor `then` fields
@@ -279,9 +273,8 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] `Object.is` for supported data values.
 - [x] `Object.groupBy` over finite collections and custom synchronous iterators/generators, with string-key coercion
      and plain-object results.
- [x] `Object.prototype` methods on values: `toString` (`"[object Array]"`, `"[object Map]"`, `"[object Promise]"`, and so
-      on for every built-in kind, as JS reports through `Symbol.toStringTag`), `toLocaleString` (calls the value's
-      `toString`, as in JS), `valueOf`, `hasOwnProperty`, `isPrototypeOf`, and `propertyIsEnumerable`.
+- [x] `Object.prototype` methods on values: `toString` (`"[object Array]"`), `toLocaleString`, `valueOf`,
+      `hasOwnProperty`, `isPrototypeOf`, and `propertyIsEnumerable`.

 ## Arrays

@@ -295,14 +288,9 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      `lastIndexOf`.
 - [x] Aggregation: `reduce` and `reduceRight`.
 - [x] Ordering: `sort`, `toSorted`, `reverse`, and `toReversed`.
- [x] Access/copying: `at`, `slice`, `concat`, `flat`, `with`, `join`, and `toLocaleString` (each element's
-      `toLocaleString`, holes and nullish elements as empty strings).
+- [x] Access/copying: `at`, `slice`, `concat`, `flat`, `with`, and `join`.
 - [x] Mutation: `push`, `pop`, `shift`, `unshift`, `splice`, `fill`, and `copyWithin`.
- [x] `keys`, `values`, `entries`, and `[Symbol.iterator]` (the same function as `values`) return live iterator objects
-      with `next()` and `[Symbol.iterator]`, as in JS. Iterator objects are opaque references: they print as
-      `[opaque reference]`, serialize to `{}`, and cannot be passed to extensions. Every built-in collection iterator
-      shares one prototype. JavaScript gives each collection its own; the difference is not observable here because
-      `Object.getPrototypeOf` is not exposed.
+- [x] Materialized iteration helpers: `keys`, `values`, and `entries` return arrays rather than iterators.
 - [x] `length`, numeric indexing, index assignment, spread, and `for...of`.
 - [x] The `thisArg` argument of `Array.from` is accepted and ignored, like JS arrows.
 - [x] `Array.prototype.toSpliced`.
@@ -315,13 +303,13 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      form, like `JSON.stringify`.
 - [ ] Argument coercion for `indexOf`, `lastIndexOf`, `includes`, `fill`, `flat`, `copyWithin`, and the `join`
      separator: JavaScript applies ToIntegerOrInfinity/ToString (including `valueOf`, strings, and `undefined`), the
-      interpreter requires numbers and strings. `indexOf()` and `lastIndexOf()` with no argument already search for
-      `undefined`; `includes()` still requires a value.
+      interpreter requires numbers and strings; `includes()`/`indexOf()` with no argument should search for
+      `undefined`.
+- [ ] Iterator objects from `keys`, `values`, and `entries` with a live `next()`.

 ## Strings

- [x] Case/normalization: `toLowerCase`, `toUpperCase`, `normalize`, and the `toLocaleLowerCase`/`toLocaleUpperCase`
-      aliases, which ignore their locale argument and apply the default Unicode casing.
+- [x] Case/normalization: `toLowerCase`, `toUpperCase`, `normalize`.
 - [x] Trimming: `trim`, `trimStart`, and `trimEnd`, plus the Annex B `trimLeft` and `trimRight` aliases.
 - [x] Searching/tests: `includes`, `startsWith`, `endsWith`, `indexOf`, `lastIndexOf`, and `search`.
 - [x] Slicing/access: `slice`, `substring`, Annex B `substr`, `at`, `charAt`, `charCodeAt`, and `codePointAt`.
@@ -329,7 +317,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Regular-expression integration: `match`, materialized `matchAll`, `replace`, `replaceAll`, `split`, and `search`.
 - [x] `localeCompare`; locale and options arguments are currently ignored.
 - [x] `isWellFormed` and `toWellFormed`.
- [x] `toString`, `length`, numeric indexing, spread, `for...of`, and `[Symbol.iterator]` by Unicode code point.
+- [x] `toString`, `length`, numeric indexing, spread, and `for...of` by Unicode code point.
 - [x] Static `String.fromCharCode` and `String.fromCodePoint`.
 - [x] Native argument coercion for supported String methods; for example, `includes(1)` and `slice("1")` coerce like
      native JS, `split(undefined)` returns the whole string, and `includes`/`startsWith`/`endsWith` reject regular
@@ -345,8 +333,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Coercion functions: `Number`, `parseInt`, and `parseFloat`.
 - [x] Number predicates/parsers: `Number.isInteger`, `Number.isFinite`, `Number.isNaN`, `Number.isSafeInteger`,
      `Number.parseInt`, and `Number.parseFloat`.
- [x] Number formatting: `toFixed`, `toPrecision`, `toExponential`, `toString`, `valueOf`, and `toLocaleString`, which
-      always formats as `en-US` (`"1,234.5"`) so output does not depend on the host.
+- [x] Number formatting: `toFixed`, `toPrecision`, `toExponential`, `toString`, and `valueOf`.
 - [x] Number constants: `MAX_SAFE_INTEGER`, `MIN_SAFE_INTEGER`, `MAX_VALUE`, `MIN_VALUE`, `EPSILON`, `NaN`,
      `POSITIVE_INFINITY`, and `NEGATIVE_INFINITY`.
 - [x] Math constants: `PI`, `E`, `LN2`, `LN10`, `LOG2E`, `LOG10E`, `SQRT2`, and `SQRT1_2`.
@@ -359,8 +346,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      use their epoch time) and reject opaque runtime references as data errors.
 - [x] Unknown static members on global namespaces and on `Number`/`String`/the coercion functions read as `undefined`
      for feature detection. Calling any undefined value reports a native-style `TypeError` naming the callee, for
-      example `Math.sum is not a function.` or `search(...).catch is not a function.` Unknown `Promise` statics keep
-      their descriptive error.
+      example `Math.sum is not a function.` Unknown `Promise` statics keep their descriptive error.
 - [x] `Math.sumPrecise` over finite collections and custom synchronous iterators/generators, rejecting non-number
      elements without coercion.
 - [x] Global coercing `isFinite` and `isNaN`; opaque runtime references reject as data errors, like `Number(...)`.
@@ -374,8 +360,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] `JSON.stringify` function and array replacers. Function replacers receive `(key, value)` in preorder, including
      the root, but no `this` holder. Array replacers preserve requested property order, deduplicate names, coerce
      number primitives, and ignore non-string/non-number entries. Primitive wrapper entries remain unsupported.
- [x] Captured `console.log`, `console.info`, `console.debug`, `console.warn`, and `console.error`. An Error prints as
-      `Error.prototype.toString` would show it (`Error: boom`), wherever it appears in the logged value.
+- [x] Captured `console.log`, `console.info`, `console.debug`, `console.warn`, and `console.error`.
 - [x] Captured `console.dir` and `console.table`.

 ## Date
@@ -395,8 +380,6 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
      `TimeClip` behavior.
 - [x] `Date.prototype.toUTCString` and its `toGMTString` alias.
 - [x] `toDateString` and `toTimeString` in the host's local timezone.
- [x] `toLocaleString`, `toLocaleDateString`, and `toLocaleTimeString` always format as `en-US` in UTC
-      (`"1/1/1970, 12:00:00 AM"`) so output does not depend on the host.
 - [x] Native one-argument Date coercion for supported values, including booleans, null, arrays, and plain objects.
 - [ ] Date setters and multi-argument construction coerce object arguments through `valueOf`/`toString` and surface
      their throws.
@@ -418,29 +401,14 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Match `indices` metadata for the `d` flag, including named groups on `exec`, `match`, and `matchAll` results.
 - [x] `RegExp.escape`.

-## Iterator
-
- [x] `Iterator.prototype.map`, `filter`, `take`, `drop`, and `flatMap` on any iterator or generator: lazy, one source
-      step per result, closing the source when a callback throws, on early `return()`, or when `for...of` or
-      destructuring finishes with it early. Once done or closed a helper stays done, and a callback that re-enters its
-      own helper is a `TypeError`. `take`/`drop` coerce their count and reject `NaN` or negative counts with a
-      `RangeError`; `flatMap` callbacks must return an iterable or iterator, not a string.
- [x] `Iterator.prototype.reduce`, `toArray`, `forEach`, `some`, `every`, and `find`, closing the source on early exit.
- [x] `Iterator.from(value)` returns iterators and generators as they are, and wraps strings, iterables, and objects
-      with a `next` method. `Iterator` itself is abstract: calling or constructing it is a `TypeError`.
- [x] Helpers and `Iterator.from` wrappers have `return()`; collection iterators (`array.values()`) do not, as in JS,
-      so an early exit from them leaves them where they were.
- [ ] `Iterator.concat`, `Iterator.zip`, and `Iterator.zipKeyed` (stage 3 proposals).
-
 ## Map and Set

 - [x] Static `Map.groupBy` over finite collections and custom synchronous iterators/generators, preserving key identity.
 - [x] `new Map()` from synchronous iterables of entries.
- [x] Map `get`, `set`, `has`, `delete`, `clear`, `size`, `forEach`, `getOrInsert`, and `getOrInsertComputed`.
+- [x] Map `get`, `set`, `has`, `delete`, `clear`, `size`, and `forEach`.
 - [x] `new Set()` from synchronous iterables.
 - [x] Set `add`, `has`, `delete`, `clear`, `size`, and `forEach`.
- [x] Live `keys`, `values`, `entries`, and `[Symbol.iterator]` iterators for Map and Set; a Set-like operand's `keys()`
-      may return any iterator or an array.
+- [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.
 - [x] Set composition and relation methods: `union`, `intersection`, `difference`, `symmetricDifference`, `isSubsetOf`,
@@ -456,9 +424,8 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Writable URL fields except `origin`.
 - [x] `new URLSearchParams()` from query strings, data objects, synchronous iterables of pairs, and URLSearchParams.
 - [x] URLSearchParams `append`, `delete`, `get`, `getAll`, `has`, `set`, `sort`, `forEach`, `keys`, `values`,
-      `entries`, `[Symbol.iterator]`, `toString`, and `size`.
- [x] URL values are their href in `JSON.stringify` and at the host boundary. URLSearchParams are `{}` in
-      `JSON.stringify` and their query string at the host boundary.
+      `entries`, `toString`, and `size`.
+- [x] URL values serialize to their href; URLSearchParams serialize to `{}`.

 ## Uint8Array

@@ -470,8 +437,7 @@ with a hint to encode as text first (`TextDecoder`, `toBase64`, `toHex`).
 - [x] Index reads and writes with JS byte semantics: values wrap modulo 256, out-of-range writes are ignored, indexes
      cannot be deleted. `length` is a prototype accessor, so `Object.keys` lists only indexes.
 - [x] `at`, `slice`, `subarray` (a view on the same bytes), `set`, `fill`, `reverse`, `indexOf`, `lastIndexOf`,
-      `includes`, `join`, `toString`, `toBase64`, `toHex`, and live `keys`, `values`, `entries`, and `[Symbol.iterator]`
-      iterators.
+      `includes`, `join`, `toString`, `toBase64`, `toHex`, and materialized `keys`, `values`, and `entries` arrays.
 - [x] Spread, destructuring, `for...of`, `yield*`, `Array.from`, and `new Set(bytes)`. `Array.isArray` is false.
 - [x] String coercion joins with commas; `JSON.stringify` gives `{"0":1,...}`; `console.log` prints
      `Uint8Array(n) [...]`.
@@ -485,13 +451,7 @@ with a hint to encode as text first (`TextDecoder`, `toBase64`, `toHex`).
 - [x] `crypto.randomUUID()` and `crypto.getRandomValues(uint8Array)`.
 - [x] `TextEncoder` and `TextDecoder` for UTF-8 only: any other label is a `RangeError`. `TextDecoder` accepts the
      `fatal` and `ignoreBOM` options; `decode` takes a Uint8Array or nothing.
- [x] `new Headers()` from records, synchronous iterables of pairs, and Headers, wrapping the host's `Headers`: names
-      fold to lowercase, values are normalized and combined, and invalid names or values throw a `TypeError`.
- [x] Headers `append`, `delete`, `get`, `getSetCookie`, `has`, `set`, `forEach`, `keys`, `values`, `entries`, and
-      `[Symbol.iterator]`; iteration is live and sorted by name, with `set-cookie` values kept apart.
- [x] Headers serialize to a `{ name: value }` object in JSON, in results, and in tool arguments.
- [ ] `Request`, `Response`, and `Blob`.
- [ ] `crypto.subtle` and `TextDecoder` streaming or non-UTF-8 encodings.
+- [ ] `crypto.subtle`, `Blob`, and `TextDecoder` streaming or non-UTF-8 encodings.

 ## Extensions

@@ -501,10 +461,9 @@ Nothing is exposed unless a host provides it; extension calls are not tool calls
 - [x] Each global is a function, callable but not constructible, run with `this` undefined. A global that shadows
      a built-in or another extension throws at `make`.
 - [x] Every value crossing in either direction is converted, never shared: plain objects and arrays are copied,
-      `Date`, `RegExp`, `URL`, `URLSearchParams`, `Headers`, `Map`, `Set`, and `Uint8Array` become fresh copies with
-      their contents converted (a host `ArrayBuffer` comes in as a `Uint8Array`; other typed arrays cannot come out),
-      errors cross as errors with their name, message, `cause`, and own enumerable data, and a `__proto__` key is
-      dropped. Functions, generators,
+      `Date`, `RegExp`, `URL`, `URLSearchParams`, `Map`, `Set`, and `Uint8Array` become fresh copies with their
+      contents converted (a host `ArrayBuffer` comes in as a `Uint8Array`; other typed arrays cannot come out),
+      errors cross as errors with their name and message, and a `__proto__` key is dropped. Functions, generators,
      un-awaited promises, and symbols cannot be passed in; a class instance, a symbol, or a BigInt cannot come out.
 - [x] A host function inside a result becomes a program function whose calls cross the same way, so a result can
      carry methods (`res.json()`) whose host closures keep the host state. Diagnostics name it by its path
@@ -529,21 +488,19 @@ Nothing is exposed unless a host provides it; extension calls are not tool calls
 - [x] `AggregateError` with the `(errors, message?)` signature and an own `errors` array, constructed directly or by
      an all-rejected `Promise.any`; direct construction accepts custom synchronous iterators and generators.
 - [x] Error `name`/`message`, error inheritance through `instanceof`, and plain-data serialization. `message` is an own
-      non-enumerable property and `name` is inherited, as in JS, so `Object.keys(err)` is `[]` for a plain error. The
-      result boundary still emits `{ name, message, ...own enumerable }`, so a field such as `code` crosses. `cause` is
-      non-enumerable: an extension Error carries it, and this JSON form does not. Errors have no `stack`; the diagnostic
-      carries a 1-based line and column in the submitted source instead.
+      non-enumerable property and `name` is inherited, as in JS, so `Object.keys(err)` is `[]` while the host still
+      receives `{ name, message }`. Errors have no `stack`; the diagnostic carries the source location instead.
 - [x] `instanceof` against any constructor with a `prototype`, including every built-in and `Function`.
 - [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. The diagnostic names the rejected node type and attaches a
-      short orientation to the supported subset; this matrix is the full reference.
+- [x] Source locations on unsupported-syntax diagnostics for JavaScript-shaped input; TypeScript transpilation may
+      shift them. The diagnostic names the rejected node type and attaches a short orientation to the supported
+      subset; this matrix is the full reference.
 - [x] Model-visible host failure messages and underlying causes, including output-validation errors.
 - [x] Caught errors do not distinguish user throws, interpreter failures, and tool failures; a program sees one
-      Error-shaped value in `catch`, rejection handlers, and `Promise.allSettled` reasons. It always has `name` and
-      `message`, plus `cause` and own data when the failure carried them. This is deliberate: the program should
-      handle a failure the same way regardless of where it originated.
+      Error-shaped value with `name` and `message` in `catch`, rejection handlers, and `Promise.allSettled` reasons.
+      This is deliberate: the program should handle a failure the same way regardless of where it originated.
 - [x] Failures raised by the interpreter are `TypeError`s unless JavaScript names them otherwise (`RangeError`,
      `ReferenceError`, `SyntaxError`, `URIError`), so `e instanceof TypeError` and `e.constructor === TypeError`
      hold. Unsupported syntax reached at runtime is a `SyntaxError`; awaited tool failures stay plain `Error`.
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/codemode",
-  "version": "2.0.12",
+  "version": "2.0.8",
  "description": "Effect-native confined code execution over schema-described tools",
  "type": "module",
  "license": "MIT",
@@ -19,6 +19,12 @@
  "exports": {
    ".": "./src/index.ts"
  },
+  "imports": {
+    "#transpile": {
+      "workerd": "./src/interpreter/transpile.workerd.ts",
+      "default": "./src/interpreter/transpile.node.ts"
+    }
+  },
  "scripts": {
    "build": "bun run script/build.ts",
    "typecheck": "tsgo --noEmit",
@@ -26,7 +32,8 @@
  },
  "dependencies": {
    "acorn": "8.15.0",
-    "effect": "catalog:"
+    "effect": "catalog:",
+    "typescript": "catalog:"
  },
  "devDependencies": {
    "@tsconfig/bun": "catalog:",
@@ -15,7 +15,7 @@ const pkg = JSON.parse(originalText) as {
  name: string
  version: string
  exports: Record<string, string | { import: string; types: string }>
-  imports?: Record<string, Record<string, string>>
+  imports: Record<string, Record<string, string>>
 }
 const tarball = `${pkg.name.replace("@", "").replace("/", "-")}-${pkg.version}.tgz`
 const output = (value: string, types = false) =>
@@ -41,14 +41,12 @@ try {
      ]
    }),
  )
-  if (pkg.imports) {
-    pkg.imports = Object.fromEntries(
-      Object.entries(pkg.imports).map(([key, conditions]) => [
-        key,
-        Object.fromEntries(Object.entries(conditions).map(([condition, value]) => [condition, output(value)])),
-      ]),
-    )
-  }
+  pkg.imports = Object.fromEntries(
+    Object.entries(pkg.imports).map(([key, conditions]) => [
+      key,
+      Object.fromEntries(Object.entries(conditions).map(([condition, value]) => [condition, output(value)])),
+    ]),
+  )
  await Bun.write("package.json", JSON.stringify(pkg, null, 2) + "\n")
  await rm(tarball, { force: true })
  await $`bun pm pack`
@@ -15,23 +15,21 @@ import {
  Obj,
  PromiseObj,
  record,
-  type Value,
  SetObj,
  URLSearchParamsObj,
-  HeadersObj,
 } from "./interpreter/objects.js"
 import { typeofValue } from "./interpreter/references.js"

 export type Json = Schema.Json

-type Replacer<R> = (args: Array<Value>) => Effect.Effect<Value, unknown, R>
+type Replacer<R> = (args: Array<unknown>) => Effect.Effect<unknown, unknown, R>

 /**
 * What `JSON.stringify` would serialize for a program value, as host JSON: `toJSON` is honored, functions and
 * `undefined` vanish, non-finite numbers become null, and everything else is copied. Two departures from JS
 * so a mistake is not a silent `{}`: an Error serializes as `{ name, message, ...own }`, and a promise throws.
 */
-export const toJson = <R>(ctx: Interpreter<R>, value: Value, replacer?: Replacer<R>) =>
+export const toJson = <R>(ctx: Interpreter<R>, value: unknown, replacer?: Replacer<R>) =>
  walk(ctx, value, replacer, false)

 /**
@@ -39,11 +37,11 @@ export const toJson = <R>(ctx: Interpreter<R>, value: Value, replacer?: Replacer
 * awaited, a Set crosses as an array, a URLSearchParams as its query string, a Uint8Array asks to be encoded as
 * text first, and a `__proto__` key is dropped so host code can never receive one.
 */
-export const toBoundary = <R>(ctx: Interpreter<R>, value: Value) => walk(ctx, value, undefined, true)
+export const toBoundary = <R>(ctx: Interpreter<R>, value: unknown) => walk(ctx, value, undefined, true)

 const walk = <R>(
  ctx: Interpreter<R>,
-  value: Value,
+  value: unknown,
  replacer: Replacer<R> | undefined,
  boundary: boolean,
 ): Effect.Effect<Json | undefined, unknown, R> => {
@@ -71,7 +69,6 @@ const walk = <R>(
        )
      }
      if (boundary && value instanceof URLSearchParamsObj) return value.params.toString()
-      if (value instanceof HeadersObj) return Object.fromEntries(value.headers)
      const target = boundary && value instanceof SetObj ? new Arr(ctx.builtins.Array, [...value.set]) : value
      if (stack.has(target)) throw typeError("Converting circular structure to JSON.")
      stack.add(target)
@@ -105,7 +102,7 @@ const walk = <R>(
 }

 /** Host JSON as program values: objects and arrays are copied, primitives pass through. */
-export const fromJson = <R>(ctx: Interpreter<R>, value: Json | undefined): Value => {
+export const fromJson = <R>(ctx: Interpreter<R>, value: unknown): unknown => {
  if (value === null || typeof value !== "object") return value
  if (Array.isArray(value))
    return new Arr(
@@ -1,35 +1,24 @@
-import { Cause, Effect, Exit } from "effect"
+import { Effect, Exit } from "effect"
+import { coerceToNumber, coerceToString } from "../stdlib/value.js"
 import type { Interpreter } from "./interpreter.js"
-import { primitivePrototype } from "./intrinsics.js"
-import { GeneratorReturn, typeError } from "./model.js"
-import {
-  Callable,
-  get,
-  Native,
-  DateObj,
-  Obj,
-  coerceToNumber,
-  coerceToString,
-  type Cursor,
-  type Value,
-} from "./objects.js"
+import { typeError } from "./model.js"
+import { Callable, get, Native, DateObj, Obj } from "./objects.js"
 import { typeofValue } from "./references.js"

-/** IteratorClose: a consumer failure closes the iterator and wins over any close failure, except that a generator's
- * return() is a return completion, so a failing close wins over it, as after `break`. */
+export type IteratorCursor<R> = {
+  readonly next: Effect.Effect<{ readonly done: boolean; readonly value: unknown }, unknown, R>
+  readonly close: Effect.Effect<void, unknown, R>
+}
+
 export const preserveConsumerError = <A, R>(
-  close: Cursor<R>["close"],
+  cursor: IteratorCursor<R>,
  effect: Effect.Effect<A, unknown, R>,
 ): Effect.Effect<A, unknown, R> =>
-  Effect.flatMap(Effect.exit(effect), (exit) => {
-    if (Exit.isSuccess(exit)) return Effect.succeed(exit.value)
-    return Effect.flatMap(Effect.exit(close), (closed) => {
-      if (!Exit.isSuccess(closed) && Cause.squash(exit.cause) instanceof GeneratorReturn) {
-        return Effect.failCause(closed.cause)
-      }
-      return Effect.failCause(exit.cause)
-    })
-  })
+  Effect.flatMap(Effect.exit(effect), (exit) =>
+    Exit.isSuccess(exit)
+      ? Effect.succeed(exit.value)
+      : Effect.andThen(Effect.exit(cursor.close), Effect.failCause(exit.cause)),
+  )

 /**
 * ToPrimitive: calls `valueOf`/`toString` in hint order and returns the first primitive result. Dates treat the
@@ -37,9 +26,9 @@ export const preserveConsumerError = <A, R>(
 */
 export const toPrimitive = <R>(
  ctx: Interpreter<R>,
-  value: Value,
+  value: unknown,
  hint: "number" | "string" | "default",
-): Effect.Effect<Value, unknown, R> => {
+): Effect.Effect<unknown, unknown, R> => {
  if (!(value instanceof Obj)) return Effect.succeed(value)
  const asString = hint === "string" || (hint === "default" && value instanceof DateObj)
  const order = asString ? ["toString", "valueOf"] : ["valueOf", "toString"]
@@ -54,31 +43,24 @@ export const toPrimitive = <R>(
  })
 }

-/** Invoke(value, name): calls the method the value would find through its prototype. */
-export const invoke = <R>(ctx: Interpreter<R>, value: Value, name: string, label: string) => {
-  const target = value instanceof Obj ? value : primitivePrototype(ctx.builtins, value)
-  if (target === undefined) throw typeError(`${label} called on null or undefined.`)
-  return ctx.call(get(target, name), value, [])
-}
-
-export const toPrimitiveString = <R>(ctx: Interpreter<R>, value: Value) =>
+export const toPrimitiveString = <R>(ctx: Interpreter<R>, value: unknown) =>
  Effect.map(toPrimitive(ctx, value, "string"), coerceToString)

-export const toPrimitiveNumber = <R>(ctx: Interpreter<R>, value: Value) =>
+export const toPrimitiveNumber = <R>(ctx: Interpreter<R>, value: unknown) =>
  Effect.map(toPrimitive(ctx, value, "number"), coerceToNumber)

 // The single acceptance list for callbacks: collections, sort, string replacers,
 // Array.from mappers, and promise reactions all admit exactly these callables.
 // Admission means dispatchable, not necessarily invocable: new-requiring
 // constructors pass the gate and throw a TypeError on call, like JS.
-export const isSupportedCallback = (value: Value): value is Callable =>
+export const isSupportedCallback = (value: unknown): value is Callable =>
  value instanceof Callable && !(value instanceof Native && !value.callback)

 export const applyCollectionCallback = <R>(
  ctx: Interpreter<R>,
-  callback: Value,
+  callback: unknown,
  name: string,
-): ((args: Array<Value>) => Effect.Effect<Value, unknown, R>) => {
+): ((args: Array<unknown>) => Effect.Effect<unknown, unknown, R>) => {
  if (!isSupportedCallback(callback)) {
    if (typeofValue(callback) === "function") {
      throw typeError(
@@ -6,21 +6,10 @@ import { type AstNode, formatLocation, PendingThrow, Throw, sourceLocation, type
 import { containsRuntimeReference } from "./references.js"
 import { createErrorValue, type ErrorType, isErrorType } from "./intrinsics.js"
 import { constructor, methods, prototypeFrom, receiver } from "./native.js"
-import {
-  type Callable,
-  define,
-  get,
-  has,
-  hidden,
-  type Native,
-  Arr,
-  ErrorObj,
-  Obj,
-  coerceToString,
-  type Value,
-} from "./objects.js"
+import { type Callable, define, get, has, hidden, type Native, Arr, ErrorObj, Obj } from "./objects.js"
 import type { Interpreter } from "./interpreter.js"
 import { formatValue } from "../stdlib/console.js"
+import { coerceToString } from "../stdlib/value.js"

 export const normalizeError = (error: unknown): Diagnostic => {
  if (error instanceof PendingThrow) {
@@ -97,7 +86,7 @@ export const locate = (error: unknown, node?: AstNode): unknown => {
 }

 /** The program value a handler receives for a failure; one failure always yields the same value. */
-export const materialize = <R>(ctx: Interpreter<R>, thrown: unknown): Value => {
+export const materialize = <R>(ctx: Interpreter<R>, thrown: unknown): unknown => {
  if (thrown instanceof Throw) return thrown.value
  const builtins = ctx.builtins
  if (thrown instanceof PendingThrow) {
@@ -124,7 +113,7 @@ const errorToString = (self: Obj): string => {

 export const createAggregateErrorValue = <R>(
  ctx: Interpreter<R>,
-  errors: Array<Value>,
+  errors: Array<unknown>,
  message: string,
  proto: Obj = ctx.builtins.AggregateError,
 ) => {
@@ -135,13 +124,13 @@ export const createAggregateErrorValue = <R>(

 const constructAggregateErrorValue = <R>(
  ctx: Interpreter<R>,
-  args: Array<Value>,
+  args: Array<unknown>,
  proto: Obj,
 ): Effect.Effect<ErrorObj, unknown, R> =>
  Effect.gen(function* () {
    const cursor = yield* ctx.iterate(args[0])
    if (cursor === undefined) throw typeError("new AggregateError(...) expects a synchronous iterable of errors.")
-    const errors: Array<Value> = []
+    const errors: Array<unknown> = []
    while (true) {
      const step = yield* cursor.next
      if (step.done) {
@@ -155,7 +144,7 @@ const constructAggregateErrorValue = <R>(
 export const errorGlobal = <R>(type: ErrorType, ctx: Interpreter<R>) => {
  const builtins = ctx.builtins
  const prototype = builtins[type]
-  const construct = (args: Array<Value>, newTarget: Callable) => {
+  const construct = (args: Array<unknown>, newTarget: Callable) => {
    const proto = prototypeFrom(newTarget, prototype)
    const created =
      type === "AggregateError"
@@ -179,7 +168,6 @@ export const errorGlobal = <R>(type: ErrorType, ctx: Interpreter<R>) => {
    methods(builtins, prototype, [
      ["toString", 0, (thisValue) => errorToString(receiver(Obj, thisValue, "Error.prototype.toString"))],
    ])
-    methods(builtins, ctor, [["isError", 1, (_, args) => args[0] instanceof ErrorObj]])
  }
  return ctor
 }
@@ -1,11 +1,14 @@
 import { parse, type Program } from "acorn"
 import { Cause, Effect, Scope } from "effect"
+// #transpile: conditional import — full typescript on node/bun, an identity
+// pass-through on workerd (the compiler is ~11 MiB and can't init there).
+import { transpile } from "#transpile"
 import type { DataValue, Diagnostic, ResolvedExecutionLimits, Result } from "../codemode.js"
 import { toBoundary } from "../data.js"
 import { ToolRuntime } from "../tool-runtime.js"
 import { normalizeError } from "./errors.js"
-import type { Value } from "./objects.js"
 import { createBuiltins } from "./intrinsics.js"
+import { PendingThrow } from "./model.js"
 import { Pending } from "./promises.js"
 import { Interpreter } from "./interpreter.js"

@@ -14,7 +17,7 @@ export const executeProgram = <R>(
  prepared: ToolRuntime.Prepared<R>,
  limits: ResolvedExecutionLimits,
  hooks: ToolRuntime.Hooks<R>,
-  globals?: (ctx: Interpreter<R>) => ReadonlyArray<readonly [string, Value]>,
+  globals?: (ctx: Interpreter<R>) => ReadonlyArray<readonly [string, unknown]>,
 ): Effect.Effect<Result, never, R> => {
  if (code.trim().length === 0) {
    return Effect.succeed({
@@ -107,7 +110,16 @@ export const executeProgram = <R>(
 }

 const parseProgram = (code: string): Program => {
-  return parse(code, {
+  const transpiled = transpile(`async function __codemode__() {\n${code}\n}`)
+
+  if (transpiled.error !== undefined) {
+    throw new PendingThrow("SyntaxError", `Failed to parse TypeScript: ${transpiled.error}`, undefined, "ParseError")
+  }
+
+  const bodyStart = transpiled.outputText.indexOf("{") + 1
+  const bodyEnd = transpiled.outputText.lastIndexOf("}")
+  const executableCode = transpiled.outputText.slice(bodyStart, bodyEnd)
+  return parse(executableCode, {
    ecmaVersion: "latest",
    sourceType: "script",
    allowReturnOutsideFunction: true,
@@ -1,5 +1,6 @@
 import { Effect } from "effect"
 import type { Extension } from "../extension.js"
+import { coerceToString } from "../stdlib/value.js"
 import { type ExtensionInvocation, hooked } from "../tool-runtime.js"
 import type { Interpreter } from "./interpreter.js"
 import { createErrorValue, isErrorType } from "./intrinsics.js"
@@ -7,7 +8,9 @@ import { MAX_VALUE_DEPTH } from "./limits.js"
 import { PendingThrow, Throw, typeError } from "./model.js"
 import { fn } from "./native.js"
 import {
+  Callable,
  define,
+  entries,
  get,
  has,
  hidden,
@@ -16,17 +19,16 @@ import {
  Bytes,
  DateObj,
  ErrorObj,
-  HeadersObj,
+  GeneratorObj,
  MapObj,
  Obj,
+  PromiseObj,
  RegExpObj,
  SetObj,
  URLObj,
  URLSearchParamsObj,
-  coerceToString,
-  type Value,
 } from "./objects.js"
-import { describeValue, isOpaque } from "./references.js"
+import { describeValue } from "./references.js"

 /**
 * The global bindings of one run's extensions. Everything crossing the boundary is converted: plain data and
@@ -36,18 +38,33 @@ import { describeValue, isOpaque } from "./references.js"
 export const extensionGlobals = <R>(
  ctx: Interpreter<R>,
  extensions: ReadonlyArray<Extension>,
-): ReadonlyArray<readonly [string, Value]> => {
+): ReadonlyArray<readonly [string, unknown]> => {
  const builtins = ctx.builtins

-  const toHost = (value: Value, label: string, depth = 0, seen = new Set<object>()): unknown => {
+  const toHost = (value: unknown, label: string, depth = 0, seen = new Set<object>()): unknown => {
    if (depth > MAX_VALUE_DEPTH) throw typeError(`${label} exceeds the maximum value depth of ${MAX_VALUE_DEPTH}.`)
-    if (isPrimitive(value)) return value
-    if (!(value instanceof Obj) || isOpaque(value)) {
+    if (value === null || typeof value !== "object") {
+      if (isPrimitive(value)) return value
+      throw typeError(`${label} contains ${describeValue(value)}, which cannot be passed to an extension.`)
+    }
+    if (value instanceof Bytes) return new Uint8Array(value.bytes)
+    if (value instanceof DateObj) return new Date(value.time)
+    if (value instanceof RegExpObj) return new RegExp(value.regex.source, value.regex.flags)
+    if (value instanceof URLObj) return new URL(value.url.href)
+    if (value instanceof URLSearchParamsObj) return new URLSearchParams(value.params)
+    const next = (item: unknown) => toHost(item, label, depth + 1, seen)
+    if (value instanceof MapObj) return new Map([...value.map].map(([key, item]) => [next(key), next(item)]))
+    if (value instanceof SetObj) return new Set([...value.set].map(next))
+    if (
+      !(value instanceof Obj) ||
+      value instanceof Callable ||
+      value instanceof GeneratorObj ||
+      value instanceof PromiseObj
+    ) {
      throw typeError(`${label} contains ${describeValue(value)}, which cannot be passed to an extension.`)
    }
    if (seen.has(value)) throw typeError(`${label} contains a circular value.`)
    seen.add(value)
-    const next = (item: Value) => toHost(item, label, depth + 1, seen)
    if (value instanceof ErrorObj) {
      const name = coerceToString(get(value, "name"))
      const message = get(value, "message")
@@ -68,12 +85,19 @@ export const extensionGlobals = <R>(
      seen.delete(value)
      return copied
    }
-    const copied = value.toHost(next)
+    const copied =
+      value instanceof Arr
+        ? value.items.map(next)
+        : Object.fromEntries(
+            entries(value)
+              .filter(([key]) => key !== "__proto__")
+              .map(([key, item]) => [key, next(item)]),
+          )
    seen.delete(value)
    return copied
  }

-  const fromHost = (value: unknown, label: string, depth = 0, seen = new Set<object>()): Value => {
+  const fromHost = (value: unknown, label: string, depth = 0, seen = new Set<object>()): unknown => {
    if (depth > MAX_VALUE_DEPTH) throw typeError(`${label} exceeds the maximum value depth of ${MAX_VALUE_DEPTH}.`)
    if (isPrimitive(value)) return value
    if (typeof value === "function") return wrap(value, label)
@@ -101,7 +125,6 @@ export const extensionGlobals = <R>(
      if (value instanceof URLSearchParams) {
        return new URLSearchParamsObj(builtins.URLSearchParams, new URLSearchParams(value))
      }
-      if (value instanceof Headers) return new HeadersObj(builtins.Headers, new Headers(value))
      if (value instanceof Map) {
        const wrapped = new MapObj(builtins.Map)
        for (const [key, item] of value) wrapped.map.set(next(key, label), next(item, label))
@@ -172,7 +195,7 @@ export const extensionGlobals = <R>(
 */
 const uncrossed = new Set(["stack", "constructor", "toString", "__proto__"])
 const left = Symbol("left behind")
-const crossing = <T>(convert: () => T): T | typeof left => {
+const crossing = (convert: () => unknown): unknown => {
  try {
    return convert()
  } catch (reason) {
@@ -191,7 +214,7 @@ const hostErrors = new Map<string, ErrorConstructor>([
 ])

 // The primitives the interpreter operates on; symbols and BigInts are not among them.
-const isPrimitive = (value: unknown): value is string | number | boolean | null | undefined =>
+const isPrimitive = (value: unknown): boolean =>
  value === null ||
  value === undefined ||
  typeof value === "string" ||
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import { fn, type Method, methods, receiver } from "./native.js"
 import { AsyncIteratorSymbol, type GeneratorRequestKind, IteratorSymbol } from "./model.js"
-import { define, hidden, GeneratorObj, type Value } from "./objects.js"
+import { define, hidden, GeneratorObj } from "./objects.js"
 import type { Interpreter } from "./interpreter.js"

 /** `next`/`return`/`throw` on the generator prototypes; async generators answer with promises. */
@@ -13,9 +13,9 @@ export const generatorGlobals = <R>(ctx: Interpreter<R>): void => {
    const request = (kind: GeneratorRequestKind): Method => [
      kind,
      1,
-      (thisValue: Value, args: Array<Value>) => {
+      (thisValue: unknown, args: Array<unknown>) => {
        const generator = receiver(GeneratorObj, thisValue, `${label}.prototype.${kind}`)
-        const requested = generator.request(kind, args[0]) as Effect.Effect<Value, unknown, R>
+        const requested = generator.request(kind, args[0]) as Effect.Effect<unknown, unknown, R>
        return generator.asynchronous ? ctx.pending.create(requested) : requested
      },
    ]
@@ -1,5 +1,4 @@
 import { Effect } from "effect"
-import type { Value } from "./objects.js"
 import { arrayGlobal } from "../stdlib/array.js"
 import { textDecoderGlobal, textEncoderGlobal, uint8ArrayGlobal } from "../stdlib/bytes.js"
 import { mapGlobal, setGlobal } from "../stdlib/collections.js"
@@ -12,8 +11,6 @@ import { objectGlobal } from "../stdlib/object.js"
 import { regexpGlobal } from "../stdlib/regexp.js"
 import { stringGlobal } from "../stdlib/string.js"
 import { uriGlobal, urlGlobal, urlSearchParamsGlobal } from "../stdlib/url.js"
-import { headersGlobal } from "../stdlib/headers.js"
-import { iteratorGlobals } from "../stdlib/iterator.js"
 import { coercion } from "../stdlib/value.js"
 import { base64Global, cryptoGlobal } from "../stdlib/web.js"
 import { ToolReference } from "../tool-runtime.js"
@@ -52,7 +49,7 @@ const symbolGlobal = <R>(ctx: Interpreter<R>) => {
  return symbol
 }

-type Factory = <R>(ctx: Interpreter<R>) => Value
+type Factory = <R>(ctx: Interpreter<R>) => unknown

 // A table rather than a list so the names are known before any runtime exists.
 const table: Record<string, Factory> = {
@@ -70,7 +67,6 @@ const table: Record<string, Factory> = {
  console: (ctx) => consoleGlobal(ctx),
  Promise: (ctx) => promiseGlobal(ctx),
  Symbol: (ctx) => symbolGlobal(ctx),
-  Iterator: (ctx) => iteratorGlobals(ctx),
  Number: (ctx) => numberGlobal(ctx),
  String: (ctx) => stringGlobal(ctx),
  Boolean: (ctx) => booleanGlobal(ctx),
@@ -84,7 +80,6 @@ const table: Record<string, Factory> = {
  Set: (ctx) => setGlobal(ctx),
  URL: (ctx) => urlGlobal(ctx),
  URLSearchParams: (ctx) => urlSearchParamsGlobal(ctx),
-  Headers: (ctx) => headersGlobal(ctx),
  Uint8Array: (ctx) => uint8ArrayGlobal(ctx),
  TextEncoder: (ctx) => textEncoderGlobal(ctx),
  TextDecoder: (ctx) => textDecoderGlobal(ctx),
@@ -102,7 +97,7 @@ const table: Record<string, Factory> = {
 export const globalNames: ReadonlySet<string> = new Set(Object.keys(table))

 /** The immutable global bindings of every program, in declaration order. */
-export const globals = <R>(ctx: Interpreter<R>): ReadonlyArray<readonly [string, Value]> => {
+export const globals = <R>(ctx: Interpreter<R>): ReadonlyArray<readonly [string, unknown]> => {
  generatorGlobals(ctx)
  return Object.entries(table).map(([name, factory]) => [name, factory(ctx)] as const)
 }
@@ -32,7 +32,6 @@ import type {
  Statement,
  Super,
  SwitchStatement,
-  Literal,
  TemplateLiteral,
  ThrowStatement,
  TryStatement,
@@ -63,32 +62,31 @@ import {
 } from "./model.js"
 import { checkStringLength } from "./limits.js"
 import { locate, materialize } from "./errors.js"
-import { type Builtins, primitivePrototype } from "./intrinsics.js"
+import type { Builtins } from "./intrinsics.js"
 import { globals } from "./globals.js"
 import {
  assign,
  Callable,
  define,
  get,
-  hostCursor,
-  IteratorObj,
-  type Cursor,
  has,
  hasPrototype,
  keys,
  Native,
  parseArrayIndex,
  Arr,
+  Bytes,
+  DateObj,
  Fn,
  GeneratorObj,
+  MapObj,
  Obj,
  PromiseObj,
+  SetObj,
+  URLSearchParamsObj,
  record,
  remove,
  set,
-  coerceToNumber,
-  coerceToString,
-  type Value,
 } from "./objects.js"
 import { preserveConsumerError } from "./callback.js"
 import { Pending, resolvePromise, resolvePromiseValue } from "./promises.js"
@@ -96,7 +94,7 @@ import { containsOpaqueReference, describeValue, rejectCircularInsertion, typeof
 import { ScopeStack } from "./scope.js"
 import { constructRegExp } from "../stdlib/regexp.js"
 import { enumerableSource } from "../stdlib/object.js"
-import { compoundOperators } from "../stdlib/value.js"
+import { coerceToNumber, coerceToString, compoundOperators } from "../stdlib/value.js"

 // What a loop does with its body's result: exit with a StatementResult, or undefined to keep iterating.
 // Unlabelled break ends this loop; a label the loop does not carry propagates outward.
@@ -110,36 +108,24 @@ const loopExit = (result: StatementResult, labels: ReadonlySet<string> | undefin
  return undefined
 }

-// Native engines name the callee (`search(...).catch is not a function`), including call chains. Returns
-// undefined when a link cannot be named, so a chain is either named completely or not at all.
-const calleeDescription = (node: Expression | Super | undefined): string | undefined => {
-  if (node?.type === "Identifier") return node.name
-  if (node?.type === "CallExpression") {
-    const target = calleeDescription(node.callee)
-    return target === undefined ? undefined : `${target}(...)`
+const calleeDescription = (callee: Expression | Super | undefined): string => {
+  if (callee?.type === "Identifier") return callee.name
+  if (callee?.type === "MemberExpression") {
+    const object = callee.object
+    const property = callee.property
+    const key =
+      !callee.computed && property.type === "Identifier"
+        ? property.name
+        : property.type === "Literal" && typeof property.value === "string"
+          ? property.value
+          : undefined
+    if (object.type === "Identifier" && key !== undefined) return `${object.name}.${key}`
  }
-  if (node?.type !== "MemberExpression") return undefined
-  const property = node.property
-  const key =
-    !node.computed && property.type === "Identifier"
-      ? property.name
-      : property.type === "Literal" && typeof property.value === "string"
-        ? property.value
-        : undefined
-  if (key === undefined) return undefined
-  const object = calleeDescription(node.object)
-  return object === undefined ? undefined : `${object}.${key}`
+  return "The called value"
 }

 // OrdinaryHasInstance: walk the left operand's chain looking for the constructor's `prototype`.
-// acorn types every literal as possibly a BigInt or RegExp; regex literals become RegExp objects before this is asked.
-const literal = (node: Literal): Value => {
-  if (typeof node.value === "bigint") throw typeError("BigInt literals are not supported.", node)
-  if (node.value instanceof RegExp) throw unsupportedSyntax("RegExpLiteral", node)
-  return node.value
-}
-
-const instanceofValue = (lhs: Value, rhs: Value, node: AstNode): boolean => {
+const instanceofValue = (lhs: unknown, rhs: unknown, node: AstNode): boolean => {
  if (!(rhs instanceof Callable)) {
    throw typeError("The right-hand side of 'instanceof' is not callable.", node)
  }
@@ -236,7 +222,7 @@ const loopDeclaration = (left: VariableDeclaration | Pattern, statement: "for...

 type CustomIterator = {
  iterator: Obj
-  next: Value
+  next: unknown
  asynchronous: boolean
 }

@@ -244,13 +230,13 @@ type CustomIterator = {
 type MemberReference = {
  target: Obj
  key: PropertyKey
-  receiver: Value
+  receiver: unknown
 }

 type GeneratorRequest = {
  kind: GeneratorRequestKind
-  value: Value
-  response: Deferred.Deferred<Value, unknown>
+  value: unknown
+  response: Deferred.Deferred<unknown, unknown>
 }

 type GeneratorState = {
@@ -276,7 +262,7 @@ export class Interpreter<R> {
    readonly pending: Pending<R>
    readonly builtins: Builtins
    readonly logs?: Array<string>
-    readonly globals?: (ctx: Interpreter<R>) => ReadonlyArray<readonly [string, Value]>
+    readonly globals?: (ctx: Interpreter<R>) => ReadonlyArray<readonly [string, unknown]>
  }) {
    this.tools = options.tools
    this.pending = options.pending
@@ -290,31 +276,27 @@ export class Interpreter<R> {
    }
  }

-  run(program: Program): Effect.Effect<Value, unknown, R> {
+  run(program: Program): Effect.Effect<unknown, unknown, R> {
    return this.root.run(program)
  }

-  call(callable: Value, thisValue: Value, args: Array<Value>): Effect.Effect<Value, unknown, R> {
+  call(callable: unknown, thisValue: unknown, args: Array<unknown>): Effect.Effect<unknown, unknown, R> {
    return this.root.call(callable, thisValue, args)
  }

-  await(promise: PromiseObj): Effect.Effect<Value, unknown, never> {
+  await(promise: PromiseObj): Effect.Effect<unknown, unknown, never> {
    return this.root.await(promise)
  }

-  iterate(value: Value) {
+  iterate(value: unknown) {
    return this.root.iterate(value)
  }

-  iterateDirect(value: Value) {
-    return this.root.iterateDirect(value)
-  }
-
  /** Runs one host tool: arguments cross as JSON and the result comes back as program values. */
  tool(
    run: (args: Array<Json | undefined>) => Effect.Effect<Json | undefined, unknown, R>,
-    args: Array<Value>,
-  ): Effect.Effect<Value, unknown, R> {
+    args: Array<unknown>,
+  ): Effect.Effect<unknown, unknown, R> {
    const ctx = this
    return Effect.gen(function* () {
      const json = yield* Effect.forEach(args, (arg) => toBoundary(ctx, arg))
@@ -337,7 +319,7 @@ class Frame<R> {
    private depth = 0,
  ) {}

-  run(program: Program): Effect.Effect<Value, unknown, R> {
+  run(program: Program): Effect.Effect<unknown, unknown, R> {
    const self = this
    // Keep top-level declarations separate so they can shadow builtins.
    this.scopes.push()
@@ -345,7 +327,7 @@ class Frame<R> {
      self.predeclareLexical(program.body)
      self.hoistFunctions(program.body)
      self.hoistVars(program.body)
-      let value: Value = undefined
+      let value: unknown = undefined
      for (const [index, statement] of program.body.entries()) {
        if (index === program.body.length - 1 && statement.type === "ExpressionStatement") {
          value = yield* self.evaluateExpression(statement.expression)
@@ -370,12 +352,15 @@ class Frame<R> {
  }

  // Fork at the call site so admission and hooks occur when the call is made.
-  private createToolCallPromise(path: ReadonlyArray<string>, args: Array<Value>): Effect.Effect<PromiseObj, never, R> {
+  private createToolCallPromise(
+    path: ReadonlyArray<string>,
+    args: Array<unknown>,
+  ): Effect.Effect<PromiseObj, never, R> {
    return this.ctx.pending.create(this.ctx.tool((json) => this.ctx.tools.execute(path, json), args))
  }

  // Fiber exits make settlement idempotent; yielding prevents inline continuation.
-  await(promise: PromiseObj): Effect.Effect<Value, unknown, never> {
+  await(promise: PromiseObj): Effect.Effect<unknown, unknown, never> {
    const pending = this.ctx.pending
    return Effect.suspend(() => {
      pending.markObserved(promise)
@@ -466,7 +451,7 @@ class Frame<R> {
  }

  // NamedEvaluation: an anonymous function definition takes the name of what it is assigned to.
-  private evaluateNamed(node: Expression, name: string): Effect.Effect<Value, unknown, R> {
+  private evaluateNamed(node: Expression, name: string): Effect.Effect<unknown, unknown, R> {
    if (node.type === "ArrowFunctionExpression" || (node.type === "FunctionExpression" && !node.id)) {
      return Effect.sync(() => this.createFunction(node, name))
    }
@@ -664,11 +649,11 @@ class Frame<R> {
      if (declared?.lexical) self.predeclarePattern(declared.pattern, declared.mutable, left)
      const right = yield* self.evaluateExpression(node.right)

-      const cursor = self.builtinCursor(right)
-      const iterator = cursor === undefined ? yield* self.customIterator(right, node, awaiting) : undefined
+      const iterator = yield* self.customIterator(right, node, awaiting)
+      const cursor = iterator === undefined ? yield* self.iterate(right, node) : undefined
      if (iterator === undefined && cursor === undefined) {
        throw invalidData(
-          `${awaiting ? "for await...of" : "for...of"} requires an iterable value, received ${describeValue(right)}.`,
+          `${awaiting ? "for await...of" : "for...of"} requires an array, string, Map, Set, or URLSearchParams, or custom iterator value.`,
          node,
        )
      }
@@ -684,7 +669,7 @@ class Frame<R> {
      }
      const assignment = left.type === "VariableDeclaration" ? undefined : left

-      const evaluateBody = (value: Value) =>
+      const evaluateBody = (value: unknown) =>
        Effect.gen(function* () {
          if (declared?.lexical) {
            self.scopes.push()
@@ -713,8 +698,10 @@ class Frame<R> {
        const bodyExit = yield* Effect.exit(evaluateBody(step.value))
        if (!Exit.isSuccess(bodyExit)) {
          // Process interruption must remain prompt; user cleanup cannot extend a timeout.
-          if (Cause.hasInterruptsOnly(bodyExit.cause)) return yield* Effect.failCause(bodyExit.cause)
-          return yield* preserveConsumerError(close(), Effect.failCause(bodyExit.cause))
+          if (!Cause.hasInterruptsOnly(bodyExit.cause)) {
+            yield* Effect.exit(close())
+          }
+          return yield* Effect.failCause(bodyExit.cause)
        }
        const exit = loopExit(bodyExit.value, labels)
        if (exit !== undefined) {
@@ -731,7 +718,7 @@ class Frame<R> {
    )
  }

-  private awaitValue(value: Value): Effect.Effect<Value, unknown, R> {
+  private awaitValue(value: unknown): Effect.Effect<unknown, unknown, R> {
    return Effect.flatMap(resolvePromise(this.ctx, value), (promise) =>
      Effect.ensuring(
        this.await(promise),
@@ -742,10 +729,10 @@ class Frame<R> {

  private awaitAsyncFromSyncValue(
    iterator: CustomIterator,
-    value: Value,
+    value: unknown,
    node: AstNode | undefined,
    closeOnRejection: boolean,
-  ): Effect.Effect<Value, unknown, R> {
+  ): Effect.Effect<unknown, unknown, R> {
    const self = this
    return Effect.gen(function* () {
      const settled = yield* Effect.exit(self.awaitValue(value))
@@ -757,50 +744,46 @@ class Frame<R> {
    })
  }

-  iterate(value: Value, node?: AstNode): Effect.Effect<Cursor<R> | undefined, unknown, R> {
-    const cursor = this.builtinCursor(value)
-    if (cursor !== undefined) return Effect.succeed(cursor)
-    return Effect.map(this.customIterator(value, node, false), (iterator) =>
-      iterator === undefined ? undefined : this.customCursor(iterator, node),
-    )
-  }
-
-  /** GetIteratorDirect: drive an iterator by its own `next`, without asking for `[Symbol.iterator]`. */
-  iterateDirect(value: Value, node?: AstNode): Cursor<R> {
-    if (value instanceof IteratorObj) return value.cursor as Cursor<R>
-    if (!(value instanceof Obj)) {
-      throw typeError(`An iterator must be an object, received ${describeValue(value)}.`, node)
-    }
-    return this.customCursor(
-      {
-        iterator: value,
-        next: this.requireIteratorMethod(get(value, "next"), "Iterator next", node),
-        asynchronous: false,
-      },
-      node,
-    )
-  }
-
-  private customCursor(iterator: CustomIterator, node: AstNode | undefined): Cursor<R> {
-    return {
-      next: this.nextIteratorResult(iterator, node, false),
-      close: Effect.suspend(() => this.closeIterator(iterator, node, false)),
-    }
-  }
-
-  private builtinCursor(value: Value): Cursor<R> | undefined {
-    // Natives build their cursors without knowing R, like `lift` in native.ts.
-    if (value instanceof IteratorObj) return value.cursor as Cursor<R>
+  iterate(value: unknown, node?: AstNode) {
    const iterator =
-      typeof value === "string"
-        ? value[Symbol.iterator]()
-        : value instanceof Obj
-          ? value.iterator(this.ctx.builtins)
-          : undefined
-    return iterator === undefined ? undefined : hostCursor(iterator)
+      value instanceof Arr
+        ? value.items[Symbol.iterator]()
+        : typeof value === "string"
+          ? value[Symbol.iterator]()
+          : value instanceof MapObj
+            ? value.map.entries()
+            : value instanceof SetObj
+              ? value.set.values()
+              : value instanceof URLSearchParamsObj
+                ? value.params.entries()
+                : value instanceof Bytes
+                  ? value.bytes.values()
+                  : undefined
+    if (iterator !== undefined) {
+      const proto = this.ctx.builtins.Array
+      return Effect.succeed({
+        next: Effect.sync(() => {
+          const step = iterator.next()
+          return {
+            done: Boolean(step.done),
+            value: Array.isArray(step.value) ? new Arr(proto, step.value) : step.value,
+          }
+        }),
+        close: Effect.void,
+      })
+    }
+    const self = this
+    return Effect.map(this.customIterator(value, node, false), (iterator) =>
+      iterator === undefined
+        ? undefined
+        : {
+            next: self.nextIteratorResult(iterator, node, false),
+            close: Effect.suspend(() => self.closeIterator(iterator, node, false)),
+          },
+    )
  }

-  private customIterator(value: Value, node: AstNode | undefined, allowAsync = true) {
+  private customIterator(value: unknown, node: AstNode | undefined, allowAsync = true) {
    if (!(value instanceof Obj)) return Effect.undefined
    const asyncMethod = allowAsync ? get(value, AsyncIteratorSymbol) : undefined
    const method = asyncMethod ?? get(value, IteratorSymbol)
@@ -890,18 +873,18 @@ class Frame<R> {
    })
  }

-  private requireIteratorObject(value: Value, context: string, node?: AstNode): Obj {
+  private requireIteratorObject(value: unknown, context: string, node?: AstNode): Obj {
    if (value instanceof Obj) return value
    throw typeError(`${context} must be an object.`, node)
  }

-  private requireIteratorMethod(value: Value, context: string, node?: AstNode): Value {
+  private requireIteratorMethod(value: unknown, context: string, node?: AstNode): unknown {
    if (typeofValue(value) === "function") return value
    throw typeError(`${context} must be a function.`, node)
  }

  // for...in over null/undefined iterates nothing, like JS.
-  private enumerableKeys(value: Value, node: AstNode): Array<string> {
+  private enumerableKeys(value: unknown, node: AstNode): Array<string> {
    if (value instanceof ToolReference) return [...this.ctx.tools.keys(value.path)]
    if (value === null || value === undefined) return []
    return keys(enumerableSource(this.ctx, "for...in", value, node))
@@ -1065,7 +1048,7 @@ class Frame<R> {

  private declarePattern(
    pattern: Pattern,
-    value: Value,
+    value: unknown,
    mutable: boolean,
    node: AstNode,
    initialize = false,
@@ -1125,7 +1108,7 @@ class Frame<R> {
    })
  }

-  private assignPattern(pattern: Pattern, value: Value, node: AstNode): Effect.Effect<void, unknown, R> {
+  private assignPattern(pattern: Pattern, value: unknown, node: AstNode): Effect.Effect<void, unknown, R> {
    const self = this
    return Effect.gen(function* () {
      if (pattern.type === "Identifier") {
@@ -1177,7 +1160,7 @@ class Frame<R> {
    })
  }

-  private evaluateDefault(pattern: AssignmentPattern): Effect.Effect<Value, unknown, R> {
+  private evaluateDefault(pattern: AssignmentPattern): Effect.Effect<unknown, unknown, R> {
    return pattern.left.type === "Identifier"
      ? this.evaluateNamed(pattern.right, pattern.left.name)
      : this.evaluateExpression(pattern.right)
@@ -1185,8 +1168,8 @@ class Frame<R> {

  private destructureArrayPattern(
    pattern: ArrayPattern,
-    value: Value,
-    consume: (target: Pattern, value: Value, context: AstNode) => Effect.Effect<void, unknown, R>,
+    value: unknown,
+    consume: (target: Pattern, value: unknown, context: AstNode) => Effect.Effect<void, unknown, R>,
  ): Effect.Effect<void, unknown, R> {
    const self = this
    return Effect.gen(function* () {
@@ -1210,7 +1193,7 @@ class Frame<R> {
        done = step.done
        if (element === null) continue
        if (element.type === "RestElement") {
-          const rest: Array<Value> = []
+          const rest: Array<unknown> = []
          if (!step.done) rest.push(step.value)
          while (!done) {
            const next = yield* cursor.next
@@ -1221,7 +1204,7 @@ class Frame<R> {
          return
        }
        const consumed = consume(element, step.done ? undefined : step.value, pattern)
-        yield* step.done ? consumed : preserveConsumerError(cursor.close, consumed)
+        yield* step.done ? consumed : preserveConsumerError(cursor, consumed)
      }
      if (!done) yield* cursor.close
    })
@@ -1240,12 +1223,13 @@ class Frame<R> {
    throw unsupportedSyntax(keyNode.type, keyNode)
  }

-  private evaluateExpression(node: Expression): Effect.Effect<Value, unknown, R> {
+  private evaluateExpression(node: Expression): Effect.Effect<unknown, unknown, R> {
    switch (node.type) {
      case "Literal": {
        const regex = node.regex
        if (regex) return Effect.sync(() => constructRegExp(this.ctx.builtins, [regex.pattern, regex.flags]))
-        return Effect.succeed(literal(node))
+        if (typeof node.value === "bigint") throw typeError("BigInt literals are not supported.", node)
+        return Effect.succeed(node.value)
      }
      case "Identifier":
        return Effect.sync(() => this.scopes.get(node.name, node))
@@ -1260,7 +1244,7 @@ class Frame<R> {
      case "SequenceExpression": {
        const self = this
        return Effect.gen(function* () {
-          let result: Value
+          let result: unknown
          for (const expression of node.expressions) {
            result = yield* self.evaluateExpression(expression)
          }
@@ -1301,7 +1285,7 @@ class Frame<R> {
    }
  }

-  private evaluateNewExpression(node: NewExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateNewExpression(node: NewExpression): Effect.Effect<unknown, unknown, R> {
    const self = this
    return Effect.gen(function* () {
      const callee = yield* self.evaluateExpression(node.callee)
@@ -1311,7 +1295,7 @@ class Frame<R> {
        // `new` itself is supported, so a non-constructible callee is a TypeError like JS rather than
        // unsupported syntax. Built-ins like Number are real constructors in JS, so do not claim
        // otherwise; say `new` is unsupported for them and point at the plain call.
-        const name = calleeDescription(node.callee) ?? "The called value"
+        const name = calleeDescription(node.callee)
        const message =
          callee instanceof Fn
            ? `${name} cannot be constructed: user-defined constructors and classes are not supported. Call it as a function that returns a plain object instead.`
@@ -1325,7 +1309,7 @@ class Frame<R> {
    })
  }

-  private evaluateBinaryExpression(node: BinaryExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateBinaryExpression(node: BinaryExpression): Effect.Effect<unknown, unknown, R> {
    const operator = node.operator
    const left = node.left
    if (left.type === "PrivateIdentifier") throw unsupportedSyntax(left.type, left)
@@ -1338,7 +1322,7 @@ class Frame<R> {
    })
  }

-  private applyBinaryOperator(operator: string, lhs: Value, rhs: Value, node: AstNode): Value {
+  private applyBinaryOperator(operator: string, lhs: unknown, rhs: unknown, node: AstNode): unknown {
    if (operator === "===") return lhs === rhs
    if (operator === "!==") return lhs !== rhs
    if (operator === "in" && rhs instanceof Obj && !containsOpaqueReference(lhs)) {
@@ -1347,9 +1331,14 @@ class Frame<R> {
    if (containsOpaqueReference(lhs) || containsOpaqueReference(rhs)) {
      throw invalidData("Binary operators require data values.", node)
    }
-    // Addition and loose equality use the default hint; every other operator asks for a number.
-    const hint = operator === "+" || operator === "==" || operator === "!=" ? "default" : "number"
-    const coerceOperand = (operand: Value) => (operand instanceof Obj ? operand.toPrimitive(hint) : operand)
+    // Null-prototype data needs explicit primitive coercion; identity and `in` retain raw objects.
+    // Dates use their default string hint for addition and loose equality, and epoch time elsewhere.
+    const coerceOperand = (operand: unknown): unknown => {
+      if (operand instanceof DateObj) {
+        return operator === "+" || operator === "==" || operator === "!=" ? coerceToString(operand) : operand.time
+      }
+      return operand !== null && typeof operand === "object" ? coerceToString(operand) : operand
+    }
    const bothObjects = lhs !== null && typeof lhs === "object" && rhs !== null && typeof rhs === "object"
    const l = coerceOperand(lhs)
    const r = coerceOperand(rhs)
@@ -1403,7 +1392,7 @@ class Frame<R> {
    }
  }

-  private evaluateLogicalExpression(node: LogicalExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateLogicalExpression(node: LogicalExpression): Effect.Effect<unknown, unknown, R> {
    const operator = node.operator
    return Effect.flatMap(this.evaluateExpression(node.left), (left) => {
      if (operator === "&&") return left ? this.evaluateExpression(node.right) : Effect.succeed(left)
@@ -1414,7 +1403,7 @@ class Frame<R> {
    })
  }

-  private evaluateUnaryExpression(node: UnaryExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateUnaryExpression(node: UnaryExpression): Effect.Effect<unknown, unknown, R> {
    const operator = node.operator
    const argument = node.argument
    if (operator === "delete") return this.evaluateDeleteExpression(argument)
@@ -1429,8 +1418,13 @@ class Frame<R> {
      if (containsOpaqueReference(value)) {
        throw invalidData("Unary operators require data values.", node)
      }
-      const operand = value instanceof Obj ? value.toPrimitive("number") : value
-      let result: Value
+      const operand =
+        value instanceof DateObj
+          ? value.time
+          : value !== null && typeof value === "object"
+            ? coerceToString(value)
+            : value
+      let result: unknown
      switch (operator) {
        case "+":
          result = +(operand as number)
@@ -1448,7 +1442,7 @@ class Frame<R> {
    })
  }

-  private evaluateAssignmentExpression(node: AssignmentExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateAssignmentExpression(node: AssignmentExpression): Effect.Effect<unknown, unknown, R> {
    const left = node.left
    const operator = node.operator
    const self = this
@@ -1488,9 +1482,9 @@ class Frame<R> {
    node: AssignmentExpression,
    left: Pattern,
    operator: string,
-  ): Effect.Effect<Value, unknown, R> {
+  ): Effect.Effect<unknown, unknown, R> {
    const self = this
-    const shouldAssign = (current: Value): boolean =>
+    const shouldAssign = (current: unknown): boolean =>
      operator === "??=" ? current === null || current === undefined : operator === "||=" ? !current : Boolean(current)
    if (left.type === "Identifier") {
      const name = left.name
@@ -1515,7 +1509,7 @@ class Frame<R> {
    throw typeError("Assignment target must be an Identifier or MemberExpression.", left)
  }

-  private evaluateUpdateExpression(node: UpdateExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateUpdateExpression(node: UpdateExpression): Effect.Effect<unknown, unknown, R> {
    const operator = node.operator
    const argument = node.argument
    const prefix = node.prefix
@@ -1528,7 +1522,7 @@ class Frame<R> {

    // CodeMode numeric coercion, not host Number(): null-prototype data objects would make
    // the host throw during ToPrimitive, and opaque runtime references must reject clearly.
-    const operand = (current: Value): number => {
+    const operand = (current: unknown): number => {
      if (containsOpaqueReference(current)) {
        throw invalidData(`'${operator}' requires a data value.`, argument)
      }
@@ -1557,7 +1551,7 @@ class Frame<R> {
  }

  // EvaluateCall: a member callee supplies its base object as `this`; anything else calls with undefined.
-  private evaluateCallExpression(node: CallExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateCallExpression(node: CallExpression): Effect.Effect<unknown, unknown, R> {
    const callee = node.callee

    const self = this
@@ -1575,7 +1569,7 @@ class Frame<R> {
    })
  }

-  private readMethod(node: MemberExpression): Effect.Effect<{ callable: Value; thisValue: Value }, unknown, R> {
+  private readMethod(node: MemberExpression): Effect.Effect<{ callable: unknown; thisValue: unknown }, unknown, R> {
    return Effect.map(this.getMemberReference(node), (reference) => {
      if (reference === OptionalShortCircuit) return { callable: OptionalShortCircuit, thisValue: undefined }
      if (reference instanceof ToolReference) return { callable: reference, thisValue: undefined }
@@ -1586,12 +1580,12 @@ class Frame<R> {

  // The single dispatch for every invocation: call expressions and callbacks share it.
  call(
-    callable: Value,
-    thisValue: Value,
-    args: Array<Value>,
+    callable: unknown,
+    thisValue: unknown,
+    args: Array<unknown>,
    node?: AstNode,
    callee?: Expression,
-  ): Effect.Effect<Value, unknown, R> {
+  ): Effect.Effect<unknown, unknown, R> {
    const self = this
    return Effect.gen(function* () {
      if (callable instanceof ToolReference) {
@@ -1604,12 +1598,12 @@ class Frame<R> {
      if (callable instanceof Native) {
        return yield* self.native(() => (callable as Native<R>).call(thisValue, args), node)
      }
-      throw typeError(`${calleeDescription(callee) ?? "The called value"} is not a function.`, callee ?? node)
+      throw typeError(`${calleeDescription(callee)} is not a function.`, callee ?? node)
    })
  }

  // Built-ins throw without a location, synchronously or inside their Effect; the call site supplies it.
-  private native(body: () => Effect.Effect<Value, unknown, R>, node?: AstNode): Effect.Effect<Value, unknown, R> {
+  private native(body: () => Effect.Effect<unknown, unknown, R>, node?: AstNode): Effect.Effect<unknown, unknown, R> {
    return Effect.provideService(
      Effect.catchDefect(Effect.suspend(body), (defect) => Effect.die(locate(defect, node))),
      CallSite,
@@ -1619,10 +1613,10 @@ class Frame<R> {

  private evaluateCallArguments(
    argNodes: ReadonlyArray<Expression | SpreadElement>,
-  ): Effect.Effect<Array<Value>, unknown, R> {
+  ): Effect.Effect<Array<unknown>, unknown, R> {
    const self = this
    return Effect.gen(function* () {
-      const args: Array<Value> = []
+      const args: Array<unknown> = []
      for (const argNode of argNodes) {
        if (argNode.type === "SpreadElement") {
          const spread = yield* self.evaluateExpression(argNode.argument)
@@ -1642,7 +1636,7 @@ class Frame<R> {
  }

  // A callback invoked by a built-in runs below the call that invoked the built-in, so the deeper of the two counts.
-  invokeFunction(fn: Fn, args: Array<Value>, node?: AstNode): Effect.Effect<Value, unknown, R> {
+  invokeFunction(fn: Fn, args: Array<unknown>, node?: AstNode): Effect.Effect<unknown, unknown, R> {
    const self = this
    return Effect.flatMap(CallSite, (site) => {
      const depth = Math.max(self.depth, site.depth) + 1
@@ -1689,16 +1683,16 @@ class Frame<R> {

  private createGenerator(
    invocation: Frame<R>,
-    run: Effect.Effect<Value, unknown, R>,
+    run: Effect.Effect<unknown, unknown, R>,
    asynchronous: boolean,
  ): GeneratorObj {
    const state: GeneratorState = { started: false, completed: false, draining: false, pending: [], pendingIndex: 0 }
    invocation.generatorState = state
    invocation.generatorAsync = asynchronous
    const builtins = this.ctx.builtins
-    const result = (value: Value, done: boolean) => record(builtins.Object, { value, done })
-    const request = (kind: GeneratorRequestKind, value: Value) => {
-      const request = { kind, value, response: Deferred.makeUnsafe<Value, unknown>() }
+    const result = (value: unknown, done: boolean) => record(builtins.Object, { value, done })
+    const request = (kind: GeneratorRequestKind, value: unknown) => {
+      const request = { kind, value, response: Deferred.makeUnsafe<unknown, unknown>() }
      if (!asynchronous && state.active) return Effect.die(typeError("Generator is already running."))
      if (asynchronous && (state.completed || (!state.started && kind !== "next"))) {
        state.started = true
@@ -1769,7 +1763,7 @@ class Frame<R> {

  private completeGeneratorRequests(state: GeneratorState, asynchronous: boolean): Effect.Effect<void, never, R> {
    const self = this
-    const result = (value: Value, done: boolean) => record(self.ctx.builtins.Object, { value, done })
+    const result = (value: unknown, done: boolean) => record(self.ctx.builtins.Object, { value, done })
    return Effect.gen(function* () {
      while (true) {
        const pending = self.dequeueGeneratorRequest(state)
@@ -1815,7 +1809,7 @@ class Frame<R> {
    return request
  }

-  private evaluateYieldExpression(node: YieldExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateYieldExpression(node: YieldExpression): Effect.Effect<unknown, unknown, R> {
    const argument = node.argument
    const self = this
    return Effect.gen(function* () {
@@ -1830,7 +1824,7 @@ class Frame<R> {
    })
  }

-  private suspendGenerator(value: Value, node: AstNode): Effect.Effect<Value, unknown, R> {
+  private suspendGenerator(value: unknown, node: AstNode): Effect.Effect<unknown, unknown, R> {
    const state = this.generatorState
    if (!state?.active) throw typeError("Generator has no active request.", node)
    Deferred.doneUnsafe(state.active.response, Exit.succeed(record(this.ctx.builtins.Object, { value, done: false })))
@@ -1845,11 +1839,19 @@ class Frame<R> {
    })
  }

-  private delegateYield(value: Value, node: AstNode): Effect.Effect<Value, unknown, R> {
+  private delegateYield(value: unknown, node: AstNode): Effect.Effect<unknown, unknown, R> {
    const self = this
    return Effect.gen(function* () {
-      const cursor = self.builtinCursor(value)
-      if (cursor !== undefined) {
+      if (
+        value instanceof Arr ||
+        typeof value === "string" ||
+        value instanceof MapObj ||
+        value instanceof SetObj ||
+        value instanceof URLSearchParamsObj ||
+        value instanceof Bytes
+      ) {
+        const cursor = yield* self.iterate(value, node)
+        if (!cursor) throw typeError("Built-in iterator is unavailable.", node)
        while (true) {
          const step = yield* cursor.next
          if (step.done) return undefined
@@ -1873,7 +1875,7 @@ class Frame<R> {
      const iterator = yield* self.customIterator(value, node, self.generatorAsync)
      if (!iterator) throw typeError("yield* requires a compatible iterable value.", node)
      let kind: GeneratorRequestKind = "next"
-      let input: Value = undefined
+      let input: unknown = undefined
      while (true) {
        const method = kind === "next" ? iterator.next : get(iterator.iterator, kind)
        if (method === undefined || method === null) {
@@ -1893,7 +1895,7 @@ class Frame<R> {
          node,
        )
        const done = Boolean(get(result, "done"))
-        const resultValue: Value =
+        const resultValue: unknown =
          self.generatorAsync && !iterator.asynchronous
            ? yield* self.awaitAsyncFromSyncValue(iterator, get(result, "value"), node, kind !== "return" && !done)
            : get(result, "value")
@@ -1902,7 +1904,7 @@ class Frame<R> {
          return resultValue
        }

-        const resumed: Exit.Exit<Value, unknown> = yield* Effect.exit(self.suspendGenerator(resultValue, node))
+        const resumed: Exit.Exit<unknown, unknown> = yield* Effect.exit(self.suspendGenerator(resultValue, node))
        if (Exit.isSuccess(resumed)) {
          kind = "next"
          input = resumed.value
@@ -1943,7 +1945,7 @@ class Frame<R> {
        } else if (keyNode.type === "Identifier") {
          key = keyNode.name
        } else if (keyNode.type === "Literal") {
-          key = self.toPropertyKey(literal(keyNode), keyNode)
+          key = self.toPropertyKey(keyNode.value, keyNode)
        } else {
          throw typeError("Unsupported object property key shape.", keyNode)
        }
@@ -1962,7 +1964,7 @@ class Frame<R> {
  }

  private evaluateArrayExpression(node: ArrayExpression): Effect.Effect<Arr, unknown, R> {
-    const values: Array<Value> = []
+    const values: Array<unknown> = []

    const self = this
    return Effect.gen(function* () {
@@ -2017,13 +2019,13 @@ class Frame<R> {
    })
  }

-  private evaluateConditionalExpression(node: ConditionalExpression): Effect.Effect<Value, unknown, R> {
+  private evaluateConditionalExpression(node: ConditionalExpression): Effect.Effect<unknown, unknown, R> {
    return Effect.flatMap(this.evaluateExpression(node.test), (test) =>
      this.evaluateExpression(test ? node.consequent : node.alternate),
    )
  }

-  private applyCompoundAssignment(operator: string, current: Value, incoming: Value, node: AstNode): Value {
+  private applyCompoundAssignment(operator: string, current: unknown, incoming: unknown, node: AstNode): unknown {
    if (!compoundOperators.has(operator)) {
      throw typeError(`Unsupported assignment operator '${operator}'.`, node)
    }
@@ -2032,7 +2034,7 @@ class Frame<R> {

  private getMemberReference(
    node: MemberExpression,
-  ): Effect.Effect<MemberReference | ToolReference | { value: Value } | typeof OptionalShortCircuit, unknown, R> {
+  ): Effect.Effect<MemberReference | ToolReference | { value: unknown } | typeof OptionalShortCircuit, unknown, R> {
    const objectNode = node.object
    const propertyNode = node.property
    if (objectNode.type === "Super") throw unsupportedSyntax(objectNode.type, objectNode)
@@ -2058,14 +2060,16 @@ class Frame<R> {

      if (objectValue instanceof Obj) return { target: objectValue, key, receiver: objectValue }

-      // Strings own length and indexes; every other primitive property reads through the wrapper prototype.
+      // Primitives read through their wrapper prototype without being boxed; strings own length and indexes.
+      const builtins = self.ctx.builtins
      if (typeof objectValue === "string") {
        if (key === "length") return { value: objectValue.length }
        const index = typeof key === "symbol" ? undefined : parseArrayIndex(key)
        if (index !== undefined) return { value: objectValue[index] }
+        return { target: builtins.String, key, receiver: objectValue }
      }
-      const proto = primitivePrototype(self.ctx.builtins, objectValue)
-      if (proto !== undefined) return { target: proto, key, receiver: objectValue }
+      if (typeof objectValue === "number") return { target: builtins.Number, key, receiver: objectValue }
+      if (typeof objectValue === "boolean") return { target: builtins.Boolean, key, receiver: objectValue }

      if (objectValue === null || objectValue === undefined) {
        throw typeError(`Cannot read properties of ${objectValue} (reading '${String(key)}').`, objectNode)
@@ -2074,7 +2078,7 @@ class Frame<R> {
    })
  }

-  private readReference(reference: MemberReference, node: MemberExpression): Value {
+  private readReference(reference: MemberReference, node: MemberExpression): unknown {
    // Reject unknown promise properties so a missing await cannot hide.
    if (reference.target instanceof PromiseObj && !has(reference.target, reference.key)) {
      throw invalidData(
@@ -2086,7 +2090,7 @@ class Frame<R> {
  }

  // Accessors throw without a location; the member or pattern that read them supplies it.
-  private readProperty(target: Obj, key: PropertyKey, node: AstNode, receiver: Value = target): Value {
+  private readProperty(target: Obj, key: PropertyKey, node: AstNode, receiver: unknown = target): unknown {
    try {
      return get(target, key, receiver)
    } catch (error) {
@@ -2094,7 +2098,7 @@ class Frame<R> {
    }
  }

-  private readMember(node: MemberExpression): Effect.Effect<Value, unknown, R> {
+  private readMember(node: MemberExpression): Effect.Effect<unknown, unknown, R> {
    return Effect.map(this.getMemberReference(node), (reference) => {
      if (reference === OptionalShortCircuit) return OptionalShortCircuit
      if (reference instanceof ToolReference) return reference
@@ -2103,7 +2107,7 @@ class Frame<R> {
    })
  }

-  private writeMember(node: MemberExpression, value: Value): Effect.Effect<Value, unknown, R> {
+  private writeMember(node: MemberExpression, value: unknown): Effect.Effect<unknown, unknown, R> {
    return this.modifyMember(node, () => Effect.succeed({ write: true, next: value, result: value }))
  }

@@ -2125,8 +2129,8 @@ class Frame<R> {
  // Resolve side-effecting object and key expressions exactly once.
  private modifyMember(
    node: MemberExpression,
-    compute: (current: Value) => Effect.Effect<{ write: boolean; next: Value; result: Value }, unknown, R>,
-  ): Effect.Effect<Value, unknown, R> {
+    compute: (current: unknown) => Effect.Effect<{ write: boolean; next: unknown; result: unknown }, unknown, R>,
+  ): Effect.Effect<unknown, unknown, R> {
    const self = this
    return Effect.gen(function* () {
      const reference = yield* self.getMemberReference(node)
@@ -2146,7 +2150,7 @@ class Frame<R> {
    })
  }

-  private assignToReference(target: Obj, key: PropertyKey, next: Value, node: AstNode): void {
+  private assignToReference(target: Obj, key: PropertyKey, next: unknown, node: AstNode): void {
    const written = (() => {
      try {
        rejectCircularInsertion(
@@ -2164,7 +2168,7 @@ class Frame<R> {
    throw typeError(`Cannot assign to read only property '${String(key)}'.`, node)
  }

-  private toPropertyKey(value: Value, node: AstNode): PropertyKey {
+  private toPropertyKey(value: unknown, node: AstNode): PropertyKey {
    if (typeof value === "string" || typeof value === "number") {
      return value
    }
@@ -1,5 +1,5 @@
 import { Effect } from "effect"
-import { define, hidden, Native, Arr, ErrorObj, Obj, type Value } from "./objects.js"
+import { define, hidden, Native, Arr, ErrorObj, Obj } from "./objects.js"

 export const errorTypes = [
  "Error",
@@ -29,13 +29,11 @@ const builtins = [
  "Set",
  "URL",
  "URLSearchParams",
-  "Headers",
  "Uint8Array",
  "TextEncoder",
  "TextDecoder",
  "Promise",
  "Iterator",
-  "IteratorHelper",
  "AsyncIterator",
  "Generator",
  "AsyncGenerator",
@@ -53,14 +51,6 @@ export const createErrorValue = (prototype: Obj, message: string | undefined): E
  return value
 }

-/** The prototype a primitive reads its methods from without being boxed; none for null, undefined, and symbols. */
-export const primitivePrototype = (builtins: Builtins, value: Value): Obj | undefined => {
-  if (typeof value === "string") return builtins.String
-  if (typeof value === "number") return builtins.Number
-  if (typeof value === "boolean") return builtins.Boolean
-  return undefined
-}
-
 export const createBuiltins = (): Builtins => {
  const object = new Obj(null)
  // Function.prototype is itself callable and returns undefined.
@@ -90,13 +80,11 @@ export const createBuiltins = (): Builtins => {
    Set: plain(),
    URL: plain(),
    URLSearchParams: plain(),
-    Headers: plain(),
    Uint8Array: plain(),
    TextEncoder: plain(),
    TextDecoder: plain(),
    Promise: plain(),
    Iterator: iterator,
-    IteratorHelper: new Obj(iterator),
    AsyncIterator: asyncIterator,
    Generator: new Obj(iterator),
    AsyncGenerator: new Obj(asyncIterator),
@@ -2,7 +2,7 @@ import type { Node } from "acorn"
 import { Context } from "effect"
 import type { ErrorType } from "./intrinsics.js"
 import type { DiagnosticKind } from "../codemode.js"
-import type { ErrorObj, Value } from "./objects.js"
+import type { ErrorObj } from "./objects.js"

 /** Any parsed node; the interpreter narrows on `type` and reads `loc` for diagnostics. */
 export type AstNode = Node
@@ -14,13 +14,13 @@ export const CallSite = Context.Reference<{ readonly node?: AstNode; readonly de

 export type Binding = {
  mutable: boolean
-  value: Value
+  value: unknown
  initialized?: boolean
 }

 export type StatementResult =
  | { kind: "none" }
-  | { kind: "return"; value: Value }
+  | { kind: "return"; value: unknown }
  | { kind: "break"; label?: string }
  | { kind: "continue"; label?: string }

@@ -31,11 +31,11 @@ export const IteratorSymbol: unique symbol = Symbol("codemode.iterator")
 export const IteratorSymbols = [AsyncIteratorSymbol, IteratorSymbol] as const

 export class Throw {
-  constructor(readonly value: Value) {}
+  constructor(readonly value: unknown) {}
 }

 export class GeneratorReturn {
-  constructor(readonly value: Value) {}
+  constructor(readonly value: unknown) {}
 }

 export const OptionalShortCircuit: unique symbol = Symbol("codemode.optional-short-circuit")
@@ -83,10 +83,12 @@ export const unsupportedSyntax = (kind: string, node: AstNode): PendingThrow =>
    [supportedSyntaxMessage],
  )

-// Acorn lines are 1-based and its columns are 0-based. Diagnostics use 1-based columns of the submitted source.
+export const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null
+
 export const sourceLocation = (node: AstNode): { readonly line: number; readonly column: number } => ({
-  line: node.loc?.start.line ?? 1,
-  column: (node.loc?.start.column ?? 0) + 1,
+  line: Math.max(1, (node.loc?.start.line ?? 2) - 1),
+  column: Math.max(1, (node.loc?.start.column ?? 4) - 3),
 })

 export const formatLocation = (node?: AstNode): string => {
@@ -1,18 +1,18 @@
 import { Effect } from "effect"
 import type { Builtins } from "./intrinsics.js"
 import { typeError } from "./model.js"
-import { type Callable, define, frozen, hidden, Native, type NativeOptions, Obj, type Value } from "./objects.js"
+import { type Callable, define, frozen, hidden, Native, type NativeOptions, Obj } from "./objects.js"
 import { describeValue } from "./references.js"

-/** A native function body: a value, a thrown `PendingThrow`, or an Effect of a value. */
-export type Impl = (thisValue: Value, args: Array<Value>) => Value | Effect.Effect<Value, unknown, unknown>
+/** A native function body: a plain value, a thrown `PendingThrow`, or an Effect. */
+export type Impl = (thisValue: unknown, args: Array<unknown>) => unknown

 // The dispatch in `Frame.call` suspends every native call, so a synchronous throw here is a defect.
 const lift =
  <R>(impl: Impl) =>
-  (thisValue: Value, args: Array<Value>): Effect.Effect<Value, unknown, R> => {
+  (thisValue: unknown, args: Array<unknown>): Effect.Effect<unknown, unknown, R> => {
    const result = impl(thisValue, args)
-    return Effect.isEffect(result) ? (result as Effect.Effect<Value, unknown, R>) : Effect.succeed(result)
+    return Effect.isEffect(result) ? (result as Effect.Effect<unknown, unknown, R>) : Effect.succeed(result)
  }

 export const native = <R>(builtins: Builtins, options: NativeOptions<R>): Native<R> =>
@@ -27,7 +27,7 @@ export const methods = (builtins: Builtins, target: Obj, table: ReadonlyArray<Me
  for (const [name, length, impl] of table) define(target, name, fn(builtins, name, length, impl), hidden)
 }

-export const constants = (target: Obj, table: Record<string, Value>): void => {
+export const constants = (target: Obj, table: Record<string, unknown>): void => {
  for (const [name, value] of Object.entries(table)) define(target, name, value, frozen)
 }

@@ -54,7 +54,7 @@ export const prototypeFrom = (newTarget: Callable, fallback: Obj): Obj => {
 /** Narrows a method receiver to the built-in it belongs to, or throws the TypeError JS would. */
 export const receiver = <T extends Obj>(
  cls: abstract new (...args: never) => T,
-  thisValue: Value,
+  thisValue: unknown,
  method: string,
 ): T => {
  if (thisValue instanceof cls) return thisValue
@@ -1,7 +1,5 @@
 import type { BlockStatement, Expression, Pattern } from "acorn"
-import { Effect, type Fiber } from "effect"
-import { ToolReference } from "../tool-runtime.js"
-import type { Builtins } from "./intrinsics.js"
+import type { Effect, Fiber } from "effect"
 import { checkArrayLength } from "./limits.js"
 import {
  AsyncIteratorSymbol,
@@ -18,12 +16,12 @@ export type Attributes = {
  readonly configurable: boolean
 }

-export type Getter = (receiver: Value) => Value
-export type Setter = (receiver: Value, value: Value) => void
+export type Getter = (receiver: unknown) => unknown
+export type Setter = (receiver: unknown, value: unknown) => void

 /** One own property: a data slot or a native accessor pair. */
 export type Slot =
-  | { value: Value; writable: boolean; enumerable: boolean; configurable: boolean }
+  | { value: unknown; writable: boolean; enumerable: boolean; configurable: boolean }
  | { get: Getter | undefined; set: Setter | undefined; enumerable: boolean; configurable: boolean }

 /** Ordinary assignment: writable, enumerable, configurable. */
@@ -35,122 +33,33 @@ export const readonly: Attributes = { writable: false, enumerable: false, config
 /** Constants such as `Math.PI` and a constructor's `prototype`. */
 export const frozen: Attributes = { writable: false, enumerable: false, configurable: false }

-/**
- * An object owned by the program: own properties plus a prototype link. Subclasses answer, in one place, how a
- * built-in kind of object prints, coerces, iterates, and crosses to the host.
- */
+/** An object owned by the program: own properties plus a prototype link. */
 export class Obj {
  readonly props = new Map<string | symbol, Slot>()
  constructor(public proto: Obj | null) {}
-
-  /** The class name `Object.prototype.toString` reports: `[object Map]`. */
-  readonly tag: string = "Object"
-
-  /** How diagnostics refer to a value of this kind. */
-  get describe(): string {
-    if (this.tag === "Object") return "a data object"
-    return `${/^[AEIO]/.test(this.tag) ? "an" : "a"} ${this.tag}`
-  }
-
-  /** ToString without consulting program-defined methods. */
-  toString(): string {
-    return `[object ${this.tag}]`
-  }
-
-  /** ToPrimitive without consulting program-defined methods: only a Date answers a number hint differently. */
-  toPrimitive(hint: "default" | "number" | "string"): string | number {
-    return this.toString()
-  }
-
-  /** ToNumber without consulting program-defined methods. */
-  toNumber(): number {
-    return Number(this.toPrimitive("number"))
-  }
-
-  /** How `console.log` shows the value; `item` formats a child with cycle and depth tracking. */
-  inspect(item: (value: Value) => string): string {
-    return `{${entries(this)
-      .map(([key, value]) => `${JSON.stringify(key)}:${item(value)}`)
-      .join(",")}}`
-  }
-
-  /** A copy the host can hold; `item` converts a child. A `__proto__` key never reaches host code. */
-  toHost(item: (value: Value) => unknown): unknown {
-    return Object.fromEntries(
-      entries(this)
-        .filter(([key]) => key !== "__proto__")
-        .map(([key, value]) => [key, item(value)]),
-    )
-  }
-
-  /** The built-in iteration `for...of` and spread use, when this kind of object has one. */
-  iterator(builtins: Builtins): Iterator<Value, undefined> | undefined {
-    return undefined
-  }
 }

 export class Arr extends Obj {
-  override readonly tag = "Array"
  constructor(
    proto: Obj,
-    readonly items: Array<Value> = [],
+    readonly items: Array<unknown> = [],
  ) {
    super(proto)
  }
-  override get describe() {
-    return "an array"
-  }
-  override toString() {
-    return this.items.map((item) => (item === null || item === undefined ? "" : coerceToString(item))).join(",")
-  }
-  override inspect(item: (value: Value) => string) {
-    return `[${this.items.map(item).join(",")}]`
-  }
-  override toHost(item: (value: Value) => unknown) {
-    return this.items.map(item)
-  }
-  override iterator() {
-    return this.items.values()
-  }
 }

 /** An object with the [[ErrorData]] slot: what `Error.prototype.toString` and the host boundary recognize as an error. */
 export class ErrorObj extends Obj {
-  override readonly tag = "Error"
  /** The interpreter failure this error materialized from, so rethrowing it keeps the diagnostic kind and location. */
  host?: PendingThrow
-  /** Error.prototype.toString: "name: message", or just one when the other is empty. */
-  override toString() {
-    const name = get(this, "name")
-    const message = get(this, "message")
-    const shownName = typeof name === "string" ? name : "Error"
-    const shownMessage = typeof message === "string" ? message : ""
-    if (shownMessage === "") return shownName
-    if (shownName === "") return shownMessage
-    return `${shownName}: ${shownMessage}`
-  }
-  override inspect() {
-    return this.toString()
-  }
 }

-/** Interpreter machinery a program can hold but never inspect, serialize, or hand to the host. */
-export abstract class Opaque extends Obj {
-  override inspect() {
-    return "[opaque reference]"
-  }
-}
-
-export abstract class Callable extends Opaque {
-  override readonly tag = "Function"
+export abstract class Callable extends Obj {
  constructor(proto: Obj, name: string, length: number) {
    super(proto)
    define(this, "length", length, readonly)
    define(this, "name", name, readonly)
  }
-  override get describe() {
-    return "a function"
-  }
 }

 export class Fn extends Callable {
@@ -168,8 +77,8 @@ export class Fn extends Callable {
  }
 }

-export type NativeCall<R> = (thisValue: Value, args: Array<Value>) => Effect.Effect<Value, unknown, R>
-export type NativeConstruct<R> = (args: Array<Value>, newTarget: Callable) => Effect.Effect<Value, unknown, R>
+export type NativeCall<R> = (thisValue: unknown, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
+export type NativeConstruct<R> = (args: Array<unknown>, newTarget: Callable) => Effect.Effect<unknown, unknown, R>

 export type NativeOptions<R> = {
  readonly name: string
@@ -194,182 +103,60 @@ export class Native<R = never> extends Callable {
  }
 }

-export class PromiseObj extends Opaque {
-  override readonly tag = "Promise"
+export class PromiseObj extends Obj {
  constructor(
    proto: Obj,
-    readonly fiber: Fiber.Fiber<Value, unknown>,
+    readonly fiber: Fiber.Fiber<unknown, unknown>,
  ) {
    super(proto)
  }
-  override get describe() {
-    return "an un-awaited Promise"
-  }
-  override inspect() {
-    return "[Promise (await it to get its value)]"
-  }
 }

-export class GeneratorObj extends Opaque {
-  override readonly tag = "Generator"
+export class GeneratorObj extends Obj {
  constructor(
    proto: Obj,
    readonly asynchronous: boolean,
-    readonly request: (kind: GeneratorRequestKind, value: Value) => Effect.Effect<Value, unknown, unknown>,
+    readonly request: (kind: GeneratorRequestKind, value: unknown) => Effect.Effect<unknown, unknown, unknown>,
  ) {
    super(proto)
  }
-  override get describe() {
-    return "a generator"
-  }
 }

-/** One pull from an iterator, as `for...of` sees it. */
-export type Step = { readonly done: boolean; readonly value: Value }
-
-/** How the interpreter drives any iterator: pull the next step, or close it early. */
-export type Cursor<R = unknown> = {
-  readonly next: Effect.Effect<Step, unknown, R>
-  readonly close: Effect.Effect<void, unknown, R>
-}
-
-/** A cursor over a host iterator; there is nothing to close. */
-export const hostCursor = (iterator: Iterator<Value, undefined>): Cursor<never> => ({
-  next: Effect.sync(() => {
-    const step = iterator.next()
-    return { done: Boolean(step.done), value: step.value }
-  }),
-  close: Effect.void,
-})
-
-/** A built-in iterator: a live cursor over a host collection or an iterator helper, yielding program values. */
-export class IteratorObj extends Opaque {
-  override readonly tag = "Iterator"
-  constructor(
-    proto: Obj,
-    readonly cursor: Cursor,
-  ) {
-    super(proto)
-  }
-  override get describe() {
-    return "an iterator"
-  }
-}
-
-/** A built-in iterator over a host iterator, e.g. `array.values()`. */
-export const hostIterator = (builtins: Builtins, iterator: Iterator<Value, undefined>): IteratorObj =>
-  new IteratorObj(builtins.Iterator, hostCursor(iterator))
-
-/** A built-in object around a host value: data-like, so it prints as itself and crosses to extensions as a copy. */
-export abstract class Wrapper extends Obj {
-  override inspect(item: (value: Value) => string) {
-    return this.toString()
-  }
-}
-
-export class DateObj extends Wrapper {
-  override readonly tag = "Date"
+export class DateObj extends Obj {
  constructor(
    proto: Obj,
    public time: number,
  ) {
    super(proto)
  }
-  override toString() {
-    return Number.isFinite(this.time) ? new Date(this.time).toISOString() : "Invalid Date"
-  }
-  override toPrimitive(hint: "default" | "number" | "string") {
-    return hint === "number" ? this.time : this.toString()
-  }
-  override toHost() {
-    return new Date(this.time)
-  }
 }

-export class RegExpObj extends Wrapper {
-  override readonly tag = "RegExp"
+export class RegExpObj extends Obj {
  readonly regex: RegExp
  constructor(proto: Obj, pattern: string, flags: string) {
    super(proto)
    this.regex = new RegExp(pattern, flags)
  }
-  override toString() {
-    return `/${this.regex.source}/${this.regex.flags}`
-  }
-  override toHost() {
-    return new RegExp(this.regex.source, this.regex.flags)
-  }
 }

-export class MapObj extends Wrapper {
-  override readonly tag = "Map"
-  readonly map = new Map<Value, Value>()
-  override inspect(item: (value: Value) => string) {
-    return `Map(${this.map.size}) [${[...this.map].map(([key, value]) => `[${item(key)},${item(value)}]`).join(",")}]`
-  }
-  override toHost(item: (value: Value) => unknown) {
-    return new Map([...this.map].map(([key, value]) => [item(key), item(value)]))
-  }
-  override iterator(builtins: Builtins) {
-    return this.map.entries().map((entry) => new Arr(builtins.Array, entry))
-  }
+export class MapObj extends Obj {
+  readonly map = new Map<unknown, unknown>()
 }

-export class SetObj extends Wrapper {
-  override readonly tag = "Set"
-  readonly set = new Set<Value>()
-  override inspect(item: (value: Value) => string) {
-    return `Set(${this.set.size}) [${[...this.set].map(item).join(",")}]`
-  }
-  override toHost(item: (value: Value) => unknown) {
-    return new Set([...this.set].map(item))
-  }
-  override iterator() {
-    return this.set.values()
-  }
+export class SetObj extends Obj {
+  readonly set = new Set<unknown>()
 }

-export class URLSearchParamsObj extends Wrapper {
-  override readonly tag = "URLSearchParams"
+export class URLSearchParamsObj extends Obj {
  constructor(
    proto: Obj,
    readonly params: URLSearchParams,
  ) {
    super(proto)
  }
-  override toString() {
-    return this.params.toString()
-  }
-  override toHost() {
-    return new URLSearchParams(this.params)
-  }
-  override iterator(builtins: Builtins) {
-    return this.params.entries().map((entry) => new Arr(builtins.Array, entry))
-  }
 }

-export class HeadersObj extends Wrapper {
-  override readonly tag = "Headers"
-  constructor(
-    proto: Obj,
-    readonly headers: Headers,
-  ) {
-    super(proto)
-  }
-  override inspect() {
-    return `Headers ${JSON.stringify(Object.fromEntries(this.headers))}`
-  }
-  override toHost() {
-    return new Headers(this.headers)
-  }
-  override iterator(builtins: Builtins) {
-    // Bun's Headers typings lack the iterator helpers, so the host iterator is lifted first.
-    return Iterator.from(this.headers.entries()).map((entry) => new Arr(builtins.Array, entry))
-  }
-}
-
-export class URLObj extends Wrapper {
-  override readonly tag = "URL"
+export class URLObj extends Obj {
  readonly searchParams: URLSearchParamsObj
  constructor(
    proto: Obj,
@@ -379,52 +166,29 @@ export class URLObj extends Wrapper {
    super(proto)
    this.searchParams = new URLSearchParamsObj(searchParamsProto, url.searchParams)
  }
-  override toString() {
-    return this.url.href
-  }
-  override toHost() {
-    return new URL(this.url.href)
-  }
 }

 /** A `Uint8Array`: the host array does the byte clamping and ignores out-of-range writes, as JS does. */
-export class Bytes extends Wrapper {
-  override readonly tag = "Uint8Array"
+export class Bytes extends Obj {
  constructor(
    proto: Obj,
    readonly bytes: Uint8Array,
  ) {
    super(proto)
  }
-  override toString() {
-    return this.bytes.join(",")
-  }
-  override inspect() {
-    return `Uint8Array(${this.bytes.length}) [${this.bytes.join(",")}]`
-  }
-  override toHost() {
-    return new Uint8Array(this.bytes)
-  }
-  override iterator() {
-    return this.bytes.values()
-  }
 }

-/** Every value a program can hold. Host values never appear here; they are copied in at the boundaries. */
-export type Value = string | number | boolean | null | undefined | symbol | Obj | ToolReference
-
-/** ToString without consulting program-defined methods. */
-export const coerceToString = (value: Value): string => (value instanceof Obj ? value.toString() : String(value))
-
-/** ToNumber without consulting program-defined methods; tool references are not numbers. */
-export const coerceToNumber = (value: Value): number => {
-  if (value instanceof Obj) return value.toNumber()
-  return value instanceof ToolReference ? Number.NaN : Number(value)
-}
-
-/** Values that cannot cross the data boundary: opaque machinery and host-backed wrappers. */
-export const isRuntimeReference = (value: Value): boolean =>
-  value instanceof Opaque || value instanceof Wrapper || value instanceof ToolReference
+/** Built-in objects that wrap a host value; data-like, but never plain data. */
+export const isWrapper = (
+  value: unknown,
+): value is DateObj | RegExpObj | MapObj | SetObj | URLObj | URLSearchParamsObj | Bytes =>
+  value instanceof DateObj ||
+  value instanceof RegExpObj ||
+  value instanceof MapObj ||
+  value instanceof SetObj ||
+  value instanceof URLObj ||
+  value instanceof URLSearchParamsObj ||
+  value instanceof Bytes

 const MAX_ARRAY_INDEX = 4_294_967_295

@@ -442,7 +206,7 @@ type Indexed = Arr | Bytes

 const isIndexed = (target: Obj): target is Indexed => target instanceof Arr || target instanceof Bytes

-const elements = (target: Indexed): Array<Value> | Uint8Array => (target instanceof Arr ? target.items : target.bytes)
+const elements = (target: Indexed): Array<unknown> | Uint8Array => (target instanceof Arr ? target.items : target.bytes)

 const index = (target: Obj, key: string | symbol): number | undefined =>
  isIndexed(target) && typeof key === "string" ? parseArrayIndex(key) : undefined
@@ -463,18 +227,18 @@ export const own = (target: Obj, key: PropertyKey): Slot | undefined => {
  return target.props.get(name)
 }

-const read = (slot: Slot, receiver: Value): Value =>
+const read = (slot: Slot, receiver: unknown): unknown =>
  "value" in slot ? slot.value : slot.get === undefined ? undefined : slot.get(receiver)

 export const hasOwn = (target: Obj, key: PropertyKey): boolean => own(target, key) !== undefined

-export const getOwn = (target: Obj, key: PropertyKey): Value => {
+export const getOwn = (target: Obj, key: PropertyKey): unknown => {
  const slot = own(target, key)
  return slot === undefined ? undefined : read(slot, target)
 }

 /** [[Get]]: walks the prototype chain; accessors see `receiver`, which is the primitive for wrapper prototypes. */
-export const get = (target: Obj, key: PropertyKey, receiver: Value = target): Value => {
+export const get = (target: Obj, key: PropertyKey, receiver: unknown = target): unknown => {
  for (let current: Obj | null = target; current !== null; current = current.proto) {
    const slot = own(current, key)
    if (slot !== undefined) return read(slot, receiver)
@@ -489,14 +253,14 @@ export const has = (target: Obj, key: PropertyKey): boolean => {
  return false
 }

-export const hasPrototype = (value: Value, proto: Obj): boolean => {
+export const hasPrototype = (value: unknown, proto: Obj): boolean => {
  for (let current = value instanceof Obj ? value.proto : null; current !== null; current = current.proto) {
    if (current === proto) return true
  }
  return false
 }

-const writeElement = (target: Indexed, name: string | symbol, value: Value): boolean | undefined => {
+const writeElement = (target: Indexed, name: string | symbol, value: unknown): boolean | undefined => {
  const at = index(target, name)
  if (at !== undefined) {
    if (target instanceof Bytes) target.bytes[at] = typeof value === "number" ? value : Number(value)
@@ -512,7 +276,7 @@ const writeElement = (target: Indexed, name: string | symbol, value: Value): boo
 }

 /** [[Set]]: an inherited setter or read-only property decides before an own data property is created. */
-export const set = (target: Obj, key: PropertyKey, value: Value): boolean => {
+export const set = (target: Obj, key: PropertyKey, value: unknown): boolean => {
  const name = canonical(key)
  for (let current: Obj | null = target; current !== null; current = current.proto) {
    const slot = own(current, name)
@@ -540,7 +304,7 @@ export const set = (target: Obj, key: PropertyKey, value: Value): boolean => {
 }

 /** [[DefineOwnProperty]] for a data property, ignoring the chain. */
-export const define = (target: Obj, key: PropertyKey, value: Value, attrs: Attributes = data): void => {
+export const define = (target: Obj, key: PropertyKey, value: unknown, attrs: Attributes = data): void => {
  const name = canonical(key)
  if (isIndexed(target) && writeElement(target, name, value) !== undefined) return
  target.props.set(name, { value, ...attrs })
@@ -591,9 +355,9 @@ export const keys = (target: Obj): Array<string> =>
  ownKeys(target).filter((key): key is string => typeof key === "string" && enumerable(target, key))

 /** Own enumerable string entries: `Object.entries` and serialization. */
-export const entries = (target: Obj): Array<[string, Value]> => keys(target).map((key) => [key, getOwn(target, key)])
+export const entries = (target: Obj): Array<[string, unknown]> => keys(target).map((key) => [key, getOwn(target, key)])

-export const record = (proto: Obj, fields: Record<string, Value>): Obj => {
+export const record = (proto: Obj, fields: Record<string, unknown>): Obj => {
  const target = new Obj(proto)
  for (const [key, value] of Object.entries(fields)) define(target, key, value)
  return target
@@ -2,15 +2,15 @@ import { Cause, Deferred, Effect, Exit, Fiber, Scope } from "effect"
 import type { Diagnostic } from "../codemode.js"
 import { MAX_PENDING_PROMISES } from "./limits.js"
 import { CallSite, Throw, rangeError, typeError } from "./model.js"
-import { Callable, define, get, hidden, Arr, Fn, Obj, PromiseObj, record, type Value } from "./objects.js"
+import { Callable, define, get, hidden, Arr, Fn, Obj, PromiseObj, record } from "./objects.js"
 import { constructor, fn, methods, native, receiver, requiresNew } from "./native.js"
 import { createAggregateErrorValue, locate, materialize, normalizeError } from "./errors.js"
-import { describeValue, typeofValue } from "./references.js"
+import { typeofValue } from "./references.js"
 import { applyCollectionCallback, isSupportedCallback } from "./callback.js"
 import type { Interpreter } from "./interpreter.js"

 // A `resolve`/`reject` handed to an executor or thenable: calling it settles the capability.
-const capability = <R>(ctx: Interpreter<R>, name: string, settle: (value: Value) => void) =>
+const capability = <R>(ctx: Interpreter<R>, name: string, settle: (value: unknown) => void) =>
  fn(ctx.builtins, name, 1, (_, args) => {
    settle(args[0])
    return undefined
@@ -31,7 +31,7 @@ export class Pending<R> {

  // Resolution bodies need the promise's own identity to reject `resolve(promise)` self-resolution.
  createWithSelf(
-    body: (self: { promise?: PromiseObj }) => Effect.Effect<Value, unknown, R>,
+    body: (self: { promise?: PromiseObj }) => Effect.Effect<unknown, unknown, R>,
  ): Effect.Effect<PromiseObj, never, R> {
    const self: { promise?: PromiseObj } = {}
    return Effect.map(this.create(body(self)), (promise) => {
@@ -40,7 +40,7 @@ export class Pending<R> {
    })
  }

-  create(effect: Effect.Effect<Value, unknown, R>): Effect.Effect<PromiseObj, never, R> {
+  create(effect: Effect.Effect<unknown, unknown, R>): Effect.Effect<PromiseObj, never, R> {
    return Effect.flatMap(CallSite, (site) => {
      if (this.active.size >= MAX_PENDING_PROMISES) {
        throw rangeError(
@@ -79,7 +79,7 @@ export class Pending<R> {
    if (id !== undefined) this.failures.delete(id)
  }

-  await(promise: PromiseObj): Effect.Effect<Exit.Exit<Value, unknown>> {
+  await(promise: PromiseObj): Effect.Effect<Exit.Exit<unknown, unknown>> {
    return Fiber.await(promise.fiber)
  }

@@ -105,9 +105,9 @@ export class Pending<R> {

 export const resolvePromiseValue = <R>(
  ctx: Interpreter<R>,
-  value: Value,
+  value: unknown,
  own?: { promise?: PromiseObj },
-): Effect.Effect<Value, unknown, R> => {
+): Effect.Effect<unknown, unknown, R> => {
  if (own?.promise !== undefined && value === own.promise) {
    return Effect.die(typeError("Chaining cycle detected: a promise cannot resolve with itself."))
  }
@@ -119,7 +119,7 @@ export const resolvePromiseValue = <R>(
  return Effect.gen(function* () {
    // Promise resolution invokes a thenable's method in a later job.
    yield* Effect.yieldNow
-    const deferred = Deferred.makeUnsafe<Value, unknown>()
+    const deferred = Deferred.makeUnsafe<unknown, unknown>()
    const resolve = capability(ctx, "resolve", (result) => Deferred.doneUnsafe(deferred, Exit.succeed(result)))
    const reject = capability(ctx, "reject", (reason) => Deferred.doneUnsafe(deferred, Exit.fail(new Throw(reason))))
    const executed = yield* Effect.exit(ctx.call(then, value, [resolve, reject]))
@@ -131,46 +131,29 @@ export const resolvePromiseValue = <R>(
  })
 }

-export const resolvePromise = <R>(ctx: Interpreter<R>, value: Value): Effect.Effect<PromiseObj, never, R> => {
+export const resolvePromise = <R>(ctx: Interpreter<R>, value: unknown): Effect.Effect<PromiseObj, never, R> => {
  if (value instanceof PromiseObj) return Effect.succeed(value)
  return ctx.pending.createWithSelf((self) => resolvePromiseValue(ctx, value, self))
 }

-const promiseStatics = ["all", "allSettled", "race", "any", "resolve", "reject", "withResolvers", "try"] as const
+const promiseStatics = ["all", "allSettled", "race", "any", "resolve", "reject"] as const

 const invokePromiseMethod = <R>(
  ctx: Interpreter<R>,
  name: (typeof promiseStatics)[number],
-  args: Array<Value>,
-): Effect.Effect<Value, unknown, R> => {
+  args: Array<unknown>,
+): Effect.Effect<unknown, unknown, R> => {
  if (name === "resolve") {
    return resolvePromise(ctx, args[0])
  }
  if (name === "reject") {
    return ctx.pending.create(Effect.fail(new Throw(args[0])))
  }
-  if (name === "withResolvers") {
-    return Effect.map(promiseCapability(ctx), (made) =>
-      record(ctx.builtins.Object, { promise: made.promise, resolve: made.resolve, reject: made.reject }),
-    )
-  }
-  if (name === "try") {
-    if (typeofValue(args[0]) !== "function") {
-      throw typeError(`Promise.try expects a function, received ${describeValue(args[0])}.`)
-    }
-    return Effect.flatMap(Effect.exit(ctx.call(args[0], undefined, args.slice(1))), (called) => {
-      if (Exit.isSuccess(called)) return resolvePromise(ctx, called.value)
-      if (Cause.hasInterruptsOnly(called.cause)) return Effect.failCause(called.cause)
-      return ctx.pending.create(Effect.fail(Cause.squash(called.cause)))
-    })
-  }

  return ctx.pending.create(
    Effect.gen(function* () {
      const cursor = yield* ctx.iterate(args[0])
-      if (cursor === undefined) {
-        throw typeError(`Promise.${name} expects a synchronous iterable, received ${describeValue(args[0])}.`)
-      }
+      if (cursor === undefined) throw typeError(`Promise.${name} expects an array or other synchronous iterable.`)
      const items: Array<PromiseObj> = []
      while (true) {
        const step = yield* cursor.next
@@ -192,7 +175,7 @@ const invokePromiseMethod = <R>(
        )
      }
      if (name === "allSettled") {
-        const outcomes: Array<Value> = []
+        const outcomes: Array<unknown> = []
        for (const item of items) {
          const exit = yield* ctx.pending.await(item)
          if (Exit.isSuccess(exit)) {
@@ -240,8 +223,8 @@ const invokePromiseMethod = <R>(
 const instanceMethod = <R>(
  ctx: Interpreter<R>,
  name: "then" | "catch" | "finally",
-  thisValue: Value,
-  args: Array<Value>,
+  thisValue: unknown,
+  args: Array<unknown>,
 ): Effect.Effect<PromiseObj, unknown, R> => {
  const method = `Promise.prototype.${name}`
  const promise = receiver(PromiseObj, thisValue, method)
@@ -254,30 +237,23 @@ const instanceMethod = <R>(
  return chainReaction(ctx, promise, onFulfilled, onRejected, method)
 }

-/** NewPromiseCapability: a pending promise with the resolve/reject callables that settle it exactly once. */
-const promiseCapability = <R>(ctx: Interpreter<R>) =>
-  Effect.gen(function* () {
-    const deferred = Deferred.makeUnsafe<Value, unknown>()
+const constructPromise = <R>(ctx: Interpreter<R>, executor: unknown): Effect.Effect<PromiseObj, unknown, R> => {
+  if (!(executor instanceof Fn)) {
+    throw typeError("new Promise(...) expects an executor function (e.g. new Promise((resolve, reject) => { ... })).")
+  }
+  return Effect.gen(function* () {
+    const deferred = Deferred.makeUnsafe<unknown, unknown>()
    const promise = yield* ctx.pending.createWithSelf((self) =>
      Effect.flatMap(Deferred.await(deferred), (value) => resolvePromiseValue(ctx, value, self)),
    )
    const resolve = capability(ctx, "resolve", (value) => Deferred.doneUnsafe(deferred, Exit.succeed(value)))
    const reject = capability(ctx, "reject", (value) => Deferred.doneUnsafe(deferred, Exit.fail(new Throw(value))))
-    return { promise, resolve, reject, deferred }
-  })
-
-const constructPromise = <R>(ctx: Interpreter<R>, executor: Value): Effect.Effect<PromiseObj, unknown, R> => {
-  if (!(executor instanceof Fn)) {
-    throw typeError("new Promise(...) expects an executor function (e.g. new Promise((resolve, reject) => { ... })).")
-  }
-  return Effect.gen(function* () {
-    const made = yield* promiseCapability(ctx)
-    const executed = yield* Effect.exit(ctx.call(executor, undefined, [made.resolve, made.reject]))
+    const executed = yield* Effect.exit(ctx.call(executor, undefined, [resolve, reject]))
    if (!Exit.isSuccess(executed)) {
      if (Cause.hasInterruptsOnly(executed.cause)) return yield* Effect.failCause(executed.cause)
-      Deferred.doneUnsafe(made.deferred, Exit.fail(Cause.squash(executed.cause)))
+      Deferred.doneUnsafe(deferred, Exit.fail(Cause.squash(executed.cause)))
    }
-    return made.promise
+    return promise
  })
 }

@@ -286,10 +262,10 @@ const settleAfterTurn = <A, E, R>(body: Effect.Effect<A, E, R>): Effect.Effect<A
  Effect.flatMap(Effect.exit(body), (exit) => Effect.andThen(Effect.yieldNow, exit))

 class PromiseAnyFulfilled {
-  constructor(readonly value: Value) {}
+  constructor(readonly value: unknown) {}
 }

-const reactionHandler = (value: Value, method: string): Callable | undefined => {
+const reactionHandler = (value: unknown, method: string): Callable | undefined => {
  if (isSupportedCallback(value)) return value
  if (typeofValue(value) === "function") {
    throw typeError(
@@ -303,7 +279,7 @@ const reactionHandler = (value: Value, method: string): Callable | undefined =>
 const reactionExit = <R>(
  ctx: Interpreter<R>,
  source: PromiseObj,
-): Effect.Effect<Exit.Exit<Value, unknown>, unknown, R> =>
+): Effect.Effect<Exit.Exit<unknown, unknown>, unknown, R> =>
  Effect.gen(function* () {
    const exit = yield* ctx.pending.await(source)
    if (!Exit.isSuccess(exit) && Cause.hasInterruptsOnly(exit.cause)) return yield* Effect.failCause(exit.cause)
@@ -1,18 +1,44 @@
 import { ToolReference } from "../tool-runtime.js"
 import { invalidData } from "./model.js"
-import { Callable, getOwn, isRuntimeReference, Obj, Opaque, ownKeys, type Value } from "./objects.js"
+import {
+  Callable,
+  getOwn,
+  isWrapper,
+  ownKeys,
+  Arr,
+  Bytes,
+  DateObj,
+  GeneratorObj,
+  MapObj,
+  Obj,
+  PromiseObj,
+  RegExpObj,
+  SetObj,
+  URLObj,
+  URLSearchParamsObj,
+} from "./objects.js"

-/** Interpreter machinery that is never data, unlike a Date or Map, which cross some boundaries as copies. */
-export const isOpaque = (value: Value): boolean => value instanceof Opaque || value instanceof ToolReference
+/** Values that cannot cross the data boundary. */
+export const isRuntimeReference = (value: unknown): boolean =>
+  value instanceof Callable ||
+  value instanceof GeneratorObj ||
+  value instanceof ToolReference ||
+  value instanceof PromiseObj ||
+  isWrapper(value)
+
+function* childValues(value: object): Generator {
+  if (!(value instanceof Obj)) return
+  for (const key of ownKeys(value)) yield getOwn(value, key)
+}

 // Depth-first search over a value tree. `match` stops the walk; `skip` prunes a subtree without matching it.
 const find = (
-  value: Value,
-  match: (current: Value) => boolean,
-  skip: (current: Value) => boolean,
+  value: unknown,
+  match: (current: unknown) => boolean,
+  skip: (current: unknown) => boolean,
  seen: Set<object>,
 ): boolean => {
-  const pending: Array<Iterator<Value>> = [[value].values()]
+  const pending: Array<Iterator<unknown>> = [[value].values()]
  while (pending.length > 0) {
    const next = pending.at(-1)!.next()
    if (next.done) {
@@ -21,28 +47,25 @@ const find = (
    }
    const current = next.value
    if (match(current)) return true
-    if (!(current instanceof Obj) || skip(current) || seen.has(current)) continue
+    if (current === null || typeof current !== "object" || skip(current) || seen.has(current)) continue
    seen.add(current)
-    pending.push(
-      ownKeys(current)
-        .map((key) => getOwn(current, key))
-        .values(),
-    )
+    pending.push(childValues(current))
  }
  return false
 }

 const never = () => false

-export const containsRuntimeReference = (value: Value): boolean => find(value, isRuntimeReference, never, new Set())
+export const containsRuntimeReference = (value: unknown): boolean => find(value, isRuntimeReference, never, new Set())

-export const containsOpaqueReference = (value: Value): boolean =>
-  find(value, isOpaque, (current) => isRuntimeReference(current) && !isOpaque(current), new Set())
+// Wrapper values are data here, not opaque interpreter references.
+export const containsOpaqueReference = (value: unknown): boolean =>
+  find(value, (current) => !isWrapper(current) && isRuntimeReference(current), isWrapper, new Set())

 // Reject cycles before mutation so later boundary walks remain safe.
 export const rejectCircularInsertion = (
-  container: Obj,
-  value: Value,
+  container: object,
+  value: unknown,
  label: string,
  seen = new Set<object>(),
 ): void => {
@@ -51,14 +74,25 @@ export const rejectCircularInsertion = (
  }
 }

-export const describeValue = (value: Value): string => {
+export const describeValue = (value: unknown): string => {
  if (value === null || value === undefined) return String(value)
-  if (value instanceof Obj) return value.describe
+  if (value instanceof Arr) return "an array"
+  if (value instanceof PromiseObj) return "an un-awaited Promise"
  if (value instanceof ToolReference) return "a tool reference"
+  if (value instanceof DateObj) return "a Date"
+  if (value instanceof RegExpObj) return "a RegExp"
+  if (value instanceof MapObj) return "a Map"
+  if (value instanceof SetObj) return "a Set"
+  if (value instanceof URLObj) return "a URL"
+  if (value instanceof URLSearchParamsObj) return "a URLSearchParams"
+  if (value instanceof Bytes) return "a Uint8Array"
+  if (value instanceof GeneratorObj) return "a generator"
+  if (isRuntimeReference(value)) return "a function"
+  if (typeof value === "object") return "a data object"
  return `a ${typeof value}`
 }

-export const typeofValue = (value: Value): string => {
+export const typeofValue = (value: unknown): string => {
  if (value instanceof Callable) return "function"
  if (value instanceof ToolReference) return value.path.length > 0 ? "function" : "object"
  return typeof value
@@ -1,5 +1,4 @@
 import { type AstNode, type Binding, referenceError, typeError } from "./model.js"
-import type { Value } from "./objects.js"

 export class ScopeStack {
  private readonly scopes: Array<Map<string, Binding>>
@@ -16,7 +15,7 @@ export class ScopeStack {
    scope.set(name, { mutable, value: undefined, initialized: false })
  }

-  initialize(name: string, value: Value, node: AstNode): void {
+  initialize(name: string, value: unknown, node: AstNode): void {
    const binding = this.current().get(name)
    if (!binding || binding.initialized !== false) {
      throw typeError(`Identifier '${name}' has not been reserved for initialization.`, node)
@@ -25,7 +24,7 @@ export class ScopeStack {
    binding.initialized = true
  }

-  declare(name: string, value: Value, mutable: boolean, node: AstNode): void {
+  declare(name: string, value: unknown, mutable: boolean, node: AstNode): void {
    const scope = this.current()
    if (scope.has(name)) {
      throw typeError(`Identifier '${name}' has already been declared.`, node)
@@ -33,7 +32,7 @@ export class ScopeStack {
    scope.set(name, { mutable, value, initialized: true })
  }

-  get(name: string, node: AstNode): Value {
+  get(name: string, node: AstNode): unknown {
    const binding = this.resolve(name)

    if (!binding) {
@@ -47,7 +46,7 @@ export class ScopeStack {
    return binding.value
  }

-  set(name: string, value: Value, node: AstNode): Value {
+  set(name: string, value: unknown, node: AstNode): unknown {
    const binding = this.resolve(name)

    if (!binding) {
@@ -0,0 +1,25 @@
+import { DiagnosticCategory, ModuleKind, ScriptTarget, flattenDiagnosticMessageText, transpileModule } from "typescript"
+
+export interface TranspileResult {
+  readonly outputText: string
+  readonly error?: string
+}
+
+// Full TypeScript transpilation on node/bun runtimes.
+export const transpile = (source: string): TranspileResult => {
+  const transpiled = transpileModule(source, {
+    reportDiagnostics: true,
+    compilerOptions: {
+      target: ScriptTarget.ESNext,
+      module: ModuleKind.ESNext,
+    },
+  })
+  const diagnostic = transpiled.diagnostics?.find((item) => item.category === DiagnosticCategory.Error)
+  if (diagnostic) {
+    return {
+      outputText: transpiled.outputText,
+      error: flattenDiagnosticMessageText(diagnostic.messageText, "\n"),
+    }
+  }
+  return { outputText: transpiled.outputText }
+}
@@ -0,0 +1,11 @@
+export interface TranspileResult {
+  readonly outputText: string
+  readonly error?: string
+}
+
+// workerd profile: the typescript compiler is ~11 MiB and probes node
+// internals at module init, so codemode programs are passed through
+// untranspiled. Plain-JS programs (the overwhelmingly common case) parse
+// fine downstream via acorn; TypeScript-only syntax surfaces as a parse
+// error from the interpreter instead of a transpile diagnostic.
+export const transpile = (source: string): TranspileResult => ({ outputText: source })
@@ -1,35 +1,27 @@
 import { Effect } from "effect"
 import { constructor, type Method, methods, prototypeFrom, receiver } from "../interpreter/native.js"
 import { checkArrayLength, checkStringLength, MAX_ARRAY_LENGTH } from "../interpreter/limits.js"
-import { invalidData, IteratorSymbol, rangeError, typeError } from "../interpreter/model.js"
-import {
-  define,
-  get,
-  hidden,
-  Arr,
-  GeneratorObj,
-  hostIterator,
-  Obj,
-  coerceToNumber,
-  coerceToString,
-  type Value,
-} from "../interpreter/objects.js"
+import { invalidData, rangeError, typeError } from "../interpreter/model.js"
+import { get, Arr, GeneratorObj, Obj } from "../interpreter/objects.js"
 import { describeValue, rejectCircularInsertion } from "../interpreter/references.js"
-import { applyCollectionCallback, invoke, preserveConsumerError } from "../interpreter/callback.js"
+import { applyCollectionCallback, preserveConsumerError } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
 import { compareText } from "../tool-runtime.js"
+import { coerceToNumber, coerceToString } from "./value.js"

-const arrayLikeSource = (source: Value): { readonly length: number; readonly source: Obj } => {
+const arrayLikeSource = (source: unknown): { readonly length: number; readonly source: Obj } => {
  if (source instanceof Obj && typeof get(source, "length") === "number") {
    const length = get(source, "length") as number
    const normalized = Number.isNaN(length) || length <= 0 ? 0 : Math.trunc(length)
    checkArrayLength(normalized)
    return { length: normalized, source }
  }
-  throw invalidData(`Array.from expects an iterable or array-like value, received ${describeValue(source)}.`)
+  throw invalidData(
+    `Array.from expects an array, string, Map, Set, or array-like value, received ${describeValue(source)}.`,
+  )
 }

-const arrayFrom = <R>(ctx: Interpreter<R>, args: Array<Value>): Effect.Effect<Value, unknown, R> => {
+const arrayFrom = <R>(ctx: Interpreter<R>, args: Array<unknown>): Effect.Effect<unknown, unknown, R> => {
  const source = args[0]
  const proto = ctx.builtins.Array
  const apply =
@@ -38,26 +30,22 @@ const arrayFrom = <R>(ctx: Interpreter<R>, args: Array<Value>): Effect.Effect<Va
    const cursor = yield* ctx.iterate(source)
    if (cursor === undefined) {
      if (source instanceof GeneratorObj) {
-        throw typeError(
-          `Array.from expects a synchronous iterable or array-like value, received ${describeValue(source)}.`,
-        )
+        throw typeError("Array.from expects a synchronous iterable or array-like value.")
      }
      const arrayLike = arrayLikeSource(source)
-      const values: Array<Value> = []
+      const values: Array<unknown> = []
      for (let index = 0; index < arrayLike.length; index += 1) {
        const item = get(arrayLike.source, index)
        values.push(apply === undefined ? item : yield* apply([item, index]))
      }
      return new Arr(proto, values)
    }
-    const values: Array<Value> = []
+    const values: Array<unknown> = []
    let index = 0
    while (true) {
      const step = yield* cursor.next
      if (step.done) return new Arr(proto, values)
-      values.push(
-        apply === undefined ? step.value : yield* preserveConsumerError(cursor.close, apply([step.value, index])),
-      )
+      values.push(apply === undefined ? step.value : yield* preserveConsumerError(cursor, apply([step.value, index])))
      index += 1
    }
  })
@@ -65,21 +53,21 @@ const arrayFrom = <R>(ctx: Interpreter<R>, args: Array<Value>): Effect.Effect<Va

 export const sortArray = <R>(
  ctx: Interpreter<R>,
-  target: Array<Value>,
-  comparator: Value,
+  target: Array<unknown>,
+  comparator: unknown,
  name: string,
-): Effect.Effect<Array<Value>, unknown, R> => {
+): Effect.Effect<Array<unknown>, unknown, R> => {
  if (comparator === undefined) {
    return Effect.sync(() => [...target].sort((a, b) => compareText(coerceToString(a), coerceToString(b))))
  }
  const apply = applyCollectionCallback(ctx, comparator, name)
-  const mergeSort = (items: Array<Value>): Effect.Effect<Array<Value>, unknown, R> => {
+  const mergeSort = (items: Array<unknown>): Effect.Effect<Array<unknown>, unknown, R> => {
    if (items.length <= 1) return Effect.succeed(items)
    const midpoint = Math.floor(items.length / 2)
    return Effect.gen(function* () {
      const left = yield* mergeSort(items.slice(0, midpoint))
      const right = yield* mergeSort(items.slice(midpoint))
-      const merged: Array<Value> = []
+      const merged: Array<unknown> = []
      let leftIndex = 0
      let rightIndex = 0
      while (leftIndex < left.length && rightIndex < right.length) {
@@ -100,8 +88,8 @@ export const sortArray = <R>(
 export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
  const builtins = ctx.builtins
  const proto = builtins.Array
-  const wrap = (items: Array<Value>) => new Arr(proto, items)
-  const construct = (args: Array<Value>, into: Obj): Arr => {
+  const wrap = (items: Array<unknown>) => new Arr(proto, items)
+  const construct = (args: Array<unknown>, into: Obj): Arr => {
    if (args.length !== 1) return new Arr(into, [...args])
    const first = args[0]
    if (typeof first !== "number") return new Arr(into, [first])
@@ -121,8 +109,8 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
    ["from", 1, (_, args) => arrayFrom(ctx, args)],
  ])

-  const self = (thisValue: Value, name: string) => receiver(Arr, thisValue, `Array.prototype.${name}`)
-  const optNumber = (name: string, value: Value, label: string): number | undefined => {
+  const self = (thisValue: unknown, name: string) => receiver(Arr, thisValue, `Array.prototype.${name}`)
+  const optNumber = (name: string, value: unknown, label: string): number | undefined => {
    if (value === undefined) return undefined
    if (typeof value !== "number") {
      throw typeError(`Array.${name} expects ${label} to be a number.`)
@@ -134,11 +122,11 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
    name: string,
    length: number,
    body: (
-      target: Array<Value>,
+      target: Array<unknown>,
      receiver: Arr,
-      apply: (args: Array<Value>) => Effect.Effect<Value, unknown, R>,
-      args: Array<Value>,
-    ) => Effect.Effect<Value, unknown, R>,
+      apply: (args: Array<unknown>) => Effect.Effect<unknown, unknown, R>,
+      args: Array<unknown>,
+    ) => Effect.Effect<unknown, unknown, R>,
  ): Method => [
    name,
    length,
@@ -226,7 +214,7 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
      "flat",
      0,
      (thisValue, args) => {
-        const flatten = (items: Array<Value>, depth: number): Array<Value> =>
+        const flatten = (items: Array<unknown>, depth: number): Array<unknown> =>
          items.flatMap((item) => (item instanceof Arr && depth > 0 ? flatten(item.items, depth - 1) : [item]))
        const flattened = flatten(self(thisValue, "flat").items, optNumber("flat", args[0], "depth") ?? 1)
        checkArrayLength(flattened.length)
@@ -352,36 +340,18 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
        return target
      },
    ],
-    [
-      "toLocaleString",
-      0,
-      (thisValue) =>
-        Effect.map(
-          Effect.forEach(self(thisValue, "toLocaleString").items, (item) =>
-            item === null || item === undefined
-              ? Effect.succeed("")
-              : Effect.map(invoke(ctx, item, "toLocaleString", "Array.prototype.toLocaleString"), coerceToString),
-          ),
-          (parts) => parts.join(","),
-        ),
-    ],
-    ["keys", 0, (thisValue) => hostIterator(builtins, self(thisValue, "keys").items.keys())],
-    ["values", 0, (thisValue) => hostIterator(builtins, self(thisValue, "values").items.values())],
+    ["keys", 0, (thisValue) => wrap(Array.from(self(thisValue, "keys").items.keys()))],
+    ["values", 0, (thisValue) => wrap([...self(thisValue, "values").items])],
    [
      "entries",
      0,
      (thisValue) =>
-        hostIterator(
-          builtins,
-          self(thisValue, "entries")
-            .items.entries()
-            .map(([index, item]) => wrap([index, item])),
-        ),
+        wrap(Array.from(self(thisValue, "entries").items.entries(), ([index, item]) => wrap([index, item]))),
    ],
    iterate("map", 1, (target, receiver, apply) =>
      Effect.gen(function* () {
        const length = target.length
-        const values: Array<Value> = []
+        const values: Array<unknown> = []
        values.length = length
        for (let index = 0; index < length; index += 1) {
          if (!(index in target)) continue
@@ -393,7 +363,7 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
    iterate("flatMap", 1, (target, receiver, apply) =>
      Effect.gen(function* () {
        const length = target.length
-        const values: Array<Value> = []
+        const values: Array<unknown> = []
        for (let index = 0; index < length; index += 1) {
          if (!(index in target)) continue
          const mapped = yield* apply([target[index], index, receiver])
@@ -406,7 +376,7 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
    iterate("filter", 1, (target, receiver, apply) =>
      Effect.gen(function* () {
        const length = target.length
-        const values: Array<Value> = []
+        const values: Array<unknown> = []
        for (let index = 0; index < length; index += 1) {
          if (!(index in target)) continue
          const item = target[index]
@@ -520,6 +490,5 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
      }),
    ),
  ])
-  define(proto, IteratorSymbol, get(proto, "values"), hidden)
  return array
 }
@@ -1,25 +1,14 @@
 import { Effect } from "effect"
 import { checkArrayLength, checkStringLength } from "../interpreter/limits.js"
 import { constructor, methods, prototypeFrom, receiver, requiresNew } from "../interpreter/native.js"
-import { IteratorSymbol, rangeError, syntaxError, typeError } from "../interpreter/model.js"
-import {
-  define,
-  defineAccessor,
-  get,
-  hidden,
-  Arr,
-  Bytes,
-  hostIterator,
-  Obj,
-  coerceToNumber,
-  coerceToString,
-  type Value,
-} from "../interpreter/objects.js"
+import { rangeError, syntaxError, typeError } from "../interpreter/model.js"
+import { defineAccessor, get, Arr, Bytes, Obj } from "../interpreter/objects.js"
 import { describeValue } from "../interpreter/references.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
+import { coerceToNumber, coerceToString } from "./value.js"

 /** The bytes a Uint8Array, array, or other iterable of numbers describes; the host array clamps each value. */
-const collectBytes = <R>(ctx: Interpreter<R>, source: Value, name: string): Effect.Effect<Uint8Array, unknown, R> => {
+const collectBytes = <R>(ctx: Interpreter<R>, source: unknown, name: string): Effect.Effect<Uint8Array, unknown, R> => {
  if (source instanceof Bytes) return Effect.succeed(new Uint8Array(source.bytes))
  return Effect.gen(function* () {
    const cursor = yield* ctx.iterate(source)
@@ -38,7 +27,7 @@ const collectBytes = <R>(ctx: Interpreter<R>, source: Value, name: string): Effe
  })
 }

-const constructBytes = <R>(ctx: Interpreter<R>, args: Array<Value>, proto: Obj) => {
+const constructBytes = <R>(ctx: Interpreter<R>, args: Array<unknown>, proto: Obj) => {
  const source = args[0]
  if (source !== null && typeof source === "object") {
    return Effect.map(collectBytes(ctx, source, "new Uint8Array(...)"), (bytes) => new Bytes(proto, bytes))
@@ -59,7 +48,7 @@ export const uint8ArrayGlobal = <R>(ctx: Interpreter<R>) => {
    call: requiresNew("Uint8Array"),
    construct: (args, newTarget) => constructBytes(ctx, args, prototypeFrom(newTarget, proto)),
  })
-  const decode = (name: string, args: Array<Value>, from: (text: string) => Uint8Array) => {
+  const decode = (name: string, args: Array<unknown>, from: (text: string) => Uint8Array) => {
    if (typeof args[0] !== "string") throw typeError(`Uint8Array.${name} expects a string.`)
    try {
      return wrap(from(args[0]))
@@ -74,13 +63,13 @@ export const uint8ArrayGlobal = <R>(ctx: Interpreter<R>) => {
    ["fromHex", 1, (_, args) => decode("fromHex", args, (text) => Uint8Array.fromHex(text))],
  ])

-  const self = (thisValue: Value, name: string) => receiver(Bytes, thisValue, `Uint8Array.prototype.${name}`)
-  const optNumber = (name: string, value: Value, label: string): number | undefined => {
+  const self = (thisValue: unknown, name: string) => receiver(Bytes, thisValue, `Uint8Array.prototype.${name}`)
+  const optNumber = (name: string, value: unknown, label: string): number | undefined => {
    if (value === undefined) return undefined
    if (typeof value !== "number") throw typeError(`Uint8Array.${name} expects ${label} to be a number.`)
    return value
  }
-  const wrapAll = (items: Array<Value>) => new Arr(builtins.Array, items)
+  const wrapAll = (items: Array<unknown>) => new Arr(builtins.Array, items)
  defineAccessor(proto, "length", (thisValue) => self(thisValue, "length").bytes.length)
  methods(builtins, proto, [
    ["at", 1, (thisValue, args) => self(thisValue, "at").bytes.at(optNumber("at", args[0], "index") ?? 0)],
@@ -184,21 +173,15 @@ export const uint8ArrayGlobal = <R>(ctx: Interpreter<R>) => {
    ["toString", 0, (thisValue) => self(thisValue, "toString").bytes.join(",")],
    ["toBase64", 0, (thisValue) => self(thisValue, "toBase64").bytes.toBase64()],
    ["toHex", 0, (thisValue) => self(thisValue, "toHex").bytes.toHex()],
-    ["keys", 0, (thisValue) => hostIterator(builtins, self(thisValue, "keys").bytes.keys())],
-    ["values", 0, (thisValue) => hostIterator(builtins, self(thisValue, "values").bytes.values())],
+    ["keys", 0, (thisValue) => wrapAll(Array.from(self(thisValue, "keys").bytes.keys()))],
+    ["values", 0, (thisValue) => wrapAll(Array.from(self(thisValue, "values").bytes.values()))],
    [
      "entries",
      0,
      (thisValue) =>
-        hostIterator(
-          builtins,
-          self(thisValue, "entries")
-            .bytes.entries()
-            .map(([index, byte]) => wrapAll([index, byte])),
-        ),
+        wrapAll(Array.from(self(thisValue, "entries").bytes.entries(), ([index, byte]) => wrapAll([index, byte]))),
    ],
  ])
-  define(proto, IteratorSymbol, get(proto, "values"), hidden)
  return uint8Array
 }

@@ -233,7 +216,8 @@ const utf8Labels = new Set(["unicode-1-1-utf-8", "unicode11utf8", "unicode20utf8
 export const textDecoderGlobal = <R>(ctx: Interpreter<R>) => {
  const builtins = ctx.builtins
  const proto = builtins.TextDecoder
-  const self = (thisValue: Value, name: string) => receiver(TextDecoderObj, thisValue, `TextDecoder.prototype.${name}`)
+  const self = (thisValue: unknown, name: string) =>
+    receiver(TextDecoderObj, thisValue, `TextDecoder.prototype.${name}`)
  defineAccessor(proto, "encoding", (thisValue) => self(thisValue, "encoding").decoder.encoding)
  defineAccessor(proto, "fatal", (thisValue) => self(thisValue, "fatal").decoder.fatal)
  defineAccessor(proto, "ignoreBOM", (thisValue) => self(thisValue, "ignoreBOM").decoder.ignoreBOM)
@@ -1,23 +1,20 @@
 import { Effect } from "effect"
 import { constructor, fn, type Method, methods, prototypeFrom, receiver, requiresNew } from "../interpreter/native.js"
-import { invalidData, IteratorSymbol, typeError } from "../interpreter/model.js"
+import { invalidData, typeError } from "../interpreter/model.js"
 import {
  define,
  defineAccessor,
  get,
  getOwn,
  hidden,
+  isWrapper,
  Arr,
-  coerceToString,
-  hostCursor,
-  hostIterator,
  MapObj,
  Obj,
  PromiseObj,
  SetObj,
-  type Value,
 } from "../interpreter/objects.js"
-import { describeValue, isOpaque } from "../interpreter/references.js"
+import { describeValue, isRuntimeReference } from "../interpreter/references.js"
 import {
  applyCollectionCallback,
  isSupportedCallback,
@@ -27,9 +24,9 @@ import {
 } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"

-const coerceGroupByPropertyKey = <R>(ctx: Interpreter<R>, value: Value): Effect.Effect<string, unknown, R> => {
-  if (value instanceof PromiseObj) return Effect.succeed(coerceToString(value))
-  if (isOpaque(value)) {
+const coerceGroupByPropertyKey = <R>(ctx: Interpreter<R>, value: unknown): Effect.Effect<string, unknown, R> => {
+  if (value instanceof PromiseObj) return Effect.succeed("[object Promise]")
+  if (!isWrapper(value) && isRuntimeReference(value)) {
    throw invalidData(`Object.groupBy callback must return a data value, received ${describeValue(value)}.`)
  }
  return toPrimitiveString(ctx, value)
@@ -56,7 +53,7 @@ export const groupBy = <R>(ctx: Interpreter<R>, namespace: "Map" | "Object") =>
          const step = yield* cursor.next
          if (step.done) return result
          const item = step.value
-          const key = yield* preserveConsumerError(cursor.close, apply([item, index]))
+          const key = yield* preserveConsumerError(cursor, apply([item, index]))
          const group = result.map.get(key)
          if (group === undefined) result.map.set(key, new Arr(builtins.Array, [item]))
          else (group as Arr).items.push(item)
@@ -72,7 +69,7 @@ export const groupBy = <R>(ctx: Interpreter<R>, namespace: "Map" | "Object") =>
        if (step.done) return result
        const item = step.value
        const key = yield* preserveConsumerError(
-          cursor.close,
+          cursor,
          Effect.flatMap(apply([item, index]), (value) => coerceGroupByPropertyKey(ctx, value)),
        )
        const group = getOwn(result, key)
@@ -83,19 +80,19 @@ export const groupBy = <R>(ctx: Interpreter<R>, namespace: "Map" | "Object") =>
    })
  })

-const constructMap = <R>(ctx: Interpreter<R>, init: Value, proto: Obj) => {
+const constructMap = <R>(ctx: Interpreter<R>, init: unknown, proto: Obj) => {
  const target = new MapObj(proto)
  if (init === undefined || init === null) return Effect.succeed(target)
  return Effect.gen(function* () {
    const cursor = yield* ctx.iterate(init)
    if (cursor === undefined) {
-      throw typeError(`new Map(...) expects an iterable of [key, value] pairs, received ${describeValue(init)}.`)
+      throw typeError("new Map(...) expects an iterable of [key, value] pairs or no argument.")
    }
    while (true) {
      const step = yield* cursor.next
      if (step.done) return target
      yield* preserveConsumerError(
-        cursor.close,
+        cursor,
        Effect.sync(() => {
          if (!(step.value instanceof Obj)) {
            throw typeError("new Map(...) expects [key, value] pairs as entry objects.")
@@ -107,13 +104,13 @@ const constructMap = <R>(ctx: Interpreter<R>, init: Value, proto: Obj) => {
  })
 }

-const constructSet = <R>(ctx: Interpreter<R>, init: Value, proto: Obj) => {
+const constructSet = <R>(ctx: Interpreter<R>, init: unknown, proto: Obj) => {
  const target = new SetObj(proto)
  if (init === undefined || init === null) return Effect.succeed(target)
  return Effect.gen(function* () {
    const cursor = yield* ctx.iterate(init)
    if (cursor === undefined) {
-      throw typeError(`new Set(...) expects a synchronous iterable, received ${describeValue(init)}.`)
+      throw typeError("new Set(...) expects a synchronous iterable or no argument.")
    }
    while (true) {
      const step = yield* cursor.next
@@ -132,7 +129,8 @@ export const mapGlobal = <R>(ctx: Interpreter<R>) => {
    construct: (args, newTarget) => constructMap(ctx, args[0], prototypeFrom(newTarget, proto)),
  })
  define(map, "groupBy", groupBy(ctx, "Map"), hidden)
-  const self = (thisValue: Value, name: string) => receiver(MapObj, thisValue, `Map.prototype.${name}`)
+  const self = (thisValue: unknown, name: string) => receiver(MapObj, thisValue, `Map.prototype.${name}`)
+  const wrap = (items: Array<unknown>) => new Arr(builtins.Array, items)
  defineAccessor(proto, "size", (thisValue) => receiver(MapObj, thisValue, "Map.prototype.size").map.size)
  methods(builtins, proto, [
    ["get", 1, (thisValue, args) => self(thisValue, "get").map.get(args[0])],
@@ -146,29 +144,6 @@ export const mapGlobal = <R>(ctx: Interpreter<R>) => {
        return target
      },
    ],
-    [
-      "getOrInsert",
-      2,
-      (thisValue, args) => {
-        const target = self(thisValue, "getOrInsert").map
-        if (!target.has(args[0])) target.set(args[0], args[1])
-        return target.get(args[0])
-      },
-    ],
-    [
-      "getOrInsertComputed",
-      2,
-      (thisValue, args) => {
-        const target = self(thisValue, "getOrInsertComputed").map
-        const apply = applyCollectionCallback(ctx, args[1], "Map.getOrInsertComputed")
-        if (target.has(args[0])) return target.get(args[0])
-        // The callback sees the stored key (-0 is +0) and its result wins over anything it inserted itself.
-        return Effect.map(apply([args[0] === 0 ? 0 : args[0]]), (value) => {
-          target.set(args[0], value)
-          return value
-        })
-      },
-    ],
    ["delete", 1, (thisValue, args) => self(thisValue, "delete").map.delete(args[0])],
    [
      "clear",
@@ -178,9 +153,13 @@ export const mapGlobal = <R>(ctx: Interpreter<R>) => {
        return undefined
      },
    ],
-    ["keys", 0, (thisValue) => hostIterator(builtins, self(thisValue, "keys").map.keys())],
-    ["values", 0, (thisValue) => hostIterator(builtins, self(thisValue, "values").map.values())],
-    ["entries", 0, (thisValue) => hostIterator(builtins, self(thisValue, "entries").iterator(builtins))],
+    ["keys", 0, (thisValue) => wrap(Array.from(self(thisValue, "keys").map.keys()))],
+    ["values", 0, (thisValue) => wrap(Array.from(self(thisValue, "values").map.values()))],
+    [
+      "entries",
+      0,
+      (thisValue) => wrap(Array.from(self(thisValue, "entries").map.entries(), ([key, item]) => wrap([key, item]))),
+    ],
    [
      "forEach",
      1,
@@ -194,32 +173,31 @@ export const mapGlobal = <R>(ctx: Interpreter<R>) => {
      },
    ],
  ])
-  define(proto, IteratorSymbol, get(proto, "entries"), hidden)
  return map
 }

 type SetRecord<R> = {
  readonly size: number
-  readonly has: (item: Value) => Effect.Effect<boolean, unknown, R>
-  readonly keys: () => Effect.Effect<Iterable<Value>, unknown, R>
+  readonly has: (item: unknown) => Effect.Effect<boolean, unknown, R>
+  readonly keys: () => Effect.Effect<Iterable<unknown>, unknown, R>
 }

 const loadSetRecord = <R>(
  ctx: Interpreter<R>,
-  source: Value,
+  source: unknown,
  name: string,
 ): Effect.Effect<SetRecord<R>, unknown, R> => {
  if (source instanceof SetObj) {
    return Effect.succeed({
      size: source.set.size,
-      has: (item: Value) => Effect.succeed(source.set.has(item)),
+      has: (item: unknown) => Effect.succeed(source.set.has(item)),
      keys: () => Effect.succeed(source.set.values()),
    })
  }
  if (source instanceof MapObj) {
    return Effect.succeed({
      size: source.map.size,
-      has: (item: Value) => Effect.succeed(source.map.has(item)),
+      has: (item: unknown) => Effect.succeed(source.map.has(item)),
      keys: () => Effect.succeed(source.map.keys()),
    })
  }
@@ -238,17 +216,11 @@ const loadSetRecord = <R>(
    }
    return {
      size: Math.max(Math.trunc(size), 0),
-      has: (item: Value) => Effect.map(ctx.call(has, source, [item]), Boolean),
+      has: (item: unknown) => Effect.map(ctx.call(has, source, [item]), Boolean),
      keys: () =>
-        Effect.gen(function* () {
-          const result = yield* ctx.call(keys, source, [])
-          const cursor = result instanceof Arr ? hostCursor(result.items.values()) : ctx.iterateDirect(result)
-          const items: Array<Value> = []
-          while (true) {
-            const step = yield* cursor.next
-            if (step.done) return items
-            items.push(step.value)
-          }
+        Effect.flatMap(ctx.call(keys, source, []), (result) => {
+          if (result instanceof Arr) return Effect.succeed(result.items)
+          throw typeError(`Set.${name} expected 'keys' to return an iterator.`)
        }),
    }
  })
@@ -258,8 +230,8 @@ const setOperation = <R>(
  ctx: Interpreter<R>,
  target: SetObj,
  name: string,
-  source: Value,
-): Effect.Effect<Value, unknown, R> =>
+  source: unknown,
+): Effect.Effect<unknown, unknown, R> =>
  Effect.gen(function* () {
    const other = yield* loadSetRecord(ctx, source, name)
    const copy = () => {
@@ -338,8 +310,8 @@ export const setGlobal = <R>(ctx: Interpreter<R>) => {
    call: requiresNew("Set"),
    construct: (args, newTarget) => constructSet(ctx, args[0], prototypeFrom(newTarget, proto)),
  })
-  const self = (thisValue: Value, name: string) => receiver(SetObj, thisValue, `Set.prototype.${name}`)
-  const wrap = (items: Array<Value>) => new Arr(builtins.Array, items)
+  const self = (thisValue: unknown, name: string) => receiver(SetObj, thisValue, `Set.prototype.${name}`)
+  const wrap = (items: Array<unknown>) => new Arr(builtins.Array, items)
  const operation = (name: string): Method => [
    name,
    1,
@@ -366,18 +338,12 @@ export const setGlobal = <R>(ctx: Interpreter<R>) => {
        return undefined
      },
    ],
-    ["keys", 0, (thisValue) => hostIterator(builtins, self(thisValue, "keys").set.values())],
-    ["values", 0, (thisValue) => hostIterator(builtins, self(thisValue, "values").set.values())],
+    ["keys", 0, (thisValue) => wrap(Array.from(self(thisValue, "keys").set.values()))],
+    ["values", 0, (thisValue) => wrap(Array.from(self(thisValue, "values").set.values()))],
    [
      "entries",
      0,
-      (thisValue) =>
-        hostIterator(
-          builtins,
-          self(thisValue, "entries")
-            .set.values()
-            .map((item) => wrap([item, item])),
-        ),
+      (thisValue) => wrap(Array.from(self(thisValue, "entries").set.values(), (item) => wrap([item, item]))),
    ],
    [
      "forEach",
@@ -399,6 +365,5 @@ export const setGlobal = <R>(ctx: Interpreter<R>) => {
    operation("isSupersetOf"),
    operation("isDisjointFrom"),
  ])
-  define(proto, IteratorSymbol, get(proto, "values"), hidden)
  return set
 }
@@ -1,8 +1,21 @@
 import { type Method, methods } from "../interpreter/native.js"
-import { entries, get, Arr, Obj, type Value } from "../interpreter/objects.js"
-import { ToolReference } from "../tool-runtime.js"
-import { containsOpaqueReference } from "../interpreter/references.js"
+import {
+  entries,
+  get,
+  Arr,
+  Bytes,
+  DateObj,
+  MapObj,
+  Obj,
+  PromiseObj,
+  RegExpObj,
+  SetObj,
+  URLObj,
+  URLSearchParamsObj,
+} from "../interpreter/objects.js"
+import { containsOpaqueReference, isRuntimeReference } from "../interpreter/references.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
+import { coerceToString } from "./value.js"

 const consoleMethods = ["log", "info", "debug", "warn", "error", "dir", "table"]

@@ -29,7 +42,7 @@ export const consoleGlobal = <R>(ctx: Interpreter<R>) => {

 const MAX_CONSOLE_DEPTH = 32

-const formatConsoleMessage = (name: string, args: Array<Value>): string => {
+const formatConsoleMessage = (name: string, args: Array<unknown>): string => {
  if (name === "dir") return args.length === 0 ? "undefined" : formatValue(args[0])
  if (name === "table") return formatConsoleTable(args[0], args[1])
  const prefix = name === "warn" ? "[warn] " : name === "error" ? "[error] " : name === "debug" ? "[debug] " : ""
@@ -37,27 +50,59 @@ const formatConsoleMessage = (name: string, args: Array<Value>): string => {
 }

 /** One value as `console.log` shows it. */
-export const formatValue = (value: Value): string => {
+export const formatValue = (value: unknown): string => {
  if (value === undefined) return "undefined"
  if (typeof value === "string") return value
  return formatConsoleValue(value, new Set(), 0)
 }

-const formatConsoleValue = (value: Value, seen: Set<object>, depth: number): string => {
+const formatConsoleValue = (value: unknown, seen: Set<object>, depth: number): string => {
  if (value === null || value === undefined) return "null"
  if (typeof value === "string") return JSON.stringify(value)
-  if (!(value instanceof Obj)) return value instanceof ToolReference ? "[opaque reference]" : String(value)
+  if (typeof value === "number" || typeof value === "boolean") return String(value)
+  if (typeof value !== "object") return String(value)
+  if (value instanceof PromiseObj) return "[Promise (await it to get its value)]"
+  if (value instanceof DateObj) return coerceToString(value)
+  if (value instanceof RegExpObj) return coerceToString(value)
+  if (value instanceof URLObj) return coerceToString(value)
+  if (value instanceof URLSearchParamsObj) return coerceToString(value)
+  if (value instanceof Bytes) return `Uint8Array(${value.bytes.length}) [${value.bytes.join(",")}]`
  if (depth > MAX_CONSOLE_DEPTH) return "..."
  if (seen.has(value)) return "[Circular]"
+  if (value instanceof MapObj) {
+    seen.add(value)
+    try {
+      const items = Array.from(value.map.entries(), ([key, item]) => `[${formatItems([key, item], seen, depth + 1)}]`)
+      return `Map(${value.map.size}) [${items.join(",")}]`
+    } finally {
+      seen.delete(value)
+    }
+  }
+  if (value instanceof SetObj) {
+    seen.add(value)
+    try {
+      return `Set(${value.set.size}) [${formatItems([...value.set.values()], seen, depth + 1)}]`
+    } finally {
+      seen.delete(value)
+    }
+  }
+  if (isRuntimeReference(value)) return "[opaque reference]"
  seen.add(value)
  try {
-    return value.inspect((item) => formatConsoleValue(item, seen, depth + 1))
+    if (value instanceof Arr) return `[${formatItems(value.items, seen, depth + 1)}]`
+    if (!(value instanceof Obj)) return "[object Object]"
+    return `{${entries(value)
+      .map(([key, item]) => `${JSON.stringify(key)}:${formatConsoleValue(item, seen, depth + 1)}`)
+      .join(",")}}`
  } finally {
    seen.delete(value)
  }
 }

-const formatConsoleTable = (value: Value, columnsArgument: Value): string => {
+const formatItems = (items: Array<unknown>, seen: Set<object>, depth: number): string =>
+  items.map((item) => formatConsoleValue(item, seen, depth)).join(",")
+
+const formatConsoleTable = (value: unknown, columnsArgument: unknown): string => {
  if (value === undefined) return "undefined"
  if (containsOpaqueReference(value)) return "[opaque reference]"
  const columns = columnsArgument instanceof Arr ? columnsArgument.items.map(String) : undefined
@@ -71,9 +116,9 @@ const formatConsoleTable = (value: Value, columnsArgument: Value): string => {
 }

 const consoleTableRows = (
-  data: Value,
+  data: unknown,
  columns: ReadonlyArray<string> | undefined,
-): Array<{ readonly index: string; readonly values: Record<string, Value> }> => {
+): Array<{ readonly index: string; readonly values: Record<string, unknown> }> => {
  if (data instanceof Arr) {
    return data.items.map((item, index) => ({ index: String(index), values: consoleTableValues(item, columns) }))
  }
@@ -83,7 +128,7 @@ const consoleTableRows = (
  return [{ index: "0", values: { Value: data } }]
 }

-const consoleTableValues = (value: Value, columns: ReadonlyArray<string> | undefined): Record<string, Value> => {
+const consoleTableValues = (value: unknown, columns: ReadonlyArray<string> | undefined): Record<string, unknown> => {
  if (value instanceof Obj && !(value instanceof Arr)) {
    if (columns !== undefined) return Object.fromEntries(columns.map((column) => [column, get(value, column)]))
    return Object.fromEntries(entries(value))
@@ -91,7 +136,7 @@ const consoleTableValues = (value: Value, columns: ReadonlyArray<string> | undef
  return { Value: value }
 }

-const formatConsoleTableCell = (value: Value): string => {
+const formatConsoleTableCell = (value: unknown): string => {
  if (value === undefined) return ""
  if (typeof value === "string") return value
  return formatConsoleValue(value, new Set(), 0)
@@ -1,11 +1,12 @@
 import { Effect } from "effect"
 import { constructor, type Method, methods, prototypeFrom, receiver } from "../interpreter/native.js"
 import { rangeError } from "../interpreter/model.js"
-import { DateObj, Obj, coerceToNumber, coerceToString, type Value } from "../interpreter/objects.js"
+import { DateObj, Obj } from "../interpreter/objects.js"
 import { toPrimitive, toPrimitiveNumber } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
+import { coerceToNumber, coerceToString } from "./value.js"

-const constructDate = <R>(ctx: Interpreter<R>, args: Array<Value>, proto: Obj) => {
+const constructDate = <R>(ctx: Interpreter<R>, args: Array<unknown>, proto: Obj) => {
  if (args.length === 0) return Effect.succeed(new DateObj(proto, Date.now()))
  if (args.length === 1) {
    const arg = args[0]
@@ -82,7 +83,7 @@ export const dateGlobal = <R>(ctx: Interpreter<R>) => {
    ["UTC", 7, (_, args) => Date.UTC(...(args.map((arg) => coerceToNumber(arg)) as Parameters<typeof Date.UTC>))],
  ])

-  const self = (thisValue: Value, name: string) => receiver(DateObj, thisValue, `Date.prototype.${name}`)
+  const self = (thisValue: unknown, name: string) => receiver(DateObj, thisValue, `Date.prototype.${name}`)
  const iso = (value: DateObj) => {
    if (!Number.isFinite(value.time)) throw rangeError("Invalid time value.")
    return new Date(value.time).toISOString()
@@ -104,13 +105,6 @@ export const dateGlobal = <R>(ctx: Interpreter<R>) => {
    ["toTimeString", 0, (thisValue) => new Date(self(thisValue, "toTimeString").time).toTimeString()],
    ["toUTCString", 0, (thisValue) => new Date(self(thisValue, "toUTCString").time).toUTCString()],
    ["toGMTString", 0, (thisValue) => new Date(self(thisValue, "toGMTString").time).toUTCString()],
-    ...(["toLocaleString", "toLocaleDateString", "toLocaleTimeString"] as const).map(
-      (name): Method => [
-        name,
-        0,
-        (thisValue) => new Date(self(thisValue, name).time)[name]("en-US", { timeZone: "UTC" }),
-      ],
-    ),
    ...getters.map((name): Method => [name, 0, (thisValue) => new Date(self(thisValue, name).time)[name]()]),
    ...setters.map(
      ([name, length]): Method => [
@@ -1,128 +0,0 @@
-import { Effect } from "effect"
-import { constructor, methods, prototypeFrom, receiver, requiresNew } from "../interpreter/native.js"
-import { IteratorSymbol, typeError } from "../interpreter/model.js"
-import {
-  define,
-  entries,
-  get,
-  hidden,
-  Arr,
-  HeadersObj,
-  hostIterator,
-  Obj,
-  coerceToString,
-  isRuntimeReference,
-  type Value,
-} from "../interpreter/objects.js"
-import { applyCollectionCallback } from "../interpreter/callback.js"
-import type { Interpreter } from "../interpreter/interpreter.js"
-import { readPairs } from "./url.js"
-
-// The host validates header names and values and throws its own TypeError; the program gets one of its own.
-const attempt = <T>(run: () => T): T => {
-  try {
-    return run()
-  } catch (error) {
-    throw typeError(error instanceof Error ? error.message : String(error))
-  }
-}
-
-const constructHeaders = <R>(ctx: Interpreter<R>, init: Value, proto: Obj): Effect.Effect<HeadersObj, unknown, R> => {
-  const wrap = (headers: Headers) => new HeadersObj(proto, headers)
-  if (init === undefined) return Effect.succeed(wrap(new Headers()))
-  return Effect.gen(function* () {
-    const pairs = init instanceof Obj ? yield* readPairs(ctx, init, "new Headers(...)") : undefined
-    if (pairs !== undefined) return wrap(attempt(() => new Headers(pairs)))
-    if (!(init instanceof Obj) || isRuntimeReference(init)) {
-      throw typeError("new Headers(...) expects a record of names to values, iterable [name, value] pairs, or Headers.")
-    }
-    return wrap(
-      attempt(() => new Headers(Object.fromEntries(entries(init).map(([key, value]) => [key, coerceToString(value)])))),
-    )
-  })
-}
-
-export const headersGlobal = <R>(ctx: Interpreter<R>) => {
-  const builtins = ctx.builtins
-  const proto = builtins.Headers
-  const headers = constructor<R>(builtins, proto, {
-    name: "Headers",
-    call: requiresNew("Headers"),
-    construct: (args, newTarget) => constructHeaders(ctx, args[0], prototypeFrom(newTarget, proto)),
-  })
-  const self = (thisValue: Value, name: string) => receiver(HeadersObj, thisValue, `Headers.prototype.${name}`)
-  const wrap = (items: Array<Value>) => new Arr(builtins.Array, items)
-  const arg = (args: Array<Value>, index: number): string => coerceToString(args[index])
-  const requireArgs = (name: string, args: Array<Value>, count: number): void => {
-    if (args.length < count) throw typeError(`Headers.${name} requires ${count} argument${count === 1 ? "" : "s"}.`)
-  }
-  methods(builtins, proto, [
-    [
-      "append",
-      2,
-      (thisValue, args) => {
-        requireArgs("append", args, 2)
-        const target = self(thisValue, "append").headers
-        attempt(() => target.append(arg(args, 0), arg(args, 1)))
-        return undefined
-      },
-    ],
-    [
-      "delete",
-      1,
-      (thisValue, args) => {
-        requireArgs("delete", args, 1)
-        const target = self(thisValue, "delete").headers
-        attempt(() => target.delete(arg(args, 0)))
-        return undefined
-      },
-    ],
-    [
-      "get",
-      1,
-      (thisValue, args) => {
-        requireArgs("get", args, 1)
-        const target = self(thisValue, "get").headers
-        return attempt(() => target.get(arg(args, 0)))
-      },
-    ],
-    ["getSetCookie", 0, (thisValue) => wrap(self(thisValue, "getSetCookie").headers.getSetCookie())],
-    [
-      "has",
-      1,
-      (thisValue, args) => {
-        requireArgs("has", args, 1)
-        const target = self(thisValue, "has").headers
-        return attempt(() => target.has(arg(args, 0)))
-      },
-    ],
-    [
-      "set",
-      2,
-      (thisValue, args) => {
-        requireArgs("set", args, 2)
-        const target = self(thisValue, "set").headers
-        attempt(() => target.set(arg(args, 0), arg(args, 1)))
-        return undefined
-      },
-    ],
-    ["keys", 0, (thisValue) => hostIterator(builtins, self(thisValue, "keys").headers.keys())],
-    ["values", 0, (thisValue) => hostIterator(builtins, self(thisValue, "values").headers.values())],
-    ["entries", 0, (thisValue) => hostIterator(builtins, self(thisValue, "entries").iterator(builtins))],
-    [
-      "forEach",
-      1,
-      (thisValue, args) => {
-        requireArgs("forEach", args, 1)
-        const target = self(thisValue, "forEach")
-        const apply = applyCollectionCallback(ctx, args[0], "Headers.forEach")
-        return Effect.gen(function* () {
-          for (const [key, value] of Array.from(target.headers.entries())) yield* apply([value, key, target])
-          return undefined
-        })
-      },
-    ],
-  ])
-  define(proto, IteratorSymbol, get(proto, "entries"), hidden)
-  return headers
-}
@@ -1,348 +0,0 @@
-import { Cause, Effect, Exit } from "effect"
-import { applyCollectionCallback } from "../interpreter/callback.js"
-import type { Interpreter } from "../interpreter/interpreter.js"
-import { rangeError, typeError } from "../interpreter/model.js"
-import { constructor, fn, methods, receiver, requiresNew } from "../interpreter/native.js"
-import {
-  Arr,
-  coerceToNumber,
-  type Cursor,
-  define,
-  hasPrototype,
-  hidden,
-  IteratorObj,
-  Obj,
-  record,
-  type Step,
-  type Value,
-} from "../interpreter/objects.js"
-import { describeValue } from "../interpreter/references.js"
-
-const finished: Step = { done: true, value: undefined }
-
-// Every built-in iterator and helper shares the Iterator prototype; JS gives each collection its own, which is only
-// observable through getPrototypeOf.
-export const iteratorGlobals = <R>(ctx: Interpreter<R>) => {
-  const builtins = ctx.builtins
-  const proto = builtins.Iterator
-  const method = (name: string) => `Iterator.prototype.${name}`
-
-  // A step that runs program code: when it throws, close the source first, as IteratorClose does.
-  const guarded = <A>(source: Cursor<R>, body: Effect.Effect<A, unknown, R>) =>
-    Effect.flatMap(Effect.exit(body), (exit) => {
-      if (Exit.isSuccess(exit)) return Effect.succeed(exit.value)
-      if (Cause.hasInterruptsOnly(exit.cause)) return Effect.failCause(exit.cause)
-      return Effect.andThen(Effect.exit(source.close), Effect.failCause(exit.cause))
-    })
-
-  // A lazy helper: `pull` advances it once. Once it reports done, throws, or is closed, it stays done. A callback
-  // that re-enters its own helper is a TypeError, as for a running generator.
-  const helper = (source: Cursor<R>, pull: Effect.Effect<Step, unknown, R>, close = source.close) => {
-    let done = false
-    let running = false
-    const enter = () => {
-      if (running) throw typeError("Iterator helper is already running.")
-      running = true
-    }
-    return new IteratorObj(builtins.IteratorHelper, {
-      next: Effect.suspend(() => {
-        if (done) return Effect.succeed(finished)
-        enter()
-        return Effect.flatMap(Effect.exit(pull), (exit) => {
-          running = false
-          done = Exit.isSuccess(exit) ? exit.value.done : true
-          return exit
-        })
-      }),
-      close: Effect.suspend(() => {
-        if (done) return Effect.void
-        enter()
-        done = true
-        return Effect.ensuring(
-          close,
-          Effect.sync(() => {
-            running = false
-          }),
-        )
-      }),
-    })
-  }
-
-  // GetIteratorFlattenable: an iterable by `[Symbol.iterator]`, otherwise the object itself as an iterator.
-  const flattenable = (value: Value, name: string, strings: boolean) =>
-    Effect.gen(function* () {
-      if (typeof value === "string" ? !strings : !(value instanceof Obj)) {
-        throw typeError(`${name} expects an iterable or iterator, received ${describeValue(value)}.`)
-      }
-      return (yield* ctx.iterate(value)) ?? ctx.iterateDirect(value)
-    })
-
-  const limit = (value: Value, name: string) => {
-    const count = Math.trunc(coerceToNumber(value))
-    if (Number.isNaN(count) || count < 0) {
-      throw rangeError(`${method(name)} expects a non-negative count, received ${count}.`)
-    }
-    return count
-  }
-
-  methods(builtins, proto, [
-    [
-      "next",
-      0,
-      (thisValue) =>
-        Effect.map(receiver(IteratorObj, thisValue, method("next")).cursor.next, (step) =>
-          record(builtins.Object, { value: step.value, done: step.done }),
-        ),
-    ],
-    [
-      "map",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        const apply = applyCollectionCallback(ctx, args[0], method("map"))
-        let counter = 0
-        return helper(
-          source,
-          Effect.gen(function* () {
-            const step = yield* source.next
-            if (step.done) return finished
-            return { done: false, value: yield* guarded(source, apply([step.value, counter++])) }
-          }),
-        )
-      },
-    ],
-    [
-      "filter",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        const apply = applyCollectionCallback(ctx, args[0], method("filter"))
-        let counter = 0
-        return helper(
-          source,
-          Effect.gen(function* () {
-            while (true) {
-              const step = yield* source.next
-              if (step.done) return finished
-              if (yield* guarded(source, apply([step.value, counter++]))) return step
-            }
-          }),
-        )
-      },
-    ],
-    [
-      "take",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        let remaining = limit(args[0], "take")
-        return helper(
-          source,
-          Effect.gen(function* () {
-            if (remaining === 0) {
-              yield* source.close
-              return finished
-            }
-            remaining -= 1
-            return yield* source.next
-          }),
-        )
-      },
-    ],
-    [
-      "drop",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        let remaining = limit(args[0], "drop")
-        return helper(
-          source,
-          Effect.gen(function* () {
-            while (remaining > 0) {
-              remaining -= 1
-              const step = yield* source.next
-              if (step.done) return finished
-            }
-            return yield* source.next
-          }),
-        )
-      },
-    ],
-    [
-      "flatMap",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        const apply = applyCollectionCallback(ctx, args[0], method("flatMap"))
-        let counter = 0
-        let inner: Cursor<R> | undefined
-        return helper(
-          source,
-          Effect.gen(function* () {
-            while (true) {
-              if (inner !== undefined) {
-                const step = yield* guarded(source, inner.next)
-                if (!step.done) return step
-                inner = undefined
-              }
-              const step = yield* source.next
-              if (step.done) return finished
-              inner = yield* guarded(
-                source,
-                Effect.flatMap(apply([step.value, counter++]), (mapped) =>
-                  flattenable(mapped, method("flatMap"), false),
-                ),
-              )
-            }
-          }),
-          Effect.suspend(() => (inner === undefined ? source.close : Effect.andThen(inner.close, source.close))),
-        )
-      },
-    ],
-    [
-      "reduce",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        const apply = applyCollectionCallback(ctx, args[0], method("reduce"))
-        return Effect.gen(function* () {
-          let counter = 0
-          let accumulator = args[1]
-          if (args.length < 2) {
-            const first = yield* source.next
-            if (first.done) throw typeError("Iterator.prototype.reduce of an empty iterator with no initial value.")
-            accumulator = first.value
-            counter = 1
-          }
-          while (true) {
-            const step = yield* source.next
-            if (step.done) return accumulator
-            accumulator = yield* guarded(source, apply([accumulator, step.value, counter++]))
-          }
-        })
-      },
-    ],
-    [
-      "toArray",
-      0,
-      (thisValue) => {
-        const source = ctx.iterateDirect(thisValue)
-        return Effect.gen(function* () {
-          const items: Array<Value> = []
-          while (true) {
-            const step = yield* source.next
-            if (step.done) return new Arr(builtins.Array, items)
-            items.push(step.value)
-          }
-        })
-      },
-    ],
-    [
-      "forEach",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        const apply = applyCollectionCallback(ctx, args[0], method("forEach"))
-        return Effect.gen(function* () {
-          let counter = 0
-          while (true) {
-            const step = yield* source.next
-            if (step.done) return undefined
-            yield* guarded(source, apply([step.value, counter++]))
-          }
-        })
-      },
-    ],
-    [
-      "some",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        const apply = applyCollectionCallback(ctx, args[0], method("some"))
-        return Effect.gen(function* () {
-          let counter = 0
-          while (true) {
-            const step = yield* source.next
-            if (step.done) return false
-            if (yield* guarded(source, apply([step.value, counter++]))) {
-              yield* source.close
-              return true
-            }
-          }
-        })
-      },
-    ],
-    [
-      "every",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        const apply = applyCollectionCallback(ctx, args[0], method("every"))
-        return Effect.gen(function* () {
-          let counter = 0
-          while (true) {
-            const step = yield* source.next
-            if (step.done) return true
-            if (!(yield* guarded(source, apply([step.value, counter++])))) {
-              yield* source.close
-              return false
-            }
-          }
-        })
-      },
-    ],
-    [
-      "find",
-      1,
-      (thisValue, args) => {
-        const source = ctx.iterateDirect(thisValue)
-        const apply = applyCollectionCallback(ctx, args[0], method("find"))
-        return Effect.gen(function* () {
-          let counter = 0
-          while (true) {
-            const step = yield* source.next
-            if (step.done) return undefined
-            if (yield* guarded(source, apply([step.value, counter++]))) {
-              yield* source.close
-              return step.value
-            }
-          }
-        })
-      },
-    ],
-  ])
-
-  // Helpers and `Iterator.from` wrappers can be closed; collection iterators, as in JS, cannot.
-  methods(builtins, builtins.IteratorHelper, [
-    [
-      "return",
-      0,
-      (thisValue) =>
-        Effect.map(receiver(IteratorObj, thisValue, "Iterator.prototype.return").cursor.close, () =>
-          record(builtins.Object, { value: undefined, done: true }),
-        ),
-    ],
-  ])
-
-  const iterator = constructor<R>(builtins, proto, {
-    name: "Iterator",
-    length: 0,
-    call: requiresNew("Iterator"),
-    construct: () =>
-      Effect.sync(() => {
-        throw typeError("Iterator is abstract; use Iterator.from(...) or a built-in iterator.")
-      }),
-  })
-  define(
-    iterator,
-    "from",
-    fn(builtins, "from", 1, (_, args) =>
-      Effect.gen(function* () {
-        if (args[0] instanceof Obj && hasPrototype(args[0], proto)) return args[0]
-        return new IteratorObj(builtins.IteratorHelper, yield* flattenable(args[0], "Iterator.from", true))
-      }),
-    ),
-    hidden,
-  )
-  return iterator
-}
@@ -6,7 +6,7 @@ import { checkStringLength } from "../interpreter/limits.js"
 import { syntaxError, typeError } from "../interpreter/model.js"
 import { typeofValue } from "../interpreter/references.js"
 import { fromJson, toJson } from "../data.js"
-import { get, keys, Arr, Obj, record, remove, set, type Value } from "../interpreter/objects.js"
+import { get, keys, Arr, Obj, record, remove, set } from "../interpreter/objects.js"

 export const jsonGlobal = <R>(ctx: Interpreter<R>) => {
  const json = new Obj(ctx.builtins.Object)
@@ -17,7 +17,7 @@ export const jsonGlobal = <R>(ctx: Interpreter<R>) => {
  return json
 }

-const parse = <R>(ctx: Interpreter<R>, args: Array<Value>): Effect.Effect<Value, unknown, R> => {
+const parse = <R>(ctx: Interpreter<R>, args: Array<unknown>): Effect.Effect<unknown, unknown, R> => {
  const text = args[0]
  if (typeof text !== "string") throw typeError("JSON.parse expects a string.")

@@ -31,7 +31,7 @@ const parse = <R>(ctx: Interpreter<R>, args: Array<Value>): Effect.Effect<Value,
  if (typeofValue(args[1]) !== "function") return Effect.succeed(parsed)

  const apply = applyCollectionCallback(ctx, args[1], "JSON.parse")
-  const visit = (holder: Obj, key: string): Effect.Effect<Value, unknown, R> =>
+  const visit = (holder: Obj, key: string): Effect.Effect<unknown, unknown, R> =>
    Effect.gen(function* () {
      const value = get(holder, key)
      if (value instanceof Obj) {
@@ -46,7 +46,7 @@ const parse = <R>(ctx: Interpreter<R>, args: Array<Value>): Effect.Effect<Value,
  return visit(record(ctx.builtins.Object, { "": parsed }), "")
 }

-const stringify = <R>(ctx: Interpreter<R>, args: Array<Value>): Effect.Effect<Value, unknown, R> => {
+const stringify = <R>(ctx: Interpreter<R>, args: Array<unknown>): Effect.Effect<unknown, unknown, R> => {
  const space = args[2]
  const indent = typeof space === "number" || typeof space === "string" ? space : undefined
  const replacer = args[1]
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import { constants, type Method, methods } from "../interpreter/native.js"
 import { typeError } from "../interpreter/model.js"
-import { Obj, type Value } from "../interpreter/objects.js"
+import { Obj } from "../interpreter/objects.js"
 import { preserveConsumerError } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"

@@ -14,7 +14,7 @@ declare global {

 // Validate only the arguments a method consumes; like JS, extras are ignored
 // (so built-ins work as callbacks receiving (element, index, array)).
-const number = (name: string, args: Array<Value>, index: number): number => {
+const number = (name: string, args: Array<unknown>, index: number): number => {
  if (index >= args.length) return Number.NaN
  const arg = args[index]
  if (typeof arg !== "number") throw typeError(`Math.${name} expects number arguments.`)
@@ -105,7 +105,7 @@ export const mathGlobal = <R>(ctx: Interpreter<R>) => {
            const step = yield* cursor.next
            if (step.done) return Math.sumPrecise(numbers)
            yield* preserveConsumerError(
-              cursor.close,
+              cursor,
              Effect.sync(() => {
                if (typeof step.value !== "number") {
                  throw typeError("Math.sumPrecise expects an iterable of numbers.")
@@ -1,8 +1,7 @@
 import { constructor, constants, methods } from "../interpreter/native.js"
-import { coerceToString, type Value } from "../interpreter/objects.js"
 import { rangeError, typeError } from "../interpreter/model.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
-import { coercion } from "./value.js"
+import { coercion, coerceToString } from "./value.js"

 export const numberGlobal = <R>(ctx: Interpreter<R>) => {
  const builtins = ctx.builtins
@@ -40,18 +39,17 @@ export const numberGlobal = <R>(ctx: Interpreter<R>) => {
    ["parseFloat", 1, (_, args) => parseFloat(coerceToString(args[0]))],
  ])

-  const self = (thisValue: Value, name: string): number => {
+  const self = (thisValue: unknown, name: string): number => {
    if (typeof thisValue === "number") return thisValue
    throw typeError(`Number.prototype.${name} requires that 'this' be a Number.`)
  }
-  const optNum = (name: string, arg: Value): number | undefined => {
+  const optNum = (name: string, arg: unknown): number | undefined => {
    if (arg === undefined) return undefined
    if (typeof arg !== "number") throw typeError(`Number.${name} expects a number argument.`)
    return arg
  }
  methods(builtins, builtins.Number, [
    ["toFixed", 1, (thisValue, args) => self(thisValue, "toFixed").toFixed(optNum("toFixed", args[0]))],
-    ["toLocaleString", 0, (thisValue) => self(thisValue, "toLocaleString").toLocaleString("en-US")],
    [
      "toExponential",
      1,
@@ -90,7 +88,7 @@ export const booleanGlobal = <R>(ctx: Interpreter<R>) => {
    length: 1,
    call: coercion(ctx, "Boolean").call,
  })
-  const self = (thisValue: Value, name: string): boolean => {
+  const self = (thisValue: unknown, name: string): boolean => {
    if (typeof thisValue === "boolean") return thisValue
    throw typeError(`Boolean.prototype.${name} requires that 'this' be a Boolean.`)
  }
@@ -9,6 +9,7 @@ import {
  typeError,
 } from "../interpreter/model.js"
 import {
+  Callable,
  define,
  entries,
  enumerableKeys,
@@ -19,20 +20,23 @@ import {
  keys,
  own,
  Arr,
+  Bytes,
+  DateObj,
+  ErrorObj,
  Obj,
  PromiseObj,
+  RegExpObj,
  set,
-  coerceToString,
-  type Value,
 } from "../interpreter/objects.js"
 import { containsOpaqueReference, describeValue, rejectCircularInsertion } from "../interpreter/references.js"
-import { invoke, preserveConsumerError } from "../interpreter/callback.js"
+import { preserveConsumerError } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
 import { ToolReference } from "../tool-runtime.js"
 import { groupBy } from "./collections.js"
+import { coerceToString } from "./value.js"

 // ToObject for enumeration.
-export const enumerableSource = <R>(ctx: Interpreter<R>, label: string, value: Value, node?: AstNode): Obj => {
+export const enumerableSource = <R>(ctx: Interpreter<R>, label: string, value: unknown, node?: AstNode): Obj => {
  if (value === null || value === undefined) {
    throw typeError(`${label} cannot convert ${describeValue(value)} to an object.`, node)
  }
@@ -50,7 +54,7 @@ export const enumerableSource = <R>(ctx: Interpreter<R>, label: string, value: V
  return new Obj(ctx.builtins.Object)
 }

-export const objectAssign = <R>(ctx: Interpreter<R>, args: Array<Value>): Value => {
+export const objectAssign = <R>(ctx: Interpreter<R>, args: Array<unknown>): unknown => {
  const target = args[0]
  // JS would box a primitive target; wrappers and primitives cannot hold fields here.
  if (!(target instanceof Obj)) {
@@ -71,7 +75,7 @@ export const objectAssign = <R>(ctx: Interpreter<R>, args: Array<Value>): Value
  return target
 }

-const objectFromEntries = <R>(ctx: Interpreter<R>, source: Value): Effect.Effect<Obj, unknown, R> => {
+const objectFromEntries = <R>(ctx: Interpreter<R>, source: unknown): Effect.Effect<Obj, unknown, R> => {
  const out = new Obj(ctx.builtins.Object)
  return Effect.gen(function* () {
    const cursor = yield* ctx.iterate(source)
@@ -82,7 +86,7 @@ const objectFromEntries = <R>(ctx: Interpreter<R>, source: Value): Effect.Effect
      const step = yield* cursor.next
      if (step.done) return out
      yield* preserveConsumerError(
-        cursor.close,
+        cursor,
        Effect.sync(() => {
          if (!(step.value instanceof Obj) || containsOpaqueReference(step.value)) {
            throw typeError("Object.fromEntries expects [key, value] entry objects.")
@@ -94,24 +98,29 @@ const objectFromEntries = <R>(ctx: Interpreter<R>, source: Value): Effect.Effect
  })
 }

-const classTag = (value: Value): string => {
+export const classTag = (value: unknown): string => {
  if (value === null) return "Null"
  if (value === undefined) return "Undefined"
-  if (value instanceof Obj) return value.tag
+  if (value instanceof Arr) return "Array"
+  if (value instanceof Callable) return "Function"
+  if (value instanceof ErrorObj) return "Error"
+  if (value instanceof DateObj) return "Date"
+  if (value instanceof RegExpObj) return "RegExp"
+  if (value instanceof Bytes) return "Uint8Array"
  if (typeof value === "string") return "String"
  if (typeof value === "number") return "Number"
  if (typeof value === "boolean") return "Boolean"
  return "Object"
 }

-const propertyKey = (value: Value): PropertyKey =>
+const propertyKey = (value: unknown): PropertyKey =>
  value === AsyncIteratorSymbol || value === IteratorSymbol ? value : coerceToString(value)

 // Object constructs identically with or without new, like JS. Only `keys` copies its result into the
 // program; `values`, `entries`, `assign`, and `fromEntries` hand back the program's own values.
 export const objectGlobal = <R>(ctx: Interpreter<R>) => {
  const builtins = ctx.builtins
-  const construct = (args: Array<Value>): Value => {
+  const construct = (args: Array<unknown>): unknown => {
    const first = args[0]
    if (first === null || first === undefined) return new Obj(builtins.Object)
    if (first instanceof Obj) return first
@@ -187,7 +196,7 @@ export const objectGlobal = <R>(ctx: Interpreter<R>) => {
        true,
    ],
    ["toString", 0, (thisValue) => `[object ${classTag(thisValue)}]`],
-    ["toLocaleString", 0, (thisValue) => invoke(ctx, thisValue, "toString", "Object.prototype.toLocaleString")],
+    ["toLocaleString", 0, (thisValue) => `[object ${classTag(thisValue)}]`],
    [
      "valueOf",
      0,
@@ -2,18 +2,9 @@ import { Effect } from "effect"
 import type { Builtins } from "../interpreter/intrinsics.js"
 import { constructor, type Method, methods, prototypeFrom, receiver } from "../interpreter/native.js"
 import { syntaxError, typeError } from "../interpreter/model.js"
-import {
-  define,
-  defineAccessor,
-  Arr,
-  Obj,
-  RegExpObj,
-  record,
-  coerceToNumber,
-  coerceToString,
-  type Value,
-} from "../interpreter/objects.js"
+import { define, defineAccessor, Arr, Obj, RegExpObj, record } from "../interpreter/objects.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
+import { coerceToNumber, coerceToString } from "./value.js"

 const flagProperties = [
  "hasIndices",
@@ -32,7 +23,7 @@ const regexFailureReason = (error: unknown): string =>
 const escapeRegexHint =
  'To match special characters like ( ) [ ] { } + * ? . literally, escape them with a backslash (e.g. "\\\\(") or test for them with String.includes instead.'

-export const toHostRegex = (arg: Value, method: string, extraFlags = ""): RegExp => {
+export const toHostRegex = (arg: unknown, method: string, extraFlags = ""): RegExp => {
  // Native parity: an undefined pattern behaves as an empty pattern.
  if (arg === undefined) return new RegExp("", extraFlags)
  if (arg instanceof RegExpObj) return arg.regex
@@ -62,7 +53,7 @@ export const matchToValue = (builtins: Builtins, match: RegExpMatchArray): Arr =
  return result
 }

-export const constructRegExp = (builtins: Builtins, args: Array<Value>, proto: Obj = builtins.RegExp): RegExpObj => {
+export const constructRegExp = (builtins: Builtins, args: Array<unknown>, proto: Obj = builtins.RegExp): RegExpObj => {
  const first = args[0]
  const pattern = first instanceof RegExpObj ? first.regex.source : first === undefined ? "" : coerceToString(first)
  const flagsArg = args[1]
@@ -105,7 +96,7 @@ export const regexpGlobal = <R>(ctx: Interpreter<R>) => {
    ],
  ])

-  const self = (thisValue: Value, name: string) => receiver(RegExpObj, thisValue, `RegExp.prototype.${name}`)
+  const self = (thisValue: unknown, name: string) => receiver(RegExpObj, thisValue, `RegExp.prototype.${name}`)
  defineAccessor(proto, "source", (thisValue) => self(thisValue, "source").regex.source)
  defineAccessor(proto, "flags", (thisValue) => self(thisValue, "flags").regex.flags)
  // The host regex holds the only lastIndex, so exec/test and the String methods share one counter.
@@ -1,26 +1,16 @@
 import { Effect } from "effect"
-import { constructor, fn, type Impl, type Method, methods } from "../interpreter/native.js"
+import { constructor, type Method, methods } from "../interpreter/native.js"
 import { checkArrayLength, checkStringLength } from "../interpreter/limits.js"
-import { invalidData, IteratorSymbol, rangeError, typeError } from "../interpreter/model.js"
-import {
-  define,
-  hidden,
-  Arr,
-  hostIterator,
-  RegExpObj,
-  record,
-  coerceToNumber,
-  coerceToString,
-  type Value,
-} from "../interpreter/objects.js"
+import { invalidData, rangeError, typeError } from "../interpreter/model.js"
+import { Arr, PromiseObj, RegExpObj, record } from "../interpreter/objects.js"
 import { containsOpaqueReference, typeofValue } from "../interpreter/references.js"
 import { applyCollectionCallback, isSupportedCallback } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
 import { matchToValue, toHostRegex } from "./regexp.js"
-import { coercion } from "./value.js"
+import { coerceToNumber, coerceToString, coercion } from "./value.js"

 // console is intercepted by the interpreter before reaching here.
-const requireDataArgument = (name: string, index: number, arg: Value): Value => {
+const requireDataArgument = (name: string, index: number, arg: unknown): unknown => {
  if (containsOpaqueReference(arg)) {
    throw invalidData(`String.${name} expects argument ${index + 1} to be a data value.`)
  }
@@ -39,23 +29,21 @@ const replaceWithCallback = <R>(
  ctx: Interpreter<R>,
  value: string,
  name: "replace" | "replaceAll",
-  args: Array<Value>,
-): Effect.Effect<Value, unknown, R> => {
+  args: Array<unknown>,
+): Effect.Effect<unknown, unknown, R> => {
  const builtins = ctx.builtins
  const apply = applyCollectionCallback(ctx, args[1], `String.${name}`)
-  const matches: Array<{ readonly match: string; readonly offset: number; readonly args: Array<Value> }> = []
-  // The host calls back with (match, ...captures, offset, string, groups?); only groups is not already a Value.
-  const collect = (
-    ...callbackArgs: Array<string | number | undefined | Record<string, string | undefined>>
-  ): string => {
+  const matches: Array<{ readonly match: string; readonly offset: number; readonly args: Array<unknown> }> = []
+  const collect = (...callbackArgs: Array<unknown>): string => {
    const match = callbackArgs[0]
-    const hasGroups = typeof callbackArgs.at(-1) === "object"
+    const groups = callbackArgs[callbackArgs.length - 1]
+    const hasGroups = groups !== null && typeof groups === "object"
    const offset = callbackArgs[callbackArgs.length - (hasGroups ? 3 : 2)]
    if (typeof match !== "string" || typeof offset !== "number") {
      throw typeError(`String.${name} produced an invalid replacement match.`)
    }
-    const args = callbackArgs.map((arg) => (typeof arg === "object" ? record(builtins.Object, arg) : arg))
-    matches.push({ match, offset, args })
+    if (hasGroups) callbackArgs[callbackArgs.length - 1] = record(builtins.Object, groups as Record<string, unknown>)
+    matches.push({ match, offset, args: callbackArgs })
    return match
  }

@@ -75,7 +63,10 @@ const replaceWithCallback = <R>(
    let end = 0
    for (const match of matches) {
      const replacement = yield* apply(match.args)
-      output.push(value.slice(end, match.offset), coerceToString(replacement))
+      output.push(
+        value.slice(end, match.offset),
+        replacement instanceof PromiseObj ? "[object Promise]" : coerceToString(replacement),
+      )
      end = match.offset + match.match.length
    }
    output.push(value.slice(end))
@@ -108,7 +99,7 @@ export const stringGlobal = <R>(ctx: Interpreter<R>) => {
    codeUnits("fromCodePoint", String.fromCodePoint),
  ])

-  const self = (thisValue: Value, name: string): string => {
+  const self = (thisValue: unknown, name: string): string => {
    if (typeof thisValue === "string") return thisValue
    if (thisValue === null || thisValue === undefined) {
      throw typeError(`String.prototype.${name} called on null or undefined.`)
@@ -116,26 +107,26 @@ export const stringGlobal = <R>(ctx: Interpreter<R>) => {
    return coerceToString(thisValue)
  }
  // Coerce arguments like native JS; opaque runtime references still reject.
-  const str = (name: string, args: Array<Value>, index: number): string =>
+  const str = (name: string, args: Array<unknown>, index: number): string =>
    coerceToString(requireDataArgument(name, index, args[index]))
-  const num = (name: string, args: Array<Value>, index: number): number =>
+  const num = (name: string, args: Array<unknown>, index: number): number =>
    coerceToNumber(requireDataArgument(name, index, args[index]))
-  const optNum = (name: string, args: Array<Value>, index: number): number | undefined =>
+  const optNum = (name: string, args: Array<unknown>, index: number): number | undefined =>
    args[index] === undefined ? undefined : num(name, args, index)
-  const optStr = (name: string, args: Array<Value>, index: number): string | undefined =>
+  const optStr = (name: string, args: Array<unknown>, index: number): string | undefined =>
    args[index] === undefined ? undefined : str(name, args, index)
-  const rejectRegex = (name: string, args: Array<Value>): void => {
+  const rejectRegex = (name: string, args: Array<unknown>): void => {
    if (args[0] instanceof RegExpObj) {
      throw typeError(
        `String.${name} cannot take a regular expression; use regex.test(string) or String.search instead.`,
      )
    }
  }
-  const simple = (
-    name: string,
-    length: number,
-    op: (value: string, args: Array<Value>) => ReturnType<Impl>,
-  ): Method => [name, length, (thisValue, args) => op(self(thisValue, name), args)]
+  const simple = (name: string, length: number, op: (value: string, args: Array<unknown>) => unknown): Method => [
+    name,
+    length,
+    (thisValue, args) => op(self(thisValue, name), args),
+  ]
  const replace = (name: "replace" | "replaceAll") =>
    simple(name, 2, (value, args) => {
      if (isSupportedCallback(args[1])) return replaceWithCallback(ctx, value, name, args)
@@ -159,8 +150,6 @@ export const stringGlobal = <R>(ctx: Interpreter<R>) => {
    simple("valueOf", 0, (value) => value),
    simple("toLowerCase", 0, (value) => value.toLowerCase()),
    simple("toUpperCase", 0, (value) => value.toUpperCase()),
-    simple("toLocaleLowerCase", 0, (value) => value.toLowerCase()),
-    simple("toLocaleUpperCase", 0, (value) => value.toUpperCase()),
    simple("trim", 0, (value) => value.trim()),
    simple("trimStart", 0, (value) => value.trimStart()),
    simple("trimLeft", 0, (value) => value.trimStart()),
@@ -227,7 +216,7 @@ export const stringGlobal = <R>(ctx: Interpreter<R>) => {
          `String.matchAll requires a regular expression with the global (g) flag: write /${pattern.source}/${pattern.flags}g, or use String.match for a single match.`,
        )
      }
-      const matches: Array<Value> = []
+      const matches: Array<unknown> = []
      for (const match of value.matchAll(pattern)) {
        checkArrayLength(matches.length + 1)
        matches.push(matchToValue(builtins, match))
@@ -269,13 +258,5 @@ export const stringGlobal = <R>(ctx: Interpreter<R>) => {
      return joined
    }),
  ])
-  define(
-    builtins.String,
-    IteratorSymbol,
-    fn(builtins, "[Symbol.iterator]", 0, (thisValue) =>
-      hostIterator(builtins, self(thisValue, "[Symbol.iterator]")[Symbol.iterator]()),
-    ),
-    hidden,
-  )
  return string
 }
@@ -1,23 +1,11 @@
 import { Effect } from "effect"
 import { constructor, fn, type Method, methods, prototypeFrom, receiver, requiresNew } from "../interpreter/native.js"
-import { IteratorSymbol, PendingThrow, typeError, uriError } from "../interpreter/model.js"
-import {
-  define,
-  defineAccessor,
-  entries,
-  get,
-  hidden,
-  Arr,
-  hostIterator,
-  Obj,
-  URLObj,
-  URLSearchParamsObj,
-  coerceToString,
-  isRuntimeReference,
-  type Value,
-} from "../interpreter/objects.js"
+import { PendingThrow, typeError, uriError } from "../interpreter/model.js"
+import { defineAccessor, entries, isWrapper, Arr, Obj, URLObj, URLSearchParamsObj } from "../interpreter/objects.js"
+import { isRuntimeReference } from "../interpreter/references.js"
 import { applyCollectionCallback, preserveConsumerError } from "../interpreter/callback.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
+import { coerceToString } from "./value.js"

 const urlProperties = [
  "href",
@@ -52,12 +40,12 @@ export const uriGlobal = <R>(ctx: Interpreter<R>, name: UriFunction) =>
    }
  })

-const urlArgument = (value: Value): string => (value instanceof URLObj ? value.url.href : coerceToString(value))
+const urlArgument = (value: unknown): string => (value instanceof URLObj ? value.url.href : coerceToString(value))

 export const urlGlobal = <R>(ctx: Interpreter<R>) => {
  const builtins = ctx.builtins
  const proto = builtins.URL
-  const construct = (args: Array<Value>, into: Obj): URLObj => {
+  const construct = (args: Array<unknown>, into: Obj): URLObj => {
    if (args.length === 0) {
      throw typeError("new URL(...) requires a URL string and an optional base URL.")
    }
@@ -92,7 +80,7 @@ export const urlGlobal = <R>(ctx: Interpreter<R>) => {
  ]
  methods(builtins, url, [parse("canParse"), parse("parse")])

-  const self = (thisValue: Value, name: string) => receiver(URLObj, thisValue, `URL.prototype.${name}`)
+  const self = (thisValue: unknown, name: string) => receiver(URLObj, thisValue, `URL.prototype.${name}`)
  for (const name of urlProperties) {
    defineAccessor(
      proto,
@@ -119,49 +107,28 @@ export const urlGlobal = <R>(ctx: Interpreter<R>) => {
  return url
 }

-const readPair = <R>(ctx: Interpreter<R>, value: Value, label: string): Effect.Effect<Array<string>, unknown, R> =>
+const readPair = <R>(ctx: Interpreter<R>, value: unknown): Effect.Effect<Array<string>, unknown, R> =>
  Effect.gen(function* () {
    const cursor = yield* ctx.iterate(value)
-    if (cursor === undefined) throw typeError(`${label} expects iterable [name, value] pairs.`)
+    if (cursor === undefined) {
+      throw typeError("new URLSearchParams(...) expects iterable [name, value] pairs.")
+    }
    const items: Array<string> = []
    while (true) {
      const step = yield* cursor.next
      if (step.done) return items
      items.push(
        yield* preserveConsumerError(
-          cursor.close,
+          cursor,
          Effect.sync(() => coerceToString(step.value)),
        ),
      )
    }
  })

-/**
- * Reads a synchronous iterable of `[name, value]` pairs as strings; `undefined` when `init` is not iterable. As in
- * WebIDL, the whole sequence is converted before any pair's length is checked.
- */
-export const readPairs = <R>(
-  ctx: Interpreter<R>,
-  init: Value,
-  label: string,
-): Effect.Effect<Array<[string, string]> | undefined, unknown, R> =>
-  Effect.gen(function* () {
-    const cursor = yield* ctx.iterate(init)
-    if (cursor === undefined) return undefined
-    const pairs: Array<Array<string>> = []
-    while (true) {
-      const step = yield* cursor.next
-      if (step.done) {
-        if (pairs.some((entry) => entry.length !== 2)) throw typeError(`${label} expects iterable [name, value] pairs.`)
-        return pairs as Array<[string, string]>
-      }
-      pairs.push(yield* preserveConsumerError(cursor.close, readPair(ctx, step.value, label)))
-    }
-  })
-
 const constructURLSearchParams = <R>(
  ctx: Interpreter<R>,
-  init: Value,
+  init: unknown,
  proto: Obj,
 ): Effect.Effect<URLSearchParamsObj, unknown, R> => {
  const wrap = (params: URLSearchParams) => new URLSearchParamsObj(proto, params)
@@ -172,11 +139,24 @@ const constructURLSearchParams = <R>(
    return Effect.succeed(wrap(new URLSearchParams(coerceToString(init))))
  }
  return Effect.gen(function* () {
-    const pairs = yield* readPairs(ctx, init, "new URLSearchParams(...)")
-    if (pairs !== undefined) return wrap(new URLSearchParams(pairs))
+    const cursor = yield* ctx.iterate(init)
+    if (cursor !== undefined) {
+      const pairs: Array<Array<string>> = []
+      while (true) {
+        const step = yield* cursor.next
+        if (step.done) {
+          if (pairs.some((entry) => entry.length !== 2)) {
+            throw typeError("new URLSearchParams(...) expects iterable [name, value] pairs.")
+          }
+          return wrap(new URLSearchParams(pairs.map((entry): [string, string] => [entry[0] ?? "", entry[1] ?? ""])))
+        }
+        pairs.push(yield* preserveConsumerError(cursor, readPair(ctx, step.value)))
+      }
+    }
    if (isRuntimeReference(init)) {
      throw typeError("new URLSearchParams(...) expects a query string, data object, or synchronous iterable pairs.")
    }
+    if (isWrapper(init)) return wrap(new URLSearchParams())
    if (!(init instanceof Obj)) {
      throw typeError(
        "new URLSearchParams(...) expects a query string, data object, iterable pairs, or URLSearchParams.",
@@ -196,11 +176,11 @@ export const urlSearchParamsGlobal = <R>(ctx: Interpreter<R>) => {
    call: requiresNew("URLSearchParams"),
    construct: (args, newTarget) => constructURLSearchParams(ctx, args[0], prototypeFrom(newTarget, proto)),
  })
-  const self = (thisValue: Value, name: string) =>
+  const self = (thisValue: unknown, name: string) =>
    receiver(URLSearchParamsObj, thisValue, `URLSearchParams.prototype.${name}`)
-  const wrap = (items: Array<Value>) => new Arr(builtins.Array, items)
-  const arg = (args: Array<Value>, index: number): string => coerceToString(args[index])
-  const requireArgs = (name: string, args: Array<Value>, count: number): void => {
+  const wrap = (items: Array<unknown>) => new Arr(builtins.Array, items)
+  const arg = (args: Array<unknown>, index: number): string => coerceToString(args[index])
+  const requireArgs = (name: string, args: Array<unknown>, count: number): void => {
    if (args.length < count) {
      throw typeError(`URLSearchParams.${name} requires ${count} argument${count === 1 ? "" : "s"}.`)
    }
@@ -269,9 +249,14 @@ export const urlSearchParamsGlobal = <R>(ctx: Interpreter<R>) => {
        return undefined
      },
    ],
-    ["keys", 0, (thisValue) => hostIterator(builtins, self(thisValue, "keys").params.keys())],
-    ["values", 0, (thisValue) => hostIterator(builtins, self(thisValue, "values").params.values())],
-    ["entries", 0, (thisValue) => hostIterator(builtins, self(thisValue, "entries").iterator(builtins))],
+    ["keys", 0, (thisValue) => wrap(Array.from(self(thisValue, "keys").params.keys()))],
+    ["values", 0, (thisValue) => wrap(Array.from(self(thisValue, "values").params.values()))],
+    [
+      "entries",
+      0,
+      (thisValue) =>
+        wrap(Array.from(self(thisValue, "entries").params.entries(), ([key, value]) => wrap([key, value]))),
+    ],
    ["toString", 0, (thisValue) => self(thisValue, "toString").params.toString()],
    [
      "forEach",
@@ -287,6 +272,5 @@ export const urlSearchParamsGlobal = <R>(ctx: Interpreter<R>) => {
      },
    ],
  ])
-  define(proto, IteratorSymbol, get(proto, "entries"), hidden)
  return searchParams
 }
@@ -1,13 +1,62 @@
 import { fn } from "../interpreter/native.js"
 import { typeError } from "../interpreter/model.js"
-import { coerceToNumber, coerceToString, type Native, type Value } from "../interpreter/objects.js"
+import {
+  get,
+  isWrapper,
+  type Native,
+  Arr,
+  Bytes,
+  DateObj,
+  ErrorObj,
+  MapObj,
+  RegExpObj,
+  SetObj,
+  URLObj,
+  URLSearchParamsObj,
+} from "../interpreter/objects.js"
 import type { Interpreter } from "../interpreter/interpreter.js"

 export const compoundOperators = new Set(["+=", "-=", "*=", "/=", "%=", "**=", "&=", "|=", "^=", "<<=", ">>=", ">>>="])

+/** The built-in string form of a value, without consulting program-defined `toString` methods. */
+export const coerceToString = (value: unknown): string => {
+  if (value === null) return "null"
+  if (value === undefined) return "undefined"
+  if (value instanceof DateObj) return Number.isFinite(value.time) ? new Date(value.time).toISOString() : "Invalid Date"
+  if (value instanceof RegExpObj) return `/${value.regex.source}/${value.regex.flags}`
+  if (value instanceof MapObj) return "[object Map]"
+  if (value instanceof SetObj) return "[object Set]"
+  if (value instanceof URLObj) return value.url.href
+  if (value instanceof URLSearchParamsObj) return value.params.toString()
+  if (value instanceof Bytes) return value.bytes.join(",")
+  if (value instanceof ErrorObj) {
+    // Match Error.prototype.toString: "name: message", or just one when the other is empty.
+    const name = get(value, "name")
+    const message = get(value, "message")
+    const shownName = typeof name === "string" ? name : "Error"
+    const shownMessage = typeof message === "string" ? message : ""
+    if (shownMessage === "") return shownName
+    if (shownName === "") return shownMessage
+    return `${shownName}: ${shownMessage}`
+  }
+  if (value instanceof Arr) {
+    return value.items.map((item) => (item === null || item === undefined ? "" : coerceToString(item))).join(",")
+  }
+  if (typeof value === "object") return "[object Object]"
+  return String(value)
+}
+
+export const coerceToNumber = (value: unknown): number => {
+  if (value instanceof DateObj) return value.time
+  if (value instanceof Bytes) return Number(coerceToString(value))
+  if (isWrapper(value)) return Number.NaN
+  if (value instanceof Arr) return Number(coerceToString(value))
+  return value !== null && typeof value === "object" ? Number.NaN : Number(value)
+}
+
 export type Coercion = "Number" | "String" | "Boolean" | "parseInt" | "parseFloat" | "isFinite" | "isNaN"

-const coerce = <R>(ctx: Interpreter<R>, name: Coercion, args: Array<Value>): Value => {
+const coerce = <R>(ctx: Interpreter<R>, name: Coercion, args: Array<unknown>): unknown => {
  // Native: Number() is 0 and String() is "", unlike their undefined-argument forms; the
  // other coercers match native through the undefined-argument path below.
  if (args.length === 0) {
@@ -15,6 +64,15 @@ const coerce = <R>(ctx: Interpreter<R>, name: Coercion, args: Array<Value>): Val
    if (name === "String") return ""
  }
  const raw = args[0]
+  if (isWrapper(raw)) {
+    if (name === "Boolean") return true
+    if (name === "Number") return coerceToNumber(raw)
+    if (name === "String") return coerceToString(raw)
+    if (name === "isFinite") return Number.isFinite(coerceToNumber(raw))
+    if (name === "isNaN") return Number.isNaN(coerceToNumber(raw))
+    if (name === "parseInt") return parseInt(coerceToString(raw))
+    return parseFloat(coerceToString(raw))
+  }
  if (name === "Number") return coerceToNumber(raw)
  if (name === "Boolean") return Boolean(raw)
  if (name === "isFinite") return Number.isFinite(coerceToNumber(raw))
@@ -1,8 +1,9 @@
 import { fn, methods } from "../interpreter/native.js"
 import { typeError } from "../interpreter/model.js"
-import { Bytes, Obj, coerceToString } from "../interpreter/objects.js"
+import { Bytes, Obj } from "../interpreter/objects.js"
 import { describeValue } from "../interpreter/references.js"
 import type { Interpreter } from "../interpreter/interpreter.js"
+import { coerceToString } from "./value.js"

 // WebIDL DOMString conversion: a missing argument is a TypeError, anything else stringifies. Invalid input is a
 // TypeError as well; browsers throw a DOMException named InvalidCharacterError, which CodeMode does not have.
@@ -176,7 +176,7 @@ const describeTool = <R>(visible: VisibleTool<R>): ToolDescription => {
      // Joining the final fragments avoids retaining the rendering's intermediate string ropes in JSC.
      return (signature ??= [
        toolExpression(visible.path),
-        isEmptyInput(visible.tool) ? "()" : `(${inputTypeScript(visible.tool, true)})`,
+        isEmptyInput(visible.tool) ? "()" : `(input: ${inputTypeScript(visible.tool, true)})`,
        `: Promise<${outputTypeScript(visible.tool, true)}>`,
      ].join(""))
    },
@@ -192,8 +192,6 @@ export type Prepared<R = never> = {

 export type SearchEntry = {
  readonly description: ToolDescription
-  /** The path split into words, so `zones` matches `get_zones` as a word rather than as a substring of `timezones`. */
-  readonly pathWords: ReadonlyArray<string>
  readonly searchText: string
 }

@@ -221,15 +219,14 @@ const makeSearchTool = (searchIndex: ReadonlyArray<SearchEntry>): Tool => ({
      const request = input as typeof SearchInput.Type
      const query = request.query ?? ""
      const offset = request.offset ?? 0
-      let ns = request.namespace
-      if (ns !== undefined && !searchIndex.some((entry) => entry.description.path.startsWith("tools."))) {
-        if (ns === "tools") ns = undefined
-        else if (ns.startsWith("tools.")) ns = ns.slice("tools.".length)
-      }
      const scoped =
-        ns === undefined
+        request.namespace === undefined
          ? searchIndex
-          : searchIndex.filter((entry) => entry.description.path === ns || entry.description.path.startsWith(`${ns}.`))
+          : searchIndex.filter(
+              (entry) =>
+                entry.description.path === request.namespace ||
+                entry.description.path.startsWith(`${request.namespace}.`),
+            )
      const trimmed = query.trim()
      const pathQuery = trimmed.startsWith("tools.") ? trimmed.slice("tools.".length) : trimmed
      const exact =
@@ -250,7 +247,6 @@ const makeSearchTool = (searchIndex: ReadonlyArray<SearchEntry>): Tool => ({
                  (total, forms) =>
                    total +
                    (forms.some((form) => path === form || path.endsWith(`.${form}`)) ? 20 : 0) +
-                    (forms.some((form) => entry.pathWords.includes(form)) ? 12 : 0) +
                    (forms.some((form) => path.includes(form)) ? 8 : 0) +
                    (forms.some((form) => description.includes(form)) ? 4 : 0) +
                    (forms.some((form) => entry.searchText.includes(form)) ? 2 : 0),
@@ -280,12 +276,11 @@ const makeSearchTool = (searchIndex: ReadonlyArray<SearchEntry>): Tool => ({
 /** Exact callable signature of the built-in `search` function, for host-owned instructions. */
 export const searchSignature = (() => {
  const tool = makeSearchTool([])
-  return `search(${inputTypeScript(tool, true)}): ${outputTypeScript(tool, true)}`
+  return `search(input: ${inputTypeScript(tool, true)}): ${outputTypeScript(tool, true)}`
 })()

 const toSearchEntry = <R>(visible: VisibleTool<R>): SearchEntry => ({
  description: describeTool(visible),
-  pathWords: tokenize(visible.path),
  searchText: [
    visible.path,
    visible.tool.description,
--- a/Show More
+++ b/Show More