fix(app): restore composer focus on session tab changes

2026-09-07 09:26:26 +00:00 · 2026-09-05 18:31:20 +00:00
148 changed files with 1559 additions and 5053 deletions
@@ -33,7 +33,6 @@
      "name": "@opencode-ai/ai",
      "version": "1.17.20",
      "dependencies": {
-        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode-ai/schema": "workspace:*",
        "@smithy/eventstream-codec": "4.2.14",
        "@smithy/util-utf8": "4.2.2",
@@ -339,6 +338,7 @@
      "version": "1.18.4",
      "dependencies": {
        "@ai-sdk/alibaba": "1.0.17",
+        "@ai-sdk/amazon-bedrock": "4.0.112",
        "@ai-sdk/anthropic": "3.0.82",
        "@ai-sdk/azure": "3.0.88",
        "@ai-sdk/cohere": "3.0.27",
@@ -350,6 +350,7 @@
        "@ai-sdk/provider": "3.0.8",
        "@ai-sdk/provider-utils": "4.0.23",
        "@ai-sdk/vercel": "2.0.39",
+        "@aws-sdk/credential-providers": "3.1057.0",
        "@ff-labs/fff-bun": "0.10.5",
        "@ff-labs/fff-node": "0.10.5",
        "@lydell/node-pty": "catalog:",
@@ -1188,7 +1189,7 @@

    "@ai-sdk/mistral": ["@ai-sdk/mistral@3.0.51", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.40" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-83eXY6p0lUFhSuMvNDmTKDuMciK5XDAWDlNh5c0L80tKjmtCFRItA1MZHp4IKe1r7eK8Rb5nN7qtxqMLUFRIRw=="],

-    "@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
+    "@ai-sdk/openai": ["@ai-sdk/openai@3.0.67", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-oAiGC9eWG7IgtdsdS74bOCnAAHarAfTJhWN9x5INwnWPekL802AvF+0I5DvLzIF1MIRmNw4N8mPSL/GUVbX9Mw=="],

    "@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],

@@ -5866,8 +5867,6 @@

    "@ai-sdk/amazon-bedrock/@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.81", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-B1JDd9Ugq9R5AgIaW3674lhGCMMYJcPUxnrZh8fzbGojgg4QvHFRv6eZahGQAUsmGHbcf74G9bdSBDLWQGY2GA=="],

-    "@ai-sdk/amazon-bedrock/@ai-sdk/openai": ["@ai-sdk/openai@3.0.67", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-oAiGC9eWG7IgtdsdS74bOCnAAHarAfTJhWN9x5INwnWPekL802AvF+0I5DvLzIF1MIRmNw4N8mPSL/GUVbX9Mw=="],
-
    "@ai-sdk/amazon-bedrock/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],

    "@ai-sdk/amazon-bedrock/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
@@ -5876,6 +5875,8 @@

    "@ai-sdk/anthropic/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],

+    "@ai-sdk/azure/@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
+
    "@ai-sdk/azure/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],

    "@ai-sdk/azure/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
@@ -5922,9 +5923,9 @@

    "@ai-sdk/mistral/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.40", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-OL5IrpUm9Y8Dwy+w/vvFwPotS6m52O9W0op2oXgXdCROMJIBalBI0oro6OIBYkPxvm5Xg02GSkoQN25RlR0bnw=="],

-    "@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
+    "@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],

-    "@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
+    "@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],

    "@ai-sdk/perplexity/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],

@@ -6384,6 +6385,8 @@

    "ai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@5.0.27", "", { "dependencies": { "@ai-sdk/provider": "4.0.7", "@standard-schema/spec": "^1.1.0", "@workflow/serde": "4.1.0", "eventsource-parser": "^3.0.8", "undici": "^7.28.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-EzAn4pdgG5g0xXtH6lE2zyNmfjDQIDjATkfqzuidEI35g++hh4+07vnjzkT/RmGmIClPZiRj/Q2GMPV2V7mkHw=="],

+    "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
+
    "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],

    "anymatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="],
@@ -7244,6 +7247,10 @@

    "@vitest/expect/@vitest/utils/@vitest/pretty-format": ["@vitest/pretty-format@3.2.4", "", { "dependencies": { "tinyrainbow": "^2.0.0" } }, "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA=="],

+    "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
+
+    "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
+
    "ai/@ai-sdk/provider-utils/undici": ["undici@7.29.0", "", {}, "sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw=="],

    "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-bWKV3fV8Yc+3ILaNRChIYajsRcvEG2OkydsD2KMUXCM=",
-    "aarch64-linux": "sha256-zIavB09LW+BU3GOq0PO7Lqfc3MVchkiOUf3trnAjhRM=",
-    "aarch64-darwin": "sha256-Jlvz7QsXsb8GS9Ty4TmUIfGOawiueZWWEYmyEPms3dc=",
-    "x86_64-darwin": "sha256-TzTDtcDtj1c3+eP2WZAHOfkszxIS06J6QUwlnscLaUM="
+    "x86_64-linux": "sha256-6VoxH/BowtAOYdhGqD7ZkFJv+h+/onFmuNZhvBxoGAI=",
+    "aarch64-linux": "sha256-Va77URDCTAkvMQ0g7huFgp1iwb5C6+idSrlLOaFNVB0=",
+    "aarch64-darwin": "sha256-IqCsKuiuuAmK4Z3oOfJ9kX4b4CpCmj6GeTKhXOewc7E=",
+    "x86_64-darwin": "sha256-LXOxHzh6SS63WkfKvwBz+NylfvbcCi+rmXIRmpwu/oE="
  }
 }
@@ -7,7 +7,7 @@
  "type": "module",
  "packageManager": "bun@1.4.2",
  "scripts": {
-    "dev": "bun run --cwd packages/cli src/index.ts",
+    "dev": "bun run --cwd packages/cli --conditions=browser src/index.ts",
    "dev:live": "sh -c 'OPENCODE_TUI_CHANNEL=dev OPENCODE_PASSWORD=\"$(opencode2 service get password)\" exec bun run dev \"$@\" --server \"$(opencode2 service status)\"' --",
    "dev:desktop": "bun --cwd packages/desktop dev",
    "dev:web": "bun --cwd packages/app dev",
@@ -28,7 +28,6 @@
    "typescript": "catalog:"
  },
  "dependencies": {
-    "@aws-sdk/credential-providers": "3.1057.0",
    "@smithy/eventstream-codec": "4.2.14",
    "@smithy/util-utf8": "4.2.2",
    "@opencode-ai/schema": "workspace:*",
@@ -2,12 +2,13 @@ import { AwsV4Signer } from "aws4fetch"
 import { Effect } from "effect"
 import { Headers } from "effect/unstable/http"
 import { Auth, type AuthInput } from "../../route/auth.js"
-import { AIError, AuthenticationError } from "../../schema/index.js"
 import { ProviderShared } from "../shared.js"

 /**
 * AWS credentials for SigV4 signing. Bedrock also supports Bearer API key auth,
- * which provider facades configure as route auth instead of SigV4.
+ * which provider facades configure as route auth instead of SigV4. STS-vended
+ * credentials should be refreshed by the consumer (rebuild the model) before
+ * they expire; the route does not refresh.
 */
 export interface Credentials {
  readonly region: string
@@ -16,44 +17,6 @@ export interface Credentials {
  readonly sessionToken?: string
 }

-/** Static credentials or an effect resolved before every request. */
-export type CredentialSource = Credentials | Effect.Effect<Credentials, AIError>
-
-export interface DefaultChainOptions {
-  readonly region: string
-  /** Shared config profile passed to the AWS default chain. */
-  readonly profile?: string
-}
-
-/**
- * Resolve credentials through the AWS default provider chain: environment
- * variables, shared config and SSO caches, web identity tokens, process
- * credentials, and container or instance metadata. A fresh chain runs on every
- * request so credentials rotated on disk without an expiration (for example
- * shared-config keys rewritten by a corporate SSO tool) are always re-read;
- * the SDK's own memoization would otherwise pin them for the process lifetime.
- */
-export const defaultChain = (options: DefaultChainOptions): Effect.Effect<Credentials, AIError> =>
-  Effect.tryPromise({
-    try: async () => {
-      const { fromNodeProviderChain } = await import("@aws-sdk/credential-providers")
-      const identity = await fromNodeProviderChain(options.profile === undefined ? {} : { profile: options.profile })()
-      return {
-        region: options.region,
-        accessKeyId: identity.accessKeyId,
-        secretAccessKey: identity.secretAccessKey,
-        ...(identity.sessionToken === undefined ? {} : { sessionToken: identity.sessionToken }),
-      }
-    },
-    catch: (error) =>
-      new AIError({
-        reason: new AuthenticationError({
-          message: `AWS default credential chain failed: ${ProviderShared.errorText(error)}`,
-          cause: error,
-        }),
-      }),
-  })
-
 const signRequest = (input: {
  readonly url: string
  readonly body: string
@@ -85,17 +48,16 @@ const signRequest = (input: {

 /** Sign the exact JSON bytes with SigV4 using credentials configured on the route. */
 export const sigV4 = (
-  source: CredentialSource | undefined,
+  credentials: Credentials | undefined,
  options: { readonly service?: string; readonly name?: string } = {},
 ) =>
  Auth.custom((input: AuthInput) => {
    return Effect.gen(function* () {
-      if (!source) {
+      if (!credentials) {
        return yield* ProviderShared.invalidRequest(
          `${options.name ?? "Bedrock Converse"} requires either route bearer auth or AWS credentials configured on the route`,
        )
      }
-      const credentials = Effect.isEffect(source) ? yield* source : source
      const headersForSigning = Headers.set(input.headers, "content-type", "application/json")
      const signed = yield* signRequest({
        url: input.url,
@@ -112,35 +74,4 @@ export const sigV4 = (
 /** Bedrock route auth defaults to SigV4 and expects credentials from route configuration. */
 export const auth = sigV4(undefined)

-export const resolveRegion = (input: {
-  readonly region?: string
-  readonly credentials?: { readonly region: string }
-}) =>
-  input.region ?? input.credentials?.region ?? process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? "us-east-1"
-
-export interface ResolveAuthInput {
-  readonly apiKey?: string
-  readonly credentials?: Credentials
-  readonly profile?: string
-}
-
-export interface ResolveAuthOptions {
-  readonly service?: string
-  readonly name?: string
-  /** `sigv4` ignores an ambient `AWS_BEARER_TOKEN_BEDROCK`; `bearer` is validated by the caller. */
-  readonly mode?: "bearer" | "sigv4"
-}
-
-/**
- * Bearer wins over SigV4 and explicit static credentials win over the default
- * chain, matching the AWS SDK's own precedence for `AWS_BEARER_TOKEN_BEDROCK`.
- * The region is applied to the SigV4 scope so it always matches the endpoint host.
- */
-export const resolveAuth = (input: ResolveAuthInput, region: string, options: ResolveAuthOptions = {}) => {
-  const apiKey = options.mode === "sigv4" ? undefined : (input.apiKey ?? process.env.AWS_BEARER_TOKEN_BEDROCK)
-  if (apiKey !== undefined) return Auth.bearer(apiKey)
-  if (input.credentials !== undefined) return sigV4({ ...input.credentials, region }, options)
-  return sigV4(defaultChain({ region, profile: input.profile }), options)
-}
-
 export * as BedrockAuth from "./bedrock-auth.js"
@@ -1,3 +1,4 @@
+import { Auth } from "../route/auth.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import type { ProviderPackage } from "../provider-package.js"
 import { OpenAIChat } from "../protocols/openai-chat.js"
@@ -9,15 +10,9 @@ import { withOpenAIOptions, type OpenAIProviderOptionsInput } from "./openai-opt
 export const id = ProviderID.make("amazon-bedrock")

 export type Config = RouteDefaultsInput & {
-  /** Bedrock API key. Falls back to `AWS_BEARER_TOKEN_BEDROCK`; bearer auth takes precedence over SigV4. */
  readonly apiKey?: string
-  /** `sigv4` ignores `apiKey` fallbacks from the environment; `bearer` requires a token. */
-  readonly auth?: "bearer" | "sigv4"
  readonly baseURL?: string
-  /** Static SigV4 credentials. When omitted the AWS default credential chain resolves them per request. */
  readonly credentials?: Credentials
-  /** Shared config profile for the default credential chain. */
-  readonly profile?: string
  readonly region?: string
  readonly providerOptions?: OpenAIProviderOptionsInput
 }
@@ -27,7 +22,6 @@ export interface Settings extends ProviderPackage.Settings {
  readonly auth?: "bearer" | "sigv4"
  readonly baseURL?: string
  readonly credentials?: Credentials
-  readonly profile?: string
  readonly region?: string
  readonly topP?: number
  readonly providerOptions?: OpenAIProviderOptionsInput
@@ -53,35 +47,23 @@ const chatRoute = OpenAIChat.route.with({
 export const routes = [responsesRoute, chatRoute]

 const configuredRoute = <Body, Prepared>(route: Route<Body, Prepared>, input: Config) => {
-  const region = BedrockAuth.resolveRegion(input)
+  const region = input.region ?? input.credentials?.region ?? "us-east-1"
+  const credentials = input.credentials === undefined ? undefined : { ...input.credentials, region }
  return route.with({
    endpoint: { baseURL: input.baseURL ?? `https://bedrock-mantle.${region}.api.aws/v1` },
-    auth: BedrockAuth.resolveAuth(input, region, {
-      service: "bedrock-mantle",
-      name: "Bedrock Mantle",
-      mode: input.auth,
-    }),
+    auth:
+      input.apiKey === undefined
+        ? BedrockAuth.sigV4(credentials, { service: "bedrock-mantle", name: "Bedrock Mantle" })
+        : Auth.bearer(input.apiKey),
  })
 }

 const defaults = (input: Config) => {
-  const {
-    apiKey: _,
-    auth: _auth,
-    baseURL: _baseURL,
-    credentials: _credentials,
-    profile: _profile,
-    region: _region,
-    ...rest
-  } = input
+  const { apiKey: _, baseURL: _baseURL, credentials: _credentials, region: _region, ...rest } = input
  return rest
 }

 export const configure = (input: Config = {}) => {
-  if (input.auth === "bearer" && input.apiKey === undefined && process.env.AWS_BEARER_TOKEN_BEDROCK === undefined)
-    throw new Error("Amazon Bedrock Mantle bearer auth requires apiKey")
-  if (input.auth === "sigv4" && input.apiKey !== undefined)
-    throw new Error("Amazon Bedrock Mantle SigV4 auth does not accept apiKey")
  const configuredResponsesRoute = configuredRoute(responsesRoute, input)
  const configuredChatRoute = configuredRoute(chatRoute, input)
  const modelDefaults = defaults(input)
@@ -105,26 +87,29 @@ export const configure = (input: Config = {}) => {

 export const provider = configure()

-const fromSettings = (settings: Settings) =>
-  configure({
-    apiKey: settings.apiKey,
-    auth: settings.auth,
+const config = (settings: Settings): Config => {
+  if (settings.auth === "bearer" && settings.apiKey === undefined)
+    throw new Error("Amazon Bedrock Mantle bearer auth requires apiKey")
+  if (settings.auth === "sigv4" && settings.apiKey !== undefined)
+    throw new Error("Amazon Bedrock Mantle SigV4 auth does not accept apiKey")
+  return {
+    apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey,
    baseURL: settings.baseURL,
    credentials: settings.credentials,
    generation: settings.topP === undefined ? undefined : { topP: settings.topP },
    headers: settings.headers === undefined ? undefined : { ...settings.headers },
    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    profile: settings.profile,
    providerOptions: settings.providerOptions,
    region: settings.region,
-  })
+  }
+}

 export const chatModel: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (
  modelID,
  settings,
-) => fromSettings(settings).chat(modelID)
+) => configure(config(settings)).chat(modelID)
 export const responsesModel: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (
  modelID,
  settings,
-) => fromSettings(settings).responses(modelID)
+) => configure(config(settings)).responses(modelID)
 export const model = responsesModel
@@ -1,23 +1,17 @@
 import type { RouteDefaultsInput } from "../route/client.js"
+import { Auth } from "../route/auth.js"
 import type { ProviderPackage } from "../provider-package.js"
 import { ProviderID, type ModelID } from "../schema/index.js"
 import * as BedrockConverse from "../protocols/bedrock-converse.js"
 import type { BedrockCredentials } from "../protocols/bedrock-converse.js"
-import { BedrockAuth } from "../protocols/utils/bedrock-auth.js"

 export const id = ProviderID.make("amazon-bedrock")

 export type Config = RouteDefaultsInput & {
-  /** Bedrock API key. Falls back to `AWS_BEARER_TOKEN_BEDROCK`; bearer auth takes precedence over SigV4. */
  readonly apiKey?: string
-  /** `sigv4` ignores `apiKey` fallbacks from the environment; `bearer` requires a token. */
-  readonly auth?: "bearer" | "sigv4"
  readonly headers?: Record<string, string>
-  /** Static SigV4 credentials. When omitted the AWS default credential chain resolves them per request. */
  readonly credentials?: BedrockCredentials
-  /** Shared config profile for the default credential chain. */
-  readonly profile?: string
-  /** AWS region. Falls back to `credentials.region`, `AWS_REGION`, `AWS_DEFAULT_REGION`, then `us-east-1`. */
+  /** AWS region. Defaults to `us-east-1` when neither this nor `credentials.region` is set. */
  readonly region?: string
  /** Override the computed `https://bedrock-runtime.<region>.amazonaws.com` URL. */
  readonly baseURL?: string
@@ -28,7 +22,6 @@ export interface Settings extends ProviderPackage.Settings {
  readonly auth?: "bearer" | "sigv4"
  readonly baseURL?: string
  readonly credentials?: BedrockCredentials
-  readonly profile?: string
  readonly region?: string
  readonly topP?: number
 }
@@ -37,17 +30,14 @@ export const routes = [BedrockConverse.route]
 const bedrockBaseURL = (region: string) => `https://bedrock-runtime.${region}.amazonaws.com`

 const configuredRoute = (input: Config) => {
-  const { apiKey, auth, credentials, profile, region, baseURL, ...rest } = input
-  if (auth === "bearer" && apiKey === undefined && process.env.AWS_BEARER_TOKEN_BEDROCK === undefined)
-    throw new Error("Amazon Bedrock bearer auth requires apiKey")
-  if (auth === "sigv4" && apiKey !== undefined) throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey")
-  const resolvedRegion = BedrockAuth.resolveRegion(input)
+  const { apiKey, credentials, region, baseURL, ...rest } = input
+  const resolvedRegion = region ?? credentials?.region ?? "us-east-1"
  return BedrockConverse.route.with({
    ...rest,
    provider: id,
    providerMetadataKey: "bedrock",
    endpoint: { baseURL: baseURL ?? bedrockBaseURL(resolvedRegion) },
-    auth: BedrockAuth.resolveAuth({ apiKey, credentials, profile }, resolvedRegion, { mode: auth }),
+    auth: apiKey === undefined ? BedrockConverse.sigV4Auth(credentials) : Auth.bearer(apiKey),
  })
 }

@@ -61,15 +51,18 @@ export const configure = (input: Config = {}) => {
 }

 export const provider = configure()
-export const model: ProviderPackage.Definition<Settings>["model"] = (modelID, settings) =>
-  configure({
-    apiKey: settings.apiKey,
-    auth: settings.auth,
+export const model: ProviderPackage.Definition<Settings>["model"] = (modelID, settings) => {
+  if (settings.auth === "bearer" && settings.apiKey === undefined)
+    throw new Error("Amazon Bedrock bearer auth requires apiKey")
+  if (settings.auth === "sigv4" && settings.apiKey !== undefined)
+    throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey")
+  return configure({
+    apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey,
    baseURL: settings.baseURL,
    credentials: settings.credentials,
    generation: settings.topP === undefined ? undefined : { topP: settings.topP },
    headers: settings.headers === undefined ? undefined : { ...settings.headers },
    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    profile: settings.profile,
    region: settings.region,
  }).model(modelID)
+}
@@ -1,30 +0,0 @@
-import { Effect } from "effect"
-
-/**
- * Run an effect with `process.env` overrides, restoring the previous values
- * afterwards. Use for code that reads `process.env` directly, such as AWS SDK
- * credential providers, where Effect `ConfigProvider` layers do not apply.
- * `undefined` removes a variable for the duration of the effect.
- */
-export const withProcessEnv =
-  (env: Record<string, string | undefined>) =>
-  <A, E, R>(effect: Effect.Effect<A, E, R>) =>
-    Effect.acquireUseRelease(
-      Effect.sync(() => {
-        const previous = Object.fromEntries(Object.keys(env).map((name) => [name, process.env[name]]))
-        apply(env)
-        return previous
-      }),
-      () => effect,
-      (previous) => Effect.sync(() => apply(previous)),
-    )
-
-const apply = (env: Record<string, string | undefined>) => {
-  for (const [name, value] of Object.entries(env)) {
-    if (value === undefined) {
-      delete process.env[name]
-      continue
-    }
-    process.env[name] = value
-  }
-}
@@ -2,11 +2,9 @@ import { EventStreamCodec } from "@smithy/eventstream-codec"
 import { fromUtf8, toUtf8 } from "@smithy/util-utf8"
 import { describe, expect } from "bun:test"
 import { Effect, Encoding, Ref, Stream } from "effect"
-import { HttpClientRequest } from "effect/unstable/http"
 import {
  CacheHint,
  GenerationOptions,
-  type LanguageModel,
  LLM,
  LLMEvent,
  LLMRequest,
@@ -20,8 +18,7 @@ import { compileRequest } from "../../src/route/client.js"
 import { AmazonBedrock } from "../../src/providers.js"
 import * as BedrockConverse from "../../src/protocols/bedrock-converse.js"
 import { it } from "../lib/effect.js"
-import { withProcessEnv } from "../lib/env.js"
-import { dynamicResponse, fixedResponse } from "../lib/http.js"
+import { fixedResponse } from "../lib/http.js"
 import {
  eventSummary,
  expectWeatherToolLoop,
@@ -98,41 +95,6 @@ const fixedByteChunks = (...chunks: ReadonlyArray<Uint8Array>) =>
    { headers: { "content-type": "application/vnd.amazon.eventstream" } },
  )

-// Clears every input the AWS default chain reads so tests do not pick up the
-// developer's profiles, SSO cache, or instance metadata.
-const noAmbientAWS = {
-  AWS_ACCESS_KEY_ID: undefined,
-  AWS_SECRET_ACCESS_KEY: undefined,
-  AWS_SESSION_TOKEN: undefined,
-  AWS_BEARER_TOKEN_BEDROCK: undefined,
-  AWS_PROFILE: undefined,
-  AWS_REGION: undefined,
-  AWS_DEFAULT_REGION: undefined,
-  AWS_WEB_IDENTITY_TOKEN_FILE: undefined,
-  AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: undefined,
-  AWS_CONTAINER_CREDENTIALS_FULL_URI: undefined,
-  AWS_EC2_METADATA_DISABLED: "true",
-}
-
-const captureHeaders = (target: LanguageModel) =>
-  Effect.gen(function* () {
-    const seen: Array<Headers> = []
-    yield* LLMClient.generate(LLMRequest.update(baseRequest, { model: target })).pipe(
-      Effect.provide(
-        dynamicResponse((input) =>
-          Effect.gen(function* () {
-            const request = yield* HttpClientRequest.toWeb(input.request)
-            seen.push(request.headers)
-            return input.respond(eventStreamBody(["messageStop", { stopReason: "end_turn" }]), {
-              headers: { "content-type": "application/vnd.amazon.eventstream" },
-            })
-          }),
-        ),
-      ),
-    )
-    return seen[0]!
-  })
-
 const model = AmazonBedrock.configure({
  baseURL: "https://bedrock-runtime.test",
  apiKey: "test-bearer",
@@ -1349,137 +1311,35 @@ describe("Bedrock Converse route", () => {
    }),
  )

-  it.effect("fails with an authentication error when the default chain cannot resolve credentials", () =>
+  it.effect("rejects requests with no auth path", () =>
    Effect.gen(function* () {
      const unsignedModel = AmazonBedrock.configure({
        baseURL: "https://bedrock-runtime.test",
-        profile: "opencode-test-missing-profile",
      }).model("anthropic.claude-3-5-sonnet-20240620-v1:0")
      const error = yield* LLMClient.generate(LLMRequest.update(baseRequest, { model: unsignedModel })).pipe(
        Effect.provide(fixedBytes(eventStreamBody(["messageStop", { stopReason: "end_turn" }]))),
        Effect.flip,
      )

-      expect(error.reason._tag).toBe("Authentication")
-      expect(error.message).toContain("AWS default credential chain failed")
-    }).pipe(withProcessEnv(noAmbientAWS)),
+      expect(error.message).toContain("Bedrock Converse requires either route bearer auth or AWS credentials")
+    }),
  )

-  it.effect("signs with static credentials using the configured region for the SigV4 scope", () =>
+  it.effect("signs requests with SigV4 when AWS credentials are provided (deterministic plumbing check)", () =>
    Effect.gen(function* () {
      const signed = AmazonBedrock.configure({
        baseURL: "https://bedrock-runtime.test",
-        region: "eu-west-1",
        credentials: {
          region: "us-east-1",
          accessKeyId: "AKIAIOSFODNN7EXAMPLE",
          secretAccessKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
        },
      }).model("anthropic.claude-3-5-sonnet-20240620-v1:0")
-      const headers = yield* captureHeaders(signed)
+      const prepared = yield* compileRequest(LLMRequest.update(baseRequest, { model: signed }))

-      expect(headers.get("authorization")).toContain("Credential=AKIAIOSFODNN7EXAMPLE/")
-      expect(headers.get("authorization")).toContain("/eu-west-1/bedrock/aws4_request")
-      expect(headers.get("x-amz-security-token")).toBeNull()
-    }).pipe(withProcessEnv(noAmbientAWS)),
-  )
-
-  it.effect("resolves SigV4 credentials through the AWS default chain on every request", () =>
-    Effect.gen(function* () {
-      const chained = AmazonBedrock.configure({ baseURL: "https://bedrock-runtime.test", region: "us-west-2" }).model(
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      )
-      const headers = yield* captureHeaders(chained)
-
-      expect(headers.get("authorization")).toContain("Credential=AKIACHAINEXAMPLE/")
-      expect(headers.get("authorization")).toContain("/us-west-2/bedrock/aws4_request")
-      expect(headers.get("x-amz-security-token")).toBe("chain-session-token")
-    }).pipe(
-      withProcessEnv({
-        ...noAmbientAWS,
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-        AWS_SESSION_TOKEN: "chain-session-token",
-      }),
-    ),
-  )
-
-  it.effect("re-resolves rotated chain credentials on the next request without rebuilding the model", () =>
-    Effect.gen(function* () {
-      const chained = AmazonBedrock.configure({ baseURL: "https://bedrock-runtime.test", region: "us-west-2" }).model(
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      )
-      const first = yield* captureHeaders(chained)
-      const second = yield* captureHeaders(chained).pipe(
-        withProcessEnv({ AWS_ACCESS_KEY_ID: "AKIAROTATEDEXAMPLE", AWS_SECRET_ACCESS_KEY: "rotated-secret" }),
-      )
-
-      expect(first.get("authorization")).toContain("Credential=AKIACHAINEXAMPLE/")
-      expect(second.get("authorization")).toContain("Credential=AKIAROTATEDEXAMPLE/")
-    }).pipe(
-      withProcessEnv({
-        ...noAmbientAWS,
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-      }),
-    ),
-  )
-
-  it.effect("prefers AWS_BEARER_TOKEN_BEDROCK over the credential chain", () =>
-    Effect.gen(function* () {
-      const bearer = AmazonBedrock.configure({ baseURL: "https://bedrock-runtime.test" }).model(
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      )
-      const headers = yield* captureHeaders(bearer)
-
-      expect(headers.get("authorization")).toBe("Bearer env-bearer-token")
-    }).pipe(
-      withProcessEnv({
-        ...noAmbientAWS,
-        AWS_BEARER_TOKEN_BEDROCK: "env-bearer-token",
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-      }),
-    ),
-  )
-
-  it.effect("auth: sigv4 ignores an ambient bearer token from configure and settings", () =>
-    Effect.gen(function* () {
-      const configured = AmazonBedrock.configure({ auth: "sigv4", baseURL: "https://bedrock-runtime.test" }).model(
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      )
-      const fromSettings = AmazonBedrock.model("anthropic.claude-3-5-sonnet-20240620-v1:0", {
-        auth: "sigv4",
-        baseURL: "https://bedrock-runtime.test",
-      })
-
-      for (const target of [configured, fromSettings]) {
-        const headers = yield* captureHeaders(target)
-        expect(headers.get("authorization")).toContain("Credential=AKIACHAINEXAMPLE/")
-        expect(headers.get("authorization")).toContain("/ap-southeast-2/bedrock/aws4_request")
-      }
-      expect(() => AmazonBedrock.configure({ auth: "sigv4", apiKey: "k" })).toThrow("does not accept apiKey")
-    }).pipe(
-      withProcessEnv({
-        ...noAmbientAWS,
-        AWS_BEARER_TOKEN_BEDROCK: "env-bearer-token",
-        AWS_REGION: "ap-southeast-2",
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-      }),
-    ),
-  )
-
-  it.effect("derives the endpoint region from AWS_REGION then AWS_DEFAULT_REGION", () =>
-    Effect.gen(function* () {
-      const fromRegion = AmazonBedrock.configure({ apiKey: "k" }).model("anthropic.claude-3-5-sonnet-20240620-v1:0")
-      expect(fromRegion.route.endpoint.baseURL).toBe("https://bedrock-runtime.eu-central-1.amazonaws.com")
-
-      const fromDefault = yield* Effect.sync(() =>
-        AmazonBedrock.configure({ apiKey: "k" }).model("anthropic.claude-3-5-sonnet-20240620-v1:0"),
-      ).pipe(withProcessEnv({ AWS_REGION: undefined }))
-      expect(fromDefault.route.endpoint.baseURL).toBe("https://bedrock-runtime.us-gov-west-1.amazonaws.com")
-    }).pipe(withProcessEnv({ ...noAmbientAWS, AWS_REGION: "eu-central-1", AWS_DEFAULT_REGION: "us-gov-west-1" })),
+      expect(prepared.route).toBe("bedrock-converse")
+      expect(prepared.model).toBe(signed)
+    }),
  )

  it.effect("emits cachePoint markers after system, user-text, and assistant-text with cache hints", () =>
@@ -7,7 +7,6 @@ import { model } from "../../src/providers/amazon-bedrock/mantle.js"
 import { OpenAIResponses } from "../../src/protocols/openai-responses.js"
 import { compileRequest, LLMClient } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
-import { withProcessEnv } from "../lib/env.js"
 import { dynamicResponse, fixedResponse } from "../lib/http.js"
 import { sseEvents } from "../lib/sse.js"
 import { recordedTests } from "../recorded-test.js"
@@ -83,36 +82,6 @@ describe("Amazon Bedrock Mantle provider", () => {
    }),
  )

-  it.effect("signs with the Mantle service using default-chain credentials", () =>
-    Effect.gen(function* () {
-      const seen: Array<string | undefined> = []
-      const model = AmazonBedrockMantle.configure({ region: "us-west-1" }).responses("openai.gpt-oss-120b")
-      yield* LLMClient.generate(LLM.request({ model, prompt: "Hi" })).pipe(
-        Effect.provide(
-          dynamicResponse((input) =>
-            Effect.gen(function* () {
-              const request = yield* HttpClientRequest.toWeb(input.request)
-              seen.push(request.headers.get("authorization") ?? undefined)
-              return input.respond("", { headers: { "content-type": "text/event-stream" } })
-            }),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(seen[0]).toContain("Credential=AKIACHAINEXAMPLE/")
-      expect(seen[0]).toContain("/us-west-1/bedrock-mantle/aws4_request")
-    }).pipe(
-      withProcessEnv({
-        AWS_BEARER_TOKEN_BEDROCK: undefined,
-        AWS_PROFILE: undefined,
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-        AWS_SESSION_TOKEN: undefined,
-      }),
-    ),
-  )
-
  it.effect("supports bearer authentication and custom base URLs", () =>
    Effect.gen(function* () {
      const seen: Array<{ readonly url: string; readonly authorization: string | undefined }> = []
@@ -1,139 +1,16 @@
 import { expect, story } from "../../storybook/playwright/story"

-for (const direction of ["ltr", "rtl"]) {
-  for (const alternate of ["none", "queue", "steer"]) {
-    story(`scrolls overflowing controls beside fixed ${alternate} actions in ${direction}`, async ({ mount, page }) => {
-      const component = await mount("opencode-composer-flow--toolbar-overflow", {
-        args: { alternate },
-        globals: { direction },
-      })
-      const controls = component.locator('[data-slot="composer-controls"]')
-      const actions = component.locator('[data-slot="composer-actions"]')
-      const submit = component.locator('[data-action="composer-submit"]')
-      const add = component.locator('[data-action="composer-attach"]')
-      const agent = controls.getByRole("button", { name: "Choose agent" })
-      const variant = controls.getByRole("button", { name: "Choose model variant" })
-      await expect(controls).toHaveCSS("overflow-x", "auto")
-      await expect(controls).toHaveCSS("overscroll-behavior-x", "contain")
-      await expect(controls).toHaveCSS("direction", direction)
-      await expect(controls).toHaveCSS("padding-inline-start", "0px")
-      await expect(controls).toHaveCSS("padding-inline-end", "0px")
-      await expect(component.locator('[data-action="composer-alternate-delivery"]')).toHaveCount(
-        alternate === "none" ? 0 : 1,
-      )
+story("raises the docked composer only in dark mode", async ({ mount, page }) => {
+  const component = await mount("opencode-composer-flow--empty-draft")
+  const composer = component.locator('[data-component="composer"]')

-      for (const width of [1024, 360]) {
-        await page.setViewportSize({ width, height: 720 })
-        await expect
-          .poll(() => controls.evaluate((element) => element.scrollWidth - element.clientWidth))
-          .toBeGreaterThan(0)
-        const fixed = await submit.boundingBox()
-        const fixedAdd = await add.boundingBox()
-        const viewport = await controls.boundingBox()
-        const action = await actions.boundingBox()
-        expect(fixed).not.toBeNull()
-        expect(viewport).not.toBeNull()
-        expect(action).not.toBeNull()
-        expect(fixedAdd).not.toBeNull()
-        if (!fixed || !viewport || !action || !fixedAdd) return
-        expect(direction === "ltr" ? fixedAdd.x + fixedAdd.width : viewport.x + viewport.width).toBeCloseTo(
-          direction === "ltr" ? viewport.x - 4 : fixedAdd.x - 4,
-          1,
-        )
-        expect(direction === "ltr" ? viewport.x + viewport.width : action.x + action.width).toBeCloseTo(
-          direction === "ltr" ? action.x - 12 : viewport.x - 12,
-          1,
-        )
+  await page.locator("html").evaluate((root) => root.setAttribute("data-color-scheme", "light"))
+  await expect(composer).toHaveCSS("background-color", "rgb(255, 255, 255)")

-        await controls.evaluate((element) => {
-          element.scrollLeft = 0
-        })
-        await expect(controls).toHaveAttribute("data-overflow-start", "false")
-        await expect(controls).toHaveAttribute("data-overflow-end", "true")
-        await expect(controls).toHaveCSS(
-          "mask-image",
-          `linear-gradient(to ${direction === "ltr" ? "right" : "left"}, rgba(0, 0, 0, 0), rgb(0, 0, 0) 0px, rgb(0, 0, 0) calc(100% - 16px), rgba(0, 0, 0, 0))`,
-        )
-        const first = await agent.boundingBox()
-        if (!first) throw new Error("Missing agent control")
-        expect(
-          direction === "ltr" ? first.x - viewport.x : viewport.x + viewport.width - first.x - first.width,
-        ).toBeCloseTo(0, 0)
-        await controls.evaluate((element) => {
-          element.scrollLeft =
-            ((getComputedStyle(element).direction === "rtl" ? -1 : 1) * (element.scrollWidth - element.clientWidth)) / 2
-        })
-        await expect(controls).toHaveAttribute("data-overflow-start", "true")
-        await expect(controls).toHaveAttribute("data-overflow-end", "true")
-        const scrolled = (await controls.boundingBox())!
-        expect(scrolled.x).toBeCloseTo(viewport.x, 1)
-        expect(scrolled.width).toBeCloseTo(viewport.width, 1)
-        await controls.hover()
-        await page.mouse.wheel(direction === "ltr" ? 1000 : -1000, 0)
-        await expect.poll(() => controls.evaluate((element) => Math.abs(element.scrollLeft))).toBeGreaterThan(0)
-        expect(await submit.boundingBox()).toEqual(fixed)
-        expect(await add.boundingBox()).toEqual(fixedAdd)
-
-        // The fade disappears at the endpoint instead of reserving padding.
-        await variant.focus()
-        await controls.evaluate((element) => {
-          element.scrollLeft =
-            getComputedStyle(element).direction === "rtl" ? -element.scrollWidth : element.scrollWidth
-        })
-        await expect(controls).toHaveAttribute("data-overflow-start", "true")
-        await expect(controls).toHaveAttribute("data-overflow-end", "false")
-        const last = await variant.boundingBox()
-        if (!last) throw new Error("Missing variant control")
-        expect(
-          Math.abs(direction === "ltr" ? viewport.x + viewport.width - last.x - last.width : last.x - viewport.x),
-        ).toBeLessThan(1)
-        expect(
-          Math.abs((direction === "ltr" ? action.x - last.x - last.width : last.x - action.x - action.width) - 12),
-        ).toBeLessThan(1)
-        await page.keyboard.press("Enter")
-        await expect(page.getByRole("menuitemradio", { name: "high", exact: true })).toBeVisible()
-        await page.keyboard.press("Escape")
-        await expect(variant).toBeFocused()
-        await expect(submit).toBeInViewport()
-        await expect(add).toBeInViewport()
-        await add.click()
-        await expect(page.getByRole("menuitem", { name: "Images and files" })).toBeVisible()
-        await page.keyboard.press("Escape")
-        expect(await add.boundingBox()).toEqual(fixedAdd)
-      }
-
-      if (alternate !== "none") {
-        const width = (await controls.boundingBox())!.width
-        await component.getByRole("textbox", { name: "Prompt", exact: true }).fill("")
-        await expect(component.locator('[data-action="composer-alternate-delivery"]')).toHaveCount(0)
-        await expect.poll(async () => (await controls.boundingBox())!.width).toBeGreaterThan(width)
-      }
-    })
-  }
-}
-
-story("does not mask or pad controls when they fit", async ({ mount }) => {
-  const component = await mount("opencode-composer-flow--model-and-variant")
-  const controls = component.locator('[data-slot="composer-controls"]')
-  await expect(controls).toHaveAttribute("data-overflow-start", "false")
-  await expect(controls).toHaveAttribute("data-overflow-end", "false")
-  await expect(controls).toHaveCSS("mask-image", "none")
-  await expect(controls).toHaveCSS("padding-inline-start", "0px")
-  await expect(controls).toHaveCSS("padding-inline-end", "0px")
+  await page.locator("html").evaluate((root) => root.setAttribute("data-color-scheme", "dark"))
+  await expect(composer).toHaveCSS("background-color", "rgb(36, 36, 36)")
 })

-// ThemeProvider writes resolved token values into a <style> block, so toggling data-color-scheme by hand
-// leaves every --v2-* variable at its previous value. Switch themes through the Storybook global instead.
-for (const [theme, background] of [
-  ["light", "rgb(255, 255, 255)"],
-  ["dark", "rgb(36, 36, 36)"],
-] as const) {
-  story(`raises the docked composer only in dark mode (${theme})`, async ({ mount }) => {
-    const component = await mount("opencode-composer-flow--empty-draft", { globals: { theme } })
-    await expect(component.locator('[data-component="composer"]')).toHaveCSS("background-color", background)
-  })
-}
-
 story("centers add menu shortcuts in a consistent column", async ({ mount, page }) => {
  const component = await mount("opencode-composer-flow--empty-draft")
  await component.locator('[data-action="composer-attach"]').click()
@@ -1,86 +0,0 @@
-import { expect, story } from "../../storybook/playwright/story"
-
-for (const theme of ["light", "dark"]) {
-  for (const direction of ["ltr", "rtl"]) {
-    story(`shimmers once over the visible wordmark (${theme}, ${direction})`, async ({ mount, page }, testInfo) => {
-      await page.emulateMedia({ reducedMotion: "no-preference" })
-      const component = await mount("app-new-session-wordmark--reveal", { globals: { theme, direction } })
-      const logo = component.locator('[data-component="new-session-wordmark"]')
-      const reveal = logo.locator('[data-slot="wordmark-reveal"]')
-      const shimmer = logo.locator(".wordmark-shimmer")
-      const base = logo.locator("svg").first()
-      await expect(base).toHaveCSS("opacity", theme === "dark" ? "0.5" : "0.6")
-      await expect(shimmer).toHaveCSS("animation-iteration-count", "1")
-      await expect(logo.locator("g[mask]")).toHaveCount(0)
-      await expect(shimmer).toHaveCSS("color", "rgb(255, 255, 255)")
-      await expect(shimmer).toHaveCSS("mix-blend-mode", "screen")
-      await expect(base.locator("g[fill]")).toHaveAttribute("fill", "currentColor")
-
-      await logo.evaluate((element) => {
-        element.getAnimations({ subtree: true }).forEach((animation) => {
-          animation.pause()
-          animation.currentTime = 0
-        })
-      })
-      await expect(reveal).toHaveCSS("opacity", "1")
-      await expect(reveal).toHaveCSS("animation-name", "none")
-      await expect(shimmer).toHaveCSS("mask-position", "100% 0px")
-
-      await logo.evaluate((element) => {
-        element.getAnimations({ subtree: true }).forEach((animation) => (animation.currentTime = 400))
-      })
-      await expect(shimmer).toHaveCSS("mask-position", "50% 0px")
-      await expect(shimmer).toHaveCSS("opacity", theme === "dark" ? "0.0672" : "0.45")
-      const swept = await logo.screenshot({ path: testInfo.outputPath("wordmark-shimmer.png") })
-
-      await logo.evaluate((element) => {
-        element.getAnimations({ subtree: true }).forEach((animation) => animation.finish())
-      })
-      await expect(reveal).toHaveCSS("opacity", "1")
-      await expect(shimmer).toHaveCSS("opacity", "0")
-      await expect(shimmer).toHaveCSS("mask-position", "0% 0px")
-      const settled = await logo.screenshot({ path: testInfo.outputPath("wordmark-settled.png") })
-      const brightness = await page.evaluate(
-        async (screenshots) => {
-          const pixels = await Promise.all(
-            screenshots.map(async (screenshot) => {
-              const image = new Image()
-              image.src = `data:image/png;base64,${screenshot}`
-              await image.decode()
-              const canvas = new OffscreenCanvas(image.width, image.height)
-              const context = canvas.getContext("2d")
-              if (!context) throw new Error("Cannot read screenshot pixels")
-              context.drawImage(image, 0, 0)
-              return context.getImageData(0, 0, image.width, image.height).data
-            }),
-          )
-          return {
-            min: pixels[0].reduce(
-              (min, value, index) => (index % 4 === 3 ? min : Math.min(min, value - pixels[1][index])),
-              0,
-            ),
-            max: pixels[0].reduce(
-              (max, value, index) => (index % 4 === 3 ? max : Math.max(max, value - pixels[1][index])),
-              0,
-            ),
-          }
-        },
-        [swept.toString("base64"), settled.toString("base64")],
-      )
-      expect(brightness.min).toBeGreaterThanOrEqual(0)
-      expect(brightness.max).toBeGreaterThanOrEqual(5)
-    })
-  }
-
-  story(`shows a static wordmark with reduced motion (${theme})`, async ({ mount, page }) => {
-    await page.emulateMedia({ reducedMotion: "reduce" })
-    await page.setViewportSize({ width: 360, height: 640 })
-    const component = await mount("app-new-session-wordmark--reveal", { globals: { theme } })
-    const logo = component.locator('[data-component="new-session-wordmark"]')
-    await expect(logo.locator("svg").first()).toHaveCSS("opacity", theme === "dark" ? "0.5" : "0.6")
-    await expect(logo.locator('[data-slot="wordmark-reveal"]')).toHaveCSS("opacity", "1")
-    await expect(logo.locator(".wordmark-shimmer")).toHaveCSS("opacity", "0")
-    expect(await logo.evaluate((element) => element.getAnimations({ subtree: true }).length)).toBe(0)
-    expect(await logo.evaluate((element) => element.getBoundingClientRect().right <= innerWidth)).toBe(true)
-  })
-}
@@ -1,79 +0,0 @@
-import { expect, story } from "../../storybook/playwright/story"
-
-story("enables Any only after confirmation and supports resetting the preview", async ({ mount }) => {
-  const component = await mount("app-current-session-surface--web-search-request")
-  const card = component.getByRole("region", { name: "Third-party web search" })
-  await expect(card.getByRole("button", { name: "Enable", exact: true })).toBeEnabled()
-  await expect(card.getByRole("button", { name: "Search provider Any", exact: true })).toBeVisible()
-  await card.getByRole("button", { name: "Enable", exact: true }).click()
-  await expect(component.getByRole("status")).toHaveText("Web search selection (local only): random")
-  await expect(card).toHaveCount(0)
-  await component.getByRole("button", { name: "Reset", exact: true }).click()
-  await expect(card.getByRole("button", { name: "Enable", exact: true })).toBeEnabled()
-})
-
-story("declining search is an explicit disabled selection", async ({ mount }) => {
-  const component = await mount("app-current-session-surface--web-search-request")
-  const card = component.getByRole("region", { name: "Third-party web search" })
-  await card.getByRole("button", { name: "Don’t use search", exact: true }).click()
-  await expect(component.getByRole("status")).toHaveText("Web search selection (local only): false")
-  await expect(card).toHaveCount(0)
-})
-
-story("sizes provider options to their content", async ({ mount, page }) => {
-  const component = await mount("app-current-session-surface--web-search-request")
-  await component.getByRole("button", { name: "Search provider Any", exact: true }).click()
-  const menu = page.getByRole("listbox", { name: "Search provider", exact: true })
-  await expect(menu).toBeVisible()
-  const metrics = await menu.evaluate((listbox) => {
-    const items = Array.from(listbox.querySelectorAll('[data-component="menu-v2-item"]'))
-    const longest = items
-      .flatMap((item) => {
-        const label = item.querySelector('[data-slot="menu-v2-item-content"]')?.getBoundingClientRect()
-        const check = item.querySelector('[data-slot="menu-v2-item-indicator"]')?.getBoundingClientRect()
-        return label && check ? [{ label, check }] : []
-      })
-      .toSorted((a, b) => b.label.width - a.label.width)[0]
-    return {
-      width: listbox.getBoundingClientRect().width,
-      gap: longest ? longest.check.left - longest.label.right : 0,
-    }
-  })
-  expect(metrics.width).toBeLessThan(160)
-  expect(metrics.gap).toBe(24)
-})
-
-for (const width of [360, 1200]) {
-  for (const direction of ["ltr", "rtl"]) {
-    for (const theme of ["light", "dark"]) {
-      story(`selects and confirms a provider at ${width}px in ${direction} ${theme}`, async ({ mount, page }) => {
-        await page.setViewportSize({ width, height: 900 })
-        const component = await mount("app-current-session-surface--web-search-request", {
-          globals: { theme, direction },
-        })
-        const card = component.getByRole("region", { name: "Third-party web search" })
-        const select = card.getByRole("button", { name: /^Search provider/ })
-        await expect(select).toBeEnabled()
-        await expect(card).toHaveCSS("direction", direction)
-        expect(await card.evaluate((node) => node.scrollWidth <= node.clientWidth)).toBe(true)
-        await select.focus()
-        await select.press("Enter")
-        const list = page.getByRole("listbox", { name: "Search provider", exact: true })
-        await expect(list).toHaveCSS("direction", direction)
-        await list.getByRole("option", { name: "Parallel", exact: true }).click()
-        await expect(select).toHaveText("Parallel")
-        await expect(card).toBeVisible()
-        await expect(component.getByRole("status")).toHaveText("Ready")
-        await expect(select).toBeFocused()
-        await select.press("Tab")
-        await expect(card.getByRole("button", { name: "Don’t use search", exact: true })).toBeFocused()
-        await page.keyboard.press("Tab")
-        const enable = card.getByRole("button", { name: "Enable", exact: true })
-        await expect(enable).toBeFocused()
-        await enable.press("Enter")
-        await expect(component.getByRole("status")).toHaveText("Web search selection (local only): parallel")
-        await expect(card).toHaveCount(0)
-      })
-    }
-  }
-}
@@ -43,7 +43,6 @@ The suite contains:
 - home-session click timing split between content and titlebar-tab paint
 - single-session tab close timing through stable home restoration
 - cached session repaint and mutation tracing
- large-session search scan, first-result reveal, and highlight stabilization
 - streaming timeline throughput, RAF-gap, long-task, geometry, and remount diagnostics
 - retained renderer heap with a large model catalog across repeated session navigation

@@ -1,69 +0,0 @@
-import { benchmark, expect } from "../benchmark"
-import { buildInitialStreamEvent, setupTimelineBenchmark, textPartID } from "./session-timeline-benchmark.fixture"
-import {
-  collectTimelineSearchMetrics,
-  installTimelineSearchProbe,
-  waitForStableTimelineSearch,
-} from "./session-timeline-search-probe"
-
-benchmark("searches a large virtualized session and reveals the first result", async ({ page, report }) => {
-  benchmark.setTimeout(180_000)
-  const historyTurns = Number(process.env.TIMELINE_SEARCH_HISTORY_TURNS ?? 320)
-  const completionTimeout = Number(process.env.TIMELINE_SEARCH_COMPLETION_TIMEOUT_MS ?? 60_000)
-  const query = "Historical prompt"
-  const targetPartID = "msg_0000_0000_a_user:text:0"
-  const expectedCounter = `1/${historyTurns}`
-  const fixture = await setupTimelineBenchmark(page, {
-    historyTurns,
-    eventBatch: 1,
-  })
-
-  fixture.transport.enqueue(buildInitialStreamEvent(1))
-  await expect(fixture.text).toContainText("Implementation plan")
-  await fixture.scrollToBottom()
-  await fixture.waitForStableGeometry()
-  // Chromium reserves the physical shortcut for its native find overlay, so request the same controller path directly.
-  await page.evaluate(() => document.dispatchEvent(new Event("opencode:timeline-search-open")))
-
-  const search = page.locator('[data-component="timeline-search-bar"]')
-  const field = search.getByRole("searchbox", { name: "Find..." })
-  const count = search.locator('[data-slot="timeline-search-count"]')
-  const target = page.locator(`[data-timeline-part-id="${targetPartID}"]`)
-  await expect(field).toBeVisible()
-  await expect(field).toBeFocused()
-  await installTimelineSearchProbe(page, { targetPartID })
-
-  await field.fill(query)
-  await expect(count).toHaveText(expectedCounter)
-  await expect(target).toBeVisible({ timeout: completionTimeout })
-  await waitForStableTimelineSearch(page, { counter: expectedCounter, targetPartID, timeout: completionTimeout })
-  const metrics = await collectTimelineSearchMetrics(page, { counter: expectedCounter, targetPartID })
-
-  expect(metrics.summary.handlerDurationMs).toBeDefined()
-  expect(metrics.summary.firstCountObservedMs).toBeDefined()
-  expect(metrics.summary.firstTargetVisibleMs).toBeDefined()
-  expect(metrics.summary.firstActiveHighlightObservedMs).toBeDefined()
-  expect(metrics.summary.stableResultObservedMs).toBeDefined()
-  expect(metrics.summary.activeHighlightRanges).toBe(1)
-  report(metrics, { historyTurns, query, expectedMatches: historyTurns })
-
-  // Check navigation and the V2 assistant content IDs outside the measured interval.
-  await field.press("Enter")
-  await expect(count).toHaveText(`2/${historyTurns}`)
-  await field.press("Shift+Enter")
-  await expect(count).toHaveText(expectedCounter)
-  await field.fill("Implementation plan")
-  await expect(count).toHaveText("1/1")
-  await expect(fixture.text).toBeInViewport()
-  await expect
-    .poll(() =>
-      page.evaluate(() => {
-        const range = [...(CSS.highlights.get("timeline-search-hit-active") ?? [])][0]
-        return range?.startContainer.parentElement?.closest<HTMLElement>("[data-timeline-part-id]")?.dataset
-          .timelinePartId
-      }),
-    )
-    .toBe(textPartID)
-  await field.press("Escape")
-  await expect(search).toBeHidden()
-})
@@ -1,176 +0,0 @@
-import type { Page } from "@playwright/test"
-
-export type TimelineSearchSample = {
-  observedAtMs: number
-  counter: string
-  targetMounted: boolean
-  targetVisible: boolean
-  targetTopPx?: number
-  activeRanges: number
-  activePartID?: string
-  activeVisible: boolean
-  scrollTopPx: number
-}
-
-type TimelineSearchProbe = {
-  samples: TimelineSearchSample[]
-  handlerDurationMs?: number
-  initialScrollTopPx: number
-  stop: () => void
-}
-
-export async function installTimelineSearchProbe(page: Page, input: { targetPartID: string }) {
-  await page.evaluate(({ targetPartID }) => {
-    const search = document.querySelector<HTMLElement>('[data-component="timeline-search-bar"]')
-    const field = search?.querySelector<HTMLInputElement>('[data-slot="text-input-v2-input"]')
-    const root = [...document.querySelectorAll<HTMLElement>(".scroll-view__viewport")].find((element) =>
-      element.querySelector("[data-timeline-row]"),
-    )
-    if (!search || !field || !root) throw new Error("missing timeline search benchmark nodes")
-
-    const samples: TimelineSearchSample[] = []
-    const initialScrollTopPx = root.scrollTop
-    let startedAt: number | undefined
-    let handlerDurationMs: number | undefined
-    let frame: number | undefined
-    let running = true
-
-    const visibleInRoot = (rect: DOMRect) => {
-      const viewport = root.getBoundingClientRect()
-      return rect.width > 0 && rect.height > 0 && rect.bottom > viewport.top && rect.top < viewport.bottom
-    }
-    const sample = () => {
-      if (!running || startedAt === undefined) return
-      frame = requestAnimationFrame(() => {
-        frame = undefined
-        setTimeout(() => {
-          if (!running || startedAt === undefined) return
-          const target = root.querySelector<HTMLElement>(`[data-timeline-part-id="${targetPartID}"]`)
-          const targetRect = target?.getBoundingClientRect()
-          const highlight = CSS.highlights.get("timeline-search-hit-active")
-          const ranges = highlight ? [...highlight] : []
-          const active = ranges.find((range): range is Range => range instanceof Range)
-          const activeRect = active?.getBoundingClientRect()
-          const activeElement =
-            active?.startContainer instanceof Element ? active.startContainer : active?.startContainer.parentElement
-
-          samples.push({
-            observedAtMs: performance.now() - startedAt,
-            counter:
-              search.querySelector<HTMLElement>('[data-slot="timeline-search-count"]')?.textContent?.trim() ?? "",
-            targetMounted: !!target,
-            targetVisible: !!targetRect && visibleInRoot(targetRect),
-            targetTopPx: targetRect?.top,
-            activeRanges: ranges.length,
-            activePartID: activeElement?.closest<HTMLElement>("[data-timeline-part-id]")?.dataset.timelinePartId,
-            activeVisible: !!activeRect && visibleInRoot(activeRect),
-            scrollTopPx: root.scrollTop,
-          })
-          sample()
-        }, 0)
-      })
-    }
-    const onInputCapture = (event: Event) => {
-      if (event.target !== field || startedAt !== undefined) return
-      startedAt = performance.now()
-      sample()
-    }
-    const onInput = (event: Event) => {
-      if (event.target !== field || startedAt === undefined || handlerDurationMs !== undefined) return
-      handlerDurationMs = performance.now() - startedAt
-    }
-    document.addEventListener("input", onInputCapture, { capture: true })
-    document.addEventListener("input", onInput)
-    ;(window as Window & { __timelineSearchBenchmark?: TimelineSearchProbe }).__timelineSearchBenchmark = {
-      samples,
-      initialScrollTopPx,
-      get handlerDurationMs() {
-        return handlerDurationMs
-      },
-      stop: () => {
-        running = false
-        document.removeEventListener("input", onInputCapture, { capture: true })
-        document.removeEventListener("input", onInput)
-        if (frame !== undefined) cancelAnimationFrame(frame)
-      },
-    }
-  }, input)
-}
-
-export async function waitForStableTimelineSearch(
-  page: Page,
-  input: { counter: string; targetPartID: string; timeout: number },
-) {
-  await page.waitForFunction(
-    ({ counter, targetPartID }) => {
-      const samples = (window as Window & { __timelineSearchBenchmark?: TimelineSearchProbe }).__timelineSearchBenchmark
-        ?.samples
-      if (!samples) return false
-      return samples.some((_, index) => {
-        const stable = samples.slice(index, index + 3)
-        if (stable.length !== 3) return false
-        return stable.every(
-          (sample, sampleIndex) =>
-            sample.counter === counter &&
-            sample.targetVisible &&
-            sample.activeRanges === 1 &&
-            sample.activePartID === targetPartID &&
-            sample.activeVisible &&
-            (sampleIndex === 0 ||
-              (Math.abs(sample.scrollTopPx - stable[sampleIndex - 1]!.scrollTopPx) <= 1 &&
-                Math.abs((sample.targetTopPx ?? Infinity) - (stable[sampleIndex - 1]!.targetTopPx ?? -Infinity)) <= 1)),
-        )
-      })
-    },
-    { counter: input.counter, targetPartID: input.targetPartID },
-    { timeout: input.timeout },
-  )
-}
-
-export async function collectTimelineSearchMetrics(page: Page, input: { counter: string; targetPartID: string }) {
-  const result = await page.evaluate(() => {
-    const probe = (window as Window & { __timelineSearchBenchmark?: TimelineSearchProbe }).__timelineSearchBenchmark
-    if (!probe) throw new Error("missing timeline search benchmark probe")
-    probe.stop()
-    return {
-      samples: probe.samples,
-      handlerDurationMs: probe.handlerDurationMs,
-      initialScrollTopPx: probe.initialScrollTopPx,
-    }
-  })
-  const first = (predicate: (sample: TimelineSearchSample) => boolean) => result.samples.find(predicate)?.observedAtMs
-  const stable = result.samples.findIndex((_, index) => {
-    const samples = result.samples.slice(index, index + 3)
-    if (samples.length !== 3) return false
-    return samples.every(
-      (sample, sampleIndex) =>
-        sample.counter === input.counter &&
-        sample.targetVisible &&
-        sample.activeRanges === 1 &&
-        sample.activePartID === input.targetPartID &&
-        sample.activeVisible &&
-        (sampleIndex === 0 ||
-          (Math.abs(sample.scrollTopPx - samples[sampleIndex - 1]!.scrollTopPx) <= 1 &&
-            Math.abs((sample.targetTopPx ?? Infinity) - (samples[sampleIndex - 1]!.targetTopPx ?? -Infinity)) <= 1)),
-    )
-  })
-  const final = result.samples.at(-1)
-
-  return {
-    summary: {
-      handlerDurationMs: result.handlerDurationMs,
-      firstCountObservedMs: first((sample) => sample.counter === input.counter),
-      firstTargetMountedMs: first((sample) => sample.targetMounted),
-      firstTargetVisibleMs: first((sample) => sample.targetVisible),
-      firstActiveHighlightObservedMs: first(
-        (sample) => sample.activeRanges === 1 && sample.activePartID === input.targetPartID && sample.activeVisible,
-      ),
-      stableResultObservedMs: stable >= 0 ? result.samples[stable + 2]?.observedAtMs : undefined,
-      initialScrollTopPx: result.initialScrollTopPx,
-      finalScrollTopPx: final?.scrollTopPx,
-      scrollDistancePx: final === undefined ? undefined : Math.abs(result.initialScrollTopPx - final.scrollTopPx),
-      activeHighlightRanges: final?.activeRanges,
-    },
-    samples: result.samples,
-  }
-}
@@ -7,13 +7,11 @@ const directory = "C:/OpenCode/OpenFileExpand"
 const projectID = "proj_open_file_expand"
 const sessionID = "ses_open_file_expand"
 const title = "Open file expand"
-const longFilename = "a-very-long-file-name-that-must-overflow-the-file-sidebar-instead-of-being-truncated.ts"
-const longPath = `frontend/${longFilename}`
 const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`

 test.use({ viewport: { width: 1440, height: 900 } })

-test("expands Windows paths and horizontally scrolls long filenames", async ({ page }) => {
+test("expands a folder whose path has a trailing Windows separator", async ({ page }) => {
  await mockOpenCodeServer(page, {
    directory,
    project: {
@@ -46,17 +44,7 @@ test("expands Windows paths and horizontally scrolls long filenames", async ({ p
        time: { created: 1700000000000, updated: 1700000000000 },
      },
    ],
-    vcsDiff: [
-      {
-        file: longPath,
-        before: "",
-        after: "export const added = true\n",
-        additions: 1,
-        deletions: 0,
-        status: "added",
-        patch: "@@ -0,0 +1 @@\n+export const added = true\n",
-      },
-    ],
+    vcsDiff: [],
    fileList: (path) => {
      if (path === "frontend\\" || path === "frontend") {
        return [
@@ -67,13 +55,6 @@ test("expands Windows paths and horizontally scrolls long filenames", async ({ p
            type: "file" as const,
            ignored: false,
          },
-          {
-            name: longFilename,
-            path: `frontend\\${longFilename}`,
-            absolute: `${directory}/${longPath}`,
-            type: "file" as const,
-            ignored: false,
-          },
        ]
      }
      if (path) return []
@@ -94,7 +75,6 @@ test("expands Windows paths and horizontally scrolls long filenames", async ({ p
        },
      ]
    },
-    findFiles: ({ query }) => (longPath.includes(query) ? [longPath] : []),
    fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
    pageMessages: () => ({ items: [] }),
  })
@@ -139,93 +119,6 @@ test("expands Windows paths and horizontally scrolls long filenames", async ({ p
  await frontendRow.click()
  await expect(frontendRow).toHaveAttribute("aria-expanded", "true")

-  const viewport = sidebar.locator('[data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
-  const longRow = panel.getByRole("button", { name: longFilename })
-  await expect(longRow).toBeVisible()
-  await expect.poll(() => viewport.evaluate((element) => element.scrollWidth - element.clientWidth)).toBeGreaterThan(0)
-  expect(
-    await longRow.evaluate((element) => getComputedStyle(element.querySelector("bdi")!.parentElement!).textOverflow),
-  ).toBe("clip")
-  expect(await longRow.evaluate((element) => element.getBoundingClientRect().width)).toBeGreaterThanOrEqual(
-    await viewport.evaluate((element) => element.clientWidth),
-  )
-  await expect
-    .poll(() =>
-      panel.locator('[data-slot="file-tree-v2-row"]').evaluateAll((rows) => {
-        const widths = rows.map((row) => row.getBoundingClientRect().width)
-        return Math.max(...widths) - Math.min(...widths)
-      }),
-    )
-    .toBeLessThanOrEqual(0.5)
-  await expect(longRow.locator('[data-slot="file-tree-v2-label"]')).toHaveCSS("margin-inline-end", "12px")
-  const status = longRow.locator('[data-slot="file-tree-v2-change"]')
-  await expect(status).toHaveText("A")
-  const statusBox = await status.boundingBox()
-  if (!statusBox) throw new Error("File status has no bounding box")
-  const viewportBox = await viewport.boundingBox()
-  if (!viewportBox) throw new Error("File tree viewport has no bounding box")
-  expect(viewportBox.x + viewportBox.width - statusBox.x - statusBox.width).toBeLessThanOrEqual(24)
-
-  await viewport.hover()
-  const horizontalThumb = sidebar.locator('.scroll-view__thumb[data-orientation="horizontal"]')
-  await expect(horizontalThumb).toHaveCSS("opacity", "1")
-  await page.mouse.wheel(1_000, 0)
-  await expect.poll(() => viewport.evaluate((element) => Math.abs(element.scrollLeft))).toBeGreaterThan(0)
-  await expect(horizontalThumb).toHaveAttribute("data-visible", "true")
-  await expect
-    .poll(() =>
-      status.evaluate((element) => {
-        const viewport = element.closest<HTMLElement>(".scroll-view__viewport")!.getBoundingClientRect()
-        return viewport.right - element.getBoundingClientRect().right
-      }),
-    )
-    .toBeLessThanOrEqual(24)
-
-  const beforeDrag = await viewport.evaluate((element) => Math.abs(element.scrollLeft))
-  const thumbBox = await horizontalThumb.boundingBox()
-  if (!thumbBox) throw new Error("Horizontal scrollbar thumb has no bounding box")
-  await page.mouse.move(thumbBox.x + thumbBox.width / 2, thumbBox.y + thumbBox.height / 2)
-  await page.mouse.down()
-  await page.mouse.move(thumbBox.x + thumbBox.width / 2 - 40, thumbBox.y + thumbBox.height / 2)
-  await page.mouse.up()
-  await expect.poll(() => viewport.evaluate((element) => Math.abs(element.scrollLeft))).toBeLessThan(beforeDrag)
-
-  const filter = panel.getByRole("combobox", { name: "Filter files" })
-  await filter.fill(longFilename)
-  const filteredRow = panel.getByRole("option", { name: longFilename })
-  await expect(filteredRow).toBeVisible()
-  const filteredStatus = filteredRow.locator('[data-slot="file-tree-v2-change"]')
-  await expect(filteredStatus).toHaveText("A")
-  await expect.poll(() => viewport.evaluate((element) => element.scrollWidth - element.clientWidth)).toBeGreaterThan(0)
-
-  await viewport.evaluate((element) => {
-    element.setAttribute("dir", "rtl")
-    element.scrollLeft = 0
-    element.dispatchEvent(new Event("scroll"))
-  })
-  await expect
-    .poll(() =>
-      filteredStatus.evaluate((element) => {
-        const viewport = element.closest<HTMLElement>(".scroll-view__viewport")!.getBoundingClientRect()
-        return element.getBoundingClientRect().left - viewport.left
-      }),
-    )
-    .toBeLessThanOrEqual(24)
-  const rtlThumbBox = await horizontalThumb.boundingBox()
-  if (!rtlThumbBox) throw new Error("RTL horizontal scrollbar thumb has no bounding box")
-  await page.mouse.move(rtlThumbBox.x + rtlThumbBox.width / 2, rtlThumbBox.y + rtlThumbBox.height / 2)
-  await page.mouse.down()
-  await page.mouse.move(rtlThumbBox.x + rtlThumbBox.width / 2 - 40, rtlThumbBox.y + rtlThumbBox.height / 2)
-  await page.mouse.up()
-  await expect.poll(() => viewport.evaluate((element) => element.scrollLeft)).toBeLessThan(0)
-  await viewport.evaluate((element) => {
-    element.removeAttribute("dir")
-    element.scrollLeft = 0
-    element.dispatchEvent(new Event("scroll"))
-  })
-
-  await filter.fill("")
-
  const appRow = panel.locator('[data-slot="file-tree-v2-row"][data-path="frontend/app.ts"]')
  await expect(appRow).toBeVisible()
  await appRow.click()
@@ -0,0 +1,90 @@
+import { base64Encode } from "@opencode-ai/util/encode"
+import { expect, test } from "@playwright/test"
+import { mockOpenCodeServer } from "../utils/mock-server"
+
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+const directory = "/tab-focus"
+const sessions = ["Alpha", "Beta"].map((title, index) => ({
+  id: `ses_tab_focus_${index}`,
+  slug: `tab-focus-${index}`,
+  projectID: "proj_tab_focus",
+  directory,
+  title,
+  version: "dev",
+  time: { created: 1700000000000 + index, updated: 1700000000000 + index },
+}))
+
+for (const { layout, platform, modifier } of [
+  { layout: "horizontal", platform: "MacIntel", modifier: "Meta" },
+  { layout: "vertical", platform: "MacIntel", modifier: "Meta" },
+  { layout: "horizontal", platform: "Linux x86_64", modifier: "Control" },
+  { layout: "vertical", platform: "Linux x86_64", modifier: "Control" },
+]) {
+  test(`${modifier}+number refocuses the destination composer with ${layout} tabs`, async ({ page }, testInfo) => {
+    await mockOpenCodeServer(page, {
+      directory,
+      project: {
+        id: "proj_tab_focus",
+        worktree: directory,
+        vcs: "git",
+        time: { created: 1700000000000, updated: 1700000000000 },
+        sandboxes: [],
+      },
+      provider: {
+        all: [{ id: "opencode", name: "OpenCode", models: { test: { id: "test", name: "Test" } } }],
+        connected: ["opencode"],
+        default: { providerID: "opencode", modelID: "test" },
+      },
+      sessions,
+      pageMessages: () => ({ items: [] }),
+    })
+    await page.addInitScript(
+      ({ server, sessions, layout, platform }) => {
+        Object.defineProperty(navigator, "platform", { configurable: true, value: platform })
+        localStorage.setItem("settings.v3", JSON.stringify({ appearance: { tabLayout: layout } }))
+        localStorage.setItem(
+          "opencode.window.browser.dat:tabs",
+          JSON.stringify(sessions.map((session) => ({ type: "session", server, sessionId: session.id }))),
+        )
+      },
+      { server, sessions, layout, platform },
+    )
+    const href = (index: number) => `/server/${base64Encode(server)}/session/${sessions[index].id}`
+    await page.goto(href(0))
+    await expect(page.locator("[data-titlebar-tab-title]")).toHaveText(["Alpha", "Beta"])
+    const editor = page.getByRole("textbox", { name: "Prompt", exact: true })
+    await expect(editor).toBeEditable()
+    await editor.fill("Alpha draft")
+
+    await page.keyboard.press("Home")
+    for (const { index, text, expected } of [
+      { index: 1, text: "Beta draft", expected: "Beta draft" },
+      { index: 0, text: "Edited ", expected: "Edited Alpha draft" },
+      { index: 1, text: " continued", expected: "Beta draft continued" },
+    ]) {
+      await page.keyboard.press(`${modifier}+${index + 1}`)
+      await expect(page).toHaveURL(href(index))
+      await expect(page.getByRole("heading", { name: sessions[index].title, exact: true })).toBeVisible()
+      await expect(editor).toBeEditable()
+      await expect(editor).toBeFocused()
+      await page.keyboard.type(text)
+      await expect(editor).toHaveText(expected)
+    }
+    await page.setViewportSize({ width: 800, height: 720 })
+    await page.keyboard.press(`${modifier}+1`)
+    await expect(page).toHaveURL(href(0))
+    await expect(editor).toBeFocused()
+    await expect(editor).toHaveText("Edited Alpha draft")
+    const longDraft = "Keep this long draft while switching tabs. ".repeat(100)
+    await editor.fill(longDraft)
+    await page.keyboard.press(`${modifier}+2`)
+    await expect(page).toHaveURL(href(1))
+    await expect(editor).toBeFocused()
+    await expect(editor).toHaveText("Beta draft continued")
+    await page.keyboard.press(`${modifier}+1`)
+    await expect(page).toHaveURL(href(0))
+    await expect(editor).toBeFocused()
+    await expect(editor).toHaveText(longDraft)
+    await testInfo.attach("refocused-composer", { body: await page.screenshot(), contentType: "image/png" })
+  })
+}
@@ -301,14 +301,11 @@ for (const count of [0, 26]) {
 }

 for (const direction of ["ltr", "rtl"]) {
-  test(`vertical tabs keep Status pinned without Settings in ${direction}`, async ({ page }, testInfo) => {
+  test(`vertical tabs keep Settings pinned while scrolling in ${direction}`, async ({ page }, testInfo) => {
    await mockServer(page)
    await page.addInitScript(
      ({ server, sessionA, sessionB, directory }) => {
-        localStorage.setItem(
-          "settings.v3",
-          JSON.stringify({ appearance: { tabLayout: "vertical" }, general: { showStatus: true } }),
-        )
+        localStorage.setItem("settings.v3", JSON.stringify({ appearance: { tabLayout: "vertical" } }))
        localStorage.setItem(
          "opencode.window.browser.dat:tabs",
          JSON.stringify([
@@ -325,27 +322,23 @@ for (const direction of ["ltr", "rtl"]) {
      },
      { server, sessionA: sessionA.id, sessionB: sessionB.id, directory: sessionA.directory },
    )
-    await page.goto(`/server/${base64Encode(server)}/session/${sessionA.id}`)
+    await page.goto("/")

    const sidebar = page.locator('[data-slot="vertical-tabs-sidebar"]')
    const settings = sidebar.getByRole("button", { name: "Settings", exact: true })
-    const status = sidebar.getByRole("button", { name: "Status", exact: true })
    const scroll = sidebar.locator('[data-slot="vertical-tabs-scroll"]')
    const hrefB = `/server/${base64Encode(server)}/session/${sessionB.id}`
    const tabB = sidebar.locator(`[data-titlebar-tab-link][href="${hrefB}"]`)
    await expect(sidebar.locator("[data-titlebar-tab-slot]")).toHaveCount(26)
-    await expect(status).toHaveText("Status")
-    await expect(settings).toHaveCount(0)
-    await expect(status.locator('[data-slot="status-indicator"]')).toBeVisible()
+    await expect(settings).toHaveText("Settings")
    await page.evaluate((direction) => document.documentElement.setAttribute("dir", direction), direction)

    for (const width of [1280, 800]) {
      await page.setViewportSize({ width, height: 360 })
+      await expect(settings).toBeInViewport({ ratio: 1 })
      await expect(sidebar).toHaveCSS("padding-inline-start", "10px")
      await expect(sidebar).toHaveCSS("padding-bottom", "10px")
-      await expect(sidebar.locator('[data-slot="vertical-tabs-footer"]')).toHaveCSS("margin-top", "8px")
-      await expect(status).toBeInViewport({ ratio: 1 })
-      await expect(status).toHaveCSS("height", "28px")
+      await expect(settings).toHaveCSS("margin-top", "8px")
      await expect
        .poll(() =>
          sidebar.locator('[data-slot="vertical-tabs-footer"]').evaluate((element) => {
@@ -360,12 +353,12 @@ for (const direction of ["ltr", "rtl"]) {
      await expect(scroll).toHaveCSS("mask-image", /linear-gradient/)
      await scroll.evaluate((element) => element.scrollTo(0, 0))
      await expect(scroll).toHaveJSProperty("scrollTop", 0)
-      const pinnedStatus = await status.boundingBox()
+      const pinned = await settings.boundingBox()
      await scroll.hover()
      await page.mouse.wheel(0, 200)
      await expect.poll(() => scroll.evaluate((element) => element.scrollTop)).toBeGreaterThan(0)
-      await expect.poll(() => status.boundingBox()).toEqual(pinnedStatus)
-      await testInfo.attach(`vertical-tabs-status-${width}`, {
+      await expect.poll(() => settings.boundingBox()).toEqual(pinned)
+      await testInfo.attach(`vertical-tabs-settings-${width}`, {
        body: await sidebar.screenshot(),
        contentType: "image/png",
      })
@@ -379,14 +372,17 @@ for (const direction of ["ltr", "rtl"]) {
          return !!tab && !!viewport && tab.y + tab.height <= viewport.y + viewport.height - 16
        })
        .toBe(true)
-      await expect.poll(() => status.boundingBox()).toEqual(pinnedStatus)
-      await expect(settings).toHaveCount(0)
+      await expect.poll(() => settings.boundingBox()).toEqual(pinned)
    }

-    await status.click()
-    await expect(status).toHaveAttribute("aria-expanded", "true")
-    await status.press("Escape")
-    await expect(status).toHaveAttribute("aria-expanded", "false")
+    await settings.click()
+    await expect(page.getByTestId("settings-screen")).toBeVisible()
+    await expect(settings).toHaveAttribute("aria-pressed", "true")
+    await sidebar.getByRole("button", { name: "Home", exact: true }).click()
+    await expect(page.getByTestId("settings-screen")).toBeHidden()
+    await settings.focus()
+    await settings.press("Enter")
+    await expect(page.getByTestId("settings-screen")).toBeVisible()
  })
 }

@@ -67,12 +67,12 @@ for (const theme of ["light", "dark"] as const) {
          await testInfo.attach("workspace-accent", { path, contentType: "image/png" })
        }

-        await expectBackground(view.send, "icon-button-contrast")
+        await expectBackground(view.send, "contrast")
        await view.send.hover()
-        await expectBackground(view.send, "icon-button-contrast")
+        await expectBackground(view.send, "contrast")
        await view.composer.locator('[data-action="composer-model"]').press("Tab")
        await expect(view.send).toBeFocused()
-        await expectBackground(view.send, "icon-button-contrast")
+        await expectBackground(view.send, "contrast")
        const message = page.locator('[data-slot="user-message-text"]')
        await expect(message).toHaveText("Check this fixture workspace.")
        await expectToken(
@@ -92,7 +92,7 @@ for (const theme of ["light", "dark"] as const) {
      const view = await openSession(page, workspace, [{ directory: root }])
      await view.input.fill("Keep this draft while the inventory changes.")
      await expect(view.send).toBeEnabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      const url = page.url()

      const refreshed = page.waitForResponse(
@@ -109,14 +109,14 @@ for (const theme of ["light", "dark"] as const) {
        data: { projectID },
      })
      expect((await refreshed).ok()).toBe(true)
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await expect(page).toHaveURL(url)
      await expect(view.input).toHaveText("Keep this draft while the inventory changes.")
      await expect(view.send).toBeEnabled()

      await view.input.fill("")
      await expect(view.send).toBeDisabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")

      view.events.push({
        id: "evt_workspace_accent_running",
@@ -127,29 +127,29 @@ for (const theme of ["light", "dark"] as const) {
      })
      const stop = view.composer.getByRole("button", { name: "Stop", exact: true })
      await expect(stop).toBeEnabled()
-      await expectBackground(stop, "icon-button-contrast")
+      await expectBackground(stop, "contrast")

      await view.input.fill("Send a follow-up instead of stopping.")
      await expect(view.send).toBeEnabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await expect(page).toHaveURL(url)
    })

    test("new workspace send button stays neutral", async ({ page }) => {
      const view = await openSession(page, root, [...inventory], true)
      await expect(view.send).toBeDisabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await page.getByRole("button", { name: "Local", exact: true }).click()
      await page.getByRole("menuitem", { name: "New worktree", exact: true }).click()
      await expect(page.getByRole("button", { name: "New worktree", exact: true })).toBeVisible()
      await view.input.fill("Inspect this fixture workspace.")
      await expect(view.send).toBeEnabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await view.send.hover()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await view.composer.locator('[data-action="composer-model"]').press("Tab")
      await expect(view.send).toBeFocused()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
    })
  })
 }
@@ -55,8 +55,6 @@ function ComposerStory(props: {
  label?: string
  inspectRequest?: boolean
  continueOnStop?: boolean
-  longLabels?: boolean
-  alternate?: "queue" | "steer"
 }) {
  const [draft, setDraft] = createStore<ComposerPersistedState>({
    prompt: props.prompt ?? [{ type: "text", content: "", start: 0, end: 0 }],
@@ -68,15 +66,11 @@ function ComposerStory(props: {
    activity: props.label ?? "Ready",
    variant: STORY_MODEL.variant,
  })
-  const modelOption = createMemo(() => ({
-    ...selectedModel,
-    name: props.longLabels ? "Claude Sonnet with an unusually long model name" : selectedModel.name,
-  }))
  const modelSelection = {
    ready: Object.assign(() => true, { promise: undefined }),
-    current: () => modelOption(),
-    recent: () => [modelOption()],
-    list: () => [modelOption()],
+    current: () => selectedModel,
+    recent: () => [selectedModel],
+    list: () => [selectedModel],
    cycle() {},
    set() {},
    visible: () => true,
@@ -132,7 +126,7 @@ function ComposerStory(props: {
      placeholder: () => "Ask anything, / for commands, @ for context...",
      agent: {
        options: () => [
-          { id: "build", label: props.longLabels ? "Build agent with an unusually long name" : "build" },
+          { id: "build", label: "build" },
          { id: "review", label: "review" },
        ],
        current: () => "build",
@@ -141,7 +135,7 @@ function ComposerStory(props: {
      variant: {
        options: () => [
          { id: "default", label: "default" },
-          { id: "balanced", label: props.longLabels ? "Balanced reasoning with an extended label" : "balanced" },
+          { id: "balanced", label: "balanced" },
          { id: "high", label: "high" },
        ],
        current: () => story.variant,
@@ -150,17 +144,6 @@ function ComposerStory(props: {
      submit: {
        stopping: () => !!props.stopping,
        working: () => !!props.working,
-        queue: props.alternate
-          ? {
-              count: () => 0,
-              delivery: () => (props.alternate === "queue" ? "steer" : "queue"),
-              alternate: () => props.alternate,
-              editing: () => undefined,
-              confirmEdit() {},
-              cancelEdit() {},
-              editFirst: () => false,
-            }
-          : undefined,
        onSubmit: () => {
          const value = draft.prompt.map((part) => ("content" in part ? part.content : `[${part.filename}]`)).join("")
          const request = props.inspectRequest
@@ -307,21 +290,6 @@ export const NarrowLayout = {
  ),
 }

-export const ToolbarOverflow = {
-  args: { alternate: "queue" },
-  argTypes: { alternate: { control: "select", options: ["none", "queue", "steer"] } },
-  render: (args: { alternate: "none" | "queue" | "steer" }) => (
-    <div class="w-[min(420px,calc(100vw-80px))]">
-      <ComposerStory
-        longLabels
-        working
-        prompt={text("Keep all controls reachable when the toolbar overflows")}
-        alternate={args.alternate === "none" ? undefined : args.alternate}
-      />
-    </div>
-  ),
-}
-
 export const DemoFirstClassSkillIDs = {
  name: "Demo: First-class skill IDs",
  render: () => (
@@ -2,29 +2,6 @@
  content: "\200B";
 }

-/* Masks only cover hidden content; they do not reserve space in the toolbar. */
-[data-slot="composer-controls"][data-overflow-start="true"] {
-  --mask-start: 16px;
-}
-
-[data-slot="composer-controls"][data-overflow-end="true"] {
-  --mask-end: 16px;
-}
-
-[data-slot="composer-controls"]:dir(rtl) {
-  --mask-direction: to left;
-}
-
-[data-slot="composer-controls"]:is([data-overflow-start="true"], [data-overflow-end="true"]) {
-  mask-image: linear-gradient(
-    var(--mask-direction, to right),
-    transparent,
-    black var(--mask-start, 0px),
-    black calc(100% - var(--mask-end, 0px)),
-    transparent
-  );
-}
-
 [data-component="composer"]:not(:hover) .composer-variant-default:not(:focus-visible, [data-expanded]) {
  opacity: 0;
  pointer-events: none;
@@ -1,5 +1,4 @@
-import { createEffect, createMemo, createSignal, For, onCleanup, onMount, Show, type JSX } from "solid-js"
-import { createStore } from "solid-js/store"
+import { createEffect, createMemo, createSignal, For, Show, type JSX } from "solid-js"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
@@ -57,23 +56,6 @@ export function ComposerEditor(props: ComposerEditorProps) {
  const view = props.controller.view
  let editor: HTMLDivElement | undefined
  let viewport: HTMLDivElement | undefined
-  let controlsViewport!: HTMLDivElement
-  let controlsContent!: HTMLDivElement
-  const [overflow, setOverflow] = createStore({ start: false, end: false })
-  const updateOverflow = () => {
-    const offset = Math.abs(controlsViewport.scrollLeft)
-    setOverflow({
-      start: offset > 1,
-      end: controlsViewport.scrollWidth - controlsViewport.clientWidth - offset > 1,
-    })
-  }
-  onMount(() => {
-    const observer = new ResizeObserver(updateOverflow)
-    observer.observe(controlsViewport)
-    observer.observe(controlsContent)
-    updateOverflow()
-    onCleanup(() => observer.disconnect())
-  })
  let localInput = false
  const updateCursor = () => {
    if (!editor || !window.getSelection()?.isCollapsed) return
@@ -244,7 +226,7 @@ export function ComposerEditor(props: ComposerEditorProps) {

        <div class="flex h-11 items-center px-2">
          <div
-            class="flex shrink-0 items-center"
+            class="flex min-w-0 flex-1 items-center gap-1"
            aria-hidden={state.mode === "shell"}
            inert={state.mode === "shell" ? true : undefined}
            style={buttons()}
@@ -263,80 +245,64 @@ export function ComposerEditor(props: ComposerEditorProps) {
              onContext={props.controller.openContext}
              onShell={props.controller.openShell}
            />
-          </div>
-          <div
-            ref={controlsViewport}
-            data-slot="composer-controls"
-            data-overflow-start={overflow.start}
-            data-overflow-end={overflow.end}
-            class="ms-1 me-3 h-full min-w-0 flex-1 overflow-x-auto overscroll-x-contain no-scrollbar"
-            onScroll={updateOverflow}
-            aria-hidden={state.mode === "shell"}
-            inert={state.mode === "shell" ? true : undefined}
-            style={buttons()}
-          >
-            <div ref={controlsContent} class="flex h-full w-max min-w-full items-center gap-1">
-              <Show when={view.agent} keyed>
+            <Show when={view.agent} keyed>
+              {(control) => (
+                <ComposerEditorConfiguredSelect
+                  title={i18n.t("ui.promptInput.chooseAgent")}
+                  keybind={["Mod", "."]}
+                  control={control}
+                />
+              )}
+            </Show>
+            <Show when={props.modelControlsVisible ?? true}>
+              {props.modelControl}
+              <Show when={view.variant} keyed>
                {(control) => (
-                  <ComposerEditorConfiguredSelect
-                    title={i18n.t("ui.promptInput.chooseAgent")}
-                    keybind={["Mod", "."]}
-                    control={control}
-                  />
+                  <Show when={control.options().length > 1}>
+                    <ComposerEditorConfiguredSelect
+                      title={i18n.t("ui.promptInput.chooseVariant")}
+                      keybind={["Shift", "Mod", "D"]}
+                      control={control}
+                      class={control.current() === "default" ? "composer-variant-default" : undefined}
+                    />
+                  </Show>
                )}
              </Show>
-              <Show when={props.modelControlsVisible ?? true}>
-                {props.modelControl}
-                <Show when={view.variant} keyed>
-                  {(control) => (
-                    <Show when={control.options().length > 1}>
-                      <ComposerEditorConfiguredSelect
-                        title={i18n.t("ui.promptInput.chooseVariant")}
-                        keybind={["Shift", "Mod", "D"]}
-                        control={control}
-                        class={control.current() === "default" ? "composer-variant-default" : undefined}
-                      />
-                    </Show>
-                  )}
-                </Show>
-              </Show>
-            </div>
+            </Show>
          </div>
-          <div data-slot="composer-actions" class="flex shrink-0 items-center">
-            <Show when={state.mode === "normal"}>
-              <ComposerEditorAlternateDelivery
-                controller={props.controller}
-                keybind={props.alternateKeybind ?? ["Mod", "Enter"]}
-              />
-            </Show>
-            <Show when={state.mode === "shell"}>
-              <Button
-                data-action="composer-exit-shell"
-                type="button"
-                variant="ghost-faint"
-                size="small"
-                class="me-3 gap-1.5 px-1.5"
-                onClick={() => {
-                  props.controller.dispatch({ type: "mode.normal" })
-                  props.controller.restoreFocus()
-                }}
-              >
-                {i18n.t("ui.promptInput.exitShell")}
-                <span class="hidden sm:block">
-                  <Keybind keys={props.exitShellKeybind ?? ["ESC"]} variant="neutral" />
-                </span>
-              </Button>
-            </Show>
-            <ComposerEditorSubmitButton
-              mode={state.mode}
-              stopping={view.submit.stopping()}
-              disabled={!props.controller.canSubmit()}
-              sendLabel={i18n.t("ui.promptInput.send")}
-              stopLabel={i18n.t("ui.promptInput.stop")}
-              onSubmit={() => props.controller.submit()}
-              onStop={props.controller.stop}
+          <Show when={state.mode === "normal"}>
+            <ComposerEditorAlternateDelivery
+              controller={props.controller}
+              keybind={props.alternateKeybind ?? ["Mod", "Enter"]}
            />
-          </div>
+          </Show>
+          <Show when={state.mode === "shell"}>
+            <Button
+              data-action="composer-exit-shell"
+              type="button"
+              variant="ghost-faint"
+              size="small"
+              class="me-3 gap-1.5 px-1.5"
+              onClick={() => {
+                props.controller.dispatch({ type: "mode.normal" })
+                props.controller.restoreFocus()
+              }}
+            >
+              {i18n.t("ui.promptInput.exitShell")}
+              <span class="hidden sm:block">
+                <Keybind keys={props.exitShellKeybind ?? ["ESC"]} variant="neutral" />
+              </span>
+            </Button>
+          </Show>
+          <ComposerEditorSubmitButton
+            mode={state.mode}
+            stopping={view.submit.stopping()}
+            disabled={!props.controller.canSubmit()}
+            sendLabel={i18n.t("ui.promptInput.send")}
+            stopLabel={i18n.t("ui.promptInput.stop")}
+            onSubmit={() => props.controller.submit()}
+            onStop={props.controller.stop}
+          />
        </div>
      </form>
    </div>
@@ -842,7 +808,11 @@ export function ComposerEditorSubmitButton(props: {
        tabIndex={props.mode === "normal" ? undefined : -1}
        icon={<Icon name={props.stopping ? "stop" : props.mode === "shell" ? "arrow-undo-down" : "arrow-up"} />}
        variant="contrast"
-        class="size-7 rounded-md p-[6px] disabled:opacity-50"
+        class="size-7 rounded-md p-[6px] text-v2-icon-icon-muted shadow-[var(--v2-elevation-button-contrast)] disabled:opacity-50"
+        style={{
+          "background-image":
+            "linear-gradient(180deg,var(--v2-alpha-light-20) 0%,var(--v2-alpha-light-0) 100%),linear-gradient(90deg,var(--v2-background-bg-contrast) 0%,var(--v2-background-bg-contrast) 100%)",
+        }}
        aria-label={props.stopping ? props.stopLabel : props.sendLabel}
        onClick={(event) => {
          event.preventDefault()
@@ -165,15 +165,6 @@
    }
  }

-  ::highlight(timeline-search-hit) {
-    background-color: color-mix(in srgb, var(--v2-icon-icon-accent) 28%, transparent);
-  }
-
-  ::highlight(timeline-search-hit-active) {
-    background-color: var(--v2-icon-icon-accent);
-    color: var(--v2-background-bg-deep);
-  }
-
  [data-component="getting-started"] {
    container-type: inline-size;
    container-name: getting-started;
@@ -1,2 +1,2 @@
-/** Allows the prompt to extend 80px beyond each side of the 720px wordmark. */
-export const NEW_SESSION_CONTENT_WIDTH = "w-full max-w-[880px] px-0"
+/** Inline new-session content width — keep in sync with session composer `placement === "inline"`. */
+export const NEW_SESSION_CONTENT_WIDTH = "w-full max-w-[720px] px-0"
@@ -1,6 +1,7 @@
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Icon } from "@opencode-ai/ui/icon"
+import { Wordmark } from "@opencode-ai/ui/wordmark"
 import { Show, createMemo, createSignal } from "solid-js"
 import { Schema } from "effect"
 import createPresence from "solid-presence"
@@ -22,7 +23,6 @@ import { NEW_SESSION_CONTENT_WIDTH } from "@/new-session/layout"
 import { Persist, persisted } from "@/runtime/persistence/storage"
 import { Persistence } from "@/runtime/persistence/schema"
 import type { NewSessionWorkspaceController } from "./workspace/controller"
-import { NewSessionWordmark } from "./wordmark"

 const providerTipDismissalDuration = 30 * 24 * 60 * 60 * 1000

@@ -61,7 +61,7 @@ export function NewSessionView(props: {
        />
        <div class="absolute inset-x-0 top-[25.375%] flex justify-center px-6">
          <div class={NEW_SESSION_CONTENT_WIDTH}>
-            <NewSessionWordmark />
+            <Wordmark class="h-auto w-full text-v2-background-bg-inverse" />
            <div class="mt-8 flex flex-col gap-8">
              <Composer model={props.composer} />
              <Show when={props.project.empty()}>
@@ -1,43 +0,0 @@
-[data-component="new-session-wordmark"] {
-  --wordmark-shimmer-opacity: 0.45;
-
-  .wordmark-shimmer {
-    /* Blend above the base logo's opacity so the sweep only adds light in either theme. */
-    color: white;
-    mix-blend-mode: screen;
-    opacity: 0;
-    mask-image: linear-gradient(to right, transparent 40%, black 50%, transparent 60%);
-    mask-size: 300% 100%;
-    mask-repeat: no-repeat;
-    animation: new-session-wordmark-shimmer 800ms linear both;
-  }
-}
-
-[data-color-scheme="dark"] [data-component="new-session-wordmark"] {
-  /* Preserve the previous dark highlight strength: 0.16 × 0.7 × 0.6. */
-  --wordmark-shimmer-opacity: 0.0672;
-}
-
-/* Oversizing the mask moves its highlight physically left to right, including in RTL. */
-@keyframes new-session-wordmark-shimmer {
-  0% {
-    mask-position: 100% 0;
-    opacity: 0;
-  }
-  20%,
-  80% {
-    opacity: var(--wordmark-shimmer-opacity);
-  }
-  100% {
-    mask-position: 0% 0;
-    opacity: 0;
-  }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  [data-component="new-session-wordmark"] {
-    .wordmark-shimmer {
-      animation: none;
-    }
-  }
-}
@@ -1,11 +0,0 @@
-import { NewSessionWordmark } from "./wordmark"
-
-export default {
-  title: "App/New Session/Wordmark",
-  id: "app-new-session-wordmark",
-  component: NewSessionWordmark,
-}
-
-export const Reveal = {
-  render: () => <NewSessionWordmark />,
-}
@@ -1,17 +0,0 @@
-import { Wordmark } from "@opencode-ai/ui/wordmark"
-import "./wordmark.css"
-
-export function NewSessionWordmark() {
-  return (
-    <div
-      data-component="new-session-wordmark"
-      aria-hidden="true"
-      class="pointer-events-none mx-auto w-full max-w-[720px] text-v2-background-bg-inverse"
-    >
-      <div data-slot="wordmark-reveal" class="relative">
-        <Wordmark fade={false} class="block h-auto w-full opacity-60 [[data-color-scheme=dark]_&]:opacity-50" />
-        <Wordmark fade={false} muted={false} class="wordmark-shimmer absolute inset-0 h-auto w-full" />
-      </div>
-    </div>
-  )
-}
@@ -676,7 +676,7 @@ export const dict = {
  "session.error.incompatible.description":
    "{{server}} is running OpenCode {{version}}, which isn't compatible with this app. Upgrade the server to OpenCode V2 to continue.",
  "session.background.moveTasks": "Move {{tasks}} to background",
-  "session.background.moveRunning": "Move to background",
+  "session.background.moveRunning": "Move running work to background",
  "session.background.inBackground": "Running {{tasks}} in background",
  "session.background.moveInline": "Press {{keybind}} to move running work to the background",
  "session.background.running": "Running work in background",
@@ -736,16 +736,6 @@ export const dict = {
  "session.todo.expand": "Expand",
  "session.todo.progress": "{{done}} of {{total}} todos completed",
  "session.question.progress": "{{current}} of {{total}} questions",
-  "session.websearch.title": "Third-party web search",
-  "session.websearch.description": "Select the search provider agents use to search the web",
-  "session.websearch.provider": "Search provider",
-  "session.websearch.any": "Any",
-  "session.websearch.disable": "Don’t use search",
-  "session.websearch.enable": "Enable",
-  "session.websearch.loadFailed": "Could not load search providers.",
-  "session.websearch.empty": "No search providers available.",
-  "session.websearch.failed": "Could not save your choice. Please try again.",
-  "session.websearch.retry": "Retry",
  "session.question.minimize": "Minimize question",
  "session.question.restore": "Restore question",
  "session.question.pending.one": "{{count}} pending question",
@@ -769,8 +759,6 @@ export const dict = {

  "session.header.search.placeholder": "Search {{project}}",
  "session.header.searchFiles": "Search files",
-  "session.search.placeholder": "Find...",
-  "session.search.noResults": "No matches",
  "session.header.openIn": "Open in",
  "session.header.open.action": "Open {{app}}",
  "session.header.open.ariaLabel": "Open in {{app}}",
@@ -1057,8 +1045,8 @@ export const dict = {
  "settings.general.row.showTerminal.description": "Show the terminal button in the desktop title bar",
  "settings.general.row.showStatus.title": "Server status",
  "settings.general.row.showStatus.description": "Show the server status button in the title bar",
-  "settings.general.row.showProjectIcon.title": "Show project icon",
-  "settings.general.row.showProjectIcon.description": "Show project icon in session header",
+  "settings.general.row.showProjectIcon.title": "Project icon",
+  "settings.general.row.showProjectIcon.description": "Show the project icon in the session header",
  "settings.general.row.mobileTitlebarBottom.title": "Bottom navigation",
  "settings.general.row.mobileTitlebarBottom.description": "Place the title bar at the bottom of the screen on mobile",
  "settings.general.row.mobileDiffWrap.description":
@@ -1,23 +1,19 @@
 import { describe, expect, test } from "bun:test"
-import { createRequestQueue, isSlowRequest } from "./request-queue"
+import { createRequestQueue } from "./request-queue"

-function setup(input?: { limit?: number; slowLimit?: number; stallMs?: number; headersTimeoutMs?: number }) {
-  const pending: Array<{ url: string; signal: AbortSignal; resolve: () => void }> = []
+function setup(input?: { limit?: number; stallMs?: number }) {
+  const pending: Array<{ url: string; resolve: () => void }> = []
  const logs: Array<{ message: string; data: Record<string, unknown> }> = []
  let clock = 0
  const queue = createRequestQueue({
    limit: input?.limit ?? 2,
-    slowLimit: input?.slowLimit,
    stallMs: input?.stallMs,
-    headersTimeoutMs: input?.headersTimeoutMs,
    now: () => clock,
    log: (message, data) => logs.push({ message, data }),
    fetch: Object.assign(
      (resource: RequestInfo | URL) =>
-        new Promise<Response>((resolve, reject) => {
-          const request = new Request(resource)
-          request.signal.addEventListener("abort", () => reject(request.signal.reason), { once: true })
-          pending.push({ url: request.url, signal: request.signal, resolve: () => resolve(new Response("ok")) })
+        new Promise<Response>((resolve) => {
+          pending.push({ url: new Request(resource).url, resolve: () => resolve(new Response("ok")) })
        }),
      { preconnect() {} },
    ),
@@ -41,36 +37,6 @@ describe("createRequestQueue", () => {
    expect(input.queue.inflight()).toBe(0)
  })

-  test("slow endpoints hold at most their share of slots so small reads go first", async () => {
-    const input = setup({ limit: 4, slowLimit: 2 })
-    const paths = ["/api/vcs?location[directory]=%2Fa", "/api/vcs/diff?location[directory]=%2Fa", "/api/worktree", "/api/session/ses_1"]
-    const responses = paths.map((path) => input.queue.fetch(`http://server${path}`))
-    await input.settle()
-    const started = () => input.pending.map((item) => new URL(item.url).pathname)
-    // Two slow requests fill the slow share; the worktree read waits while the session read jumps ahead.
-    expect(started()).toEqual(["/api/vcs", "/api/vcs/diff", "/api/session/ses_1"])
-    expect(input.queue.inflight()).toBe(3)
-    expect(input.queue.queued()).toBe(1)
-    // A fast request finishing does not free a slow slot.
-    input.pending[2]!.resolve()
-    await input.settle()
-    expect(started()).toEqual(["/api/vcs", "/api/vcs/diff", "/api/session/ses_1"])
-    input.pending[0]!.resolve()
-    await input.settle()
-    expect(started()).toEqual(["/api/vcs", "/api/vcs/diff", "/api/session/ses_1", "/api/worktree"])
-    input.pending.forEach((item) => item.resolve())
-    await Promise.all(responses)
-    expect(input.queue.inflight()).toBe(0)
-  })
-
-  test("classifies git and worktree endpoints as slow", () => {
-    expect(isSlowRequest("/api/vcs")).toBe(true)
-    expect(isSlowRequest("/api/vcs/branches")).toBe(true)
-    expect(isSlowRequest("/api/worktree")).toBe(true)
-    expect(isSlowRequest("/api/vcsx")).toBe(false)
-    expect(isSlowRequest("/api/session")).toBe(false)
-  })
-
  test("never counts the event stream against the budget", async () => {
    const input = setup({ limit: 1 })
    void input.queue.fetch("http://server/api/session")
@@ -93,34 +59,6 @@ describe("createRequestQueue", () => {
    expect(input.queue.inflight()).toBe(0)
  })

-  test("a request the server never answers times out and frees its slot", async () => {
-    const input = setup({ limit: 1, headersTimeoutMs: 10 })
-    const dead = input.queue.fetch("http://server/api/dead")
-    const next = input.queue.fetch("http://server/api/next")
-    await input.settle()
-    expect(input.queue.queued()).toBe(1)
-    const error = await dead.catch((cause: unknown) => cause)
-    expect(error).toBeInstanceOf(DOMException)
-    expect((error as DOMException).name).toBe("TimeoutError")
-    await input.settle()
-    expect(input.pending.map((item) => new URL(item.url).pathname)).toEqual(["/api/dead", "/api/next"])
-    input.pending[1]!.resolve()
-    await expect(next).resolves.toBeInstanceOf(Response)
-    expect(input.queue.inflight()).toBe(0)
-  })
-
-  test("caller aborts still reach the underlying request", async () => {
-    const input = setup({ limit: 1 })
-    const controller = new AbortController()
-    const request = input.queue.fetch("http://server/api/slow", { signal: controller.signal })
-    await input.settle()
-    expect(input.pending[0]!.signal.aborted).toBe(false)
-    controller.abort()
-    expect(input.pending[0]!.signal.aborted).toBe(true)
-    await expect(request).rejects.toBeInstanceOf(DOMException)
-    expect(input.queue.inflight()).toBe(0)
-  })
-
  test("a burst that drains promptly is not thrashing", async () => {
    const input = setup({ stallMs: 5 })
    const responses = Array.from({ length: 12 }, (_, index) => input.queue.fetch(`http://server/api/${index}`))
@@ -1,41 +1,23 @@
-type Entry = { method: string; url: string; at: number; slow: boolean }
+type Entry = { method: string; url: string; at: number }

 // Chromium allows six connections per origin. The event stream holds one for the life of the
 // connection and health probes use their own fetch, so the app's API calls stay below that or
 // a burst stalls probes and user actions inside the browser where nothing can observe it.
 export const requestQueueLimit = 4

-// Endpoints that shell out to git or walk the filesystem take seconds on a large repository. They
-// may hold at most this many slots, so a session mount's small reads never queue behind them.
-export const requestQueueSlowLimit = 2
-export const slowRequestPaths = ["/api/vcs", "/api/worktree"]
-
 // A mount legitimately fires a dozen requests at once; only a request that has waited this long
 // for a slot indicates the server is not keeping up.
 export const requestStallMs = 2_000

-// A socket that dies while the device sleeps can leave fetch waiting for response headers until the
-// OS gives up on TCP retransmits, which takes minutes. Bound that so a dead request frees its slot
-// instead of wedging every later API call; the body may still stream for as long as it needs.
-export const requestHeadersTimeoutMs = 60_000
-
-export function isSlowRequest(pathname: string) {
-  return slowRequestPaths.some((path) => pathname === path || pathname.startsWith(`${path}/`))
-}
-
 export function createRequestQueue(input: {
  fetch: typeof globalThis.fetch
  limit?: number
-  slowLimit?: number
  stallMs?: number
-  headersTimeoutMs?: number
  log?: (message: string, data: Record<string, unknown>) => void
  now?: () => number
 }) {
  const limit = input.limit ?? requestQueueLimit
-  const slowLimit = input.slowLimit ?? requestQueueSlowLimit
  const stallMs = input.stallMs ?? requestStallMs
-  const headersTimeoutMs = input.headersTimeoutMs ?? requestHeadersTimeoutMs
  // Call the browser fetch unbound; `input.fetch(...)` would make `this` the options object.
  const base = input.fetch
  const now = input.now ?? Date.now
@@ -61,17 +43,9 @@ export function createRequestQueue(input: {
    }
    watcher = setTimeout(watch, stallMs)
  }
-  const canStart = (entry: Entry) => {
-    if (inflight.size >= limit) return false
-    if (!entry.slow) return true
-    return [...inflight].filter((item) => item.slow).length < slowLimit
-  }
-  // FIFO, except a slow request waits its turn behind faster ones while the slow slots are full.
  const release = (entry: Entry) => {
    inflight.delete(entry)
-    const index = waiting.findIndex((item) => canStart(item.entry))
-    if (index === -1) return
-    waiting.splice(index, 1)[0]?.start()
+    waiting.shift()?.start()
  }
  const acquire = (entry: Entry) =>
    new Promise<void>((resolve) => {
@@ -80,7 +54,7 @@ export function createRequestQueue(input: {
        inflight.add(entry)
        resolve()
      }
-      if (canStart(entry)) return start()
+      if (inflight.size < limit) return start()
      waiting.push({ entry, start })
      watcher ??= setTimeout(watch, stallMs)
    })
@@ -88,25 +62,15 @@ export function createRequestQueue(input: {
  const fetch: typeof globalThis.fetch = Object.assign(
    async (resource: RequestInfo | URL, init?: RequestInit) => {
      const request = new Request(resource, init)
-      const pathname = new URL(request.url).pathname
      // The event stream is long-lived; never count it against the request budget.
-      if (pathname === "/api/event") return base(request)
-      const entry = { method: request.method, url: request.url, at: now(), slow: isSlowRequest(pathname) }
+      if (new URL(request.url).pathname === "/api/event") return base(request)
+      const entry = { method: request.method, url: request.url, at: now() }
      await acquire(entry)
      if (request.signal.aborted) {
        release(entry)
        throw request.signal.reason ?? new DOMException("The operation was aborted.", "AbortError")
      }
-      const controller = new AbortController()
-      request.signal.addEventListener("abort", () => controller.abort(request.signal.reason), { once: true })
-      const timer = setTimeout(
-        () => controller.abort(new DOMException("Timed out waiting for the server to respond", "TimeoutError")),
-        headersTimeoutMs,
-      )
-      return base(new Request(request, { signal: controller.signal })).finally(() => {
-        clearTimeout(timer)
-        release(entry)
-      })
+      return base(request).finally(() => release(entry))
    },
    // Bun's fetch type carries preconnect; the browser never calls it.
    { preconnect: () => {} },
@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test"
 import { createRoot, createSignal } from "solid-js"
-import { createConnectionSync, reconnectOrder } from "./connection"
+import { createConnectionSync } from "./connection"

 test("invalidates disconnected data and synchronizes after the handshake", () => {
  const calls: string[] = []
@@ -19,9 +19,3 @@ test("invalidates disconnected data and synchronizes after the handshake", () =>
  })
  dispose()
 })
-
-test("held directories refresh before the rest, otherwise keeping their order", () => {
-  const held = new Set(["/b", "/d"])
-  expect(reconnectOrder(["/a", "/b", "/c", "/d"], (directory) => held.has(directory))).toEqual(["/b", "/d", "/a", "/c"])
-  expect(reconnectOrder(["/a", "/c"], (directory) => held.has(directory))).toEqual(["/a", "/c"])
-})
@@ -20,8 +20,3 @@ export function createConnectionSync(input: {

  return { handleEvent }
 }
-
-// Directories a mounted view holds refresh first; the rest keep their existing order behind them.
-export function reconnectOrder(directories: string[], held: (directory: string) => boolean) {
-  return [...directories.filter(held), ...directories.filter((directory) => !held(directory))]
-}
@@ -17,7 +17,7 @@ import type { ServerScope } from "@/runtime/server/scope"
 import { persisted } from "@/runtime/persistence/storage"
 import type { ServerApi } from "@/runtime/server/api"
 import { toggleMcp } from "./global-sync/mcp"
-import { createConnectionSync, reconnectOrder } from "./server-sync/connection"
+import { createConnectionSync } from "./server-sync/connection"
 import { usePlatform } from "@/runtime/platform/platform"
 import type { Data } from "@opencode-ai/client/solid"
 import { createWorktreeInventory, withWorktreeInventory } from "@/workspaces/inventory"
@@ -162,11 +162,12 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
    },
    connected: (info) => {
      if (bootstrap.data !== undefined && !bootstrap.isFetching) void bootstrap.refetch()
-      // The refresh queue re-syncs two directories at a time, held ones first. Syncing every active
-      // directory here as well sent the whole catalog fan-out for all of them at once.
-      reconnectOrder(Object.keys(children.children).filter(children.active), children.pinned).forEach(
-        (directory) => queue.push(directory),
-      )
+      Object.keys(children.children)
+        .filter(children.active)
+        .forEach((directory) => {
+          queue.push(directory)
+          void data.location.sync({ directory }).catch(() => undefined)
+        })
    },
  })

@@ -1,4 +1,5 @@
 import { createEffect, createMemo, on, type Accessor } from "solid-js"
+import { useDialog } from "@opencode-ai/ui/context/dialog"
 import type { ComposerControls } from "@/composer/adapter"
 import { setCursorPosition } from "@/composer/editor/dom"
 import { createComposerModel } from "@/composer/model"
@@ -12,6 +13,7 @@ export function createSessionComposerController(input: {
  controls: Accessor<ComposerControls>
  dock: Parameters<typeof createSessionComposerRegionController>[0]
 }) {
+  const dialog = useDialog()
  const settings = useSettings()
  const region = createSessionComposerRegionController(input.dock)
  let editor: HTMLDivElement | undefined
@@ -40,6 +42,12 @@ export function createSessionComposerController(input: {
  })
  const composer = createComposerModel(adapter, { queue })
  const editable = createMemo(() => region.showComposer() && !region.child())
+  createEffect(
+    on(adapter.ready, (ready) => {
+      if (!ready || !editable() || dialog.active) return
+      composer.restoreFocus()
+    }),
+  )
  // Requests hide the view without disposing its draft or queue edit.
  createEffect(on(editable, () => composer.onDragLeave()))

@@ -2,12 +2,11 @@ import { Show, type JSX } from "solid-js"
 import { useLanguage } from "@/runtime/i18n/language"
 import { SessionPermissionDock } from "@/session/requests/session-permission-dock"
 import { SessionQuestionDock } from "@/session/requests/session-question-dock"
-import { SessionWebSearchDock } from "@/session/requests/session-websearch-dock"
 import type { SessionComposerRegionController } from "./session-composer-region-controller"

 type SessionComposerRegionState = Pick<
  SessionComposerRegionController["state"],
-  "questionRequest" | "websearch" | "permissionRequest" | "permissionResponding" | "decide" | "blocked"
+  "questionRequest" | "permissionRequest" | "permissionResponding" | "decide" | "blocked"
 >

 export type SessionComposerRegionViewController = Pick<
@@ -33,9 +32,6 @@ export function SessionComposerRegion(props: {
          "md:max-w-[1000px] md:mx-auto": controller.centered(),
        }}
      >
-        <Show when={controller.state.websearch.request()}>
-          <SessionWebSearchDock model={controller.state.websearch} onSubmit={controller.onResponseSubmit} />
-        </Show>
        <Show when={controller.state.questionRequest()} keyed>
          {(request) => (
            <div>
@@ -24,11 +24,6 @@ import {
  type FileTreeV2Node,
 } from "@/session/files/file-tree-v2-model"
 import { virtualScrollElement } from "@/session/files/virtual-scroll"
-import { useWorkspaceLocation } from "@/workspaces/location"
-import { useOpenInApp } from "@/session/files/open-in-app"
-import { OpenInAppContextMenuV2 } from "@/session/files/open-in-app-button"
-import { resolveOpenInAppPath } from "@/session/files/open-in-app-path"
-import { usePlatform } from "@/runtime/platform/platform"

 export type { Kind } from "@/session/files/file-tree"

@@ -104,7 +99,7 @@ const FileTreeNodeV2 = (
      {...rest}
    >
      {local.children}
-      <span data-slot="file-tree-v2-label" class="flex-1 shrink-0 text-start text-12-medium whitespace-nowrap">
+      <span class="flex-1 min-w-0 text-start text-12-medium whitespace-nowrap truncate">
        <bdi dir="auto">
          {local.node.type === "directory"
            ? normalizeFileTreeV2Path(local.node.path).split("/").at(-1)
@@ -141,9 +136,6 @@ export default function FileTreeV2(props: {
  onFileDoubleClick?: (file: FileNode) => void
 }) {
  const file = useFile()
-  const location = useWorkspaceLocation()
-  const platform = usePlatform()
-  const openIn = platform.platform === "desktop" ? useOpenInApp({ path: () => location().directory }) : undefined
  const live = () => props.allowed === undefined
  const draggable = () => props.draggable ?? true
  const active = () => normalizeFileTreeV2Path(props.active ?? "")
@@ -225,19 +217,6 @@ export default function FileTreeV2(props: {
  )
  const virtualRowKeys = createMemo(() => virtualizer.getVirtualItems().map((item) => item.key))

-  createEffect(() => {
-    rows()
-    const element = root()
-    if (!element) return
-    element.style.removeProperty("width")
-    syncFileTreeV2Width(element)
-  })
-
-  createEffect(() => {
-    virtualRowKeys()
-    syncFileTreeV2Width(root())
-  })
-
  return (
    <div
      ref={setRoot}
@@ -256,7 +235,6 @@ export default function FileTreeV2(props: {
                  top: "0",
                  "inset-inline-start": "0",
                  width: "100%",
-                  "min-width": "max-content",
                  height: `${item().size}px`,
                  transform: `translateY(${item().start}px)`,
                }}
@@ -266,36 +244,29 @@ export default function FileTreeV2(props: {
                    <Show
                      when={row().node.type === "directory"}
                      fallback={
-                        <OpenInAppContextMenuV2
-                          state={openIn}
-                          path={() =>
-                            resolveOpenInAppPath(location().directory, row().node.absolute || row().node.originalPath)
-                          }
+                        <FileTreeNodeV2
+                          node={row().node}
+                          level={row().level}
+                          active={active()}
+                          draggable={draggable()}
+                          kinds={props.kinds}
+                          as="button"
+                          type="button"
+                          class="relative"
+                          onFocus={() => setFocused(row().node.path)}
+                          onBlur={() => setFocused(undefined)}
+                          onClick={() => selectFile(row().node, props.onFileClick)}
+                          onDblClick={() => selectFile(row().node, props.onFileDoubleClick)}
                        >
-                          <FileTreeNodeV2
-                            node={row().node}
-                            level={row().level}
-                            active={active()}
-                            draggable={draggable()}
-                            kinds={props.kinds}
-                            as="button"
-                            type="button"
-                            class="relative"
-                            onFocus={() => setFocused(row().node.path)}
-                            onBlur={() => setFocused(undefined)}
-                            onClick={() => selectFile(row().node, props.onFileClick)}
-                            onDblClick={() => selectFile(row().node, props.onFileDoubleClick)}
-                          >
-                            <GuideLines level={row().level} />
-                            <Show when={row().level > 0}>
-                              <div class="w-4 shrink-0" />
-                            </Show>
-                            <span class="filetree-iconpair size-4">
-                              <FileIcon node={row().node} class="size-4 filetree-icon filetree-icon--color" />
-                              <FileIcon node={row().node} class="size-4 filetree-icon filetree-icon--mono" mono />
-                            </span>
-                          </FileTreeNodeV2>
-                        </OpenInAppContextMenuV2>
+                          <GuideLines level={row().level} />
+                          <Show when={row().level > 0}>
+                            <div class="w-4 shrink-0" />
+                          </Show>
+                          <span class="filetree-iconpair size-4">
+                            <FileIcon node={row().node} class="size-4 filetree-icon filetree-icon--color" />
+                            <FileIcon node={row().node} class="size-4 filetree-icon filetree-icon--mono" mono />
+                          </span>
+                        </FileTreeNodeV2>
                      }
                    >
                      <FileTreeNodeV2
@@ -332,13 +303,3 @@ export default function FileTreeV2(props: {
    </div>
  )
 }
-
-export function syncFileTreeV2Width(element?: HTMLDivElement) {
-  if (!element) return
-  queueMicrotask(() => {
-    if (!element.isConnected) return
-    const width = Math.max(element.clientWidth, ...Array.from(element.children, (child) => child.scrollWidth))
-    if (width <= element.clientWidth) return
-    element.style.width = `${width}px`
-  })
-}
@@ -2,15 +2,10 @@ import { FileIcon } from "@opencode-ai/ui/file-icon"
 import "@opencode-ai/ui/file-tree.css"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import { createEffect, createMemo, createSignal, For, Show } from "solid-js"
-import { kindChange, kindLabel, syncFileTreeV2Width, type Kind } from "@/session/files/file-tree-v2"
+import { kindChange, kindLabel, type Kind } from "@/session/files/file-tree-v2"
 import { normalizePath } from "@/session/review/review-diff-kinds"
 import { createVirtualizer, defaultRangeExtractor } from "@tanstack/solid-virtual"
 import { virtualScrollElement } from "@/session/files/virtual-scroll"
-import { useWorkspaceLocation } from "@/workspaces/location"
-import { useOpenInApp } from "@/session/files/open-in-app"
-import { OpenInAppContextMenuV2 } from "@/session/files/open-in-app-button"
-import { resolveOpenInAppPath } from "@/session/files/open-in-app-path"
-import { usePlatform } from "@/runtime/platform/platform"

 // Drives the highlight/selection of the flat search-result list from the filter
 // input's keyboard events.
@@ -54,9 +49,6 @@ export function SessionFileList(props: {
  onFileClick: (path: string) => void
  onFileDoubleClick?: (path: string) => void
 }) {
-  const location = useWorkspaceLocation()
-  const platform = usePlatform()
-  const openIn = platform.platform === "desktop" ? useOpenInApp({ path: () => location().directory }) : undefined
  const active = () => normalizePath(props.active ?? "")
  const highlighted = () => normalizePath(props.highlighted ?? "")
  const normalized = createMemo(() => props.files.map(normalizePath))
@@ -97,19 +89,6 @@ export function SessionFileList(props: {
  )
  const virtualRowKeys = createMemo(() => virtualizer.getVirtualItems().map((item) => item.key))

-  createEffect(() => {
-    normalized()
-    const element = root()
-    if (!element) return
-    element.style.removeProperty("width")
-    syncFileTreeV2Width(element)
-  })
-
-  createEffect(() => {
-    virtualRowKeys()
-    syncFileTreeV2Width(root())
-  })
-
  return (
    <div
      ref={setRoot}
@@ -135,48 +114,47 @@ export function SessionFileList(props: {
                  style={{
                    position: "absolute",
                    top: "0",
-                    "inset-inline-start": "0",
+                    left: "0",
                    width: "100%",
-                    "min-width": "max-content",
                    height: `${item().size}px`,
                    transform: `translateY(${item().start}px)`,
                  }}
                >
-                  <OpenInAppContextMenuV2 state={openIn} path={() => resolveOpenInAppPath(location().directory, path)}>
-                    <button
-                      type="button"
-                      id={props.optionID?.(path)}
-                      role={props.role ? "option" : undefined}
-                      aria-selected={props.role ? selected() : undefined}
-                      data-slot="file-tree-v2-row"
-                      data-path={path}
-                      data-selected={selected() ? "" : undefined}
-                      data-highlighted={highlightedRow() ? "" : undefined}
-                      style="padding-inline-start: 8px"
-                      onFocus={() => setFocused(path)}
-                      onBlur={() => setFocused(undefined)}
-                      onClick={() => props.onFileClick(path)}
-                      onDblClick={() => props.onFileDoubleClick?.(path)}
-                    >
-                      <span class="filetree-iconpair size-4">
-                        <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--color" />
-                        <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--mono" mono />
-                      </span>
-                      <span data-slot="file-tree-v2-label" class="flex flex-1 shrink-0 items-center whitespace-nowrap">
-                        <Show when={directory()}>
-                          {(value) => <span class="text-12-medium text-text-muted shrink-0">{value()}</span>}
-                        </Show>
-                        <span class="text-12-medium text-text-base shrink-0">{filename()}</span>
-                      </span>
-                      <Show when={kind()}>
+                  <button
+                    type="button"
+                    id={props.optionID?.(path)}
+                    role={props.role ? "option" : undefined}
+                    aria-selected={props.role ? selected() : undefined}
+                    data-slot="file-tree-v2-row"
+                    data-path={path}
+                    data-selected={selected() ? "" : undefined}
+                    data-highlighted={highlightedRow() ? "" : undefined}
+                    style="padding-left: 8px"
+                    onFocus={() => setFocused(path)}
+                    onBlur={() => setFocused(undefined)}
+                    onClick={() => props.onFileClick(path)}
+                    onDblClick={() => props.onFileDoubleClick?.(path)}
+                  >
+                    <span class="filetree-iconpair size-4">
+                      <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--color" />
+                      <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--mono" mono />
+                    </span>
+                    <span class="flex min-w-0 flex-1 items-center overflow-hidden whitespace-nowrap">
+                      <Show when={directory()}>
                        {(value) => (
-                          <span data-slot="file-tree-v2-change" data-change={kindChange(value())}>
-                            {kindLabel(value())}
-                          </span>
+                          <span class="text-12-medium text-text-muted truncate min-w-0 shrink">{value()}</span>
                        )}
                      </Show>
-                    </button>
-                  </OpenInAppContextMenuV2>
+                      <span class="text-12-medium text-text-base truncate min-w-0 shrink-0">{filename()}</span>
+                    </span>
+                    <Show when={kind()}>
+                      {(value) => (
+                        <span data-slot="file-tree-v2-change" data-change={kindChange(value())}>
+                          {kindLabel(value())}
+                        </span>
+                      )}
+                    </Show>
+                  </button>
                </div>
              )}
            </Show>
@@ -1,4 +1,4 @@
-import { createSignal, For, Show, type ParentProps } from "solid-js"
+import { For, Show } from "solid-js"
 import { AppIcon } from "@opencode-ai/ui/app-icon"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Spinner } from "@opencode-ai/ui/spinner"
@@ -10,7 +10,7 @@ import { type OpenApp, useOpenInApp } from "@/session/files/open-in-app"

 export function OpenInAppButton(props: { directory: () => string }) {
  const language = useLanguage()
-  const state = useOpenInApp({ path: props.directory })
+  const state = useOpenInApp(props)

  return (
    <Show when={props.directory() && state.canOpen()}>
@@ -25,7 +25,7 @@ export function OpenInAppButton(props: { directory: () => string }) {
            onClick={(event) => {
              event.stopPropagation()
              if (state.opening()) return
-              state.openPath(state.current().id)
+              state.openDir(state.current().id)
            }}
            disabled={state.opening()}
            aria-label={language.t("session.header.open.ariaLabel", { app: state.current().label })}
@@ -52,7 +52,42 @@ export function OpenInAppButton(props: { directory: () => string }) {
          </Menu.Trigger>
          <Menu.Portal>
            <Menu.Content class="open-in-app-v2-menu">
-              <OpenInAppMenuItemsV2 state={state} close={() => state.setMenu("open", false)} />
+              <Menu.Group>
+                <Menu.GroupLabel>{language.t("session.header.openIn")}</Menu.GroupLabel>
+                <Menu.RadioGroup
+                  value={state.current().id}
+                  onChange={(value) => {
+                    state.selectApp(value as OpenApp)
+                  }}
+                >
+                  <For each={state.options()}>
+                    {(option) => (
+                      <Menu.RadioItem
+                        value={option.id}
+                        disabled={state.opening()}
+                        onSelect={() => {
+                          state.selectApp(option.id)
+                          state.setMenu("open", false)
+                          state.openDir(option.id)
+                        }}
+                      >
+                        <AppIcon id={option.icon} />
+                        {option.label}
+                      </Menu.RadioItem>
+                    )}
+                  </For>
+                </Menu.RadioGroup>
+              </Menu.Group>
+              <Menu.Separator />
+              <Menu.Item
+                onSelect={() => {
+                  state.setMenu("open", false)
+                  state.copyPath()
+                }}
+              >
+                <Icon name="copy" size="small" class="text-icon-weak" />
+                {language.t("session.header.open.copyPath")}
+              </Menu.Item>
            </Menu.Content>
          </Menu.Portal>
        </Menu>
@@ -60,116 +95,3 @@ export function OpenInAppButton(props: { directory: () => string }) {
    </Show>
  )
 }
-
-type OpenInAppState = ReturnType<typeof useOpenInApp>
-
-function OpenInAppMenuItemsV2(props: {
-  state: OpenInAppState
-  path?: () => string
-  reveal?: boolean
-  selection?: boolean
-  close?: () => void
-}) {
-  const language = useLanguage()
-  const path = () => props.path?.()
-
-  return (
-    <>
-      <Menu.Group>
-        <Menu.GroupLabel>{language.t("session.header.openIn")}</Menu.GroupLabel>
-        <Show
-          when={props.selection !== false}
-          fallback={
-            <For each={props.state.options()}>
-              {(option) => (
-                <Menu.Item
-                  disabled={props.state.opening()}
-                  onSelect={() => {
-                    props.state.selectApp(option.id)
-                    props.close?.()
-                    props.state.openPath(option.id, path(), props.reveal)
-                  }}
-                >
-                  <AppIcon id={option.icon} />
-                  {option.label}
-                </Menu.Item>
-              )}
-            </For>
-          }
-        >
-          <Menu.RadioGroup
-            value={props.state.current().id}
-            onChange={(value) => {
-              props.state.selectApp(value as OpenApp)
-            }}
-          >
-            <For each={props.state.options()}>
-              {(option) => (
-                <Menu.RadioItem
-                  value={option.id}
-                  closeOnSelect
-                  disabled={props.state.opening()}
-                  onSelect={() => {
-                    props.state.selectApp(option.id)
-                    props.close?.()
-                    props.state.openPath(option.id, path(), props.reveal)
-                  }}
-                >
-                  <AppIcon id={option.icon} />
-                  {option.label}
-                </Menu.RadioItem>
-              )}
-            </For>
-          </Menu.RadioGroup>
-        </Show>
-      </Menu.Group>
-      <Menu.Separator />
-      <Menu.Item
-        onSelect={() => {
-          props.close?.()
-          props.state.copyPath(path())
-        }}
-      >
-        <Icon name="copy" size="small" class="text-icon-weak" />
-        {language.t("session.header.open.copyPath")}
-      </Menu.Item>
-    </>
-  )
-}
-
-export function OpenInAppContextMenuV2(
-  props: ParentProps<{
-    state?: OpenInAppState
-    path: () => string
-  }>,
-) {
-  const state = props.state
-  if (!state) return props.children
-  const [open, setOpen] = createSignal(false)
-
-  return (
-    <Show when={state.canOpen() && props.path()} fallback={props.children}>
-      <Menu.Context modal={false} onOpenChange={setOpen}>
-        <Menu.Context.Trigger
-          as="div"
-          class="h-full w-full min-w-max"
-          data-slot="file-tree-v2-context-trigger"
-          data-context-menu-open={open() ? "" : undefined}
-        >
-          {props.children}
-        </Menu.Context.Trigger>
-        <Menu.Context.Portal>
-          <Menu.Context.Content class="open-in-app-v2-menu">
-            <OpenInAppMenuItemsV2
-              state={state}
-              path={props.path}
-              reveal
-              selection={false}
-              close={() => setOpen(false)}
-            />
-          </Menu.Context.Content>
-        </Menu.Context.Portal>
-      </Menu.Context>
-    </Show>
-  )
-}
@@ -1,36 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { openInAppParentPath, resolveOpenInAppPath } from "./open-in-app-path"
-
-describe("resolveOpenInAppPath", () => {
-  test("joins relative paths using the workspace separator", () => {
-    expect(resolveOpenInAppPath("/workspace/project", "src/file.ts")).toBe("/workspace/project/src/file.ts")
-    expect(resolveOpenInAppPath("C:\\workspace\\project", "src/file.ts")).toBe("C:\\workspace\\project\\src\\file.ts")
-  })
-
-  test("does not duplicate root separators", () => {
-    expect(resolveOpenInAppPath("/workspace/project/", "src/file.ts")).toBe("/workspace/project/src/file.ts")
-    expect(resolveOpenInAppPath("C:/workspace/project/", "src\\file.ts")).toBe("C:/workspace/project/src/file.ts")
-  })
-
-  test("preserves backslashes in POSIX filenames", () => {
-    expect(resolveOpenInAppPath("/workspace", "src\\file.ts")).toBe("/workspace/src\\file.ts")
-    expect(resolveOpenInAppPath("/workspace", "\\file.ts")).toBe("/workspace/\\file.ts")
-  })
-
-  test("preserves absolute POSIX, Windows, and UNC paths", () => {
-    expect(resolveOpenInAppPath("/workspace", "/tmp/file.ts")).toBe("/tmp/file.ts")
-    expect(resolveOpenInAppPath("C:/workspace", "D:\\src\\file.ts")).toBe("D:\\src\\file.ts")
-    expect(resolveOpenInAppPath("C:/workspace", "\\\\server\\share\\file.ts")).toBe("\\\\server\\share\\file.ts")
-    expect(resolveOpenInAppPath("C:/workspace", "\\src\\file.ts")).toBe("\\src\\file.ts")
-  })
-})
-
-describe("openInAppParentPath", () => {
-  test("preserves POSIX and Windows roots", () => {
-    expect(openInAppParentPath("/file.ts")).toBe("/")
-    expect(openInAppParentPath("/workspace/file.ts")).toBe("/workspace")
-    expect(openInAppParentPath("C:\\file.ts")).toBe("C:\\")
-    expect(openInAppParentPath("C:\\workspace\\file.ts")).toBe("C:\\workspace")
-    expect(openInAppParentPath("\\\\server\\share\\file.ts")).toBe("\\\\server\\share")
-  })
-})
@@ -1,19 +0,0 @@
-export function resolveOpenInAppPath(root: string, path: string) {
-  if (!path) return root
-  const windowsRoot = root.startsWith("\\\\") || /^[A-Za-z]:[\\/]/.test(root)
-  if (path.startsWith("/") || (windowsRoot && path.startsWith("\\")) || /^[A-Za-z]:[\\/]/.test(path)) return path
-  if (!root) return path
-
-  const separator = root.includes("\\") ? "\\" : "/"
-  const relative = windowsRoot ? path.replace(/^[\\/]+/, "") : path
-  return `${root.replace(/[\\/]+$/, "")}${separator}${windowsRoot ? relative.replaceAll(separator === "\\" ? "/" : "\\", separator) : relative}`
-}
-
-export function openInAppParentPath(path: string) {
-  const value = path.replace(/[\\/]+$/, "")
-  const index = Math.max(value.lastIndexOf("/"), value.lastIndexOf("\\"))
-  if (index < 0) return path
-  if (index === 0) return value.slice(0, 1)
-  if (index === 2 && /^[A-Za-z]:/.test(value)) return value.slice(0, 3)
-  return value.slice(0, index)
-}
@@ -7,8 +7,6 @@ import { showToast } from "@/shell/notifications/toast"
 import { useServer } from "@/runtime/server/current"
 import { Schema } from "effect"
 import { Persistence } from "@/runtime/persistence/schema"
-import { fileManagerApp } from "@/home/projects/file-manager"
-import { openInAppParentPath } from "@/session/files/open-in-app-path"

 export const OPEN_APPS = [
  "vscode",
@@ -34,8 +32,6 @@ export const OpenAppPreferences = Persistence.struct({
  app: Schema.Literals(OPEN_APPS),
 })

-const appExistence = new Map<string, Promise<boolean>>()
-
 export const MAC_OPEN_APPS = [
  {
    id: "vscode",
@@ -112,7 +108,9 @@ export function detectOpenAppOS(platform: ReturnType<typeof usePlatform>): OpenA
 }

 export function openAppFileManager(os: OpenAppOS) {
-  return fileManagerApp(os)
+  if (os === "macos") return { label: "session.header.open.finder", icon: "finder" as const }
+  if (os === "windows") return { label: "session.header.open.fileExplorer", icon: "file-explorer" as const }
+  return { label: "session.header.open.fileManager", icon: "finder" as const }
 }

 export function openAppsForOS(os: OpenAppOS) {
@@ -129,7 +127,7 @@ const showRequestError = (language: ReturnType<typeof useLanguage>, err: unknown
  })
 }

-export function useOpenInApp(input: { path: () => string }) {
+export function useOpenInApp(input: { directory: () => string }) {
  const platform = usePlatform()
  const server = useServer()
  const language = useLanguage()
@@ -151,7 +149,12 @@ export function useOpenInApp(input: { path: () => string }) {
    setExists(Object.fromEntries(list.map((app) => [app.id, undefined])) as Partial<Record<OpenApp, boolean>>)

    void Promise.all(
-      list.map((app) => checkAppExists(platform, app.openWith).then((ok) => [app.id, ok] as const)),
+      list.map((app) =>
+        Promise.resolve(platform.checkAppExists?.(app.openWith))
+          .then((value) => Boolean(value))
+          .catch(() => false)
+          .then((ok) => [app.id, ok] as const),
+      ),
    ).then((entries) => {
      setExists(Object.fromEntries(entries) as Partial<Record<OpenApp, boolean>>)
    })
@@ -186,35 +189,33 @@ export function useOpenInApp(input: { path: () => string }) {
    setPrefs("app", app)
  }

-  const openPath = (app: OpenApp | "finder", target = input.path(), reveal = false) => {
+  const openDir = (app: OpenApp | "finder") => {
    if (opening() || !canOpen() || !platform.openPath) return
-    if (!target) return
+    const directory = input.directory()
+    if (!directory) return

-    const open = (path: string, openWith?: string) => platform.openPath!(path, openWith)
    const item = options().find((o) => o.id === app)
    const openWith = item && "openWith" in item ? item.openWith : undefined
    setOpenRequest("app", app)
-    const request =
-      app === "finder" && reveal && platform.revealPath
-        ? platform.revealPath(target).then((revealed) => (revealed ? undefined : open(openInAppParentPath(target))))
-        : open(target, openWith)
-    request
+    platform
+      .openPath(directory, openWith)
      .catch((err: unknown) => showRequestError(language, err))
      .finally(() => {
        setOpenRequest("app", undefined)
      })
  }

-  const copyPath = (target = input.path()) => {
-    if (!target) return
+  const copyPath = () => {
+    const directory = input.directory()
+    if (!directory) return
    navigator.clipboard
-      .writeText(target)
+      .writeText(directory)
      .then(() => {
        showToast({
          variant: "success",
          icon: "circle-check",
          title: language.t("common.copied"),
-          description: target,
+          description: directory,
        })
      })
      .catch((err: unknown) => showRequestError(language, err))
@@ -227,18 +228,8 @@ export function useOpenInApp(input: { path: () => string }) {
    options,
    menu,
    setMenu,
-    openPath,
+    openDir,
    selectApp,
    copyPath,
  }
 }
-
-function checkAppExists(platform: ReturnType<typeof usePlatform>, app: string) {
-  const cached = appExistence.get(app)
-  if (cached) return cached
-  const request = Promise.resolve(platform.checkAppExists?.(app))
-    .then(Boolean)
-    .catch(() => false)
-  appExistence.set(app, request)
-  return request
-}
@@ -7,8 +7,7 @@ import { useServerSDK } from "@/runtime/server/client"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useSettings } from "@/settings/model"
 import { useWorkspaceLocation } from "@/workspaces/location"
-import { sessionPermissionRequest, sessionFormRequest, sessionTreeIDs } from "@/session/requests/session-request-tree"
-import { createWebSearchRequest } from "./websearch"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
 import { createSessionBackground } from "@/session/requests/background"
 import { useData } from "@/runtime/server/current"

@@ -25,40 +24,12 @@ export function createSessionRequestModel() {
    void Promise.all([
      data.shell.sync({ directory: sdk().directory }),
      data.session.permission.sync(id),
+      data.session.form.sync(id),
    ]).catch(() => undefined)
  })
-  createEffect(() => {
-    const id = params.id
-    if (!id || serverSDK.connection.status() !== "connected") return
-    void Promise.all(
-      sessionTreeIDs(data.session.list(), id).map((sessionID) => data.session.form.sync(sessionID)),
-    ).catch(() => undefined)
-  })

-  const formRequest = createMemo((): FormInfo | undefined => {
-    return sessionFormRequest(data.session.list(), data.session.form.list, params.id)
-  })
-  const websearch = createWebSearchRequest({
-    owner: () => params.id,
-    connected: () => serverSDK.connection.status() === "connected",
-    request: () => {
-      const form = formRequest()
-      return form?.metadata?.kind === "websearch.provider" ? form : undefined
-    },
-    providers: async (sessionID) => {
-      const session = data.session.get(sessionID) ?? (await serverSDK.api.session.get({ sessionID }))
-      const result = await serverSDK.api.websearch.providers({
-        location: { directory: session.location.directory, workspace: session.location.workspaceID },
-      })
-      return result.data.map((provider) => ({ value: provider.id, label: provider.name }))
-    },
-    reply: (input) => data.session.form.reply(input),
-    events: serverSDK.event,
-  })
-  const questionRequest = createMemo(() => {
-    if (websearch.request()) return
-    const form = formRequest()
-    return form?.metadata?.kind === "question" ? form : undefined
+  const questionRequest = createMemo((): FormInfo | undefined => {
+    return sessionQuestionForm(data.session.list(), data.session.form.list, params.id)
  })

  const permissionRequest = createMemo((): PermissionRequest | undefined => {
@@ -69,7 +40,7 @@ export function createSessionRequestModel() {
  const blocked = createMemo(() => {
    const id = params.id
    if (!id) return false
-    return !!permissionRequest() || !!questionRequest() || !!websearch.request()
+    return !!permissionRequest() || !!questionRequest()
  })

  const primary = () => {
@@ -125,7 +96,6 @@ export function createSessionRequestModel() {
  return {
    blocked,
    questionRequest,
-    websearch,
    permissionRequest,
    permissionResponding,
    background: {
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { FormInfo, PermissionRequest, SessionInfo } from "@opencode-ai/client/promise"
-import { sessionPermissionRequest, sessionFormRequest, sessionTreeIDs } from "@/session/requests/session-request-tree"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"

 const session = (input: { id: string; parentID?: string }) =>
  ({
@@ -23,22 +23,6 @@ const question = (id: string, sessionID: string) =>
    fields: [{ key: "q0", type: "string" }],
  }) as FormInfo

-describe("sessionTreeIDs", () => {
-  test("returns only the current session and its descendants", () => {
-    const sessions = [
-      session({ id: "root" }),
-      session({ id: "child", parentID: "root" }),
-      session({ id: "grand", parentID: "child" }),
-      session({ id: "sibling", parentID: "root" }),
-      session({ id: "other" }),
-    ]
-
-    expect(sessionTreeIDs(sessions, "child")).toEqual(["child", "grand"])
-    expect(sessionTreeIDs(sessions, "root")).toEqual(["root", "child", "sibling", "grand"])
-    expect(sessionTreeIDs(sessions)).toEqual([])
-  })
-})
-
 describe("sessionPermissionRequest", () => {
  test("prefers the current session permission", () => {
    const sessions = [session({ id: "root" }), session({ id: "child", parentID: "root" })]
@@ -97,7 +81,7 @@ describe("sessionPermissionRequest", () => {
  })
 })

-describe("sessionFormRequest", () => {
+describe("sessionQuestionForm", () => {
  test("prefers the current session question", () => {
    const sessions = [session({ id: "root" }), session({ id: "child", parentID: "root" })]
    const questions = {
@@ -105,7 +89,7 @@ describe("sessionFormRequest", () => {
      child: [question("q-child", "child")],
    }

-    expect(sessionFormRequest(sessions, questions, "root")?.id).toBe("q-root")
+    expect(sessionQuestionForm(sessions, questions, "root")?.id).toBe("q-root")
  })

  test("returns a nested child question", () => {
@@ -118,29 +102,15 @@ describe("sessionFormRequest", () => {
      grand: [question("q-grand", "grand")],
    }

-    expect(sessionFormRequest(sessions, questions, "root")?.id).toBe("q-grand")
+    expect(sessionQuestionForm(sessions, questions, "root")?.id).toBe("q-grand")
  })

-  test("skips unsupported forms", () => {
+  test("skips forms that are not questions", () => {
    const sessions = [session({ id: "root" })]
    const forms = {
      root: [{ ...question("form", "root"), metadata: { kind: "integration" } }],
    }

-    expect(sessionFormRequest(sessions, forms, "root")).toBeUndefined()
-  })
-
-  test("finds web search consent in a nested child session", () => {
-    const sessions = [session({ id: "root" }), session({ id: "child", parentID: "root" })]
-    const form = { ...question("search", "child"), metadata: { kind: "websearch.provider" } }
-    expect(sessionFormRequest(sessions, { child: [form] }, "root")).toBe(form)
-  })
-
-  test("preserves request order across questions and web search", () => {
-    const sessions = [session({ id: "root" }), session({ id: "child", parentID: "root" })]
-    const form = { ...question("search", "root"), metadata: { kind: "websearch.provider" } }
-    expect(sessionFormRequest(sessions, { root: [form, question("q", "root")] }, "root")).toBe(form)
-    expect(sessionFormRequest(sessions, { root: [question("q", "root"), form] }, "root")?.id).toBe("q")
-    expect(sessionFormRequest(sessions, { root: [form], child: [question("q", "child")] }, "root")).toBe(form)
+    expect(sessionQuestionForm(sessions, forms, "root")).toBeUndefined()
  })
 })
@@ -6,16 +6,8 @@ function sessionTreeRequest<T>(
  sessionID?: string,
  include: (item: T) => boolean = () => true,
 ) {
-  const ids = sessionTreeIDs(session, sessionID)
-  if (!ids.length) return
-  const list = (id: string) => (typeof request === "function" ? request(id) : request[id])
-  const id = ids.find((id) => list(id)?.some(include))
-  if (!id) return
-  return list(id)?.find(include)
-}
+  if (!sessionID) return

-export function sessionTreeIDs(session: SessionInfo[], sessionID?: string) {
-  if (!sessionID) return []
  const map = session.reduce((acc, item) => {
    if (!item.parentID) return acc
    const list = acc.get(item.parentID)
@@ -35,7 +27,11 @@ export function sessionTreeIDs(session: SessionInfo[], sessionID?: string) {
      ids.push(child)
    }
  }
-  return ids
+
+  const list = (id: string) => (typeof request === "function" ? request(id) : request[id])
+  const id = ids.find((id) => list(id)?.some(include))
+  if (!id) return
+  return list(id)?.find(include)
 }

 export function sessionPermissionRequest(
@@ -47,15 +43,10 @@ export function sessionPermissionRequest(
  return sessionTreeRequest(session, request, sessionID, include)
 }

-export function sessionFormRequest(
+export function sessionQuestionForm(
  session: SessionInfo[],
  request: Record<string, FormInfo[] | undefined> | ((sessionID: string) => FormInfo[] | undefined),
  sessionID?: string,
 ) {
-  return sessionTreeRequest(
-    session,
-    request,
-    sessionID,
-    (item) => item.metadata?.kind === "question" || item.metadata?.kind === "websearch.provider",
-  )
+  return sessionTreeRequest(session, request, sessionID, (item) => item.metadata?.kind === "question")
 }
@@ -1,58 +0,0 @@
-[data-component="session-websearch-dock"] {
-  width: 100%;
-  border: 0.5px solid var(--v2-border-border-base);
-  border-radius: 12px;
-
-  .websearch-body {
-    box-shadow: var(--v2-elevation-raised);
-  }
-
-  .websearch-setting {
-    padding: 16px;
-  }
-
-  .websearch-setting [data-component="settings-row"] {
-    column-gap: 24px;
-    padding-block: 0;
-    border: 0;
-  }
-
-  .websearch-footer {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    gap: 16px;
-    padding: 24px 16px 12px;
-    border: 0;
-  }
-
-  .websearch-status {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    margin-inline-end: auto;
-    color: var(--v2-text-text-base);
-    font-size: 13px;
-    line-height: var(--line-height-compact);
-  }
-
-  .websearch-status:empty {
-    display: none;
-  }
-
-  .websearch-actions {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    gap: 16px;
-  }
-}
-
-[data-component="menu-v2-content"][data-slot="select-v2-content"].websearch-provider-menu {
-  width: max-content;
-  min-width: 0;
-
-  [data-component="menu-v2-item"] {
-    gap: 24px;
-  }
-}
@@ -1,86 +0,0 @@
-import { createMemo, Show } from "solid-js"
-import { Button } from "@opencode-ai/ui/button"
-import { DockShell, DockTray } from "@opencode-ai/ui/dock-surface"
-import { Select } from "@opencode-ai/ui/select"
-import { useLanguage } from "@/runtime/i18n/language"
-import { SettingsRow } from "@/settings/row"
-import type { WebSearchRequestModel } from "./websearch"
-import "./session-websearch-dock.css"
-
-export function SessionWebSearchDock(props: { model: WebSearchRequestModel; onSubmit: () => void }) {
-  const language = useLanguage()
-  const options = createMemo(() => [
-    ...(props.model.specific() ? [] : [{ value: "random", label: language.t("session.websearch.any") }]),
-    ...props.model.options(),
-  ])
-  const current = createMemo(() => options().find((option) => option.value === props.model.selected()))
-  const busy = () => props.model.sending() || !props.model.connected()
-  const status = () => {
-    if (props.model.loading()) return language.t("common.loading")
-    if (props.model.failed()) return language.t("session.websearch.failed")
-    if (!props.model.options().length) return language.t("session.websearch.empty")
-  }
-  const unavailable = () => props.model.loading() || props.model.loadFailed() || !props.model.options().length
-  const submit = (selection: string | false) => {
-    if (busy()) return
-    props.onSubmit()
-    void props.model.submit(selection)
-  }
-
-  return (
-    <section
-      data-component="session-websearch-dock"
-      aria-label={language.t("session.websearch.title")}
-      aria-busy={props.model.sending()}
-    >
-      <DockShell class="websearch-body">
-        <div class="websearch-setting">
-          <SettingsRow
-            title={language.t("session.websearch.title")}
-            description={language.t("session.websearch.description")}
-          >
-            <Select
-              aria-label={language.t("session.websearch.provider")}
-              options={options()}
-              current={current()}
-              value={(option) => option.value}
-              label={(option) => option.label}
-              onSelect={(option) => option && props.model.select(option.value)}
-              disabled={busy() || unavailable()}
-              placeholder={language.t("session.websearch.provider")}
-              contentClass="websearch-provider-menu"
-            />
-          </SettingsRow>
-        </div>
-      </DockShell>
-      <DockTray attach="top" class="websearch-footer">
-        <div class="websearch-status" aria-live="polite">
-          <Show when={props.model.loadFailed()} fallback={status()}>
-            <span>{language.t("session.websearch.loadFailed")}</span>
-            <Button variant="ghost" size="small" onClick={props.model.retry} disabled={busy()}>
-              {language.t("session.websearch.retry")}
-            </Button>
-          </Show>
-        </div>
-        <div class="websearch-actions">
-          <Show when={!props.model.specific()}>
-            <Button variant="ghost" size="small" onClick={() => submit(false)} disabled={busy()}>
-              {language.t("session.websearch.disable")}
-            </Button>
-          </Show>
-          <Button
-            variant="neutral"
-            size="small"
-            onClick={() => {
-              const selected = props.model.selected()
-              if (selected) submit(selected)
-            }}
-            disabled={busy() || unavailable() || !current()}
-          >
-            {language.t("session.websearch.enable")}
-          </Button>
-        </div>
-      </DockTray>
-    </section>
-  )
-}
@@ -1,171 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { FormAnswer, FormCreated, FormReplyInput, OpenCodeEvent } from "@opencode-ai/client/promise"
-import { replyWebSearch } from "./websearch"
-
-const consent: FormCreated["data"]["form"] = {
-  id: "frm_consent",
-  sessionID: "ses_child",
-  title: "Web Search",
-  metadata: { kind: "websearch.provider" },
-  fields: [{ key: "choice", type: "string", required: true, custom: false }],
-}
-const provider: FormCreated["data"]["form"] = {
-  ...consent,
-  id: "frm_provider",
-  fields: [
-    {
-      key: "provider",
-      type: "string",
-      required: true,
-      custom: false,
-      options: [
-        { value: "exa", label: "Exa" },
-        { value: "parallel", label: "Parallel" },
-      ],
-    },
-  ],
-}
-
-function fixture() {
-  const listeners = new Set<(event: OpenCodeEvent) => void>()
-  const replies: FormReplyInput[] = []
-  const abort = new AbortController()
-  const emit = (event: OpenCodeEvent) => listeners.forEach((listener) => listener(event))
-  return {
-    form: consent,
-    signal: abort.signal,
-    abort,
-    listeners,
-    replies,
-    events: {
-      listen(listener: (event: OpenCodeEvent) => void) {
-        listeners.add(listener)
-        return () => {
-          listeners.delete(listener)
-        }
-      },
-    },
-    reply: async (input: FormReplyInput) => {
-      replies.push(input)
-    },
-    create: (form = provider) => emit({ id: "evt_create", created: 0, type: "form.created", data: { form } }),
-    cancel: (id: string) =>
-      emit({
-        id: "evt_cancel",
-        created: 0,
-        type: "form.cancelled",
-        data: { id, sessionID: consent.sessionID },
-      }),
-    answer: (id: string, answer: FormAnswer) =>
-      emit({
-        id: "evt_reply",
-        created: 0,
-        type: "form.replied",
-        data: { id, sessionID: consent.sessionID, answer },
-      }),
-  }
-}
-
-describe("web search desktop consent", () => {
-  test.each([
-    ["random", "allow"],
-    [false, "disable"],
-  ] as const)("submits %s without a second form", async (selection, choice) => {
-    const input = fixture()
-    await replyWebSearch({ ...input, selection })
-    expect(input.replies).toEqual([{ sessionID: consent.sessionID, formID: consent.id, answer: { choice } }])
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("subscribes before the first reply and answers the owning session's provider form", async () => {
-    const input = fixture()
-    await replyWebSearch({
-      ...input,
-      selection: "parallel",
-      reply: async (answer) => {
-        input.replies.push(answer)
-        if (answer.answer.choice === "choose") input.create()
-      },
-    })
-    expect(input.replies).toEqual([
-      { sessionID: consent.sessionID, formID: consent.id, answer: { choice: "choose" } },
-      { sessionID: consent.sessionID, formID: provider.id, answer: { provider: "parallel" } },
-    ])
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("ignores questions, other sessions, and repeated consent forms during handoff", async () => {
-    const input = fixture()
-    const pending = replyWebSearch({ ...input, selection: "exa" })
-    input.create({ ...provider, sessionID: "ses_other" })
-    input.create({ ...provider, metadata: { kind: "question" } })
-    input.create(consent)
-    input.create()
-    await pending
-    expect(input.replies).toHaveLength(2)
-    expect(input.replies[1]?.formID).toBe(provider.id)
-  })
-
-  test("leaves a changed provider list for explicit confirmation", async () => {
-    const input = fixture()
-    const pending = replyWebSearch({ ...input, selection: "removed" })
-    input.create()
-    await pending
-    expect(input.replies).toHaveLength(1)
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("supports direct entry into the provider form", async () => {
-    const input = fixture()
-    await replyWebSearch({ ...input, form: provider, selection: "exa" })
-    expect(input.replies).toEqual([{ sessionID: consent.sessionID, formID: provider.id, answer: { provider: "exa" } }])
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("does not misrepresent cancelling the provider form as disabling search", async () => {
-    const input = fixture()
-    await replyWebSearch({ ...input, form: provider, selection: false })
-    expect(input.replies).toEqual([])
-  })
-
-  test.each(["cancel", "other-client", "abort"])("ends a pending handoff on %s", async (action) => {
-    const input = fixture()
-    const pending = replyWebSearch({ ...input, selection: "exa" })
-    if (action === "cancel") input.cancel(consent.id)
-    if (action === "other-client") input.answer(consent.id, { choice: "disable" })
-    if (action === "abort") input.abort.abort()
-    await pending
-    input.create()
-    expect(input.replies).toHaveLength(1)
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("cleans up after a failed consent submission", async () => {
-    const input = fixture()
-    await expect(
-      replyWebSearch({
-        ...input,
-        selection: "exa",
-        reply: async () => {
-          throw new Error("offline")
-        },
-      }),
-    ).rejects.toThrow("offline")
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("propagates provider submission failures for retry", async () => {
-    const input = fixture()
-    await expect(
-      replyWebSearch({
-        ...input,
-        selection: "exa",
-        reply: async (answer) => {
-          if (answer.formID === provider.id) throw new Error("offline")
-          input.create()
-        },
-      }),
-    ).rejects.toThrow("offline")
-    expect(input.listeners.size).toBe(0)
-  })
-})
@@ -1,154 +0,0 @@
-import type { FormInfo, FormOption, FormReplyInput, FormStringField } from "@opencode-ai/client/promise"
-import { createEffect, createMemo, createResource, on, onCleanup } from "solid-js"
-import { createStore } from "solid-js/store"
-import type { OpenCodeEventStream } from "@/runtime/server/client"
-
-export function webSearchProviderField(form: FormInfo) {
-  return form.fields.find(
-    (field): field is FormStringField => field.type === "string" && field.key === "provider" && !!field.options,
-  )
-}
-
-export function createWebSearchRequest(input: {
-  owner: () => string | undefined
-  connected: () => boolean
-  request: () => FormInfo | undefined
-  providers: (sessionID: string) => Promise<FormOption[]>
-  reply: (input: FormReplyInput) => Promise<unknown>
-  events: Pick<OpenCodeEventStream, "listen">
-}) {
-  const [store, setStore] = createStore({
-    selected: "random",
-    sending: undefined as { form: FormInfo; abort: AbortController } | undefined,
-    error: false,
-  })
-  const [providers, resource] = createResource(input.request, async (form) => {
-    const field = webSearchProviderField(form)
-    if (field) return field.options ?? []
-    return input.providers(form.sessionID)
-  })
-  const request = createMemo(() => store.sending?.form ?? input.request())
-  const specific = createMemo(() => {
-    const form = request()
-    return !!form && !!webSearchProviderField(form)
-  })
-  const options = createMemo(() => (providers.error ? [] : (providers() ?? [])))
-  const selected = createMemo(() => {
-    if (!specific()) return store.selected
-    return options().some((option) => option.value === store.selected) ? store.selected : options()[0]?.value
-  })
-
-  createEffect(
-    on([input.owner, input.connected], () => {
-      store.sending?.abort.abort()
-      setStore({ sending: undefined, selected: "random", error: false })
-    }),
-  )
-  createEffect(
-    on(
-      () => input.request()?.id,
-      () => {
-        const form = input.request()
-        if (!form || store.sending || webSearchProviderField(form)) return
-        setStore({ selected: "random", error: false })
-      },
-    ),
-  )
-  onCleanup(() => store.sending?.abort.abort())
-
-  const submit = async (selection: string | false) => {
-    const form = input.request()
-    if (!form || store.sending || !input.connected()) return
-    if (selection === false && webSearchProviderField(form)) return
-    const sending = { form, abort: new AbortController() }
-    setStore({ sending, error: false })
-    await replyWebSearch({ ...input, form, selection, signal: sending.abort.signal })
-      .catch(() => {
-        if (!sending.abort.signal.aborted) setStore("error", true)
-      })
-      .finally(() => {
-        if (store.sending?.abort === sending.abort) setStore("sending", undefined)
-      })
-  }
-
-  return {
-    request,
-    options,
-    selected,
-    specific,
-    loading: () => providers.loading,
-    loadFailed: () => !!providers.error,
-    failed: () => store.error,
-    sending: () => !!store.sending,
-    connected: input.connected,
-    select: (value: string) => setStore({ selected: value, error: false }),
-    retry: () => void resource.refetch(),
-    submit,
-  }
-}
-
-export type WebSearchRequestModel = ReturnType<typeof createWebSearchRequest>
-
-export async function replyWebSearch(input: {
-  form: FormInfo
-  selection: string | false
-  signal: AbortSignal
-  reply: (input: FormReplyInput) => Promise<unknown>
-  events: Pick<OpenCodeEventStream, "listen">
-}) {
-  if (input.signal.aborted) return
-  if (webSearchProviderField(input.form)) {
-    if (input.selection === false) return
-    return input.reply({
-      sessionID: input.form.sessionID,
-      formID: input.form.id,
-      answer: { provider: input.selection },
-    })
-  }
-  if (input.selection === false || input.selection === "random") {
-    return input.reply({
-      sessionID: input.form.sessionID,
-      formID: input.form.id,
-      answer: { choice: input.selection === false ? "disable" : "allow" },
-    })
-  }
-
-  const next = Promise.withResolvers<FormInfo | undefined>()
-  const stop = input.events.listen((event) => {
-    if (event.type === "form.created") {
-      const form = event.data.form
-      if (
-        form.sessionID !== input.form.sessionID ||
-        form.id === input.form.id ||
-        form.metadata?.kind !== "websearch.provider" ||
-        !webSearchProviderField(form)
-      )
-        return
-      next.resolve(form)
-    }
-    if (event.type === "form.cancelled" && event.data.id === input.form.id) next.resolve(undefined)
-    if (event.type === "form.replied" && event.data.id === input.form.id && event.data.answer.choice !== "choose")
-      next.resolve(undefined)
-  })
-  const cancel = () => next.resolve(undefined)
-  input.signal.addEventListener("abort", cancel, { once: true })
-
-  return Promise.all([
-    input.reply({ sessionID: input.form.sessionID, formID: input.form.id, answer: { choice: "choose" } }),
-    next.promise,
-  ])
-    .then(([, form]) => {
-      if (!form || input.signal.aborted) return
-      const field = webSearchProviderField(form)
-      if (!field?.options?.some((option) => option.value === input.selection)) return
-      return input.reply({
-        sessionID: form.sessionID,
-        formID: form.id,
-        answer: { provider: input.selection },
-      })
-    })
-    .finally(() => {
-      stop()
-      input.signal.removeEventListener("abort", cancel)
-    })
-}
@@ -27,8 +27,6 @@ import { createSessionReview } from "./review/model"
 import { SessionDesktopReview, SessionMobileReview, SessionMobileViewTabs } from "./review/view"
 import { SessionContextTab } from "./files/session-context-tab"
 import { createSessionTimelineInteraction } from "./timeline/interaction"
-import { createTimelineSearchController } from "./timeline/search-controller"
-import { TimelineSearchBar } from "./timeline/search-bar"
 import { ActiveSessionComposerRegion, createActiveSessionRegion } from "./composer/region"
 import { SessionIdentityHeader } from "./session-identity-header"
 import { SessionReviewToggle } from "./header/session-header-actions"
@@ -49,12 +47,6 @@ export function SessionScreen(props: { session: SessionModel }) {
  const isDesktop = session.isDesktop
  const screen = createSessionScreenLayout(session)
  const timeline = createSessionTimelineInteraction(session)
-  const timelineSearch = createTimelineSearchController({
-    sessionID: session.identity.sessionID,
-    scrollRef: timeline.scroller,
-    revealMessage: timeline.actions.revealMessage,
-    pauseAutoScroll: timeline.view.unpin,
-  })
  const messagesReady = timeline.ready
  const [store, setStore] = createStore({
    deferRender: false,
@@ -270,7 +262,6 @@ export function SessionScreen(props: { session: SessionModel }) {
                  anchor={timeline.view.anchor}
                  setRevealMessage={timeline.view.setRevealMessage}
                  setScrollToEnd={timeline.view.setScrollToEnd}
-                  search={<TimelineSearchBar controller={timelineSearch} />}
                />
              )}
            </Show>
@@ -2,54 +2,30 @@ import { describe, expect, test } from "bun:test"
 import { createRoot } from "solid-js"
 import { createSessionResolution } from "./session-resolution"

-function store() {
-  const syncs = { session: 0, message: 0, pending: 0 }
-  const sessions = {
-    get: () => undefined,
-    sync: () => {
-      syncs.session++
-      return Promise.resolve()
-    },
-    message: {
-      sync: () => {
-        syncs.message++
-        return Promise.resolve()
-      },
-    },
-    pending: {
-      sync: () => {
-        syncs.pending++
-        return Promise.resolve()
-      },
-    },
-  }
-  return { syncs, sessions }
-}
-
 describe("session resolution", () => {
  test("waits for a route session ID", () => {
    createRoot((dispose) => {
-      const input = store()
+      const syncs = { session: 0, message: 0 }
+      const sessions = {
+        get: () => undefined,
+        sync: () => {
+          syncs.session++
+          return Promise.resolve()
+        },
+        message: {
+          sync: () => {
+            syncs.message++
+            return Promise.resolve()
+          },
+        },
+      }
      const session = createSessionResolution(
        () => undefined,
-        () => input.sessions,
+        () => sessions,
      )

      expect(session()).toBeUndefined()
-      expect(input.syncs).toEqual({ session: 0, message: 0, pending: 0 })
-      dispose()
-    })
-  })
-
-  test("starts the transcript and queued input reads with metadata", () => {
-    createRoot((dispose) => {
-      const input = store()
-      createSessionResolution(
-        () => "ses_open",
-        () => input.sessions,
-        { children: true },
-      )
-      expect(input.syncs).toEqual({ session: 1, message: 1, pending: 1 })
+      expect(syncs).toEqual({ session: 0, message: 0 })
      dispose()
    })
  })
@@ -7,9 +7,6 @@ type SessionStore<T> = {
  message: {
    sync: (id: string) => Promise<unknown>
  }
-  pending: {
-    sync: (id: string) => Promise<unknown>
-  }
 }

 type Resolution<T> = { id: string; store: SessionStore<T> } & (
@@ -55,11 +52,8 @@ export function createSessionResolution<T>(
      onCleanup(() => {
        stale = true
      })
-      // The timeline owns message errors; metadata resolution stays independent. Queued inputs
-      // ride along so a reconnect refreshes them with the transcript instead of leaving the
-      // pre-disconnect queue on screen.
+      // The timeline owns message errors; metadata resolution stays independent.
      void store.message.sync(id).catch(() => undefined)
-      void store.pending.sync(id).catch(() => undefined)
      if (cached() && !options?.children && !options?.connected) {
        setStatus({ id, store, state: "settled" })
        return
@@ -138,26 +138,6 @@ export const QuestionRequest = {
  ),
 }

-export const WebSearchRequest = {
-  render: () => (
-    <SessionPreview
-      title="Search for current documentation"
-      description={description}
-      document={questionPendingDocument}
-      request={{
-        type: "websearch",
-        value: {
-          id: "frm_websearch_preview",
-          sessionID: "ses_websearch_preview",
-          title: "Web Search",
-          metadata: { kind: "websearch.provider" },
-          fields: [{ key: "choice", type: "string", required: true, custom: false }],
-        },
-      }}
-    />
-  ),
-}
-
 export const RetryAndInterruption = {
  render: () => (
    <SessionPreview title="Recover the interrupted run" description={description} document={retryAfterInterruption} />
@@ -23,7 +23,6 @@ import { useLanguage } from "@/runtime/i18n/language"
 import { ReviewPanelView } from "@/session/review/panel"
 import { createReviewPanelState } from "@/session/review/panel-state"
 import { TerminalSurface } from "@/session/terminal/surface"
-import type { WebSearchRequestModel } from "./requests/websearch"

 const modelReady = Object.assign(() => true, { promise: undefined }) satisfies ModelSelection["ready"]
 const storyComposerModel = {
@@ -83,7 +82,7 @@ export type SessionPreviewProps = {
  description: string
  document: SessionDocument
  draft?: string
-  request?: { type: "permission"; value: PermissionRequest } | { type: "question" | "websearch"; value: FormInfo }
+  request?: { type: "permission"; value: PermissionRequest } | { type: "question"; value: FormInfo }
  reviewOpened?: boolean
  child?: { parentID: string }
  terminal?: { title: string; lines: string[] }
@@ -174,12 +173,10 @@ function SessionSurfaceState(props: SessionPreviewProps & { onReset: () => void
    activity: string
    reviewOpened: boolean
    request: SessionPreviewProps["request"]
-    searchProvider: string
  }>({
    activity: "Ready",
    reviewOpened: props.reviewOpened ?? false,
    request: props.request,
-    searchProvider: "random",
  })
  const prompt = createPromptController({
    initial: props.draft ?? "",
@@ -192,27 +189,6 @@ function SessionSurfaceState(props: SessionPreviewProps & { onReset: () => void
  const region = {
    state: {
      questionRequest: () => (state.request?.type === "question" ? state.request.value : undefined),
-      websearch: {
-        request: () => (state.request?.type === "websearch" ? state.request.value : undefined),
-        options: () => [
-          { value: "exa", label: "Exa" },
-          { value: "parallel", label: "Parallel" },
-          { value: "tavily", label: "Tavily" },
-        ],
-        selected: () => state.searchProvider,
-        specific: () => false,
-        loading: () => false,
-        loadFailed: () => false,
-        failed: () => false,
-        sending: () => false,
-        connected: () => true,
-        select: (value) => setState("searchProvider", value),
-        retry() {},
-        submit: async (value) => {
-          setState("request", undefined)
-          setState("activity", `Web search selection (local only): ${value}`)
-        },
-      } satisfies WebSearchRequestModel,
      permissionRequest: () => (state.request?.type === "permission" ? state.request.value : undefined),
      permissionResponding: () => false,
      decide: (response) => {
@@ -24,7 +24,6 @@ export function createSessionTimelineInteraction(session: SessionModel) {
      pinned: true,
    },
    refs: {
-      scroller: undefined as HTMLDivElement | undefined,
      content: undefined as HTMLDivElement | undefined,
      dock: undefined as HTMLDivElement | undefined,
    },
@@ -39,7 +38,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
  }
  let scroller: HTMLDivElement | undefined
  let dockHeight = 0
-  let revealMessage = (_id: string, _partID?: string) => {}
+  let revealMessage = (_id: string) => {}
  let scrollToEnd = () => {}
  let scrollMark = 0
  let messageMark = 0
@@ -158,7 +157,6 @@ export function createSessionTimelineInteraction(session: SessionModel) {
  }
  const setScrollRef = (element: HTMLDivElement | undefined) => {
    scroller = element
-    setState("refs", "scroller", element)
    if (!element) return
    scheduleScrollState(element)
    fill()
@@ -292,7 +290,6 @@ export function createSessionTimelineInteraction(session: SessionModel) {
  return {
    actions: {
      navigateMessage,
-      revealMessage: (id: string, partID?: string) => revealMessage(id, partID),
      resume,
      setActiveMessage,
    },
@@ -300,7 +297,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
    resource: timeline.resource,
    ready: timeline.ready,
    scroll: state.scroll,
-    scroller: () => state.refs.scroller,
+    scroller: () => scroller,
    view: {
      anchor,
      markUserScroll,
@@ -316,7 +313,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
      setDockRef: (element: HTMLDivElement | undefined) => {
        setState("refs", "dock", element)
      },
-      setRevealMessage: (reveal: (id: string, partID?: string) => void) => {
+      setRevealMessage: (reveal: (id: string) => void) => {
        revealMessage = reveal
      },
      setScrollRef,
@@ -58,6 +58,7 @@ export function BackgroundMoveHint(props: { keybind?: string[]; onMove?: () => v
      type="button"
      variant="ghost-faint"
      size="small"
+      icon="outline-arrow-to-corner-top-right"
      class="max-w-full"
      aria-label={language.t("session.background.moveInline", { keybind: keybind() })}
      onClick={() => props.onMove?.()}
@@ -353,9 +354,8 @@ type MessageTimelineProps = {
  workspaceMoveEligible: boolean
  onSummaryOpenChange: (open: boolean) => void
  anchor: (id: string) => string
-  setRevealMessage?: (fn: (id: string, partID?: string) => void) => void
+  setRevealMessage?: (fn: (id: string) => void) => void
  setScrollToEnd?: (fn: () => void) => void
-  search?: JSX.Element
 }

 export function MessageTimeline(props: MessageTimelineProps) {
@@ -790,7 +790,6 @@ function MessageTimelineView(
              <Show when={sessionID()} keyed>
                {(id) => (
                  <div class="shrink-0 flex items-center gap-2">
-                    {props.search}
                    <SessionContextUsage placement="bottom" />
                    <Show when={!parentID() && project()}>
                      {(project) => (
@@ -1,14 +0,0 @@
-[data-component="timeline-search-bar"] [data-component="text-input-v2"] {
-  background: var(--v2-background-bg-base);
-  box-shadow: inset 0 0 0 1px var(--v2-border-border-base);
-  outline: none;
-}
-
-[data-component="timeline-search-bar"] [data-component="text-input-v2"]:hover {
-  background: var(--v2-background-bg-base);
-}
-
-[data-component="timeline-search-bar"] [data-component="text-input-v2"]:focus-within {
-  box-shadow: inset 0 0 0 1px var(--v2-border-border-focus);
-  outline: none;
-}
@@ -1,72 +0,0 @@
-import { Icon } from "@opencode-ai/ui/icon"
-import "@opencode-ai/ui/text-input.css"
-import { Show } from "solid-js"
-import type { TimelineSearchController } from "./search-controller"
-import "./search-bar.css"
-
-export function TimelineSearchBar(props: { controller: TimelineSearchController }) {
-  const c = props.controller
-
-  return (
-    <Show when={c.visible()}>
-      <div data-component="timeline-search-bar" class="h-7 w-[200px] max-w-[50vw] shrink-0">
-        <div data-component="text-input-v2" data-appearance="base" data-leading-icon class="!h-7 !w-full max-w-full">
-          <div data-slot="text-input-v2-value">
-            <span data-slot="text-input-v2-leading-icon">
-              <Icon name="magnifying-glass" size="small" />
-            </span>
-            <input
-              ref={c.element.setInput}
-              data-slot="text-input-v2-input"
-              type="search"
-              value={c.query.value()}
-              placeholder={c.query.placeholder()}
-              aria-label={c.query.placeholder()}
-              onInput={(event) => c.query.setValue(event.currentTarget.value)}
-              onKeyDown={(event) => {
-                if (event.key === "Escape") {
-                  event.preventDefault()
-                  c.query.close()
-                  return
-                }
-                if (event.altKey || event.metaKey || event.ctrlKey) return
-                if (event.key === "Enter" && !event.isComposing) {
-                  event.preventDefault()
-                  c.result.move(event.shiftKey ? -1 : 1)
-                  return
-                }
-                if (event.key === "ArrowDown" && !event.isComposing) {
-                  event.preventDefault()
-                  c.result.move(1)
-                  return
-                }
-                if (event.key === "ArrowUp" && !event.isComposing) {
-                  event.preventDefault()
-                  c.result.move(-1)
-                  return
-                }
-              }}
-            />
-          </div>
-          <Show when={c.query.value()}>
-            <span
-              data-slot="timeline-search-count"
-              class="shrink-0 self-center text-[11px] text-v2-text-text-muted [font-weight:440] tabular-nums"
-            >
-              {c.result.count() > 0 ? c.result.activeIndex() + 1 : 0}/{c.result.count()}
-            </span>
-          </Show>
-          <button
-            type="button"
-            class="-me-1 flex size-5 shrink-0 self-center items-center justify-center rounded-[2px] border-0 bg-transparent p-0 text-v2-icon-icon-muted outline outline-1 outline-transparent hover:bg-v2-overlay-simple-overlay-hover active:bg-v2-overlay-simple-overlay-pressed focus-visible:outline-v2-border-border-focus"
-            aria-label={c.query.placeholder()}
-            onMouseDown={(event) => event.preventDefault()}
-            onClick={() => c.query.close()}
-          >
-            <Icon name="xmark-small" />
-          </button>
-        </div>
-      </div>
-    </Show>
-  )
-}
@@ -1,275 +0,0 @@
-import { useCommand } from "@/shell/commands/command"
-import { useLanguage } from "@/runtime/i18n/language"
-import { useData } from "@/runtime/server/current"
-import { Timeline } from "@opencode-ai/session-ui/timeline/projection"
-import { createEffect, createMemo, createSignal, on, onCleanup } from "solid-js"
-import { createStore } from "solid-js/store"
-
-export type TimelineSearchMatch = {
-  messageID: string
-  role: "user" | "assistant"
-  revealID: string
-  partID: string
-  occurrence: number
-  text: string
-}
-
-const HIGHLIGHT_HIT = "timeline-search-hit"
-const HIGHLIGHT_ACTIVE = "timeline-search-hit-active"
-const TEXT_SELECTORS = '[data-slot="text-part-body"], [data-slot="user-message-text"]'
-
-function supportsHighlights() {
-  return typeof CSS !== "undefined" && typeof CSS.highlights === "object" && CSS.highlights !== null
-}
-
-function clearHighlights() {
-  if (!supportsHighlights()) return
-  CSS.highlights.delete(HIGHLIGHT_HIT)
-  CSS.highlights.delete(HIGHLIGHT_ACTIVE)
-}
-
-function collectRanges(
-  root: HTMLElement,
-  query: string,
-  activePartID: string | undefined,
-  activeOccurrence: number | undefined,
-) {
-  const hits: Range[] = []
-  const active: Range[] = []
-  const lower = query.toLowerCase()
-  const bodies = root.querySelectorAll<HTMLElement>(TEXT_SELECTORS)
-  for (const body of bodies) {
-    const part = body.closest("[data-timeline-part-id]")
-    const partID = part?.getAttribute("data-timeline-part-id")
-    const isActivePart = activePartID !== undefined && partID === activePartID
-    let occurrenceInPart = 0
-    const walker = document.createTreeWalker(body, NodeFilter.SHOW_TEXT)
-    let node = walker.nextNode() as Text | null
-    while (node) {
-      const value = node.nodeValue ?? ""
-      const lowerValue = value.toLowerCase()
-      let from = 0
-      let at = lowerValue.indexOf(lower, from)
-      while (at !== -1) {
-        const range = document.createRange()
-        range.setStart(node, at)
-        range.setEnd(node, at + query.length)
-        if (isActivePart && activeOccurrence === occurrenceInPart) active.push(range)
-        else hits.push(range)
-        occurrenceInPart += 1
-        from = at + query.length
-        at = lowerValue.indexOf(lower, from)
-      }
-      node = walker.nextNode() as Text | null
-    }
-  }
-  return { hits, active }
-}
-
-function applyHighlights(
-  root: HTMLElement,
-  query: string,
-  activePartID: string | undefined,
-  activeOccurrence: number | undefined,
-) {
-  if (!supportsHighlights()) return
-  const { hits, active } = collectRanges(root, query, activePartID, activeOccurrence)
-  CSS.highlights.set(HIGHLIGHT_HIT, new Highlight(...hits))
-  CSS.highlights.set(HIGHLIGHT_ACTIVE, new Highlight(...active))
-}
-
-export function createTimelineSearchController(input: {
-  sessionID: () => string | undefined
-  scrollRef: () => HTMLDivElement | undefined
-  revealMessage: (id: string, partID?: string) => void
-  pauseAutoScroll: () => void
-}) {
-  const command = useCommand()
-  const language = useLanguage()
-  const data = useData()
-  const [state, setState] = createStore({ value: "", active: 0, visible: false })
-  const [focusTick, setFocusTick] = createSignal(0)
-  let inputEl: HTMLInputElement | undefined
-
-  const query = createMemo(() => state.value.trim().toLowerCase())
-
-  const matches = createMemo<TimelineSearchMatch[]>(() => {
-    const value = query()
-    if (!value) return []
-    const sessionID = input.sessionID()
-    if (!sessionID) return []
-    const messages = data.session.message.list(sessionID)
-    const result: TimelineSearchMatch[] = []
-    let revealID = ""
-    for (const message of messages) {
-      if (message.type === "user" || message.type === "shell") revealID = message.id
-      if (message.type !== "user" && message.type !== "assistant") continue
-      const visibleParts =
-        message.type === "user"
-          ? [{ id: `${message.id}:text:0`, content: { type: "text" as const, text: message.text } }]
-          : Timeline.contentEntries(message)
-      for (const textPart of visibleParts) {
-        if (textPart.content.type !== "text") continue
-        const text = textPart.content.text
-        if (!text) continue
-        const lower = text.toLowerCase()
-        let from = 0
-        let occurrence = 0
-        let at = lower.indexOf(value, from)
-        while (at !== -1) {
-          result.push({
-            messageID: message.id,
-            role: message.type,
-            revealID,
-            partID: textPart.id,
-            occurrence,
-            text,
-          })
-          occurrence += 1
-          from = at + value.length
-          at = lower.indexOf(value, from)
-        }
-      }
-    }
-    return result
-  })
-
-  const activeIndex = createMemo(() => {
-    const list = matches()
-    if (list.length === 0) return 0
-    if (state.active >= list.length) return 0
-    if (state.active < 0) return 0
-    return state.active
-  })
-
-  const activePartID = createMemo(() => matches()[activeIndex()]?.partID)
-  const activeOccurrence = createMemo(() => matches()[activeIndex()]?.occurrence)
-
-  createEffect(() => {
-    const root = input.scrollRef()
-    const q = query()
-    if (!root || !state.visible || !q) {
-      clearHighlights()
-      return
-    }
-    applyHighlights(root, q, activePartID(), activeOccurrence())
-    let frame: number | undefined
-    const scheduleApply = () => {
-      if (frame !== undefined) return
-      frame = requestAnimationFrame(() => {
-        frame = undefined
-        if (!state.visible) return
-        applyHighlights(root, query(), activePartID(), activeOccurrence())
-      })
-    }
-    const observer = new MutationObserver(scheduleApply)
-    observer.observe(root, { childList: true, subtree: true, characterData: true })
-    onCleanup(() => {
-      observer.disconnect()
-      if (frame !== undefined) cancelAnimationFrame(frame)
-      clearHighlights()
-    })
-  })
-
-  createEffect(
-    on(focusTick, () => {
-      if (!state.visible) return
-      requestAnimationFrame(() => {
-        inputEl?.focus()
-        inputEl?.select()
-      })
-    }),
-  )
-
-  command.register("session.search", () => [
-    {
-      id: "session.search",
-      title: language.t("session.search.placeholder"),
-      keybind: "mod+f",
-      hidden: true,
-      onSelect: () => open(),
-    },
-  ])
-  const onOpenRequest = () => open()
-  document.addEventListener("opencode:timeline-search-open", onOpenRequest)
-  onCleanup(() => document.removeEventListener("opencode:timeline-search-open", onOpenRequest))
-
-  function open() {
-    setState("visible", true)
-    setFocusTick((t) => t + 1)
-  }
-
-  function close() {
-    setState({ value: "", active: 0, visible: false })
-    inputEl?.blur()
-  }
-
-  function setValue(value: string) {
-    setState("value", value)
-    const list = matches()
-    const match = list[0]
-    if (!value.trim() || !match) {
-      setState("active", 0)
-      return
-    }
-    setState("active", 0)
-    input.pauseAutoScroll()
-    input.revealMessage(match.revealID, match.partID)
-    scrollToMatch(match)
-  }
-
-  function scrollToMatch(match: TimelineSearchMatch) {
-    let attempts = 0
-    const seek = () => {
-      if (!state.visible) return
-      const root = input.scrollRef()
-      if (!root) return
-      const { active } = collectRanges(root, query(), match.partID, match.occurrence)
-      if (active.length === 0) {
-        if (attempts++ < 12) requestAnimationFrame(seek)
-        return
-      }
-      const rect = active[0].getBoundingClientRect()
-      const rootRect = root.getBoundingClientRect()
-      const sticky = root.querySelector("[data-session-title]")
-      const inset = sticky instanceof HTMLElement ? sticky.offsetHeight : 0
-      const top = rect.top - rootRect.top + root.scrollTop - inset - (rootRect.height - rect.height) / 2
-      root.scrollTo({ top: Math.max(0, top), behavior: "auto" })
-    }
-    requestAnimationFrame(seek)
-  }
-
-  function move(delta: number) {
-    const list = matches()
-    if (list.length === 0) return
-    const next = (activeIndex() + delta + list.length) % list.length
-    setState("active", next)
-    const match = list[next]
-    if (!match) return
-    input.pauseAutoScroll()
-    input.revealMessage(match.revealID, match.partID)
-    scrollToMatch(match)
-  }
-
-  return {
-    visible: () => state.visible,
-    query: {
-      value: () => state.value,
-      placeholder: () => language.t("session.search.placeholder"),
-      noResults: () => language.t("session.search.noResults"),
-      open,
-      close,
-      setValue,
-    },
-    result: {
-      activeIndex,
-      count: () => matches().length,
-      move,
-    },
-    element: {
-      setInput: (element: HTMLInputElement) => (inputEl = element),
-    },
-  }
-}
-
-export type TimelineSearchController = ReturnType<typeof createTimelineSearchController>
@@ -69,7 +69,7 @@ type Input = {
    row: TimelineRow.TimelineRow,
    disclosure: Readonly<Record<string, boolean | undefined>>,
  ) => boolean
-  setRevealMessage?: (fn: (id: string, partID?: string) => void) => void
+  setRevealMessage?: (fn: (id: string) => void) => void
  setScrollToEnd?: (fn: () => void) => void
 }

@@ -271,13 +271,8 @@ export function createTimelineVirtualizer(input: Input) {
  const virtualRowKeys = createMemo(() => virtualizer.getVirtualItems().map((item) => String(item.key)))

  createEffect(() => {
-    input.setRevealMessage?.((id, partID) => {
-      const partIndex = partID
-        ? rows().findIndex(
-            (row) => row._tag === "AssistantPart" && row.group.type === "part" && row.group.ref.partID === partID,
-          )
-        : -1
-      const index = partIndex >= 0 ? partIndex : input.projection.messageRowIndex().get(id)
+    input.setRevealMessage?.((id) => {
+      const index = input.projection.messageRowIndex().get(id)
      if (index === undefined) return
      virtualizer.scrollToIndex(index, { align: "center" })
    })
@@ -1,4 +1,4 @@
-import { Component, Show } from "solid-js"
+import { Component } from "solid-js"
 import { Select } from "@opencode-ai/ui/select"
 import { Switch } from "@opencode-ai/ui/switch"
 import { useLanguage } from "@/runtime/i18n/language"
@@ -61,22 +61,6 @@ export const SettingsExperimental: Component = () => {
                </Switch>
              </div>
            </SettingsRow>
-            <Show when={import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
-              <SettingsRow
-                title={language.t("settings.general.row.showProjectIcon.title")}
-                description={language.t("settings.general.row.showProjectIcon.description")}
-              >
-                <div data-action="settings-show-project-icon">
-                  <Switch
-                    checked={settings.general.showProjectIcon()}
-                    onChange={settings.general.setShowProjectIcon}
-                    hideLabel
-                  >
-                    {language.t("settings.general.row.showProjectIcon.title")}
-                  </Switch>
-                </div>
-              </SettingsRow>
-            </Show>
          </SettingsList>
        </div>
      </div>
@@ -348,6 +348,20 @@ export const SettingsGeneral: Component<{
          </div>
        </SettingsRow>

+        <Show when={import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
+          <SettingsRow
+            title={language.t("settings.general.row.showProjectIcon.title")}
+            description={language.t("settings.general.row.showProjectIcon.description")}
+          >
+            <div data-action="settings-show-project-icon">
+              <Switch
+                checked={settings.general.showProjectIcon()}
+                onChange={(checked) => settings.general.setShowProjectIcon(checked)}
+              />
+            </div>
+          </SettingsRow>
+        </Show>
+
        <Show when={mobile() && import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
          <SettingsRow
            title={language.t("settings.general.row.mobileTitlebarBottom.title")}
@@ -1,6 +1,6 @@
 import { createMemo, type Accessor } from "solid-js"
 import { useGlobal, useServerCtx } from "@/runtime/server/runtime"
-import { sessionPermissionRequest, sessionFormRequest } from "@/session/requests/session-request-tree"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
 import { ServerConnection } from "@/runtime/server/registry"
 import { useSettings } from "@/settings/model"

@@ -29,12 +29,12 @@ export function useSessionTabAvatarState(
    if (!ctx) return false
    return !!sessionPermissionRequest(sessions(), ctx.data.session.permission.list, sessionId())
  })
-  const hasForms = createMemo(() => {
+  const hasQuestions = createMemo(() => {
    const data = serverCtx()?.data
    if (!data) return false
-    return !!sessionFormRequest(sessions(), data.session.form.list, sessionId())
+    return !!sessionQuestionForm(sessions(), data.session.form.list, sessionId())
  })
-  const needsAttention = createMemo(() => hasPermissions() || hasForms())
+  const needsAttention = createMemo(() => hasPermissions() || hasQuestions())
  const unread = createMemo(
    () => needsAttention() || (serverCtx()?.notification.session.unseenCount(sessionId()) ?? 0) > 0,
  )
@@ -21,19 +21,6 @@ describe("serverStatusDotClass", () => {
    expect(serverStatusDotClass({ ready: true, serverHealth: false, issue: true })).toBe("bg-icon-critical-base")
  })

-  test("pulses the neutral dot while the event stream is reconnecting", () => {
-    expect(serverStatusDotClass({ ready: true, serverHealth: true, issue: false, connecting: true })).toBe(
-      "bg-border-weak-base animate-pulse",
-    )
-    expect(serverStatusDotClass({ ready: false, serverHealth: undefined, issue: false, connecting: true })).toBe(
-      "bg-border-weak-base animate-pulse",
-    )
-    // A server that is known to be down stays critical rather than looking like a routine reconnect.
-    expect(serverStatusDotClass({ ready: true, serverHealth: false, issue: false, connecting: true })).toBe(
-      "bg-icon-critical-base",
-    )
-  })
-
  test("stays neutral before status is ready", () => {
    expect(serverStatusDotClass({ ready: false, serverHealth: true, issue: false })).toBe("bg-border-weak-base")
    expect(serverStatusDotClass({ ready: false, serverHealth: undefined, issue: false })).toBe("bg-border-weak-base")
@@ -20,12 +20,8 @@ export function serverStatusDotClass(input: {
  serverHealth: boolean | undefined
  attention?: boolean
  issue: boolean
-  connecting?: boolean
 }) {
  if (input.serverHealth === false) return "bg-icon-critical-base"
-  // The event stream is (re)connecting: keep the neutral dot but let it breathe so a stale
-  // session is visibly waiting on the server rather than silently frozen.
-  if (input.connecting) return "bg-border-weak-base animate-pulse"
  if (!input.ready || input.serverHealth === undefined) return "bg-border-weak-base"
  if (input.attention) return "bg-v2-background-bg-accent"
  if (input.issue) return "bg-icon-warning-base"
@@ -20,7 +20,6 @@ export function StatusPopover() {
  const sdk = useWorkspaceLocation()
  const settings = useSettings()
  const desktop = createMediaQuery("(min-width: 768px)")
-  const sidebar = () => desktop() && settings.appearance.tabLayout() === "vertical"
  const [shown, setShown] = createSignal(false)
  const serverHealth = () => global.servers.health[server.key]?.healthy
  const mcp = () => data.location.mcp.server.list({ directory: sdk().directory })
@@ -42,10 +41,8 @@ export function StatusPopover() {
    serverHealth: serverHealth(),
    attention: attention(),
    issue: issue(),
-    connecting: server.ctx.sdk.connection.status() !== "connected",
-    sidebar: sidebar(),
-    placement: sidebar() ? "top-start" : "bottom-end",
-    shift: sidebar() ? 0 : -168,
+    placement: desktop() && settings.appearance.tabLayout() === "vertical" ? "top-start" : "bottom-end",
+    shift: desktop() && settings.appearance.tabLayout() === "vertical" ? 0 : -168,
    label: language.t("status.popover.trigger"),
    onOpenChange: setShown,
    body: () => (
@@ -64,8 +61,6 @@ type StatusPopoverState = {
  serverHealth: boolean | undefined
  attention: boolean
  issue: boolean
-  connecting: boolean
-  sidebar: boolean
  placement: "top-start" | "bottom-end"
  shift: number
  label: string
@@ -98,37 +93,21 @@ function StatusPopoverView(props: { state: StatusPopoverState }) {
    <Popover
      open={props.state.shown}
      onOpenChange={props.state.onOpenChange}
-      triggerAs={props.state.sidebar ? "button" : IconButton}
-      triggerProps={
-        props.state.sidebar
-          ? {
-              type: "button",
-              class:
-                "flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] px-1.5 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 focus-visible:outline-none focus-visible:bg-v2-background-bg-layer-02 [app-region:no-drag]",
-              "data-state": props.state.shown ? "pressed" : undefined,
-              "aria-label": props.state.label,
-            }
-          : {
-              variant: "ghost-muted",
-              size: "large",
-              class: "!w-9 shrink-0",
-              state: props.state.shown ? "pressed" : undefined,
-              "aria-label": props.state.label,
-            }
-      }
+      triggerAs={IconButton}
+      triggerProps={{
+        variant: "ghost-muted",
+        size: "large",
+        class: "!w-9 shrink-0",
+        state: props.state.shown ? "pressed" : undefined,
+        "aria-label": props.state.label,
+      }}
      trigger={
-        <>
-          <div class="relative size-4 shrink-0">
-            <Icon name={props.state.shown ? "status-active" : "status"} />
-            <div
-              data-slot="status-indicator"
-              class={`absolute -top-1 -end-1 size-2 rounded-full border border-[var(--v2-background-bg-deep)] ${serverStatusDotClass(props.state)}`}
-            />
-          </div>
-          <Show when={props.state.sidebar}>
-            <span class="min-w-0 truncate">{props.state.label}</span>
-          </Show>
-        </>
+        <div class="relative size-4">
+          <Icon name={props.state.shown ? "status-active" : "status"} />
+          <div
+            class={`absolute -top-1 -right-1 size-2 rounded-full border border-[var(--v2-background-bg-deep)] ${serverStatusDotClass(props.state)}`}
+          />
+        </div>
      }
      {...popoverProps}
    >
@@ -38,15 +38,9 @@ export function createTitlebarRightSlot(): TitlebarRightSlot {
  }
 }

-export function TitlebarRightMount(props: { vertical?: boolean }) {
+export function TitlebarRightMount() {
  const slot = useTitlebarRightSlot()
-  return (
-    <div
-      ref={slot.setMount}
-      id="opencode-titlebar-right"
-      class={props.vertical ? "flex w-full shrink-0 flex-col" : "flex shrink-0 items-center justify-end gap-0"}
-    />
-  )
+  return <div ref={slot.setMount} id="opencode-titlebar-right" class="flex shrink-0 items-center justify-end gap-0" />
 }

 export function TitlebarRight(props: ParentProps) {
@@ -680,8 +680,20 @@ export function Titlebar(props: {
                                onReorder={(keys) => tabsStoreActions.reorder(keys)}
                              />
                            </div>
-                            <div data-slot="vertical-tabs-footer" class="mt-2 flex w-full shrink-0 flex-col">
-                              <TitlebarRightMount vertical />
+                            <button
+                              type="button"
+                              data-action="vertical-tabs-settings"
+                              data-state={layout.route().type === "settings" ? "pressed" : undefined}
+                              class="mt-2 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] px-1.5 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 focus-visible:outline-none focus-visible:bg-v2-background-bg-layer-02 [app-region:no-drag]"
+                              onClick={openSettings}
+                              aria-label={language.t("sidebar.settings")}
+                              aria-pressed={layout.route().type === "settings"}
+                            >
+                              <Icon name="settings-gear" />
+                              {language.t("sidebar.settings")}
+                            </button>
+                            <div data-slot="vertical-tabs-footer" class="flex w-full shrink-0 items-center gap-1.5">
+                              <TitlebarRightMount />
                            </div>
                          </Portal>
                        )}
@@ -17,11 +17,9 @@ function createFixture(initial: Record<string, Session> = {}) {
  const deferred = new Map<string, PromiseWithResolvers<unknown>>()
  const resolves: string[] = []
  const messages = { syncs: [] as string[], ...Promise.withResolvers<unknown>() }
-  const pending = { syncs: [] as string[] }
  return {
    resolves,
    messages,
-    pending,
    sessions: {
      get: (id: string) => cache()[id],
      sync: (id: string) => {
@@ -36,12 +34,6 @@ function createFixture(initial: Record<string, Session> = {}) {
          return messages.promise
        },
      },
-      pending: {
-        sync: (id: string) => {
-          pending.syncs.push(id)
-          return Promise.resolve()
-        },
-      },
    },
    settle(id: string, directory = `/dir/${id}`) {
      setCache({ ...cache(), [id]: { id, directory } })
@@ -94,7 +86,6 @@ test("refreshes the current session on reconnect while keeping cached content vi
    expect(fixture.resolves).toEqual(["ses_a", "ses_a"])
    expect(current()).toEqual(sessionOf("ses_a"))
    expect(fixture.messages.syncs).toEqual(["ses_a", "ses_a"])
-    expect(fixture.pending.syncs).toEqual(["ses_a", "ses_a"])
    fixture.settle("ses_a", "/worktrees/moved")
    await flush()
    expect(current()?.directory).toBe("/worktrees/moved")
@@ -1,209 +0,0 @@
-import { afterEach, describe, expect, test } from "bun:test"
-import type { FormCreated, FormReplyInput, OpenCodeEvent } from "@opencode-ai/client/promise"
-import { createEffect, createRoot } from "solid-js"
-import { createStore } from "solid-js/store"
-import { createWebSearchRequest } from "@/session/requests/websearch"
-
-const consent: FormCreated["data"]["form"] = {
-  id: "frm_consent",
-  sessionID: "ses_child",
-  title: "Web Search",
-  metadata: { kind: "websearch.provider" },
-  fields: [{ key: "choice", type: "string", required: true, custom: false }],
-}
-const options = [
-  { value: "exa", label: "Exa" },
-  { value: "parallel", label: "Parallel" },
-]
-const provider: FormCreated["data"]["form"] = {
-  ...consent,
-  id: "frm_provider",
-  fields: [{ key: "provider", type: "string", options, required: true, custom: false }],
-}
-
-const cleanups: VoidFunction[] = []
-afterEach(() => cleanups.splice(0).forEach((dispose) => dispose()))
-
-function ready(condition: () => boolean) {
-  return new Promise<void>((resolve) => {
-    createRoot((dispose) => {
-      cleanups.push(dispose)
-      createEffect(() => {
-        if (!condition()) return
-        dispose()
-        resolve()
-      })
-    })
-  })
-}
-
-function fixture(form: FormCreated["data"]["form"] | null = consent) {
-  return createRoot((dispose) => {
-    cleanups.push(dispose)
-    const listeners = new Set<(event: OpenCodeEvent) => void>()
-    const replies: FormReplyInput[] = []
-    const loads: string[] = []
-    const [state, setState] = createStore({
-      request: form ?? undefined,
-      owner: "ses_root",
-      connected: true,
-      loadFails: false,
-      replyFails: false,
-    })
-    const model = createWebSearchRequest({
-      owner: () => state.owner,
-      connected: () => state.connected,
-      request: () => state.request,
-      providers: async (sessionID) => {
-        loads.push(sessionID)
-        if (state.loadFails) throw new Error("offline")
-        return options
-      },
-      reply: async (input) => {
-        replies.push(input)
-        if (state.replyFails) throw new Error("offline")
-        setState("request", undefined)
-      },
-      events: {
-        listen(listener) {
-          listeners.add(listener)
-          return () => {
-            listeners.delete(listener)
-          }
-        },
-      },
-    })
-    return {
-      model,
-      state,
-      setState,
-      replies,
-      loads,
-      dispose,
-      listeners,
-      create(form = provider) {
-        setState("request", form)
-        listeners.forEach((listener) =>
-          listener({
-            id: "evt_create",
-            created: 0,
-            type: "form.created",
-            data: { form },
-          }),
-        )
-      },
-      cancel(id: string) {
-        setState("request", undefined)
-        listeners.forEach((listener) =>
-          listener({
-            id: "evt_cancel",
-            created: 0,
-            type: "form.cancelled",
-            data: { id, sessionID: consent.sessionID },
-          }),
-        )
-      },
-    }
-  })
-}
-
-describe("web search request state", () => {
-  test("loads providers for the form owner, not the viewed parent, and waits for consent", async () => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    expect(input.loads).toEqual(["ses_child"])
-    expect(input.model.selected()).toBe("random")
-    input.model.select("exa")
-    expect(input.replies).toEqual([])
-    await input.model.submit(false)
-    expect(input.replies[0]?.answer).toEqual({ choice: "disable" })
-    expect(input.model.request()).toBeUndefined()
-    expect(input.model.sending()).toBe(false)
-  })
-
-  test("does not load providers when there is no consent request", () => {
-    const input = fixture(null)
-    expect(input.model.request()).toBeUndefined()
-    expect(input.loads).toEqual([])
-  })
-
-  test("holds the card across both forms and prevents duplicate submissions", async () => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    input.model.select("parallel")
-    const pending = input.model.submit("parallel")
-    await input.model.submit("parallel")
-    expect(input.state.request).toBeUndefined()
-    expect(input.model.request()?.id).toBe(consent.id)
-    expect(input.model.sending()).toBe(true)
-    input.create()
-    await pending
-    expect(input.replies.map((reply) => reply.answer)).toEqual([{ choice: "choose" }, { provider: "parallel" }])
-    expect(input.model.request()).toBeUndefined()
-    expect(input.model.sending()).toBe(false)
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("direct provider requests need confirmation and do not load a different provider list", async () => {
-    const input = fixture(provider)
-    await ready(() => !input.model.loading())
-    expect(input.loads).toEqual([])
-    expect(input.model.specific()).toBe(true)
-    expect(input.model.options()).toEqual(options)
-    expect(input.replies).toEqual([])
-    await input.model.submit("exa")
-    expect(input.replies.map((reply) => reply.answer)).toEqual([{ provider: "exa" }])
-  })
-
-  test("keeps the selected provider after failure and retries only the provider form", async () => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    input.model.select("parallel")
-    const pending = input.model.submit("parallel")
-    input.setState("replyFails", true)
-    input.create()
-    await pending
-    expect(input.model.failed()).toBe(true)
-    expect(input.model.sending()).toBe(false)
-    expect(input.model.request()?.id).toBe(provider.id)
-    expect(input.model.selected()).toBe("parallel")
-    input.setState("replyFails", false)
-    await input.model.submit("parallel")
-    expect(input.replies.map((reply) => reply.answer)).toEqual([
-      { choice: "choose" },
-      { provider: "parallel" },
-      { provider: "parallel" },
-    ])
-    expect(input.model.request()).toBeUndefined()
-  })
-
-  test("can retry loading providers without submitting consent", async () => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    input.setState("loadFails", true)
-    input.model.retry()
-    await ready(() => input.model.loadFailed())
-    expect(input.model.options()).toEqual([])
-    input.setState("loadFails", false)
-    input.model.retry()
-    await ready(() => !input.model.loading())
-    expect(input.model.options()).toEqual(options)
-    expect(input.model.loadFailed()).toBe(false)
-    expect(input.replies).toEqual([])
-  })
-
-  test.each(["navigate", "disconnect", "dispose", "cancel"])("stops automatic replies on %s", async (action) => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    const pending = input.model.submit("exa")
-    if (action === "navigate") input.setState("owner", "ses_other")
-    if (action === "disconnect") input.setState("connected", false)
-    if (action === "dispose") input.dispose()
-    if (action === "cancel") input.cancel(consent.id)
-    await pending
-    expect(input.model.sending()).toBe(false)
-    expect(input.listeners.size).toBe(0)
-    input.create()
-    expect(input.replies.map((reply) => reply.answer)).toEqual([{ choice: "choose" }])
-  })
-})
@@ -17,8 +17,8 @@ import {
 } from "./shared"

 const integrationPriority = new Map([
-  ["opencode-go", 0],
-  ["opencode", 1],
+  ["opencode", 0],
+  ["opencode-go", 1],
  ["openai", 2],
  ["github-copilot", 3],
  ["google", 4],
@@ -18,9 +18,7 @@ export const loadIntegrations = Effect.fn("cli.auth.integrations")(function* (cl
  // The model endpoint is the existing public readiness boundary for the initial plugin generation.
  yield* request((signal) => client.model.default({ location }, { signal }))
  return yield* request((signal) => client.integration.list({ location }, { signal })).pipe(
-    Effect.map((response) =>
-      response.data.toSorted((a, b) => Number(b.id === "opencode-go") - Number(a.id === "opencode-go")),
-    ),
+    Effect.map((response) => response.data),
  )
 })

@@ -68,36 +68,6 @@ describe("auth command", () => {
    expect(requests.indexOf("/api/model/default")).toBeLessThan(requests.indexOf("/api/integration"))
  })

-  test("lists OpenCode Go before Zen and preserves the remaining integration order", async () => {
-    using server = authServer((request, url) => {
-      if (url.pathname === "/api/integration") {
-        return Response.json(
-          located(
-            [
-              { id: "opencode", name: "OpenCode Zen" },
-              { id: "anthropic", name: "Anthropic" },
-              { id: "opencode-go", name: "OpenCode Go" },
-            ].map((integration) => ({
-              ...integration,
-              methods: [],
-              connections: [{ type: "env", name: "TEST_API_KEY" }],
-            })),
-          ),
-        )
-      }
-      return new Response("Not found", { status: 404 })
-    })
-
-    const result = await cli(["auth", "list", "--server", server.url.toString()])
-    expect({ exitCode: result.exitCode, stderr: result.stderr }).toEqual({ exitCode: 0, stderr: "" })
-    expect(
-      result.stdout
-        .trim()
-        .split("\n")
-        .map((line) => line.split(/\s{2,}/)[0]),
-    ).toEqual(["OpenCode Go", "OpenCode Zen", "Anthropic"])
-  })
-
  test("runs command authentication without interactive input", async () => {
    const requests: Array<{ method: string; path: string }> = []
    using server = authServer((request, url) => {
@@ -9,7 +9,7 @@ export type { ClientOptions, RequestOptions } from "./generated/client.js"

 export function make(options: ClientOptions) {
  const raw = OpenCode.make(options)
-  const events = SharedEvents.make((signal, onActivity) => raw.event.subscribe({ signal, onActivity }))
+  const events = SharedEvents.make((signal) => raw.event.subscribe({ signal }))
  return {
    ...raw,
    rpc: Object.assign(makeRpc(raw, events), raw.rpc),
@@ -278,8 +278,6 @@ export interface ClientOptions {
 export interface RequestOptions {
  readonly signal?: AbortSignal
  readonly headers?: RequestInit["headers"]
-  /** Reports every chunk a streaming response receives, including keepalive comments that yield no event. */
-  readonly onActivity?: () => void
 }

 interface RequestDescriptor {
@@ -371,7 +369,6 @@ export function make(options: ClientOptions) {
          } catch (cause) {
            throw new ClientError("Transport", { cause })
          }
-          if (!next.done) requestOptions?.onActivity?.()
          buffer += decoder.decode(next.value, { stream: !next.done })
          if (buffer.length > maxSseEventBytes) throw new ClientError("SseEventTooLarge")
          const trailingCarriageReturn = !next.done && buffer.endsWith("\r")
@@ -1,19 +1,10 @@
 export * as SharedEvents from "./shared-events.js"

-export type SubscribeOptions = {
-  readonly signal?: AbortSignal
-  /** Reports transport activity on the shared stream, including keepalive frames that carry no event. */
-  readonly onActivity?: () => void
-}
-
-export function make<A extends { readonly type: string }>(
-  connect: (signal: AbortSignal, onActivity: () => void) => AsyncIterable<A>,
-) {
+export function make<A extends { readonly type: string }>(connect: (signal: AbortSignal) => AsyncIterable<A>) {
  type Completion = { readonly error: unknown } | Record<string, never>
  type Subscriber = {
    push: (value: A) => void
    finish: (completion: Completion) => void
-    activity?: () => void
  }
  type Connection = {
    controller: AbortController
@@ -35,9 +26,7 @@ export function make<A extends { readonly type: string }>(
    let completion: Completion = {}
    try {
      if (connection.controller.signal.aborted) return
-      iterator = connect(connection.controller.signal, () => {
-        connection.subscribers.forEach((subscriber) => subscriber.activity?.())
-      })[Symbol.asyncIterator]()
+      iterator = connect(connection.controller.signal)[Symbol.asyncIterator]()
      while (!connection.controller.signal.aborted) {
        const item = await iterator.next()
        if (item.done || connection.controller.signal.aborted) break
@@ -58,7 +47,7 @@ export function make<A extends { readonly type: string }>(
  }

  return {
-    subscribe(options?: SubscribeOptions): AsyncIterable<A> {
+    subscribe(options?: { readonly signal?: AbortSignal }): AsyncIterable<A> {
      return {
        [Symbol.asyncIterator]() {
          const pending: ReturnType<typeof Promise.withResolvers<IteratorResult<A>>>[] = []
@@ -83,7 +72,6 @@ export function make<A extends { readonly type: string }>(
          }

          const subscriber: Subscriber = {
-            activity: options?.onActivity,
            finish(result) {
              finish(result, false)
            },
@@ -1,4 +1,4 @@
-import { batch, onCleanup } from "solid-js"
+import { batch, onCleanup, onMount } from "solid-js"
 import { createStore } from "solid-js/store"
 import type { OpenCodeClient, OpenCodeEvent } from "../promise"

@@ -18,11 +18,6 @@ export type ClientConnectionOptions = {
  readonly onEvent: (event: OpenCodeEvent) => void
  readonly flushInterval?: number
  readonly pageLifecycle?: boolean
-  /**
-   * Abort and reconnect a stream that receives no bytes for this long. The server writes a keepalive
-   * comment every 15 seconds, so a quiet but healthy stream never trips this.
-   */
-  readonly idleTimeout?: number
  readonly log?: {
    readonly debug?: (message: string, data?: Readonly<Record<string, unknown>>) => void
    readonly info?: (message: string, data?: Readonly<Record<string, unknown>>) => void
@@ -32,15 +27,10 @@ export type ClientConnectionOptions = {
 const connectTimeout = 2_000
 const reconnectDelay = 1_000
 const connectionHistoryLimit = 50
-export const defaultIdleTimeout = 45_000
-// Longer than one server keepalive interval: a stream that is silent this long when the page
-// returns to the foreground is probably half-open after the device slept.
-export const foregroundIdleThreshold = 20_000

 export function createClientConnection(initialApi: OpenCodeClient, options: ClientConnectionOptions) {
  const abort = new AbortController()
  const history: ClientConnectionEvent[] = []
-  const idleTimeout = options.idleTimeout ?? defaultIdleTimeout
  const [connection, setConnection] = createStore<{
    status: ClientConnectionStatus
    attempt: number
@@ -50,12 +40,9 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
  let pending: OpenCodeEvent[] = []
  let flushTimer: ReturnType<typeof setTimeout> | undefined
  let stream: AbortController | undefined
-  let current: AbortController | undefined
  let run: Promise<void> | undefined
  let started = false
  let generation = 0
-  let lastActivity = 0
-  let forced = false

  function record(status: ClientConnectionEvent["data"]["status"], attempt: number, error?: string) {
    history.push({ type: "client.connection", created: Date.now(), data: { status, attempt, error } })
@@ -76,25 +63,14 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
  async function connect(signal: AbortSignal, attempt: number) {
    let connectedAt: number | undefined
    const request = new AbortController()
-    current = request
    const cancel = () => request.abort(signal.reason)
    const timeout = setTimeout(() => request.abort(new Error("Timed out connecting to server")), connectTimeout)
    signal.addEventListener("abort", cancel, { once: true })

-    // Any received bytes, including keepalive comments, push the stall deadline out. A timer whose
-    // deadline passed while the page was suspended fires as soon as the page resumes.
-    let watchdog: ReturnType<typeof setTimeout> | undefined
-    const touch = () => {
-      lastActivity = Date.now()
-      if (connectedAt === undefined) return
-      clearTimeout(watchdog)
-      watchdog = setTimeout(() => request.abort(new Error("Event stream stalled")), idleTimeout)
-    }
-
    try {
      record(attempt === 0 ? "connecting" : "reconnecting", attempt)
      options.log?.info?.("event stream connecting", { attempt })
-      const iterator = api.event.subscribe({ signal: request.signal, onActivity: touch })[Symbol.asyncIterator]()
+      const iterator = api.event.subscribe({ signal: request.signal })[Symbol.asyncIterator]()
      const first = await iterator.next()
      if (signal.aborted) return { error: undefined, connectedAt }
      if (first.done)
@@ -109,7 +85,6 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
      clearTimeout(timeout)
      record("connected", attempt)
      connectedAt = Date.now()
-      touch()
      options.log?.info?.("event stream connected")
      publish(first.value)
      setConnection({ status: "connected", attempt: 0, error: undefined })
@@ -117,13 +92,7 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
      while (!signal.aborted) {
        const event = await iterator.next()
        if (signal.aborted) return { error: undefined, connectedAt }
-        if (event.done)
-          return {
-            error:
-              request.signal.reason instanceof Error ? request.signal.reason : new Error("Event stream disconnected"),
-            connectedAt,
-          }
-        touch()
+        if (event.done) return { error: new Error("Event stream disconnected"), connectedAt }
        if ("durable" in event.value && event.value.durable)
          options.log?.debug?.("event", {
            type: event.value.type,
@@ -137,9 +106,7 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
      return { error, connectedAt }
    } finally {
      request.abort()
-      if (current === request) current = undefined
      clearTimeout(timeout)
-      clearTimeout(watchdog)
      signal.removeEventListener("abort", cancel)
    }
  }
@@ -173,11 +140,6 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
          if (attempt === 1) continue
        }
      }
-      // A deliberate resync already knows the old socket is gone; reconnect without backing off.
-      if (forced) {
-        forced = false
-        continue
-      }
      await wait(reconnectDelay, controller.signal)
    }
  }
@@ -185,7 +147,6 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
  function start() {
    if (started) return run
    started = true
-    forced = false
    const active = ++generation
    const previous = run
    const current = (async () => {
@@ -200,45 +161,26 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
  }

  function stop() {
-    if (!started) return
    started = false
    generation += 1
    stream?.abort()
-    // Nothing is listening once stopped, so consumers must treat their data as stale until start() reconnects.
-    setConnection({ status: "connecting", attempt: 0, error: undefined })
  }

-  // Drop the live request so the reconnect loop replaces it now instead of waiting for the idle watchdog.
-  function resync(reason: string) {
-    if (!started || connection.status !== "connected") return
-    options.log?.info?.("event stream resync", { reason, idle: Date.now() - lastActivity })
-    forced = true
-    current?.abort(new Error(reason))
-  }
-
-  if (options.pageLifecycle) {
-    const pagehide = () => stop()
-    const pageshow = () => void start()
-    // Locking a phone or switching apps hides the document without a pagehide; the socket usually
-    // dies while the page is suspended, and the browser may never report that on the hung read.
-    const visibility = () => {
-      if (document.visibilityState !== "visible") return
-      if (Date.now() - lastActivity < foregroundIdleThreshold) return
-      resync("Page returned to the foreground after the event stream went quiet")
+  onMount(() => {
+    if (options.pageLifecycle) {
+      const pagehide = () => stop()
+      const pageshow = (event: PageTransitionEvent) => {
+        if (event.persisted) void start()
+      }
+      window.addEventListener("pagehide", pagehide)
+      window.addEventListener("pageshow", pageshow)
+      onCleanup(() => {
+        window.removeEventListener("pagehide", pagehide)
+        window.removeEventListener("pageshow", pageshow)
+      })
    }
-    const online = () => resync("Network connection restored")
-    window.addEventListener("pagehide", pagehide)
-    window.addEventListener("pageshow", pageshow)
-    window.addEventListener("online", online)
-    document.addEventListener("visibilitychange", visibility)
-    onCleanup(() => {
-      window.removeEventListener("pagehide", pagehide)
-      window.removeEventListener("pageshow", pageshow)
-      window.removeEventListener("online", online)
-      document.removeEventListener("visibilitychange", visibility)
-    })
-  }
-  void start()
+    void start()
+  })

  onCleanup(() => {
    stop()
@@ -253,7 +195,6 @@ export function createClientConnection(initialApi: OpenCodeClient, options: Clie
    error: () => connection.error,
    internal: {
      history: () => history.slice(),
-      resync,
    },
  }
 }
@@ -73,8 +73,6 @@ export type CreateDataInput = {

 const messageIDFromEvent = (eventID: string) => eventID.replace(/^evt_/, "msg_")
 const messagePageLimit = 20
-// Trailing window for event bursts that each ask for the same refetch.
-export const settleMs = 150

 // Global MCP elicitations temporarily use "global" instead of a real session ID, so the
 // server cannot recover their Location when settling them. Preserve the event Location
@@ -143,18 +141,12 @@ function formRequestOptions(sessionID: string, ref?: LocationRef) {
 }

 function createSync() {
-  // `started` is false while a reload waits for the load it replaces. Invalidations that land in
-  // that window are already covered, since the reload has not read anything yet.
-  type Pending = { promise: Promise<void>; invalidated: boolean; started: boolean }
+  type Pending = { promise: Promise<void>; invalidated: boolean }
  const state = new Map<string, true | Pending>()
  const start = (key: string, load: () => Promise<void>, wait?: Promise<void>) => {
-    const entry: Pending = { promise: Promise.resolve(), invalidated: false, started: !wait }
+    const entry: Pending = { promise: Promise.resolve(), invalidated: false }
    state.set(key, entry)
-    const run = () => {
-      entry.started = true
-      return load()
-    }
-    entry.promise = (wait ? wait.catch(() => undefined).then(run) : run())
+    entry.promise = (wait ? wait.catch(() => undefined).then(load) : load())
      .then(() => {
        if (state.get(key) === entry && !entry.invalidated) state.set(key, true)
      })
@@ -186,12 +178,12 @@ function createSync() {
      if (key) {
        const active = state.get(key)
        if (active === true) state.delete(key)
-        if (active !== undefined && active !== true && active.started) active.invalidated = true
+        if (active !== undefined && active !== true) active.invalidated = true
        return
      }
      state.forEach((active, current) => {
        if (active === true) state.delete(current)
-        if (active !== true && active.started) active.invalidated = true
+        if (active !== true) active.invalidated = true
      })
    },
  }
@@ -211,20 +203,6 @@ export function createData(config: CreateDataInput) {
    })
  }

-  // Runs `load` once a burst of same-key events goes quiet, so N events cost one refetch.
-  const settling = new Map<string, ReturnType<typeof setTimeout>>()
-  onCleanup(() => settling.forEach((timer) => clearTimeout(timer)))
-  function settle(key: string, load: () => Promise<unknown>) {
-    clearTimeout(settling.get(key))
-    settling.set(
-      key,
-      setTimeout(() => {
-        settling.delete(key)
-        refresh(load)
-      }, settleMs),
-    )
-  }
-
  const [store, setStore] = createStore<Store>({
    session: {
      info: {},
@@ -1248,11 +1226,10 @@ export function createData(config: CreateDataInput) {
        refresh(() => result.location.websearch.refresh(location))
        break
      // Authenticating an MCP integration reconnects its server, which emits mcp.status.changed,
-      // so the mcp list syncs here rather than off integration.updated. The server emits one event
-      // per MCP server as each settles, so a location booting nine servers emitted nine refetches.
+      // so the mcp list syncs here rather than off integration.updated.
      case "mcp.status.changed":
        result.location.mcp.server.invalidate(location)
-        settle(`mcp.status:${locationKey(location)}`, () => result.location.mcp.server.sync(location))
+        refresh(() => result.location.mcp.server.sync(location))
        break
      case "mcp.resources.changed":
        result.location.mcp.resource.invalidate(location)
@@ -675,31 +675,6 @@ test("event.subscribe ignores server heartbeat comments", async () => {
  expect(received).toEqual([event])
 })

-test("event.subscribe reports heartbeat comments as stream activity", async () => {
-  const event = { id: "evt_sentinel", created: 1, type: "server.connected", data: {} }
-  const encoder = new TextEncoder()
-  const client = OpenCode.make({
-    baseUrl: "http://localhost:3000",
-    fetch: async () =>
-      new Response(
-        new ReadableStream({
-          start(controller) {
-            controller.enqueue(encoder.encode(": heartbeat\n\n"))
-            controller.enqueue(encoder.encode(`data: ${JSON.stringify(event)}\n\n`))
-            controller.enqueue(encoder.encode(": heartbeat\n\n"))
-            controller.close()
-          },
-        }),
-        { headers: { "content-type": "text/event-stream" } },
-      ),
-  })
-  let activity = 0
-  const received = []
-  for await (const item of client.event.subscribe({ onActivity: () => activity++ })) received.push(item)
-  expect(received).toEqual([event])
-  expect(activity).toBe(3)
-})
-
 // Moved from packages/app/e2e/regression/session-timeline-transport.spec.ts
 test("event transport passes through ordinary health requests", async () => {
  const requests: string[] = []
@@ -359,24 +359,3 @@ test("synchronous source creation failures reject subscribers without automatic
  await expect(shared.subscribe()[Symbol.asyncIterator]().next()).rejects.toBe(failure)
  expect(attempts).toHaveLength(2)
 })
-
-test("source activity fans out to every subscriber that asked for it", async () => {
-  const events = source()
-  let activity: (() => void) | undefined
-  const shared = SharedEvents.make<Event>((signal, onActivity) => {
-    activity = onActivity
-    return events.connect(signal)
-  })
-  const counts = { first: 0, second: 0 }
-  const first = shared.subscribe({ onActivity: () => counts.first++ })[Symbol.asyncIterator]()
-  const second = shared.subscribe()[Symbol.asyncIterator]()
-  const reads = Promise.all([first.next(), second.next()])
-  activity!()
-  activity!()
-  events.connections[0].push({ type: "server.connected" })
-  await reads
-  expect(counts).toEqual({ first: 2, second: 0 })
-  await first.return!()
-  await second.return!()
-  await events.connections[0].closed
-})
@@ -1,153 +0,0 @@
-import { expect, test } from "bun:test"
-import { createRoot } from "solid-js"
-import { createClientConnection } from "../src/solid"
-import { OpenCode, type OpenCodeEvent } from "../src/promise"
-
-const connected = { id: "evt_connected", created: 1, type: "server.connected", data: {} }
-
-// One fake server whose event streams stay open until the test writes to them or the client aborts.
-function server() {
-  const encoder = new TextEncoder()
-  const streams: {
-    write: (text: string) => void
-    close: () => void
-    aborted: boolean
-  }[] = []
-  const api = OpenCode.make({
-    baseUrl: "http://opencode.local",
-    fetch: async (input, init) => {
-      const request = input instanceof Request ? input : new Request(input, init)
-      let controller!: ReadableStreamDefaultController<Uint8Array>
-      const entry = {
-        write: (text: string) => controller.enqueue(encoder.encode(text)),
-        close: () => controller.close(),
-        aborted: false,
-      }
-      const body = new ReadableStream<Uint8Array>({
-        start(value) {
-          controller = value
-        },
-        cancel() {
-          entry.aborted = true
-        },
-      })
-      request.signal.addEventListener("abort", () => {
-        entry.aborted = true
-        controller.error(request.signal.reason)
-      })
-      streams.push(entry)
-      return new Response(body, { headers: { "content-type": "text/event-stream" } })
-    },
-  })
-  return { api, streams }
-}
-
-function setup(input: ReturnType<typeof server>, idleTimeout: number) {
-  const events: OpenCodeEvent[] = []
-  return createRoot((dispose) => ({
-    events,
-    dispose,
-    connection: createClientConnection(input.api, {
-      idleTimeout,
-      flushInterval: 0,
-      onEvent: (event) => events.push(event),
-    }),
-  }))
-}
-
-async function until(check: () => boolean, timeout = 2_000) {
-  const deadline = Date.now() + timeout
-  while (!check()) {
-    if (Date.now() > deadline) throw new Error("Timed out waiting for condition")
-    await new Promise((resolve) => setTimeout(resolve, 5))
-  }
-}
-
-test("a stream that goes silent past the idle timeout is replaced", async () => {
-  const fake = server()
-  const ctx = setup(fake, 60)
-  try {
-    await until(() => fake.streams.length === 1)
-    fake.streams[0].write(`data: ${JSON.stringify(connected)}\n\n`)
-    await until(() => ctx.connection.status() === "connected")
-
-    await until(() => fake.streams.length === 2)
-    expect(fake.streams[0].aborted).toBe(true)
-    expect(ctx.connection.internal.history().map((item) => item.data)).toContainEqual({
-      status: "disconnected",
-      attempt: 1,
-      error: "Event stream stalled",
-    })
-
-    fake.streams[1].write(`data: ${JSON.stringify({ ...connected, id: "evt_connected_2" })}\n\n`)
-    await until(() => ctx.connection.status() === "connected" && ctx.events.length === 2)
-    expect(ctx.connection.error()).toBeUndefined()
-  } finally {
-    ctx.dispose()
-  }
-})
-
-test("keepalive comments hold a quiet stream open", async () => {
-  const fake = server()
-  const ctx = setup(fake, 60)
-  try {
-    await until(() => fake.streams.length === 1)
-    fake.streams[0].write(`data: ${JSON.stringify(connected)}\n\n`)
-    await until(() => ctx.connection.status() === "connected")
-
-    const heartbeat = setInterval(() => fake.streams[0].write(": heartbeat\n\n"), 20)
-    await new Promise((resolve) => setTimeout(resolve, 250))
-    clearInterval(heartbeat)
-
-    expect(fake.streams).toHaveLength(1)
-    expect(fake.streams[0].aborted).toBe(false)
-    expect(ctx.connection.status()).toBe("connected")
-    expect(ctx.events).toHaveLength(1)
-  } finally {
-    ctx.dispose()
-  }
-})
-
-test("a forced resync replaces the stream immediately and only while connected", async () => {
-  const fake = server()
-  const ctx = setup(fake, 10_000)
-  try {
-    ctx.connection.internal.resync("too early")
-    await until(() => fake.streams.length === 1)
-    expect(fake.streams[0].aborted).toBe(false)
-    fake.streams[0].write(`data: ${JSON.stringify(connected)}\n\n`)
-    await until(() => ctx.connection.status() === "connected")
-
-    const started = Date.now()
-    ctx.connection.internal.resync("Network connection restored")
-    await until(() => fake.streams.length === 2)
-    expect(Date.now() - started).toBeLessThan(500)
-    expect(fake.streams[0].aborted).toBe(true)
-    expect(ctx.connection.internal.history().map((item) => item.data)).toContainEqual({
-      status: "disconnected",
-      attempt: 1,
-      error: "Network connection restored",
-    })
-    fake.streams[1].write(`data: ${JSON.stringify(connected)}\n\n`)
-    await until(() => ctx.connection.status() === "connected")
-  } finally {
-    ctx.dispose()
-  }
-})
-
-test("a stream the server closes reconnects and reports the disconnect", async () => {
-  const fake = server()
-  const ctx = setup(fake, 10_000)
-  try {
-    await until(() => fake.streams.length === 1)
-    fake.streams[0].write(`data: ${JSON.stringify(connected)}\n\n`)
-    await until(() => ctx.connection.status() === "connected")
-
-    fake.streams[0].close()
-    await until(() => ctx.connection.status() === "reconnecting")
-    expect(ctx.connection.error()).toBe("Event stream disconnected")
-    await until(() => fake.streams.length === 2)
-  } finally {
-    ctx.dispose()
-  }
-})
@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test"
 import { createRoot } from "solid-js"
-import { createData, settleMs, type CreateDataInput } from "../src/solid"
+import { createData, type CreateDataInput } from "../src/solid"
 import { OpenCode, type OpenCodeEvent, type SessionInfo } from "../src/promise"

 test("config reads and update refreshes are opt-in", async () => {
@@ -165,86 +165,3 @@ test.each(["reconnecting", "disposed"] as const)("background reads respect %s ow
  expect(state.requests).toBe(1)
  expect(errors).toEqual([])
 })
-
-test("a burst of mcp.status.changed events refetches the server list once it settles", async () => {
-  const listeners = new Set<Parameters<CreateDataInput["event"]["listen"]>[0]>()
-  const requests: string[] = []
-  const location = { directory: "/project" }
-  const api = OpenCode.make({
-    baseUrl: "http://opencode.local",
-    fetch: async (input, init) => {
-      const request = input instanceof Request ? input : new Request(input, init)
-      requests.push(new URL(request.url).pathname)
-      return Response.json({ location, data: [] })
-    },
-  })
-  const setup = createRoot((dispose) => ({
-    data: createData({
-      api: () => api,
-      directory: location.directory,
-      event: {
-        on: () => () => {},
-        listen(handler) {
-          listeners.add(handler)
-          return () => listeners.delete(handler)
-        },
-      },
-    }),
-    dispose,
-  }))
-  try {
-    await setup.data.location.mcp.server.sync()
-    expect(requests.filter((path) => path === "/api/mcp")).toHaveLength(1)
-    for (const server of ["a", "b", "c", "d", "e"]) {
-      const event: OpenCodeEvent = { id: `evt_${server}`, created: 1, type: "mcp.status.changed", location, data: { server } }
-      listeners.forEach((listener) => listener({ name: event.type, details: event }))
-    }
-    expect(requests.filter((path) => path === "/api/mcp")).toHaveLength(1)
-    await new Promise((resolve) => setTimeout(resolve, settleMs * 2))
-    expect(requests.filter((path) => path === "/api/mcp")).toHaveLength(2)
-  } finally {
-    setup.dispose()
-  }
-})
-
-test("invalidations that land before a queued reload starts are absorbed by it", async () => {
-  const pending: Array<PromiseWithResolvers<Response>> = []
-  const location = { directory: "/project" }
-  const api = OpenCode.make({
-    baseUrl: "http://opencode.local",
-    fetch: () => {
-      const deferred = Promise.withResolvers<Response>()
-      pending.push(deferred)
-      return deferred.promise
-    },
-  })
-  const setup = createRoot((dispose) => ({
-    data: createData({
-      api: () => api,
-      directory: location.directory,
-      event: { on: () => () => {}, listen: () => () => {} },
-    }),
-    dispose,
-  }))
-  try {
-    const first = setup.data.location.agent.sync()
-    expect(pending).toHaveLength(1)
-    setup.data.location.agent.invalidate()
-    const second = setup.data.location.agent.sync()
-    setup.data.location.agent.invalidate()
-    const third = setup.data.location.agent.sync()
-    setup.data.location.agent.invalidate()
-    expect(pending).toHaveLength(1)
-    pending[0].resolve(Response.json({ location, data: [] }))
-    await first
-    await Promise.resolve()
-    expect(pending).toHaveLength(2)
-    pending[1].resolve(Response.json({ location, data: [{ name: "reviewer" }] }))
-    await Promise.all([second, third])
-    expect(pending).toHaveLength(2)
-    await setup.data.location.agent.sync()
-    expect(pending).toHaveLength(2)
-  } finally {
-    setup.dispose()
-  }
-})
@@ -100,6 +100,7 @@
  },
  "dependencies": {
    "@ai-sdk/alibaba": "1.0.17",
+    "@ai-sdk/amazon-bedrock": "4.0.112",
    "@ai-sdk/anthropic": "3.0.82",
    "@ai-sdk/azure": "3.0.88",
    "@ai-sdk/cohere": "3.0.27",
@@ -111,6 +112,7 @@
    "@ai-sdk/provider": "3.0.8",
    "@ai-sdk/provider-utils": "4.0.23",
    "@ai-sdk/vercel": "2.0.39",
+    "@aws-sdk/credential-providers": "3.1057.0",
    "@lydell/node-pty": "catalog:",
    "@modelcontextprotocol/sdk": "1.29.0",
    "@ff-labs/fff-bun": "0.10.5",
@@ -195,9 +195,7 @@ function mapBedrockSettings(
      ? { baseURL: settings.endpoint }
      : {}),
    ...(apiKey === undefined ? {} : { apiKey }),
-    ...(settings.auth === "bearer" || settings.auth === "sigv4" ? { auth: settings.auth } : {}),
    ...(credentials === undefined ? {} : { credentials }),
-    ...(typeof settings.profile === "string" ? { profile: settings.profile } : {}),
    ...(typeof settings.region === "string" ? { region: settings.region } : {}),
    ...(typeof settings.topP === "number" ? { topP: settings.topP } : {}),
  }
@@ -5,8 +5,6 @@ import { Bus } from "./bus.js"
 import { Location } from "./location.js"
 import { LocationServiceMap } from "./location-service-map.js"
 import { SessionEvent } from "./session/event.js"
-import { SessionExecution } from "./session/execution.js"
-import { SessionStore } from "./session/store.js"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"

 const isSessionEvent = Schema.is(SessionEvent.Durable)
@@ -20,8 +18,6 @@ export function layer(options: { readonly timeToLive?: Duration.Input; readonly
      const clock = yield* Clock.Clock
      const bus = yield* Bus.Service
      const locations = yield* LocationServiceMap.Service
-      const execution = yield* SessionExecution.Service
-      const sessions = yield* SessionStore.Service
      const timeToLive = Duration.toMillis(options.timeToLive ?? "60 minutes")
      const entries = new Map<string, { readonly ref: Location.Ref; expiresAt: number }>()
      const key = (ref: Location.Ref) => `${ref.directory}\0${ref.workspaceID ?? ""}`
@@ -43,21 +39,19 @@ export function layer(options: { readonly timeToLive?: Duration.Input; readonly
        yield* Effect.sleep(options.sweepInterval ?? "1 minute")
        const refs = Array.from(yield* RcMap.keys(locations.rcMap))
        const cached = new Set(refs.map(key))
-        yield* Effect.forEach(refs, (ref) => (entries.has(key(ref)) ? Effect.void : touch(ref)), { discard: true })
+        yield* Effect.forEach(
+          refs,
+          (ref) => (entries.has(key(ref)) ? Effect.void : touch(ref)),
+          { discard: true },
+        )
        for (const id of entries.keys()) {
          if (!cached.has(id)) entries.delete(id)
        }
        const now = clock.currentTimeMillisUnsafe()
        const expired = Array.from(entries.values()).filter((entry) => entry.expiresAt <= now)
-        if (expired.length === 0) return
-        const active = yield* Effect.forEach(yield* execution.active, (sessionID) => sessions.get(sessionID))
-        const occupied = new Set(active.flatMap((session) => (session ? [key(session.location)] : [])))
        yield* Effect.forEach(
          expired,
          (entry) => {
-            // Waiting for a question or a long-running tool emits no activity.
-            // Invalidating a borrowed graph would strand it behind a new cache entry.
-            if (occupied.has(key(entry.ref))) return touch(entry.ref)
            entries.delete(key(entry.ref))
            return Effect.logInfo("location services evicted", {
              directory: entry.ref.directory,
@@ -76,5 +70,5 @@ export function layer(options: { readonly timeToLive?: Duration.Input; readonly
 export const node = makeGlobalNode({
  service: Service,
  layer: layer(),
-  deps: [Bus.node, LocationServiceMap.node, SessionExecution.node, SessionStore.node],
+  deps: [Bus.node, LocationServiceMap.node],
 })
@@ -87,7 +87,7 @@ import { ProviderPlugins } from "./provider.js"
 import { WebSearchPlugins } from "./websearch/index.js"
 import { SkillPlugin } from "./skill.js"
 import { VcsHgPlugin } from "./vcs/hg.js"
-import { OptimizePlugin } from "./optimize.js"
+import { SystemPromptPlugin } from "./system-prompt.js"
 import { VariantPlugin } from "./variant.js"
 import { VcsGitPlugin } from "./vcs/git.js"
 import { WarmingPlugin } from "./warming.js"
@@ -201,12 +201,11 @@ const pre = [
  CommandPlugin.Plugin,
  SkillPlugin.Plugin,
  VcsHgPlugin.Plugin,
+  ...SystemPromptPlugin.Plugins,
  ModelsDevPlugin,
  ...ProviderPlugins,
  ...WebSearchPlugins,
  PatchTool.Plugin,
-  // Render model prompts after the patch plugin selects the available editing tools.
-  ...OptimizePlugin.Plugins,
  EditTool.Plugin,
  GlobTool.Plugin,
  GrepTool.Plugin,
@@ -2,60 +2,14 @@ export * as PluginModule from "./module.js"

 import type { Plugin } from "@opencode-ai/plugin/effect/plugin"
 import { Host } from "@opencode-ai/plugin/host"
-import { createPluginSources } from "@opencode-ai/plugin/source"
 import { Npm } from "@opencode-ai/util/npm"
-import { Deferred, Effect, FiberSet, PubSub, Schema, Stream } from "effect"
+import { Effect, Schema } from "effect"
 import path from "path"
 import { stat } from "node:fs/promises"
 import { fileURLToPath, pathToFileURL } from "url"
 import type { ConfigPluginSource } from "../config/plugin/source.js"
 import type { Generation } from "../plugin.js"
 import { PluginPromise } from "./promise.js"
-import { Watcher } from "../filesystem/watcher.js"
-
-export const make = Effect.fn("PluginModule.make")(function* () {
-  const watcher = yield* Watcher.Service
-  const scope = yield* Effect.scope
-  const runPromise = yield* FiberSet.makeRuntimePromise()
-  const changes = yield* PubSub.unbounded<void>()
-  const watched = new Set<string>()
-  const watch = Effect.fn("PluginModule.watch")(function* (file: string) {
-    if (watched.has(file)) return
-    watched.add(file)
-    const ready = yield* Deferred.make<void>()
-    const target = yield* Effect.promise(() => watchTarget(file))
-    const updates = yield* watcher.subscribe(target, Deferred.succeed(ready, undefined))
-    yield* updates.pipe(
-      Stream.runForEach(() => PubSub.publish(changes, undefined)),
-      Effect.ensuring(Deferred.succeed(ready, undefined)),
-      Effect.forkIn(scope, { startImmediately: true }),
-    )
-    yield* Deferred.await(ready)
-  })
-  const sources = yield* Effect.acquireRelease(
-    Effect.sync(() => createPluginSources((file) => runPromise(watch(file)))),
-    (sources) => Effect.sync(() => sources.dispose()),
-  )
-  return {
-    load: (
-      operation: Extract<ConfigPluginSource.Operation, { type: "add" }>,
-      options?: { readonly install?: boolean },
-    ) => load(operation, sources, options),
-    changes: () => Stream.fromPubSub(changes),
-  }
-})
-
-// A missing dependency may have missing parents too. Watch the nearest existing
-// ancestor recursively so creating the rest of the path can trigger recovery.
-function watchTarget(file: string): Promise<Watcher.WatchInput> {
-  return stat(file).then(
-    (info) => ({ path: file, type: info.isDirectory() ? "directory" : "file" }),
-    (cause) => {
-      if (path.dirname(file) === file) throw cause
-      return watchTarget(path.dirname(file))
-    },
-  )
-}

 const Module = Schema.Struct({
  default: Schema.Union([
@@ -77,9 +31,8 @@ export class LoadError extends Schema.TaggedError<LoadError>()("PluginModule.Loa
  cause: Schema.optional(Schema.Defect()),
 }) {}

-const load = Effect.fn("PluginModule.load")(function* (
+export const load = Effect.fn("PluginModule.load")(function* (
  operation: Extract<ConfigPluginSource.Operation, { type: "add" }>,
-  sources: ReturnType<typeof createPluginSources>,
  options?: { readonly install?: boolean },
 ) {
  const local = path.isAbsolute(operation.target)
@@ -98,13 +51,12 @@ const load = Effect.fn("PluginModule.load")(function* (
  const entrypoint = entrypoints.server
  if (!local && options?.install === false && !entrypoint) return { pending: true as const }
  if (!entrypoint) return yield* new LoadError({ message: `Plugin entrypoint not found: ${operation.target}` })
-  yield* Effect.log({ msg: "loading plugin", id: operation.target, entrypoint })
-  const loaded = yield* Effect.promise(() =>
-    local
-      ? sources.read(entrypoint)
-      : Host.load(entrypoint).then((module) => ({ module, version: installed?.revision })),
-  )
-  const value = (yield* Schema.decodeUnknownEffect(Module)(loaded.module).pipe(
+  // Bun currently ignores query parameters when caching file:// imports.
+  const target = typeof Bun !== "undefined" ? fileURLToPath(entrypoint).replaceAll("\\", "/") : entrypoint
+  const source = operation.mtime === undefined ? entrypoint : `${target}?mtime=${operation.mtime}`
+  yield* Effect.log({ msg: "loading plugin", id: operation.target, entrypoint: source })
+  const mod = yield* Effect.promise(() => Host.load(source))
+  const value = (yield* Schema.decodeUnknownEffect(Module)(mod).pipe(
    Effect.mapError(
      (cause) =>
        new LoadError({
@@ -120,7 +72,7 @@ const load = Effect.fn("PluginModule.load")(function* (
      ...(entrypoints.tui ? { tui: true as const } : {}),
      ...(entrypoints.rpc ? { rpc: true as const } : {}),
    },
-    revision: JSON.stringify([operation, loaded.version]),
+    revision: JSON.stringify([operation, installed?.revision]),
    source: path.isAbsolute(operation.target)
      ? { type: "local" as const, path: fileURLToPath(entrypoint) }
      : {
@@ -1,74 +0,0 @@
-export * as OptimizePlugin from "./optimize.js"
-
-import { define } from "@opencode-ai/plugin/effect/plugin"
-import type { SessionHooks } from "@opencode-ai/plugin/effect/session"
-import { Model } from "@opencode-ai/schema/model"
-import { Effect } from "effect"
-import { SessionSystemPrompt } from "../session/system-prompt.js"
-
-import PROMPT_GPT from "./system-prompt/gpt.txt"
-import PROMPT_ASTRA from "./system-prompt/gpt-astra.txt"
-import PROMPT_KIMI from "./system-prompt/kimi.txt"
-import PROMPT_META from "./system-prompt/meta.txt"
-import PROMPT_TRINITY from "./system-prompt/trinity.txt"
-
-export const OpenAIPlugin = make("opencode.prompt.openai", (model) => {
-  const id = model.id.toLowerCase()
-  if (!id.includes("gpt")) return undefined
-  return id.includes("gpt-6") ? PROMPT_ASTRA : PROMPT_GPT
-})
-
-export const OpenAIToolsPlugin = make("opencode.optimize.openai.tools", (model, tools) => {
-  const ids = [model.id, model.modelID, model.family].join(" ").toLowerCase()
-  if (!ids.includes("gpt")) return undefined
-  delete tools.grep
-  delete tools.glob
-  return undefined
-})
-
-export const AnthropicToolsPlugin = make("opencode.optimize.anthropic.tools", (model, tools) => {
-  const ids = [model.id, model.modelID, model.family].join(" ").toLowerCase()
-  if (!ids.includes("claude")) return undefined
-  delete tools.grep
-  delete tools.glob
-  return undefined
-})
-
-export const KimiPlugin = make("opencode.prompt.kimi", (model) =>
-  model.id.toLowerCase().includes("kimi") ? PROMPT_KIMI : undefined,
-)
-export const ArceePlugin = make("opencode.prompt.arcee", (model) =>
-  model.id.toLowerCase().includes("trinity") ? PROMPT_TRINITY : undefined,
-)
-export const MetaPlugin = make("opencode.prompt.meta", (model) => {
-  if (!model.id.toLowerCase().includes("muse")) return undefined
-  return PROMPT_META.replaceAll("{{MODEL_NAME}}", model.name)
-})
-
-export const Plugins = [OpenAIPlugin, KimiPlugin, ArceePlugin, MetaPlugin] as const
-
-function make(
-  id: string,
-  optimize: (model: Model.Info, tools: SessionHooks["context"]["tools"]) => string | undefined,
-) {
-  return define({
-    id,
-    effect: Effect.fn(`OptimizePlugin.${id}`)(function* (ctx) {
-      yield* ctx.session.hook("context", (event) =>
-        Effect.gen(function* () {
-          const model =
-            (yield* ctx.catalog.model.list()).data.find(
-              (model) => model.providerID === event.model.providerID && model.id === event.model.id,
-            ) ?? Model.Info.default(event.model.providerID, event.model.id)
-          // Curate tools before rendering their guidance, including for agents with a custom system prompt.
-          const template = optimize(model, event.tools)
-          if (!template) return
-          if ((yield* ctx.agent.get({ agentID: event.agent })).data.system) return
-          const system = event.system[0]
-          if (!system) return
-          event.system[0] = { ...system, text: SessionSystemPrompt.render(template, Object.keys(event.tools)) }
-        }).pipe(Effect.catch(() => Effect.void)),
-      )
-    }),
-  })
-}
@@ -1,59 +1,123 @@
 import { Effect } from "effect"
+import type { LanguageModelV3 } from "@ai-sdk/provider"
 import { define } from "@opencode-ai/plugin/effect/plugin"
 import { Provider } from "../../provider.js"

-// Ambient inputs the AWS default credential chain can turn into credentials
-// without any key stored in opencode. Mirrors the presence checks the AWS CLI
-// and SDK use before consulting shared config.
-const CHAIN_ENV = [
-  "AWS_PROFILE",
-  "AWS_ACCESS_KEY_ID",
-  "AWS_WEB_IDENTITY_TOKEN_FILE",
-  "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI",
-  "AWS_CONTAINER_CREDENTIALS_FULL_URI",
-]
+type MantleSDK = {
+  chat: (modelID: string) => LanguageModelV3
+  responses: (modelID: string) => LanguageModelV3
+}

-const isBedrock = (item: { readonly package: string }) => {
-  const name = Provider.packageName(item.package)
-  return name.startsWith("@ai-sdk/amazon-bedrock") || name.startsWith("@opencode-ai/ai/providers/amazon-bedrock")
+// Bedrock cross-region inference profiles require regional prefixes only for
+// specific model/region combinations. Keep the mapping narrow and avoid
+// double-prefixing model IDs that models.dev already marks as global/us/eu/etc.
+function resolveModelID(modelID: string, region: string | undefined) {
+  const crossRegionPrefixes = ["global.", "us.", "eu.", "jp.", "apac.", "au."]
+  if (crossRegionPrefixes.some((prefix) => modelID.startsWith(prefix))) return modelID
+
+  const resolvedRegion = region ?? "us-east-1"
+  const regionPrefix = resolvedRegion.split("-")[0]
+  if (regionPrefix === "us") {
+    const requiresPrefix = ["nova-micro", "nova-lite", "nova-pro", "nova-premier", "nova-2", "claude", "deepseek"].some(
+      (item) => modelID.includes(item),
+    )
+    if (requiresPrefix && !resolvedRegion.startsWith("us-gov")) return `${regionPrefix}.${modelID}`
+    return modelID
+  }
+  if (regionPrefix === "eu") {
+    const regionRequiresPrefix = [
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "eu-north-1",
+      "eu-central-1",
+      "eu-south-1",
+      "eu-south-2",
+    ].some((item) => resolvedRegion.includes(item))
+    const modelRequiresPrefix = ["claude", "nova-lite", "nova-micro", "llama3", "pixtral"].some((item) =>
+      modelID.includes(item),
+    )
+    return regionRequiresPrefix && modelRequiresPrefix ? `${regionPrefix}.${modelID}` : modelID
+  }
+  if (regionPrefix !== "ap") return modelID
+
+  const australia = ["ap-southeast-2", "ap-southeast-4"].includes(resolvedRegion)
+  if (australia && ["anthropic.claude-sonnet-4-5", "anthropic.claude-haiku"].some((item) => modelID.includes(item))) {
+    return `au.${modelID}`
+  }
+
+  const prefix = resolvedRegion === "ap-northeast-1" ? "jp" : "apac"
+  return ["claude", "nova-lite", "nova-micro", "nova-pro"].some((item) => modelID.includes(item))
+    ? `${prefix}.${modelID}`
+    : modelID
+}
+
+function selectMantleModel(sdk: MantleSDK, modelID: string) {
+  if (modelID === "openai.gpt-oss-safeguard-20b" || modelID === "openai.gpt-oss-safeguard-120b")
+    return sdk.chat(modelID)
+  return sdk.responses(modelID)
 }

 export const AmazonBedrockPlugin = define({
  id: "opencode.provider.amazon.bedrock",
  effect: Effect.fn(function* (ctx) {
-    yield* ctx.integration.transform((editor) => {
-      // models.dev advertises AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, and
-      // AWS_REGION alongside the bearer token. Only the bearer token is a key;
-      // the rest feed the SigV4 credential chain and must not become one.
-      editor.method.update({
-        integrationID: Provider.ID.amazonBedrock,
-        method: { type: "env", names: ["AWS_BEARER_TOKEN_BEDROCK"] },
-      })
-    })
    yield* ctx.catalog.transform((evt) => {
      for (const item of evt.provider.list()) {
-        if (!isBedrock(item.provider)) continue
+        if (!Provider.isAISDK(item.provider.package)) continue
+        if (Provider.packageName(item.provider.package) !== "@ai-sdk/amazon-bedrock") continue
        evt.provider.update(item.provider.id, (provider) => {
-          const settings = provider.settings ?? {}
-          const chain = typeof settings.profile === "string" || CHAIN_ENV.some((name) => process.env[name])
-          // SigV4 authenticates through the AWS default chain rather than a key
-          // credential, so ambient AWS configuration is what makes Bedrock usable.
-          if (chain && provider.activation === "auto") provider.activation = "enabled"
-          // Same default the native package uses, made explicit here so catalog
-          // `${AWS_REGION}` URLs resolve without any region configured.
-          const region = process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? "us-east-1"
-          provider.settings = {
-            ...settings,
-            ...(typeof settings.region !== "string" ? { region } : {}),
-            // Users configure Bedrock private/VPC endpoints as `endpoint`; move it
-            // into the catalog base URL once.
-            ...(typeof settings.baseURL !== "string" && typeof settings.endpoint === "string"
-              ? { baseURL: settings.endpoint }
-              : {}),
-          }
+          if (typeof provider.settings?.endpoint !== "string") return
+          // The AI SDK expects a base URL, but users configure Bedrock private/VPC
+          // endpoints as `endpoint`; move it into the catalog endpoint URL once.
+          provider.settings.baseURL = provider.settings.endpoint
          delete provider.settings.endpoint
        })
      }
    })
+    yield* ctx.aisdk.hook(
+      "sdk",
+      Effect.fn(function* (evt) {
+        if (!["@ai-sdk/amazon-bedrock", "@ai-sdk/amazon-bedrock/mantle"].includes(evt.package)) return
+        const options = { ...evt.options }
+        const profile = typeof options.profile === "string" ? options.profile : process.env.AWS_PROFILE
+        const region = typeof options.region === "string" ? options.region : (process.env.AWS_REGION ?? "us-east-1")
+        const bearerToken =
+          process.env.AWS_BEARER_TOKEN_BEDROCK ??
+          (typeof options.bearerToken === "string" ? options.bearerToken : undefined)
+        if (bearerToken && !process.env.AWS_BEARER_TOKEN_BEDROCK) process.env.AWS_BEARER_TOKEN_BEDROCK = bearerToken
+        options.region = region
+        if (typeof options.endpoint === "string") options.baseURL = options.endpoint
+        if (!bearerToken && options.credentialProvider === undefined) {
+          // Do not gate SDK creation on explicit AWS env vars. The default chain
+          // also handles ~/.aws/credentials, SSO, process creds, and instance roles.
+          const { fromNodeProviderChain } = yield* Effect.promise(() => import("@aws-sdk/credential-providers"))
+          options.credentialProvider = fromNodeProviderChain(profile ? { profile } : {})
+        }
+
+        if (evt.package === "@ai-sdk/amazon-bedrock/mantle") {
+          const mod = yield* Effect.promise(() => import("@ai-sdk/amazon-bedrock/mantle"))
+          evt.sdk = mod.createBedrockMantle(options)
+          return
+        }
+
+        const mod = yield* Effect.promise(() => import("@ai-sdk/amazon-bedrock"))
+        evt.sdk = mod.createAmazonBedrock(options)
+      }),
+    )
+    yield* ctx.aisdk.hook(
+      "language",
+      Effect.fn(function* (evt) {
+        if (evt.model.providerID !== Provider.ID.amazonBedrock) return
+        if (
+          Provider.isAISDK(evt.model.package) &&
+          Provider.packageName(evt.model.package) === "@ai-sdk/amazon-bedrock/mantle"
+        ) {
+          evt.language = selectMantleModel(evt.sdk, evt.model.modelID ?? evt.model.id)
+          return
+        }
+        const region = typeof evt.options.region === "string" ? evt.options.region : process.env.AWS_REGION
+        evt.language = evt.sdk.languageModel(resolveModelID(evt.model.modelID ?? evt.model.id, region))
+      }),
+    )
  }),
 })
@@ -261,7 +261,6 @@ export const GithubCopilotPlugin = define({
            .pipe(Effect.orElseSucceed(() => undefined))
          const interaction = interactionType(evt.kind, session?.parentID !== undefined)
          evt.headers["X-Interaction-Type"] = interaction
-          evt.headers["X-Interaction-Id"] = evt.sessionID
          if (interaction !== "conversation-agent") evt.headers["x-initiator"] = "agent"
        }),
      { providerID: Provider.ID.githubCopilot },
@@ -13,10 +13,8 @@ import { PluginInternal } from "./internal.js"
 import { PluginModule } from "./module.js"
 import { SdkPlugins } from "./sdk.js"
 import { PluginUpdate } from "./update.js"
-import { Watcher } from "../filesystem/watcher.js"

 const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
-  modules: Effect.Success<ReturnType<typeof PluginModule.make>>,
  pre: readonly Plugin.Generation[],
  post: readonly Plugin.Generation[],
  operations: readonly ConfigPluginSource.Operation[],
@@ -55,7 +53,7 @@ const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
      continue
    }

-    const plugin = yield* modules.load(operation, { install }).pipe(
+    const plugin = yield* PluginModule.load(operation, { install }).pipe(
      Effect.catchCause((cause) => {
        const ref = `err_${crypto.randomUUID().slice(0, 8)}`
        const error = Cause.squash(cause)
@@ -119,7 +117,6 @@ export const layer = Layer.effectDiscard(
    const sdk = yield* SdkPlugins.Service
    const instance = yield* InstancePlugins.Service
    const sources = yield* ConfigPluginSource.Service
-    const modules = yield* PluginModule.make()
    const bus = yield* Bus.Service
    const updates = yield* PluginUpdate.Service
    const internal = yield* PluginInternal.list()
@@ -152,7 +149,7 @@ export const layer = Layer.effectDiscard(
      }))
      const operations = yield* sources.operations()
      // Activate everything available locally before waiting on missing package installs.
-      const immediate = yield* resolve(modules, pre, post, operations, false, running)
+      const immediate = yield* resolve(pre, post, operations, false, running)
      const source = (source: Plugin.Source) =>
        source.type === "package"
          ? {
@@ -167,9 +164,7 @@ export const layer = Layer.effectDiscard(
          resolved.failures.map((failure) => ({ ...failure, source: source(failure.source) })),
        )
      yield* apply(immediate)
-      const resolved = immediate.pending.length
-        ? yield* resolve(modules, pre, post, operations, true, running)
-        : immediate
+      const resolved = immediate.pending.length ? yield* resolve(pre, post, operations, true, running) : immediate
      if (resolved !== immediate) yield* apply(resolved)
      running = resolved.packages
      const targets = new Set(
@@ -208,7 +203,6 @@ export const layer = Layer.effectDiscard(
        Effect.forkScoped({ startImmediately: true }),
      )
    yield* watch(sources.changes())
-    yield* watch(modules.changes())
    yield* watch(Stream.fromEffectRepeat(Effect.sleep("24 hours")))
    yield* watch(bus.subscribe([Event.Updated, SdkPlugins.Updated]))
    yield* watch(
@@ -246,7 +240,6 @@ const nodeDeps = [
  PluginUpdate.node,
  Bus.node,
  Npm.node,
-  Watcher.node,
  PluginInternal.requirements,
 ] as const

@@ -0,0 +1,74 @@
+export * as SystemPromptPlugin from "./system-prompt.js"
+
+import { SystemPart } from "@opencode-ai/ai"
+import { define } from "@opencode-ai/plugin/effect/plugin"
+import { Model } from "@opencode-ai/schema/model"
+import { Effect } from "effect"
+import { SessionSystemPrompt } from "../session/system-prompt.js"
+
+import PROMPT_GPT from "./system-prompt/gpt.txt"
+import PROMPT_ASTRA from "./system-prompt/gpt-astra.txt"
+import PROMPT_KIMI from "./system-prompt/kimi.txt"
+import PROMPT_META from "./system-prompt/meta.txt"
+import PROMPT_TRINITY from "./system-prompt/trinity.txt"
+
+export const OpenAIPlugin = make(
+  "openai",
+  (model) => {
+    if (!model.id.toLowerCase().includes("gpt")) return
+
+    if (model.id.toLowerCase().includes("gpt-6")) return PROMPT_ASTRA
+
+    return PROMPT_GPT
+  },
+  { operation: "replace" },
+)
+
+export const KimiPlugin = make("kimi", (model) => (model.id.toLowerCase().includes("kimi") ? PROMPT_KIMI : undefined), {
+  operation: "replace",
+})
+export const ArceePlugin = make(
+  "arcee",
+  (model) => (model.id.toLowerCase().includes("trinity") ? PROMPT_TRINITY : undefined),
+  { operation: "replace" },
+)
+export const MetaPlugin = make(
+  "meta",
+  (model) => {
+    if (!model.id.toLowerCase().includes("muse")) return
+    return PROMPT_META.replaceAll("{{MODEL_NAME}}", model.name)
+  },
+  { operation: "replace" },
+)
+
+export const Plugins = [OpenAIPlugin, KimiPlugin, ArceePlugin, MetaPlugin] as const
+
+function make(
+  id: string,
+  getPrompt: (model: Model.Info) => string | undefined,
+  options: { operation: "replace" | "append" },
+) {
+  return define({
+    id: `opencode.prompt.${id}`,
+    effect: Effect.fn(`SystemPromptPlugin.${id}`)(function* (ctx) {
+      yield* ctx.session.hook("context", (event) =>
+        Effect.gen(function* () {
+          if ((yield* ctx.agent.get({ agentID: event.agent })).data.system) return
+          const system = event.system[0]
+          if (!system) return
+          const model = (yield* ctx.catalog.model.list()).data.find(
+            (model) => model.providerID === event.model.providerID && model.id === event.model.id,
+          )
+          const template = getPrompt(model ?? Model.Info.default(event.model.providerID, event.model.id))
+          if (!template) return
+          const prompt = SessionSystemPrompt.render(template, Object.keys(event.tools))
+          if (options.operation === "append") {
+            event.system.splice(1, 0, SystemPart.make(prompt))
+            return
+          }
+          event.system[0] = { ...system, text: prompt }
+        }).pipe(Effect.catch(() => Effect.void)),
+      )
+    }),
+  })
+}
@@ -311,6 +311,7 @@ describe("AISDKNative", () => {
            region: "eu-west-1",
          },
          baseURL: "https://bedrock-mantle.${AWS_REGION}.api.aws/v1",
+          profile: "ignored",
          credentialProvider: "ignored",
          fetch: "ignored",
          store: false,
@@ -332,19 +333,6 @@ describe("AISDKNative", () => {
    })
  })

-  test("forwards Bedrock profile and auth mode for the default credential chain", () => {
-    expect(
-      map("@ai-sdk/amazon-bedrock", { profile: "work", auth: "sigv4", region: "eu-west-1" }, "anthropic.claude"),
-    ).toEqual({
-      package: "@opencode-ai/ai/providers/amazon-bedrock",
-      settings: { profile: "work", auth: "sigv4", region: "eu-west-1" },
-    })
-    expect(map("@ai-sdk/amazon-bedrock", { auth: "bogus" }, "anthropic.claude")).toEqual({
-      package: "@opencode-ai/ai/providers/amazon-bedrock",
-      settings: {},
-    })
-  })
-
  test("maps the legacy Bedrock endpoint override", () => {
    expect(
      map(
@@ -1,149 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Context, Deferred, Duration, Effect, Fiber, Layer, LayerMap, RcMap, Schema } from "effect"
-import { TestClock } from "effect/testing"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { Bus } from "@opencode-ai/core/bus"
-import { Database } from "@opencode-ai/core/database/database"
-import { Form } from "@opencode-ai/core/form"
-import { Location } from "@opencode-ai/core/location"
-import { LocationActivity } from "@opencode-ai/core/location-activity"
-import { LocationServiceMap, type LocationServices } from "@opencode-ai/core/location-services"
-import { Project } from "@opencode-ai/core/project"
-import { ProjectTable } from "@opencode-ai/core/project/sql"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { Session } from "@opencode-ai/core/session"
-import { SessionExecution } from "@opencode-ai/core/session/execution"
-import { SessionRunner } from "@opencode-ai/core/session/runner/index"
-import { SessionTable } from "@opencode-ai/core/session/sql"
-import { Workspace } from "@opencode-ai/core/workspace"
-import { testEffect } from "./lib/effect"
-
-// Keep real execution ownership, location caching, forms, and eviction. The fixture
-// runner waits on a form instead of making a model request before asking a question.
-const locations = Layer.effect(
-  LocationServiceMap.Service,
-  Effect.gen(function* () {
-    const bus = yield* Bus.Service
-    return yield* LayerMap.make(
-      (ref: Location.Ref) =>
-        // The fixture only exercises these three Location services.
-        // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion
-        Layer.merge(
-          Layer.succeed(
-            Location.Service,
-            Location.Service.of({
-              directory: ref.directory,
-              workspaceID: ref.workspaceID,
-              project: { id: Project.ID.global, directory: ref.directory, canonical: ref.directory },
-            }),
-          ),
-          Layer.effect(
-            SessionRunner.Service,
-            Effect.gen(function* () {
-              const forms = yield* Form.Service
-              return SessionRunner.Service.of({
-                drain: ({ sessionID }) =>
-                  forms
-                    .ask({
-                      sessionID,
-                      title: "Questions",
-                      fields: [{ key: "runtime", type: "string" }],
-                    })
-                    .pipe(Effect.orDie, Effect.as(SessionRunner.DrainResult.Complete())),
-              })
-            }),
-          ),
-        ).pipe(
-          Layer.provideMerge(Form.layer),
-          Layer.provide(Layer.succeed(Bus.Service, bus)),
-          Layer.fresh,
-        ) as unknown as Layer.Layer<LocationServices>,
-      { idleTimeToLive: Duration.infinity },
-    )
-  }),
-)
-
-const it = testEffect(
-  AppNodeBuilder.build(
-    LayerNode.group([Database.node, Bus.node, LocationServiceMap.node, SessionExecution.node, LocationActivity.node]),
-    [
-      LocationServiceMap.node.replace(
-        makeGlobalNode({
-          service: LocationServiceMap.Service,
-          layer: locations,
-          deps: [Bus.node],
-        }),
-      ),
-    ],
-  ),
-)
-
-describe("LocationActivity active execution", () => {
-  for (const settle of ["answer", "cancel", "interrupt"] as const) {
-    it.effect(`keeps a waiting question reachable past the deadline until ${settle}`, () =>
-      Effect.gen(function* () {
-        const db = (yield* Database.Service).db
-        const bus = yield* Bus.Service
-        const map = yield* LocationServiceMap.Service
-        const execution = yield* SessionExecution.Service
-        const sessionID = Session.ID.make("ses_waiting_question")
-        const ref = LocationServiceMap.canonical({ directory: AbsolutePath.make("/project") })
-        const idle = Location.Ref.make({ directory: ref.directory, workspaceID: Workspace.ID.make("wrk_idle") })
-        yield* db
-          .insert(ProjectTable)
-          .values({ id: Project.ID.global, worktree: ref.directory, sandboxes: [] })
-          .run()
-          .pipe(Effect.orDie)
-        yield* db
-          .insert(SessionTable)
-          .values({
-            id: sessionID,
-            project_id: Project.ID.global,
-            slug: "question",
-            directory: ref.directory,
-            title: "Waiting question",
-            version: "test",
-          })
-          .run()
-          .pipe(Effect.orDie)
-
-        const created = yield* Deferred.make<Form.Info>()
-        const unsubscribe = yield* bus.listen((event) =>
-          event.type === Form.Event.Created.type
-            ? Deferred.succeed(created, Schema.decodeUnknownSync(Form.Event.Created.data)(event.data).form).pipe(
-                Effect.asVoid,
-              )
-            : Effect.void,
-        )
-        yield* Effect.addFinalizer(() => unsubscribe)
-        const running = yield* execution.resume(sessionID).pipe(Effect.exit, Effect.forkScoped)
-        const form = yield* Deferred.await(created)
-        yield* Location.Service.pipe(Effect.provide(map.get(idle)), Effect.scoped)
-
-        // The first sweep discovers both cached graphs. No more Session events
-        // are needed while the human is deciding how to answer.
-        yield* TestClock.adjust("1 minute")
-        yield* TestClock.adjust("62 minutes")
-        expect(yield* execution.isActive(sessionID)).toBe(true)
-        expect(Array.from(yield* RcMap.keys(map.rcMap))).toEqual([ref])
-        const context = yield* map.contextEffect(ref).pipe(Effect.scoped)
-        const forms = Context.get(context, Form.Service)
-        expect(yield* forms.list({ sessionID })).toEqual([form])
-
-        if (settle === "answer") yield* forms.reply({ id: form.id, answer: { runtime: "Bun" } })
-        if (settle === "cancel") yield* forms.cancel(form.id)
-        if (settle === "interrupt") yield* execution.interrupt(sessionID)
-        yield* Fiber.join(running)
-        yield* execution.awaitIdle(sessionID)
-        expect(yield* forms.state(form.id)).toEqual(
-          settle === "answer" ? { status: "answered", answer: { runtime: "Bun" } } : { status: "cancelled" },
-        )
-
-        yield* TestClock.adjust("62 minutes")
-        expect(Array.from(yield* RcMap.keys(map.rcMap))).toEqual([])
-      }),
-    )
-  }
-})
@@ -8,7 +8,6 @@ import { Credential } from "@opencode-ai/core/credential"
 import { Integration } from "@opencode-ai/core/integration"
 import { Plugin } from "@opencode-ai/core/plugin"
 import { PluginModule } from "@opencode-ai/core/plugin/module"
-import { Watcher } from "@opencode-ai/core/filesystem/watcher"
 import { fromPromise } from "@opencode-ai/plugin/promise/adapter"
 import { Session } from "@opencode-ai/schema/session"
 import { testEffect } from "./lib/effect"
@@ -91,8 +90,7 @@ it.live("loads a local plugin with its configured options", () =>
    const plugins = yield* Plugin.Service
    const commands = yield* Command.Service
    yield* plugins.awaitActivation
-    const modules = yield* PluginModule.make().pipe(Effect.provide(Watcher.testLayer))
-    const definition = yield* modules.load({
+    const definition = yield* PluginModule.load({
      type: "add",
      target: path.join(import.meta.dir, "plugin/fixtures/greeting.ts"),
      options: { description: "Configured greeting" },
@@ -1,92 +0,0 @@
-import { expect } from "bun:test"
-import path from "node:path"
-import { Deferred, Effect, Exit, Fiber, Layer, Schedule, Scope, Stream } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Watcher } from "@opencode-ai/core/filesystem/watcher"
-import { PluginModule } from "@opencode-ai/core/plugin/module"
-import { Global } from "@opencode-ai/util/global"
-import { Npm } from "@opencode-ai/util/npm"
-import { tempGlobalLayer } from "../fixture/global"
-import { tmpdirScoped } from "../fixture/tmpdir"
-import { testEffect } from "../lib/effect"
-
-const it = testEffect(
-  Layer.merge(
-    AppNodeBuilder.build(Npm.node, [Global.node.replace(tempGlobalLayer)]),
-    Watcher.layer().pipe(Layer.provide(Watcher.nativeLayer)),
-  ),
-)
-
-it.live("watches creation of an external helper with missing parent directories", () =>
-  Effect.gen(function* () {
-    const directory = yield* tmpdirScoped()
-    const entry = path.join(directory.path, "plugin/index.ts")
-    yield* Effect.promise(() => Bun.write(entry, 'export { default } from "../shared/new/nested/helper.ts"'))
-    const modules = yield* PluginModule.make()
-    const operation = { type: "add" as const, target: path.dirname(entry), options: {} }
-    expect(Exit.isFailure(yield* modules.load(operation).pipe(Effect.exit))).toBe(true)
-    const changed = yield* modules
-      .changes()
-      .pipe(Stream.runHead, Effect.timeout("5 seconds"), Effect.forkScoped({ startImmediately: true }))
-    yield* Effect.promise(() =>
-      Bun.write(
-        path.join(directory.path, "shared/new/nested/helper.ts"),
-        'export default { id: "appeared", async setup() {} }',
-      ),
-    )
-    yield* Fiber.join(changed)
-    const loaded = yield* modules.load(operation)
-    expect(loaded).toMatchObject({ id: "appeared" })
-  }),
-)
-
-it.live("interrupts pending watcher setup when the loader scope closes during module evaluation", () =>
-  Effect.gen(function* () {
-    const directory = yield* tmpdirScoped()
-    const entry = path.join(directory.path, "index.ts")
-    const entered = path.join(directory.path, "entered")
-    const release = path.join(directory.path, "release")
-    const started = yield* Deferred.make<void>()
-    const stopped = yield* Deferred.make<void>()
-    const gate = yield* Deferred.make<void>()
-    const scope = yield* Scope.make()
-    yield* Effect.addFinalizer(() =>
-      Effect.promise(() => Bun.write(release, "release")).pipe(
-        Effect.andThen(Deferred.succeed(gate, undefined)),
-        Effect.andThen(Scope.close(scope, Exit.void)),
-      ),
-    )
-    yield* Effect.promise(() =>
-      Bun.write(
-        entry,
-        `
-        await Bun.write(${JSON.stringify(entered)}, "entered")
-        while (!(await Bun.file(${JSON.stringify(release)}).exists())) await Bun.sleep(5)
-        export default { id: "pending", async setup() {} }
-      `,
-      ),
-    )
-    const modules = yield* PluginModule.make().pipe(
-      Effect.provideService(Scope.Scope, scope),
-      Effect.provideService(Watcher.Service, {
-        subscribe: () =>
-          Deferred.succeed(started, undefined).pipe(
-            Effect.andThen(Deferred.await(gate)),
-            Effect.ensuring(Deferred.succeed(stopped, undefined)),
-            Effect.as(Stream.never),
-          ),
-      }),
-    )
-    yield* modules.load({ type: "add", target: directory.path, options: {} }).pipe(Effect.forkIn(scope))
-    yield* Deferred.await(started)
-    yield* Effect.promise(() => Bun.file(entered).exists()).pipe(
-      Effect.repeat({ until: (exists) => exists, schedule: Schedule.spaced("5 millis") }),
-      Effect.timeout("2 seconds"),
-    )
-    yield* Scope.close(scope, Exit.void)
-    expect(yield* Deferred.isDone(stopped)).toBe(true)
-    yield* Effect.promise(() => Bun.write(release, "release"))
-    // Let the uncancellable native import finish; Bun's test runner detects unhandled rejections.
-    yield* Effect.promise(() => Bun.sleep(50))
-  }),
-)
@@ -1,11 +1,13 @@
+import { AISDK } from "@opencode-ai/core/aisdk"
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
-import { Integration } from "@opencode-ai/core/integration"
+import { Model } from "@opencode-ai/core/model"
 import { Plugin } from "@opencode-ai/core/plugin"
 import { PluginHost } from "@opencode-ai/core/plugin/host"
 import { AmazonBedrockPlugin } from "@opencode-ai/core/plugin/provider/amazon-bedrock"
 import { Provider } from "@opencode-ai/core/provider"
+import { fakeSelectorSdk } from "../fixture/selector"
 import { testEffect } from "../lib/effect"
 import { PluginTestLayer } from "./fixture"

@@ -43,183 +45,529 @@ function withEnv<A, E, R>(vars: Record<string, string | undefined>, fx: () => Ef
  )
 }

-const noAmbientAWS = {
-  AWS_PROFILE: undefined,
-  AWS_ACCESS_KEY_ID: undefined,
-  AWS_WEB_IDENTITY_TOKEN_FILE: undefined,
-  AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: undefined,
-  AWS_CONTAINER_CREDENTIALS_FULL_URI: undefined,
-  AWS_REGION: undefined,
-  AWS_DEFAULT_REGION: undefined,
+function bedrockBaseURL(sdk: unknown, modelID = "anthropic.claude-sonnet-4-5") {
+  const language = (sdk as { languageModel: (id: string) => unknown }).languageModel(modelID)
+  return (language as { config: { baseUrl: () => string } }).config.baseUrl()
 }

-const seedBedrock = Effect.fn(function* (settings?: Record<string, unknown>) {
-  const catalog = yield* Catalog.Service
-  yield* catalog.transform((catalog) => {
-    catalog.provider.update(Provider.ID.amazonBedrock, (item) => {
-      item.package = Provider.aisdk("@ai-sdk/amazon-bedrock")
-      if (settings) item.settings = settings
-    })
+function bedrockFetch(sdk: unknown, modelID = "anthropic.claude-sonnet-4-5") {
+  const language = (sdk as { languageModel: (id: string) => unknown }).languageModel(modelID)
+  return (
+    language as { config: { fetch: (input: Parameters<typeof fetch>[0], init?: RequestInit) => Promise<Response> } }
+  ).config.fetch
+}
+
+function openAIUrl(language: unknown, path: string, modelId: string) {
+  return (language as { config: { url: (input: { path: string; modelId: string }) => string } }).config.url({
+    path,
+    modelId,
  })
-  return catalog
-})
+}

 describe("AmazonBedrockPlugin", () => {
  it.effect("moves endpoint setting to baseURL", () =>
-    withEnv(noAmbientAWS, () =>
-      Effect.gen(function* () {
-        const catalog = yield* seedBedrock({ endpoint: "https://bedrock.example" })
-        yield* addPlugin()
-        const result = required(yield* catalog.provider.get(Provider.ID.amazonBedrock))
-        expect(result.package).toBe(Provider.aisdk("@ai-sdk/amazon-bedrock"))
-        expect(result.settings).toEqual({ baseURL: "https://bedrock.example", region: "us-east-1" })
-      }),
-    ),
-  )
-
-  it.effect("keeps an explicit baseURL over endpoint", () =>
-    withEnv(noAmbientAWS, () =>
-      Effect.gen(function* () {
-        const catalog = yield* seedBedrock({ baseURL: "https://base.example", endpoint: "https://endpoint.example" })
-        yield* addPlugin()
-        expect(required(yield* catalog.provider.get(Provider.ID.amazonBedrock)).settings).toEqual({
-          baseURL: "https://base.example",
-          region: "us-east-1",
-        })
-      }),
-    ),
-  )
-
-  it.effect("only treats the bearer token env var as a key credential", () =>
    Effect.gen(function* () {
-      const integrations = yield* Integration.Service
-      const integrationID = Integration.ID.make(Provider.ID.amazonBedrock)
-      yield* integrations.transform((editor) => {
-        editor.method.update({ integrationID, method: { type: "key" } })
-        editor.method.update({
-          integrationID,
-          method: {
-            type: "env",
-            names: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_REGION", "AWS_BEARER_TOKEN_BEDROCK"],
-          },
+      const catalog = yield* Catalog.Service
+      yield* catalog.transform((catalog) => {
+        catalog.provider.update(Provider.ID.amazonBedrock, (item) => {
+          item.package = Provider.aisdk("@ai-sdk/amazon-bedrock")
+          item.settings = { endpoint: "https://bedrock.example" }
        })
      })
      yield* addPlugin()
-      expect((yield* integrations.get(integrationID))?.methods).toEqual([
-        { type: "key" },
-        { type: "env", names: ["AWS_BEARER_TOKEN_BEDROCK"] },
+      const result = required(yield* catalog.provider.get(Provider.ID.amazonBedrock))
+      expect(result.package).toBe(Provider.aisdk("@ai-sdk/amazon-bedrock"))
+      expect(result.settings).toEqual({ baseURL: "https://bedrock.example" })
+    }),
+  )
+
+  it.effect("prefers endpoint over baseURL for SDK base URL", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined, AWS_ACCESS_KEY_ID: undefined }, () =>
+      Effect.gen(function* () {
+        const aisdk = yield* AISDK.Service
+        yield* addPlugin()
+        const result = yield* aisdk.runSDK({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+            modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+            package: Provider.aisdk("test-provider"),
+          }),
+          package: "@ai-sdk/amazon-bedrock",
+          options: {
+            name: "amazon-bedrock",
+            bearerToken: "token",
+            baseURL: "https://base.example",
+            endpoint: "https://endpoint.example",
+            region: "us-east-1",
+          },
+        })
+        expect(bedrockBaseURL(result.sdk)).toBe("https://endpoint.example")
+      }),
+    ),
+  )
+
+  it.effect("uses baseURL as SDK base URL", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined, AWS_ACCESS_KEY_ID: undefined }, () =>
+      Effect.gen(function* () {
+        const aisdk = yield* AISDK.Service
+        yield* addPlugin()
+        const result = yield* aisdk.runSDK({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+            modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+            package: Provider.aisdk("test-provider"),
+          }),
+          package: "@ai-sdk/amazon-bedrock",
+          options: {
+            name: "amazon-bedrock",
+            bearerToken: "token",
+            baseURL: "https://base.example",
+            region: "us-east-1",
+          },
+        })
+        expect(bedrockBaseURL(result.sdk)).toBe("https://base.example")
+      }),
+    ),
+  )
+
+  it.effect("creates SDK without explicit credential env so the default AWS chain can resolve credentials", () =>
+    withEnv(
+      {
+        AWS_ACCESS_KEY_ID: undefined,
+        AWS_BEARER_TOKEN_BEDROCK: undefined,
+        AWS_CONTAINER_CREDENTIALS_FULL_URI: undefined,
+        AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: undefined,
+        AWS_PROFILE: undefined,
+        AWS_REGION: undefined,
+        AWS_WEB_IDENTITY_TOKEN_FILE: undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          const aisdk = yield* AISDK.Service
+          yield* addPlugin()
+          const result = yield* aisdk.runSDK({
+            model: Model.Info.make({
+              ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+              modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+              package: Provider.aisdk("test-provider"),
+            }),
+            package: "@ai-sdk/amazon-bedrock",
+            options: { name: "amazon-bedrock" },
+          })
+          expect(result.sdk).toBeDefined()
+          expect(bedrockBaseURL(result.sdk)).toBe("https://bedrock-runtime.us-east-1.amazonaws.com")
+        }),
+    ),
+  )
+
+  it.effect("uses config region over AWS_REGION for SDK base URL", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: "token", AWS_REGION: "us-east-1" }, () =>
+      Effect.gen(function* () {
+        const aisdk = yield* AISDK.Service
+        yield* addPlugin()
+        const result = yield* aisdk.runSDK({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+            modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+            package: Provider.aisdk("test-provider"),
+          }),
+          package: "@ai-sdk/amazon-bedrock",
+          options: { name: "amazon-bedrock", region: "eu-west-1" },
+        })
+        expect(bedrockBaseURL(result.sdk)).toBe("https://bedrock-runtime.eu-west-1.amazonaws.com")
+      }),
+    ),
+  )
+
+  it.effect("uses AWS_REGION for SDK base URL when config region is absent", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: "token", AWS_REGION: "eu-west-1" }, () =>
+      Effect.gen(function* () {
+        const aisdk = yield* AISDK.Service
+        yield* addPlugin()
+        const result = yield* aisdk.runSDK({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+            modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+            package: Provider.aisdk("test-provider"),
+          }),
+          package: "@ai-sdk/amazon-bedrock",
+          options: { name: "amazon-bedrock" },
+        })
+        expect(bedrockBaseURL(result.sdk)).toBe("https://bedrock-runtime.eu-west-1.amazonaws.com")
+      }),
+    ),
+  )
+
+  it.effect("defaults SDK region to us-east-1", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: "token", AWS_REGION: undefined }, () =>
+      Effect.gen(function* () {
+        const aisdk = yield* AISDK.Service
+        yield* addPlugin()
+        const result = yield* aisdk.runSDK({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+            modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+            package: Provider.aisdk("test-provider"),
+          }),
+          package: "@ai-sdk/amazon-bedrock",
+          options: { name: "amazon-bedrock" },
+        })
+        expect(bedrockBaseURL(result.sdk)).toBe("https://bedrock-runtime.us-east-1.amazonaws.com")
+      }),
+    ),
+  )
+
+  it.effect("loads bearer token option into env and uses bearer auth", () =>
+    withEnv({ AWS_ACCESS_KEY_ID: undefined, AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined }, () =>
+      Effect.gen(function* () {
+        const aisdk = yield* AISDK.Service
+        const headers: Array<string | null> = []
+        yield* addPlugin()
+        const result = yield* aisdk.runSDK({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+            modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+            package: Provider.aisdk("test-provider"),
+          }),
+          package: "@ai-sdk/amazon-bedrock",
+          options: {
+            name: "amazon-bedrock",
+            bearerToken: "option-token",
+            fetch: async (_input: Parameters<typeof fetch>[0], init?: RequestInit) => {
+              headers.push(new Headers(init?.headers).get("Authorization"))
+              return new Response("{}")
+            },
+          },
+        })
+        yield* Effect.promise(() => bedrockFetch(result.sdk)("https://bedrock.example", { method: "POST" }))
+        expect(process.env.AWS_BEARER_TOKEN_BEDROCK).toBe("option-token")
+        expect(headers).toEqual(["Bearer option-token"])
+      }),
+    ),
+  )
+
+  it.effect("prefers bearer token env over bearer token option", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: "env-token" }, () =>
+      Effect.gen(function* () {
+        const aisdk = yield* AISDK.Service
+        const headers: Array<string | null> = []
+        yield* addPlugin()
+        const result = yield* aisdk.runSDK({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+            modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+            package: Provider.aisdk("test-provider"),
+          }),
+          package: "@ai-sdk/amazon-bedrock",
+          options: {
+            name: "amazon-bedrock",
+            bearerToken: "option-token",
+            fetch: async (_input: Parameters<typeof fetch>[0], init?: RequestInit) => {
+              headers.push(new Headers(init?.headers).get("Authorization"))
+              return new Response("{}")
+            },
+          },
+        })
+        yield* Effect.promise(() => bedrockFetch(result.sdk)("https://bedrock.example", { method: "POST" }))
+        expect(process.env.AWS_BEARER_TOKEN_BEDROCK).toBe("env-token")
+        expect(headers).toEqual(["Bearer env-token"])
+      }),
+    ),
+  )
+
+  it.effect("creates Mantle SDK with GPT-5 OpenAI base path", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined, AWS_ACCESS_KEY_ID: undefined }, () =>
+      Effect.gen(function* () {
+        const aisdk = yield* AISDK.Service
+        yield* addPlugin()
+        const result = yield* aisdk.runSDK({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("openai.gpt-5.5")),
+            modelID: Model.ID.make("openai.gpt-5.5"),
+            package: Provider.aisdk("@ai-sdk/amazon-bedrock/mantle"),
+          }),
+          package: "@ai-sdk/amazon-bedrock/mantle",
+          options: {
+            name: "amazon-bedrock",
+            bearerToken: "token",
+            baseURL: "https://bedrock-mantle.us-east-2.api.aws/openai/v1",
+            region: "us-east-2",
+          },
+        })
+        const language = result.sdk.responses("openai.gpt-5.5")
+        expect(openAIUrl(language, "/responses", "openai.gpt-5.5")).toBe(
+          "https://bedrock-mantle.us-east-2.api.aws/openai/v1/responses",
+        )
+      }),
+    ),
+  )
+
+  it.effect("selects Mantle APIs without Bedrock cross-region prefixes", () =>
+    Effect.gen(function* () {
+      const aisdk = yield* AISDK.Service
+      const calls: string[] = []
+      yield* addPlugin()
+      yield* aisdk.runLanguage({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("openai.gpt-5.5")),
+          modelID: Model.ID.make("openai.gpt-5.5"),
+          package: Provider.aisdk("@ai-sdk/amazon-bedrock/mantle"),
+        }),
+        sdk: fakeSelectorSdk(calls),
+        options: { baseURL: "https://bedrock-mantle.us-east-2.api.aws/openai/v1", region: "us-east-2" },
+      })
+      yield* aisdk.runLanguage({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("openai.gpt-oss-safeguard-120b")),
+          modelID: Model.ID.make("openai.gpt-oss-safeguard-120b"),
+          package: Provider.aisdk("@ai-sdk/amazon-bedrock/mantle"),
+        }),
+        sdk: fakeSelectorSdk(calls),
+        options: { region: "us-east-1" },
+      })
+      expect(calls).toEqual(["responses:openai.gpt-5.5", "chat:openai.gpt-oss-safeguard-120b"])
+    }),
+  )
+
+  it.effect("ignores other Bedrock provider subpaths", () =>
+    Effect.gen(function* () {
+      const aisdk = yield* AISDK.Service
+      yield* addPlugin()
+      const result = yield* aisdk.runSDK({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+          modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+          package: Provider.aisdk("@ai-sdk/amazon-bedrock/anthropic"),
+        }),
+        package: "@ai-sdk/amazon-bedrock/anthropic",
+        options: { name: "amazon-bedrock" },
+      })
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("uses SigV4 credential env when bearer token is absent", () =>
+    withEnv(
+      {
+        AWS_ACCESS_KEY_ID: "test-access-key",
+        AWS_BEARER_TOKEN_BEDROCK: undefined,
+        AWS_REGION: "us-east-1",
+        AWS_SECRET_ACCESS_KEY: "test-secret-key",
+        AWS_SESSION_TOKEN: "test-session-token",
+      },
+      () =>
+        Effect.gen(function* () {
+          const aisdk = yield* AISDK.Service
+          const headers: Array<string | null> = []
+          yield* addPlugin()
+          const result = yield* aisdk.runSDK({
+            model: Model.Info.make({
+              ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+              modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+              package: Provider.aisdk("test-provider"),
+            }),
+            package: "@ai-sdk/amazon-bedrock",
+            options: {
+              name: "amazon-bedrock",
+              fetch: async (_input: Parameters<typeof fetch>[0], init?: RequestInit) => {
+                headers.push(new Headers(init?.headers).get("Authorization"))
+                return new Response("{}")
+              },
+            },
+          })
+          yield* Effect.promise(() =>
+            bedrockFetch(result.sdk)("https://bedrock-runtime.us-east-1.amazonaws.com/model/test/invoke", {
+              body: "{}",
+              method: "POST",
+            }),
+          )
+          expect(headers[0]?.startsWith("AWS4-HMAC-SHA256 ")).toBe(true)
+        }),
+    ),
+  )
+
+  it.effect("applies legacy cross-region inference prefixes", () =>
+    Effect.gen(function* () {
+      const aisdk = yield* AISDK.Service
+      const calls: string[] = []
+      yield* addPlugin()
+      yield* aisdk.runLanguage({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+          modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+          package: Provider.aisdk("test-provider"),
+        }),
+        sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+        options: {},
+      })
+      yield* aisdk.runLanguage({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+          modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+          package: Provider.aisdk("test-provider"),
+        }),
+        sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+        options: { region: "eu-west-1" },
+      })
+      yield* aisdk.runLanguage({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("global.anthropic.claude-sonnet-4-5")),
+          modelID: Model.ID.make("global.anthropic.claude-sonnet-4-5"),
+          package: Provider.aisdk("test-provider"),
+        }),
+        sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+        options: { region: "eu-west-1" },
+      })
+      yield* aisdk.runLanguage({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+          modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+          package: Provider.aisdk("test-provider"),
+        }),
+        sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+        options: { region: "ap-northeast-1" },
+      })
+      yield* aisdk.runLanguage({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+          modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+          package: Provider.aisdk("test-provider"),
+        }),
+        sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+        options: { region: "ap-southeast-2" },
+      })
+      expect(calls).toEqual([
+        "languageModel:us.anthropic.claude-sonnet-4-5",
+        "languageModel:eu.anthropic.claude-sonnet-4-5",
+        "languageModel:global.anthropic.claude-sonnet-4-5",
+        "languageModel:jp.anthropic.claude-sonnet-4-5",
+        "languageModel:au.anthropic.claude-sonnet-4-5",
      ])
    }),
  )

-  it.effect("leaves activation on auto without ambient AWS configuration", () =>
-    withEnv(noAmbientAWS, () =>
+  it.effect("uses AWS_REGION for language prefixes when region option is absent", () =>
+    withEnv({ AWS_REGION: "eu-west-1" }, () =>
      Effect.gen(function* () {
-        const catalog = yield* seedBedrock()
+        const aisdk = yield* AISDK.Service
+        const calls: string[] = []
        yield* addPlugin()
-        expect(required(yield* catalog.provider.get(Provider.ID.amazonBedrock)).activation).toBe("auto")
+        yield* aisdk.runLanguage({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make("anthropic.claude-sonnet-4-5")),
+            modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+            package: Provider.aisdk("test-provider"),
+          }),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: {},
+        })
+        expect(calls).toEqual(["languageModel:eu.anthropic.claude-sonnet-4-5"])
      }),
    ),
  )

-  for (const name of Object.keys(noAmbientAWS).filter((name) => !name.includes("REGION"))) {
-    it.effect(`enables the provider when ${name} is set`, () =>
-      withEnv({ ...noAmbientAWS, [name]: "value" }, () =>
-        Effect.gen(function* () {
-          const catalog = yield* seedBedrock()
-          yield* addPlugin()
-          expect(required(yield* catalog.provider.get(Provider.ID.amazonBedrock)).activation).toBe("enabled")
-        }),
-      ),
-    )
-  }
-
-  it.effect("enables the provider when a profile is configured", () =>
-    withEnv(noAmbientAWS, () =>
-      Effect.gen(function* () {
-        const catalog = yield* seedBedrock({ profile: "work" })
-        yield* addPlugin()
-        const result = required(yield* catalog.provider.get(Provider.ID.amazonBedrock))
-        expect(result.activation).toBe("enabled")
-        expect(result.settings).toEqual({ profile: "work", region: "us-east-1" })
-      }),
-    ),
-  )
-
-  it.effect("does not override a disabled provider", () =>
-    withEnv({ ...noAmbientAWS, AWS_PROFILE: "work" }, () =>
-      Effect.gen(function* () {
-        const catalog = yield* Catalog.Service
-        yield* catalog.transform((catalog) => {
-          catalog.provider.update(Provider.ID.amazonBedrock, (item) => {
-            item.package = Provider.aisdk("@ai-sdk/amazon-bedrock")
-            item.activation = "disabled"
-          })
-        })
-        yield* addPlugin()
-        expect(required(yield* catalog.provider.get(Provider.ID.amazonBedrock)).activation).toBe("disabled")
-      }),
-    ),
-  )
-
-  it.effect("fills region from AWS_REGION then AWS_DEFAULT_REGION without overriding config", () =>
-    withEnv({ ...noAmbientAWS, AWS_REGION: "eu-west-1", AWS_DEFAULT_REGION: "us-west-2" }, () =>
-      Effect.gen(function* () {
-        const catalog = yield* seedBedrock()
-        yield* addPlugin()
-        expect(required(yield* catalog.provider.get(Provider.ID.amazonBedrock)).settings).toEqual({
-          region: "eu-west-1",
-        })
-
-        yield* catalog.transform((catalog) => {
-          catalog.provider.update(Provider.ID.amazonBedrock, (item) => {
-            item.settings = { region: "ap-southeast-2" }
-          })
-        })
-        expect(required(yield* catalog.provider.get(Provider.ID.amazonBedrock)).settings).toEqual({
+  it.effect("applies the full legacy cross-region prefix matrix", () =>
+    Effect.gen(function* () {
+      const aisdk = yield* AISDK.Service
+      const calls: string[] = []
+      const cases = [
+        { region: "us-east-1", modelID: "amazon.nova-micro-v1:0", expected: "us.amazon.nova-micro-v1:0" },
+        { region: "us-east-1", modelID: "amazon.nova-lite-v1:0", expected: "us.amazon.nova-lite-v1:0" },
+        { region: "us-east-1", modelID: "amazon.nova-pro-v1:0", expected: "us.amazon.nova-pro-v1:0" },
+        { region: "us-east-1", modelID: "amazon.nova-premier-v1:0", expected: "us.amazon.nova-premier-v1:0" },
+        { region: "us-east-1", modelID: "amazon.nova-2-lite-v1:0", expected: "us.amazon.nova-2-lite-v1:0" },
+        { region: "us-east-1", modelID: "anthropic.claude-sonnet-4-5", expected: "us.anthropic.claude-sonnet-4-5" },
+        { region: "us-east-1", modelID: "deepseek.r1-v1:0", expected: "us.deepseek.r1-v1:0" },
+        { region: "us-gov-west-1", modelID: "anthropic.claude-sonnet-4-5", expected: "anthropic.claude-sonnet-4-5" },
+        { region: "us-east-1", modelID: "cohere.command-r-plus-v1:0", expected: "cohere.command-r-plus-v1:0" },
+        { region: "eu-west-1", modelID: "anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },
+        { region: "eu-west-2", modelID: "amazon.nova-lite-v1:0", expected: "eu.amazon.nova-lite-v1:0" },
+        { region: "eu-west-3", modelID: "amazon.nova-micro-v1:0", expected: "eu.amazon.nova-micro-v1:0" },
+        {
+          region: "eu-north-1",
+          modelID: "meta.llama3-70b-instruct-v1:0",
+          expected: "eu.meta.llama3-70b-instruct-v1:0",
+        },
+        { region: "eu-central-1", modelID: "mistral.pixtral-large-v1:0", expected: "eu.mistral.pixtral-large-v1:0" },
+        { region: "eu-south-1", modelID: "anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },
+        { region: "eu-south-2", modelID: "anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },
+        { region: "eu-central-2", modelID: "anthropic.claude-sonnet-4-5", expected: "anthropic.claude-sonnet-4-5" },
+        { region: "eu-west-1", modelID: "cohere.command-r-plus-v1:0", expected: "cohere.command-r-plus-v1:0" },
+        {
          region: "ap-southeast-2",
+          modelID: "anthropic.claude-sonnet-4-5",
+          expected: "au.anthropic.claude-sonnet-4-5",
+        },
+        {
+          region: "ap-southeast-4",
+          modelID: "anthropic.claude-haiku-v1:0",
+          expected: "au.anthropic.claude-haiku-v1:0",
+        },
+        { region: "ap-southeast-2", modelID: "anthropic.claude-opus-4", expected: "apac.anthropic.claude-opus-4" },
+        {
+          region: "ap-northeast-1",
+          modelID: "anthropic.claude-sonnet-4-5",
+          expected: "jp.anthropic.claude-sonnet-4-5",
+        },
+        { region: "ap-northeast-1", modelID: "amazon.nova-pro-v1:0", expected: "jp.amazon.nova-pro-v1:0" },
+        { region: "ap-south-1", modelID: "anthropic.claude-sonnet-4-5", expected: "apac.anthropic.claude-sonnet-4-5" },
+        { region: "ap-south-1", modelID: "amazon.nova-lite-v1:0", expected: "apac.amazon.nova-lite-v1:0" },
+        { region: "ca-central-1", modelID: "anthropic.claude-sonnet-4-5", expected: "anthropic.claude-sonnet-4-5" },
+        {
+          region: "us-east-1",
+          modelID: "global.anthropic.claude-sonnet-4-5",
+          expected: "global.anthropic.claude-sonnet-4-5",
+        },
+        { region: "us-east-1", modelID: "us.anthropic.claude-sonnet-4-5", expected: "us.anthropic.claude-sonnet-4-5" },
+        { region: "eu-west-1", modelID: "eu.anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },
+        {
+          region: "ap-northeast-1",
+          modelID: "jp.anthropic.claude-sonnet-4-5",
+          expected: "jp.anthropic.claude-sonnet-4-5",
+        },
+        {
+          region: "ap-south-1",
+          modelID: "apac.anthropic.claude-sonnet-4-5",
+          expected: "apac.anthropic.claude-sonnet-4-5",
+        },
+        {
+          region: "ap-southeast-2",
+          modelID: "au.anthropic.claude-sonnet-4-5",
+          expected: "au.anthropic.claude-sonnet-4-5",
+        },
+      ]
+      yield* addPlugin()
+      for (const item of cases) {
+        yield* aisdk.runLanguage({
+          model: Model.Info.make({
+            ...Model.Info.default(Provider.ID.amazonBedrock, Model.ID.make(item.modelID)),
+            modelID: Model.ID.make(item.modelID),
+            package: Provider.aisdk("test-provider"),
+          }),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: { region: item.region },
        })
-      }),
-    ),
+      }
+      expect(calls).toEqual(cases.map((item) => `languageModel:${item.expected}`))
+    }),
  )

-  it.effect("falls back to AWS_DEFAULT_REGION then us-east-1", () =>
-    withEnv({ ...noAmbientAWS, AWS_DEFAULT_REGION: "us-west-2" }, () =>
-      Effect.gen(function* () {
-        const catalog = yield* seedBedrock()
-        yield* addPlugin()
-        expect(required(yield* catalog.provider.get(Provider.ID.amazonBedrock)).settings).toEqual({
-          region: "us-west-2",
-        })
-        const fallback = yield* Effect.gen(function* () {
-          yield* catalog.reload()
-          return required(yield* catalog.provider.get(Provider.ID.amazonBedrock)).settings
-        }).pipe((fx) => withEnv({ AWS_DEFAULT_REGION: undefined }, () => fx))
-        expect(fallback).toEqual({ region: "us-east-1" })
-      }),
-    ),
-  )
-
-  it.effect("applies to Mantle and native Bedrock packages", () =>
-    withEnv({ ...noAmbientAWS, AWS_PROFILE: "work" }, () =>
-      Effect.gen(function* () {
-        const catalog = yield* Catalog.Service
-        yield* catalog.transform((catalog) => {
-          catalog.provider.update(Provider.ID.make("mantle"), (item) => {
-            item.package = Provider.aisdk("@ai-sdk/amazon-bedrock/mantle")
-          })
-          catalog.provider.update(Provider.ID.make("native"), (item) => {
-            item.package = "@opencode-ai/ai/providers/amazon-bedrock"
-          })
-          catalog.provider.update(Provider.ID.make("other"), (item) => {
-            item.package = Provider.aisdk("@ai-sdk/anthropic")
-          })
-        })
-        yield* addPlugin()
-        expect(required(yield* catalog.provider.get(Provider.ID.make("mantle"))).activation).toBe("enabled")
-        expect(required(yield* catalog.provider.get(Provider.ID.make("native"))).activation).toBe("enabled")
-        expect(required(yield* catalog.provider.get(Provider.ID.make("other"))).activation).toBe("auto")
-      }),
-    ),
+  it.effect("ignores non-Bedrock providers for language selection", () =>
+    Effect.gen(function* () {
+      const aisdk = yield* AISDK.Service
+      const calls: string[] = []
+      yield* addPlugin()
+      const result = yield* aisdk.runLanguage({
+        model: Model.Info.make({
+          ...Model.Info.default(Provider.ID.openai, Model.ID.make("anthropic.claude-sonnet-4-5")),
+          modelID: Model.ID.make("anthropic.claude-sonnet-4-5"),
+          package: Provider.aisdk("test-provider"),
+        }),
+        sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+        options: { region: "eu-west-1" },
+      })
+      expect(calls).toEqual([])
+      expect(result.language).toBeUndefined()
+    }),
  )
 })
@@ -175,7 +175,7 @@ describe("GithubCopilotPlugin", () => {
    Effect.gen(function* () {
      yield* addPlugin()
      const event = yield* modelRequest((yield* sessions()).parent, "primary")
-      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-agent", "X-Interaction-Id": event.sessionID })
+      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-agent" })
    }),
  )

@@ -183,11 +183,7 @@ describe("GithubCopilotPlugin", () => {
    Effect.gen(function* () {
      yield* addPlugin()
      const event = yield* modelRequest((yield* sessions()).child, "primary")
-      expect(event.headers).toEqual({
-        "X-Interaction-Type": "conversation-subagent",
-        "X-Interaction-Id": event.sessionID,
-        "x-initiator": "agent",
-      })
+      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-subagent", "x-initiator": "agent" })
    }),
  )

@@ -195,11 +191,7 @@ describe("GithubCopilotPlugin", () => {
    Effect.gen(function* () {
      yield* addPlugin()
      const event = yield* modelRequest((yield* sessions()).parent, "title")
-      expect(event.headers).toEqual({
-        "X-Interaction-Type": "conversation-background",
-        "X-Interaction-Id": event.sessionID,
-        "x-initiator": "agent",
-      })
+      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-background", "x-initiator": "agent" })
    }),
  )

@@ -207,11 +199,7 @@ describe("GithubCopilotPlugin", () => {
    Effect.gen(function* () {
      yield* addPlugin()
      const event = yield* modelRequest((yield* sessions()).child, "compaction", "build")
-      expect(event.headers).toEqual({
-        "X-Interaction-Type": "conversation-compaction",
-        "X-Interaction-Id": event.sessionID,
-        "x-initiator": "agent",
-      })
+      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-compaction", "x-initiator": "agent" })
    }),
  )

@@ -219,7 +207,7 @@ describe("GithubCopilotPlugin", () => {
    Effect.gen(function* () {
      yield* addPlugin()
      const event = yield* modelRequest((yield* sessions()).parent, "primary", "compaction")
-      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-agent", "X-Interaction-Id": event.sessionID })
+      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-agent" })
    }),
  )

@@ -264,7 +252,7 @@ describe("GithubCopilotPlugin", () => {
    Effect.gen(function* () {
      yield* addPlugin()
      const event = yield* modelRequest((yield* sessions()).parent, "generate")
-      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-agent", "X-Interaction-Id": event.sessionID })
+      expect(event.headers).toEqual({ "X-Interaction-Type": "conversation-agent" })
    }),
  )

@@ -17,7 +17,6 @@ import { Instance } from "@opencode-ai/core/instance"
 import { LocationServiceMap } from "@opencode-ai/core/location-services"
 import { Location } from "@opencode-ai/core/location"
 import { Plugin } from "@opencode-ai/core/plugin"
-import { Rpc } from "@opencode-ai/core/rpc"
 import { SdkPlugins } from "@opencode-ai/core/plugin/sdk"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { tempGlobalLayer } from "../fixture/global"
@@ -111,86 +110,6 @@ const failed = (plugins: Plugin.Interface) =>
  )

 describe("PluginSupervisor reload", () => {
-  ;(
-    [
-      { name: "on a helper-only save", helper: "nested/helper.ts", touchEntry: false },
-      { name: "when the entrypoint also changes", helper: "nested/helper.ts", touchEntry: true },
-      { name: "outside the configured plugin directory", helper: "../shared/helper.ts", touchEntry: false },
-    ] as const
-  ).forEach((scenario) => {
-    it.live(`reloads helper-defined RPC methods ${scenario.name}`, () =>
-      Effect.gen(function* () {
-        const directory = yield* tmpdirScoped()
-        const root = path.join(directory.path, "external/greeter")
-        const file = path.join(root, "index.ts")
-        const helper = path.join(root, scenario.helper)
-        const entry = `export { default } from ${JSON.stringify("./" + scenario.helper)}`
-        const source = (version: number) => `import { Schema } from ${JSON.stringify(import.meta.resolve("effect"))}
-          export default {
-            id: "greeter",
-            async setup(ctx) {
-              await ctx.rpc.register({ id: "greeter", methods: {
-                status: { input: Schema.Unknown, output: Schema.Number },
-                ${version > 1 ? "info: { input: Schema.Unknown, output: Schema.Number }," : ""}
-              }, events: {} }, {
-                status: async () => ${version},
-                ${version > 1 ? `info: async () => ${version},` : ""}
-              })
-              await ctx.command.transform(editor => editor.add({ name: "greet-v${version}", execute: async () => {} }))
-            }
-          }`
-        yield* Effect.promise(async () => {
-          await Bun.write(file, entry)
-          await Bun.write(helper, source(1))
-          await Bun.write(path.join(directory.path, ".opencode/opencode.json"), JSON.stringify({ plugins: [root] }))
-        })
-        const watcher = yield* Watcher.Test
-        const locations = yield* LocationServiceMap.Service
-        yield* Effect.gen(function* () {
-          const plugins = yield* Plugin.Service
-          const rpc = yield* Rpc.Service
-          const commands = yield* Command.Service
-          yield* plugins.awaitActivation
-          expect(yield* rpc.call("greeter", "status", {})).toBe(1)
-          expect(yield* rpc.call("greeter", "info", {}).pipe(Effect.flip)).toMatchObject({
-            type: "rpc.method_not_found",
-          })
-
-          yield* Effect.promise(async () => {
-            await Bun.write(helper, source(2))
-            if (scenario.touchEntry) {
-              await Bun.write(file, entry + "; // updated entry")
-              await fs.utimes(file, new Date(), new Date(Date.now() + 1000))
-            }
-          })
-          yield* watcher.emit({ path: scenario.touchEntry ? file : helper, type: "update" })
-          yield* rpc
-            .call("greeter", "info", {})
-            .pipe(Effect.retry({ times: 80, schedule: Schedule.spaced("25 millis") }))
-          expect(yield* rpc.call("greeter", "info", {})).toBe(2)
-          expect(yield* commands.get("greet-v1")).toBeUndefined()
-          expect(yield* commands.get("greet-v2")).toBeDefined()
-
-          // Failed helper evaluations retain the active registration and recover on the next save.
-          yield* Effect.promise(() => Bun.write(helper, 'throw new Error("broken helper"); export default {}'))
-          yield* watcher.emit({ path: helper, type: "update" })
-          yield* failed(plugins)
-          expect(yield* rpc.call("greeter", "info", {})).toBe(2)
-          yield* Effect.promise(() => Bun.write(helper, source(3)))
-          yield* watcher.emit({ path: helper, type: "update" })
-          yield* commands.get("greet-v3").pipe(
-            Effect.flatMap((command) => (command ? Effect.void : Effect.fail("activation pending"))),
-            Effect.retry({ times: 80, schedule: Schedule.spaced("25 millis") }),
-          )
-          expect(yield* rpc.call("greeter", "info", {})).toBe(3)
-          expect(yield* commands.get("greet-v2")).toBeUndefined()
-        }).pipe(
-          Effect.scoped,
-          Effect.provide(locations.get(Location.Ref.make({ directory: AbsolutePath.make(directory.path) }))),
-        )
-      }),
-    )
-  })
  ;(["discovered", "configured"] as const).forEach((mode) => {
    it.effect(`retains a ${mode} plugin change during initial activation`, () =>
      Effect.gen(function* () {
--- a/Show More
+++ b/Show More