feat(codemode): add structuredClone

2026-09-11 11:26:24 +00:00 · 2026-09-10 01:26:45 -05:00
171 changed files with 2747 additions and 7236 deletions
@@ -18,6 +18,7 @@ const WebSocketResponseCreate = Schema.StructWithRest(Schema.Struct({ type: Sche
 ])
 const decodeMessage = ProviderShared.validateWith(Schema.decodeUnknownEffect(WebSocketResponseCreate))
 const encodeMessage = Schema.encodeSync(Schema.fromJsonString(WebSocketResponseCreate))
+const decodeEvent = Schema.decodeUnknownEffect(OpenResponses.protocol.stream.event)

 export interface Options {
  readonly id: string
@@ -26,7 +27,6 @@ export interface Options {
  readonly enabled?: (url: string) => boolean
  readonly url?: (url: string) => string
  readonly headers?: (headers: Headers.Headers) => Headers.Headers
-  readonly continuation?: OpenResponsesContinuation.Shape
 }

 export interface Prepared {
@@ -60,7 +60,7 @@ const driver = (options: Options, body: string): WebSocketChannelDriver => {
      }),
    observe: (_create, frame) =>
      Effect.gen(function* () {
-        const event = yield* OpenResponses.decodeChannelEvent(frame).pipe(
+        const event = yield* decodeEvent(frame).pipe(
          Effect.mapError((cause) =>
            ProviderShared.eventError(options.id, `Invalid ${options.name} WebSocket event`, frame, cause),
          ),
@@ -163,7 +163,6 @@ export const transport = <Body>(options: Options): Transport<Body, Prepared, str
                    request: create.request,
                    message: create.message,
                    base,
-                    continuation: options.continuation,
                  }),
                }
              })
@@ -6,6 +6,7 @@ import { OpenResponses } from "./open-responses.js"

 const PROTOCOL = "open-responses.websocket.v1"
 const VERSION = 1
+const decodeEvent = Schema.decodeUnknownEffect(OpenResponses.protocol.stream.event)

 interface CheckpointValue {
  readonly version: typeof VERSION
@@ -14,19 +15,12 @@ interface CheckpointValue {
  readonly output: ReadonlyArray<unknown>
 }

-/**
- * Fields to send next to `previous_response_id` on an incremental step, or undefined to send the step in full.
- * Whether omitted fields carry over from the continued response is provider behavior the route must know.
- */
-export type Shape = (request: Readonly<Record<string, unknown>>) => Readonly<Record<string, unknown>> | undefined
-
 export interface DriverInput {
  readonly id: string
  readonly name: string
  readonly request: Readonly<Record<string, unknown>>
  readonly message: string
  readonly base: WebSocketChannelDriver
-  readonly continuation?: Shape
 }

 const checkpointValue = (checkpoint: ChannelCheckpoint | undefined): CheckpointValue | undefined => {
@@ -133,26 +127,22 @@ const rejected = (

 export const driver = (input: DriverInput): WebSocketChannelDriver => {
  const { previous_response_id: _previousResponseID, ...request } = input.request
-  const shape = input.continuation ?? ((fields: Readonly<Record<string, unknown>>) => fields)
  let output: OpenResponses.StreamItem[] = []
  return {
    create: (checkpoint) =>
      Effect.sync(() => {
        output = []
        const previous = checkpointValue(checkpoint)
-        // Ask the route first: diffing the whole history is wasted when it declines the continuation.
-        const fields = previous ? shape(request) : undefined
-        const delta = previous && fields ? incremental(request, previous) : undefined
-        if (!previous || !fields || !delta)
-          return { message: ProviderShared.encodeJson(request), mode: "full" as const }
+        const delta = previous ? incremental(request, previous) : undefined
+        if (!previous || !delta) return { message: ProviderShared.encodeJson(request), mode: "full" as const }
        return {
-          message: ProviderShared.encodeJson({ ...fields, input: delta, previous_response_id: previous.responseID }),
+          message: ProviderShared.encodeJson({ ...request, input: delta, previous_response_id: previous.responseID }),
          mode: "incremental" as const,
        }
      }),
    observe: (create, frame) =>
      Effect.gen(function* () {
-        const event = yield* OpenResponses.decodeChannelEvent(frame).pipe(
+        const event = yield* decodeEvent(frame).pipe(
          Effect.mapError((cause) =>
            ProviderShared.eventError(input.id, `Invalid ${input.name} WebSocket event`, frame, cause),
          ),
@@ -205,4 +195,4 @@ export const driver = (input: DriverInput): WebSocketChannelDriver => {
  }
 }

-export * as OpenResponsesContinuation from "./open-responses-continuation.js"
+export const OpenResponsesContinuation = { driver } as const
@@ -1,4 +1,4 @@
-import { Effect, Option, Schema, SchemaGetter } from "effect"
+import { Effect, Option, Schema } from "effect"
 import type { Content } from "@opencode/schema/tool"
 import { HttpTransport } from "../route/transport/index.js"
 import { Protocol } from "../route/protocol.js"
@@ -86,7 +86,6 @@ export const OpenResponsesReasoningItem = Schema.Struct({
  id: Schema.optionalKey(Schema.String),
  summary: Schema.Array(OpenResponsesReasoningSummaryText),
  encrypted_content: optionalNull(Schema.String),
-  provider_metadata: Schema.optional(JsonObject),
 })

 const OpenResponsesWebSearchCall = Schema.StructWithRest(
@@ -183,7 +182,6 @@ export const InputItem = Schema.Union([
    content: Schema.Array(OpenResponsesOutputText),
    phase: Schema.optionalKey(MessagePhase),
    status: Schema.optional(Schema.String),
-    provider_metadata: Schema.optional(JsonObject),
  }),
  OpenResponsesReasoningItem,
  Schema.Struct({
@@ -193,7 +191,6 @@ export const InputItem = Schema.Union([
    name: Schema.String,
    namespace: Schema.optional(Schema.String),
    arguments: Schema.String,
-    provider_metadata: Schema.optional(JsonObject),
  }),
  Schema.Struct({
    type: Schema.tag("function_call_output"),
@@ -226,7 +223,6 @@ type OpenResponsesReasoningInput = {
  id?: string
  summary: Array<{ type: "summary_text"; text: string }>
  encrypted_content?: string | null
-  provider_metadata?: Record<string, unknown>
 }
 export const Tool = Schema.Struct({
  type: Schema.tag("function"),
@@ -329,8 +325,9 @@ export const StreamItem = Schema.StructWithRest(
 export type StreamItem = Schema.Schema.Type<typeof StreamItem>
 export type OutputItem = StreamItem & { readonly id: string }

-// Responses-compatible providers put streaming error details at the top level or
-// under `error`, and response failures under `response.error`. Accept all three shapes.
+// The Responses schema puts streaming error details at the top level and
+// response failures under `response.error`. WebSocket failures use an
+// event-level `error` envelope, so accept all three shapes here.
 // https://www.openresponses.org/specification
 const OpenResponsesErrorPayload = Schema.Struct({
  type: optionalNull(Schema.String),
@@ -404,44 +401,13 @@ export const Event = Schema.StructWithRest(
    headers: Schema.optional(Schema.Unknown),
  }),
  [Schema.Record(Schema.String, Schema.Unknown)],
-).pipe(
-  Schema.decode({
-    decode: SchemaGetter.transform((event) => {
-      if (event.type !== "error" || event.error != null) return event
-      const { code, message, param, ...rest } = event
-      if (code === undefined && message === undefined && param === undefined) return event
-      // Flat errors (for example, Meta's) can also arrive through generic Responses endpoints.
-      return { ...rest, error: { code, message, param } }
-    }),
-    encode: SchemaGetter.passthrough(),
-  }),
 )
 export type Event = Schema.Schema.Type<typeof Event>
 export type NormalizedEvent = Event & { readonly item?: OutputItem | null }

-const decodeEventValue = Schema.decodeUnknownEffect(Event)
-const decodeFrame = Schema.decodeUnknownEffect(ProviderShared.Json)
-
-/**
- * Decodes one WebSocket frame. xAI answers a rejected `response.create` with `{ "error": { "message", "type" } }` and no
- * event type; that envelope reads as an error event so the failure classifies instead of failing decoding.
- */
-export const decodeChannelEvent = (frame: string) =>
-  decodeFrame(frame).pipe(
-    Effect.flatMap((value) =>
-      decodeEventValue(
-        ProviderShared.isRecord(value) && value.type === undefined && ProviderShared.isRecord(value.error)
-          ? { ...value, type: "error" }
-          : value,
-      ),
-    ),
-  )
-
 export interface ProviderAdapter {
  readonly id: string
  readonly name: string
-  /** Replay opaque gateway continuation state only for adapters that own this extension. */
-  readonly preserveProviderMetadata?: boolean
  readonly nativeTool?: (
    native: NonNullable<ToolDefinition["native"]>,
  ) => Effect.Effect<{ readonly type: string }, AIError>
@@ -461,7 +427,6 @@ export interface ParserState {
  readonly id: string
  readonly name: string
  readonly providerMetadataKey: string
-  readonly preserveProviderMetadata: boolean
  readonly tools: ToolStream.State<string>
  readonly hasFunctionCall: boolean
  readonly lifecycle: Lifecycle.State
@@ -521,16 +486,7 @@ const itemID = (providerMetadata: ProviderMetadata | undefined, providerMetadata
  return separator > 0 && separator < metadata.itemId.length - 1 ? metadata.itemId : undefined
 }

-const replayProviderMetadata = (metadata: ProviderMetadata | undefined, key: string, adapter: ProviderAdapter) => {
-  const value = metadata?.[key]?.providerMetadata
-  return adapter.preserveProviderMetadata && ProviderShared.isRecord(value) ? { provider_metadata: value } : {}
-}
-
-const lowerToolCall = (
-  part: ToolCallPart,
-  providerMetadataKey: string,
-  adapter: ProviderAdapter,
-): OpenResponsesInputItem => {
+const lowerToolCall = (part: ToolCallPart, providerMetadataKey: string): OpenResponsesInputItem => {
  const id = itemID(part.providerMetadata, providerMetadataKey)
  return {
    type: "function_call",
@@ -539,15 +495,10 @@ const lowerToolCall = (
    name: part.name,
    namespace: part.namespace,
    arguments: ProviderShared.encodeJson(part.input),
-    ...replayProviderMetadata(part.providerMetadata, providerMetadataKey, adapter),
  }
 }

-const lowerReasoning = (
-  part: ReasoningPart,
-  providerMetadataKey: string,
-  adapter: ProviderAdapter,
-): OpenResponsesReasoningInput | undefined => {
+const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenResponsesReasoningInput | undefined => {
  const metadata = part.providerMetadata?.[providerMetadataKey]
  if (!ProviderShared.isRecord(metadata)) return undefined
  const id = itemID(part.providerMetadata, providerMetadataKey)
@@ -560,7 +511,6 @@ const lowerReasoning = (
    ...(id === undefined ? {} : { id }),
    summary: part.text.length > 0 ? [{ type: "summary_text", text: part.text }] : [],
    encrypted_content: encryptedContent,
-    ...replayProviderMetadata(part.providerMetadata, providerMetadataKey, adapter),
  }
 }

@@ -709,7 +659,6 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (
            status: "completed",
            content: group.parts.map((part) => ({ type: "output_text" as const, text: part.text })),
            ...(group.phase === undefined ? {} : { phase: group.phase }),
-            ...replayProviderMetadata(group.parts.at(-1)?.providerMetadata, providerMetadataKey, adapter),
          })),
        )
        content.splice(0, content.length)
@@ -730,14 +679,13 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (
        }
        if (part.type === "reasoning") {
          flushText()
-          const reasoning = lowerReasoning(part, providerMetadataKey, adapter)
+          const reasoning = lowerReasoning(part, providerMetadataKey)
          if (!reasoning) continue
          const existing = reasoning.id === undefined ? undefined : reasoningItems[reasoning.id]
          if (existing) {
            existing.summary.push(...reasoning.summary)
            if (typeof reasoning.encrypted_content === "string")
              existing.encrypted_content = reasoning.encrypted_content
-            if (reasoning.provider_metadata !== undefined) existing.provider_metadata = reasoning.provider_metadata
            continue
          }
          if (reasoning.id !== undefined) reasoningItems[reasoning.id] = reasoning
@@ -747,7 +695,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (
        if (part.type === "tool-call") {
          flushText()
          if (part.providerExecuted === true) continue
-          input.push(lowerToolCall(part, providerMetadataKey, adapter))
+          input.push(lowerToolCall(part, providerMetadataKey))
          continue
        }
        if (part.type === "tool-result" && part.providerExecuted === true) {
@@ -1086,17 +1034,8 @@ export const onReasoningDone = (state: ParserState, event: Event, itemID: string
  return onReasoningDelta(state, { ...event, delta: event.text }, itemID)
 }

-const outputMetadata = (state: ParserState, item: OutputItem, extra?: Record<string, unknown>) =>
-  providerMetadata(state, {
-    itemId: item.id,
-    ...extra,
-    ...(state.preserveProviderMetadata && ProviderShared.isRecord(item.provider_metadata)
-      ? { providerMetadata: item.provider_metadata }
-      : {}),
-  })
-
 const reasoningMetadata = (state: ParserState, item: OutputItem) =>
-  outputMetadata(state, item, { reasoningEncryptedContent: item.encrypted_content ?? null })
+  providerMetadata(state, { itemId: item.id, reasoningEncryptedContent: item.encrypted_content ?? null })

 // Responses APIs normally stream reasoning items in this order:
 //   `output_item.added` (reasoning) →
@@ -1159,7 +1098,7 @@ const onOutputItemAdded = (state: ParserState, event: NormalizedEvent): StepResu
  }
  if (item.type !== "function_call" || !item.call_id) return [state, NO_EVENTS]
  if (state.tools[item.id] !== undefined) return [state, NO_EVENTS]
-  const metadata = outputMetadata(state, item)
+  const metadata = providerMetadata(state, { itemId: item.id })
  const events: LLMEvent[] = []
  const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
  return [
@@ -1282,7 +1221,7 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
      content.push(decoded.type === "output_text" ? decoded.text : decoded.refusal)
    }
    const text = content.length > 0 ? content.join("") : undefined
-    const metadata = outputMetadata(state, item, phase === undefined ? undefined : { phase })
+    const metadata = providerMetadata(state, { itemId: item.id, ...(phase === undefined ? {} : { phase }) })
    const events: LLMEvent[] = []
    const lifecycle = text ? Lifecycle.textStart(state.lifecycle, events, item.id, metadata) : state.lifecycle
    return [
@@ -1297,11 +1236,10 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (

  if (item.type === "function_call") {
    if (!item.call_id || !item.name) return [state, NO_EVENTS] satisfies StepResult
-    const metadata = outputMetadata(state, item)
-    const pending = state.tools[item.id]
-    const registered = pending !== undefined
-    const tools = pending
-      ? ToolStream.start(state.tools, item.id, { ...pending, providerMetadata: metadata })
+    const metadata = providerMetadata(state, { itemId: item.id })
+    const registered = state.tools[item.id] !== undefined
+    const tools = registered
+      ? state.tools
      : ToolStream.start(state.tools, item.id, {
          id: item.call_id,
          name: item.name,
@@ -1555,7 +1493,6 @@ export const initial = (request: LLMRequest, adapter: ProviderAdapter = BASE_ADA
  id: adapter.id,
  name: adapter.name,
  providerMetadataKey: metadataKey(request.model),
-  preserveProviderMetadata: adapter.preserveProviderMetadata ?? false,
  hasFunctionCall: false,
  tools: ToolStream.empty<string>(),
  lifecycle: Lifecycle.initial(),
@@ -1,72 +0,0 @@
-import { Effect, Schema } from "effect"
-import { Route } from "../route/client.js"
-import { Endpoint } from "../route/endpoint.js"
-import { Protocol } from "../route/protocol.js"
-import { HttpTransport } from "../route/transport/index.js"
-import type { LLMRequest } from "../schema/index.js"
-import { OpenResponses } from "./open-responses.js"
-import { ProviderShared } from "./shared.js"
-
-const ADAPTER = "organization-routes"
-
-const adapter = {
-  id: ADAPTER,
-  name: "Organization routes",
-  preserveProviderMetadata: true,
-} satisfies OpenResponses.ProviderAdapter
-
-const Body = Schema.Struct({
-  ...OpenResponses.coreFields,
-  store: Schema.Literal(false),
-  provider_options: Schema.Struct({
-    "openai-responses": Schema.Struct({ include: Schema.Array(Schema.String) }),
-  }),
-  stream: Schema.Literal(true),
-})
-
-const fromRequest = Effect.fn("OrganizationRoutes.fromRequest")(function* (request: LLMRequest) {
-  const body = yield* OpenResponses.fromRequestWithAdapter(request, adapter)
-  // A route can select another provider on each call. Keep full history and only
-  // portable options; native caching and stored IDs would exclude translated
-  // targets. Scope encrypted reasoning to native Responses targets so their
-  // stateless continuations remain replayable without blocking other protocols.
-  return yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Body))({
-    model: body.model,
-    input: body.input,
-    instructions: body.instructions,
-    tools: body.tools,
-    tool_choice: body.tool_choice,
-    stream: true as const,
-    store: false as const,
-    provider_options: { "openai-responses": { include: ["reasoning.encrypted_content"] } },
-    max_output_tokens:
-      body.max_output_tokens !== undefined && body.max_output_tokens > 0 ? body.max_output_tokens : undefined,
-    temperature: body.temperature,
-    top_p: body.top_p,
-    parallel_tool_calls: body.parallel_tool_calls,
-    metadata: body.metadata,
-    reasoning: body.reasoning?.effort === undefined ? undefined : { effort: body.reasoning.effort },
-    text: body.text,
-  })
-})
-
-export const protocol = Protocol.make({
-  ...OpenResponses.protocol,
-  id: ADAPTER,
-  body: { schema: Body, from: fromRequest },
-  stream: {
-    ...OpenResponses.protocol.stream,
-    initial: (request: LLMRequest) => OpenResponses.initial(request, adapter),
-  },
-})
-
-export const route = Route.make({
-  id: ADAPTER,
-  providerMetadataKey: ADAPTER,
-  protocol,
-  endpoint: Endpoint.path(OpenResponses.PATH),
-  transport: HttpTransport.sseJson.with<typeof Body.Type>(),
-  defaults: { providerOptions: { store: false, include: [] } },
-})
-
-export * as OrganizationRoutes from "./organization-routes.js"
@@ -6,7 +6,7 @@ import { AuthOptions, type AtLeastOne, type ProviderAuthOption } from "../route/
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
 import { Framing } from "../route/framing.js"
-import { ProviderConfigurationError, ProviderID, ToolDefinition, type ModelID } from "../schema/index.js"
+import { ProviderID, ToolDefinition, type ModelID } from "../schema/index.js"

 export const id = ProviderID.make("alibaba")

@@ -82,13 +82,8 @@ export const configure = (input: Config) => {
        ? hosts.get(region)
        : `${workspaceID}.${region}.maas.aliyuncs.com`
  if (baseURL === undefined) {
-    if (region === undefined)
-      throw new ProviderConfigurationError({ provider: id, message: "Alibaba requires region or baseURL" })
-    if (host === undefined)
-      throw new ProviderConfigurationError({
-        provider: id,
-        message: `Alibaba region ${region} requires workspaceID or baseURL`,
-      })
+    if (region === undefined) throw new Error("Alibaba requires region or baseURL")
+    if (host === undefined) throw new Error(`Alibaba region ${region} requires workspaceID or baseURL`)
  }
  const opts = { ...rest, auth: AuthOptions.bearer(input, ["DASHSCOPE_API_KEY", "ALIBABA_API_KEY"]) }
  const common = { ...opts, endpoint: { baseURL: baseURL ?? `https://${host}/compatible-mode/v1` } }
@@ -4,7 +4,7 @@ import type { ProviderPackage } from "../provider-package.js"
 import { OpenAIChat } from "../protocols/openai-chat.js"
 import { OpenResponses } from "../protocols/open-responses.js"
 import { BedrockAuth, type Credentials } from "../protocols/utils/bedrock-auth.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
 import { withOpenAIOptions, type OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("amazon-bedrock")
@@ -79,12 +79,9 @@ const defaults = (input: Config) => {

 export const configure = (input: Config = {}) => {
  if (input.auth === "bearer" && input.apiKey === undefined && process.env.AWS_BEARER_TOKEN_BEDROCK === undefined)
-    throw new ProviderConfigurationError({ provider: id, message: "Amazon Bedrock Mantle bearer auth requires apiKey" })
+    throw new Error("Amazon Bedrock Mantle bearer auth requires apiKey")
  if (input.auth === "sigv4" && input.apiKey !== undefined)
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "Amazon Bedrock Mantle SigV4 auth does not accept apiKey",
-    })
+    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)
@@ -1,6 +1,6 @@
 import type { RouteDefaultsInput } from "../route/client.js"
 import type { ProviderPackage } from "../provider-package.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.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"
@@ -39,9 +39,8 @@ const bedrockBaseURL = (region: string) => `https://bedrock-runtime.${region}.am
 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 ProviderConfigurationError({ provider: id, message: "Amazon Bedrock bearer auth requires apiKey" })
-  if (auth === "sigv4" && apiKey !== undefined)
-    throw new ProviderConfigurationError({ provider: id, message: "Amazon Bedrock SigV4 auth does not accept apiKey" })
+    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)
  return BedrockConverse.route.with({
    ...rest,
@@ -3,7 +3,7 @@ import { AnthropicMessages } from "../protocols/anthropic-messages.js"
 import { Auth } from "../route/auth.js"
 import type { ProviderAuthOption } from "../route/auth-options.js"
 import type { RouteDefaultsInput } from "../route/client.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"

 export type AnthropicOptionsInput = AnthropicMessages.OptionsInput
 export type AnthropicProviderOptionsInput = AnthropicMessages.ProviderOptionsInput
@@ -36,12 +36,8 @@ const auth = (input: ProviderAuthOption<"optional">) => {
 }

 export const configure = (input: Config) => {
+  if (!input.baseURL) throw new Error("Anthropic-compatible providers require a baseURL")
  const provider = input.provider ?? "anthropic-compatible"
-  if (!input.baseURL)
-    throw new ProviderConfigurationError({
-      provider: ProviderID.make(provider),
-      message: "Anthropic-compatible providers require a baseURL",
-    })
  const { provider: _, baseURL, apiKey: _apiKey, auth: _auth, ...rest } = input
  const route = AnthropicMessages.route.with({
    ...rest,
@@ -65,13 +61,8 @@ export const model: ProviderPackage.Definition<Settings, AnthropicMessages.Provi
  modelID,
  settings,
 ) => {
-  // Read before the exclusivity check narrows a conflicting settings object to `never`.
-  const provider = ProviderID.make(settings.provider ?? id)
  if (settings.apiKey !== undefined && settings.authToken !== undefined)
-    throw new ProviderConfigurationError({
-      provider,
-      message: "Anthropic-compatible apiKey cannot be combined with authToken",
-    })
+    throw new Error("Anthropic-compatible apiKey cannot be combined with authToken")
  return configure({
    ...(settings.authToken === undefined ? { apiKey: settings.apiKey } : { auth: Auth.bearer(settings.authToken) }),
    baseURL: settings.baseURL,
@@ -2,7 +2,7 @@ import type { RouteDefaultsInput } from "../route/client.js"
 import { Auth } from "../route/auth.js"
 import type { ProviderAuthOption } from "../route/auth-options.js"
 import type { ProviderPackage } from "../provider-package.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
 import { AnthropicMessages } from "../protocols/anthropic-messages.js"
 import { AnthropicCompatible } from "./anthropic-compatible.js"

@@ -57,10 +57,7 @@ export const model: ProviderPackage.Definition<Settings, AnthropicMessages.Provi
  settings,
 ) => {
  if (settings.apiKey !== undefined && settings.authToken !== undefined)
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "Anthropic apiKey cannot be combined with authToken",
-    })
+    throw new Error("Anthropic apiKey cannot be combined with authToken")
  return configure({
    ...(settings.authToken === undefined ? { apiKey: settings.apiKey } : { auth: Auth.bearer(settings.authToken) }),
    baseURL: settings.baseURL,
@@ -3,7 +3,7 @@ import { Auth } from "../route/auth.js"
 import { type AtLeastOne, type ProviderAuthOption } from "../route/auth-options.js"
 import type { Route, RouteDefaultsInput, CompactionOperations } from "../route/client.js"
 import type { ProviderPackage } from "../provider-package.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
 import * as OpenAIChat from "../protocols/openai-chat.js"
 import * as OpenAIResponses from "../protocols/openai-responses.js"
 import { ProviderShared } from "../protocols/shared.js"
@@ -163,7 +163,7 @@ const config = (settings: Settings): Config => {
  }
  if (settings.baseURL !== undefined) return { ...common, baseURL: settings.baseURL }
  if (settings.resourceName !== undefined) return { ...common, resourceName: settings.resourceName }
-  throw new ProviderConfigurationError({ provider: id, message: "Azure requires resourceName or baseURL" })
+  throw new Error("Azure requires resourceName or baseURL")
 }

 export const responsesModel: ProviderPackage.Definition<
@@ -5,7 +5,7 @@ import { Auth } from "../route/auth.js"
 import type { AtLeastOne, ProviderAuthOption } from "../route/auth-options.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("cloudflare-ai-gateway")
@@ -35,11 +35,7 @@ export type Settings = ProviderPackage.Settings &

 export const baseURL = (input: GatewayURL) => {
  if (input.baseURL) return input.baseURL
-  if (!input.accountId)
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "CloudflareAIGateway.configure requires accountId unless baseURL is supplied",
-    })
+  if (!input.accountId) throw new Error("CloudflareAIGateway.configure requires accountId unless baseURL is supplied")
  return `https://gateway.ai.cloudflare.com/v1/${encodeURIComponent(input.accountId)}/${encodeURIComponent(input.gatewayId?.trim() || "default")}/compat`
 }

@@ -3,7 +3,7 @@ import { OpenAIChat } from "../protocols/openai-chat.js"
 import { AuthOptions, type AtLeastOne, type ProviderAuthOption } from "../route/auth-options.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("cloudflare-workers-ai")
@@ -28,11 +28,7 @@ export type Settings = ProviderPackage.Settings &

 export const baseURL = (input: WorkersAIURL) => {
  if (input.baseURL) return input.baseURL
-  if (!input.accountId)
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "CloudflareWorkersAI.configure requires accountId unless baseURL is supplied",
-    })
+  if (!input.accountId) throw new Error("CloudflareWorkersAI.configure requires accountId unless baseURL is supplied")
  return `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(input.accountId)}/ai/v1`
 }

@@ -2,7 +2,7 @@ import type { ProviderPackage } from "../provider-package.js"
 import { OpenAIChat } from "../protocols/openai-chat.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
 import { GoogleVertexShared } from "./google-vertex-shared.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"

@@ -37,8 +37,7 @@ const route = Route.make({
 export const routes = [route]

 const configuredRoute = (input: Config) => {
-  if ("apiKey" in input && input.apiKey !== undefined)
-    throw new ProviderConfigurationError({ provider: id, message: "Google Vertex Chat does not support API keys" })
+  if ("apiKey" in input && input.apiKey !== undefined) throw new Error("Google Vertex Chat does not support API keys")
  const {
    accessToken: _accessToken,
    auth: _auth,
@@ -75,8 +74,7 @@ export const provider = {
 }

 export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (modelID, settings) => {
-  if (settings.apiKey !== undefined)
-    throw new ProviderConfigurationError({ provider: id, message: "Google Vertex Chat does not support API keys" })
+  if (settings.apiKey !== undefined) throw new Error("Google Vertex Chat does not support API keys")
  return configure({
    accessToken: settings.accessToken,
    baseURL: settings.baseURL,
@@ -5,7 +5,7 @@ import { Auth } from "../route/auth.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
 import { Protocol } from "../route/protocol.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
 import { GoogleVertexShared } from "./google-vertex-shared.js"

 export type AnthropicOptionsInput = AnthropicMessages.OptionsInput
@@ -67,7 +67,7 @@ export const routes = [route]

 const configuredRoute = (input: Config) => {
  if ("apiKey" in input && input.apiKey !== undefined)
-    throw new ProviderConfigurationError({ provider: id, message: "Google Vertex Messages does not support API keys" })
+    throw new Error("Google Vertex Messages does not support API keys")
  const {
    accessToken: _accessToken,
    auth: _auth,
@@ -107,8 +107,7 @@ export const model: ProviderPackage.Definition<Settings, AnthropicMessages.Provi
  modelID,
  settings,
 ) => {
-  if (settings.apiKey !== undefined)
-    throw new ProviderConfigurationError({ provider: id, message: "Google Vertex Messages does not support API keys" })
+  if (settings.apiKey !== undefined) throw new Error("Google Vertex Messages does not support API keys")
  return configure({
    accessToken: settings.accessToken,
    baseURL: settings.baseURL,
@@ -2,7 +2,7 @@ import type { ProviderPackage } from "../provider-package.js"
 import { OpenResponses } from "../protocols/open-responses.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
-import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
 import { GoogleVertexShared } from "./google-vertex-shared.js"
 import type { OpenResponsesProviderOptionsInput } from "./open-responses-options.js"

@@ -39,7 +39,7 @@ export const routes = [route]

 const configuredRoute = (input: Config) => {
  if ("apiKey" in input && input.apiKey !== undefined)
-    throw new ProviderConfigurationError({ provider: id, message: "Google Vertex Responses does not support API keys" })
+    throw new Error("Google Vertex Responses does not support API keys")
  const {
    accessToken: _accessToken,
    auth: _auth,
@@ -79,8 +79,7 @@ export const model: ProviderPackage.Definition<Settings, OpenResponsesProviderOp
  modelID,
  settings,
 ) => {
-  if (settings.apiKey !== undefined)
-    throw new ProviderConfigurationError({ provider: id, message: "Google Vertex Responses does not support API keys" })
+  if (settings.apiKey !== undefined) throw new Error("Google Vertex Responses does not support API keys")
  return configure({
    accessToken: settings.accessToken,
    baseURL: settings.baseURL,
@@ -1,10 +1,8 @@
 import type { AnyAuthClient } from "google-auth-library"
 import { Effect, Redacted } from "effect"
 import { Auth, MissingCredentialError } from "../route/auth.js"
-import { ProviderConfigurationError, ProviderID } from "../schema/index.js"

 const SCOPE = "https://www.googleapis.com/auth/cloud-platform"
-const id = ProviderID.make("google-vertex")

 export type OAuthOptions =
  | { readonly accessToken?: string; readonly auth?: never }
@@ -37,18 +35,12 @@ export const host = (location: string) => {

 export const requireProject = (value: string | undefined) => {
  if (value) return value
-  throw new ProviderConfigurationError({
-    provider: id,
-    message: "Google Vertex requires a project when baseURL is not configured",
-  })
+  throw new Error("Google Vertex requires a project when baseURL is not configured")
 }

 export const apiKey = (input: ApiKeyOptions) => {
  if (input.apiKey !== undefined && (input.accessToken !== undefined || input.auth !== undefined))
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "Google Vertex apiKey cannot be combined with accessToken or auth",
-    })
+    throw new Error("Google Vertex apiKey cannot be combined with accessToken or auth")
  if (input.accessToken !== undefined || input.auth !== undefined) return undefined
  return input.apiKey ?? process.env.GOOGLE_VERTEX_API_KEY
 }
@@ -76,10 +68,7 @@ const adc = (project?: string) => {

 export const oauth = (input: OAuthOptions, project?: string) => {
  if (input.accessToken !== undefined && input.auth !== undefined)
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "Google Vertex accessToken cannot be combined with auth",
-    })
+    throw new Error("Google Vertex accessToken cannot be combined with auth")
  if (input.auth) return input.auth
  if (input.accessToken !== undefined) return Auth.bearer(input.accessToken)
  return adc(project)
@@ -6,7 +6,7 @@ import { Auth } from "../route/auth.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
 import { Framing } from "../route/framing.js"
-import { ProviderConfigurationError, ProviderID, type LLMRequest, type ModelID } from "../schema/index.js"
+import { ProviderID, type LLMRequest, type ModelID } from "../schema/index.js"
 import { GoogleVertexShared } from "./google-vertex-shared.js"

 export interface GeminiOptionsInput extends Gemini.OptionsInput {
@@ -93,10 +93,7 @@ const configuredRoute = (input: Config, modelID: string | ModelID) => {
  const apiKey = GoogleVertexShared.apiKey(input)
  const endpointModel = String(modelID).startsWith("endpoints/")
  if (apiKey !== undefined && endpointModel)
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "Google Vertex tuned models do not support Express Mode API keys",
-    })
+    throw new Error("Google Vertex tuned models do not support Express Mode API keys")
  const location = GoogleVertexShared.location(inputLocation, "us-central1")
  const project = GoogleVertexShared.project(inputProject)
  const endpoint =
@@ -126,10 +123,7 @@ export const provider = {
 }
 export const model: ProviderPackage.Definition<Settings, GeminiProviderOptionsInput>["model"] = (modelID, settings) => {
  if (settings.apiKey !== undefined && settings.accessToken !== undefined)
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "Google Vertex apiKey cannot be combined with accessToken or auth",
-    })
+    throw new Error("Google Vertex apiKey cannot be combined with accessToken or auth")
  return configure({
    ...(settings.apiKey === undefined ? { accessToken: settings.accessToken } : { apiKey: settings.apiKey }),
    baseURL: settings.baseURL,
@@ -1,57 +0,0 @@
-import type { ProviderPackage } from "../provider-package.js"
-import { OrganizationRoutes } from "../protocols/organization-routes.js"
-import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
-import type { RouteDefaultsInput } from "../route/client.js"
-import { ProviderID, type ModelID } from "../schema/index.js"
-import type { OpenResponsesProviderOptionsInput } from "./open-responses-options.js"
-
-export type Options = Pick<
-  OpenResponsesProviderOptionsInput,
-  "reasoningEffort" | "textVerbosity" | "parallelToolCalls" | "metadata" | "allowedTools"
->
-
-export const id = ProviderID.make("organization-routes")
-
-export type Config = RouteDefaultsInput &
-  ProviderAuthOption<"optional"> & {
-    readonly provider?: string
-    readonly baseURL: string
-    readonly providerOptions?: Options
-  }
-
-export interface Settings extends ProviderPackage.Settings {
-  readonly apiKey?: string
-  readonly baseURL: string
-  readonly provider?: string
-  readonly providerOptions?: Options
-}
-
-export const routes = [OrganizationRoutes.route]
-
-export const configure = (input: Config) => {
-  const provider = input.provider ?? "organization-routes"
-  const { provider: _, baseURL, apiKey: _apiKey, auth: _auth, ...rest } = input
-  const route = OrganizationRoutes.route.with({
-    ...rest,
-    provider,
-    endpoint: { baseURL },
-    auth: AuthOptions.bearer(input, []),
-  })
-  return {
-    id: ProviderID.make(provider),
-    model: (modelID: string | ModelID) => route.model<Options>({ id: modelID }),
-    configure,
-  }
-}
-
-export const provider = { id, configure }
-
-export const model: ProviderPackage.Definition<Settings, Options>["model"] = (modelID, settings) =>
-  configure({
-    apiKey: settings.apiKey,
-    baseURL: settings.baseURL,
-    headers: settings.headers === undefined ? undefined : { ...settings.headers },
-    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    provider: settings.provider,
-    providerOptions: settings.providerOptions,
-  }).model(modelID)
@@ -41,10 +41,6 @@ const responsesRoute = Route.make({
    id: "openai-responses",
    name: "xAI Responses",
    rotateAfterMs: RESPONSES_WEBSOCKET_ROTATE_AFTER_MS,
-    // xAI continues a chain only from stored responses: with `store: false` (the route default) `previous_response_id`
-    // fails with "Response with id=… not found", so those steps are sent in full over the reused connection. It also
-    // rejects `instructions` next to `previous_response_id` and keeps the instructions of the response it continues.
-    continuation: ({ instructions: _instructions, ...request }) => (request.store === false ? undefined : request),
  }),
  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
 })
@@ -23,7 +23,6 @@ import {
  LanguageModel,
  LLMEvent,
  InvalidProviderOutputError,
-  ProviderConfigurationError,
  ProviderID,
  mergeGenerationOptions,
  mergeHttpOptions,
@@ -129,10 +128,7 @@ const makeRouteLanguageModel = <Options extends ProviderOptions, Compact extends
  const provider = route.provider ?? ("provider" in mapped ? mapped.provider : undefined)
  if (!provider) throw new Error(`Route.model(${route.id}) requires a provider`)
  if (!endpointBaseURL(route.endpoint))
-    throw new ProviderConfigurationError({
-      provider: ProviderID.make(provider),
-      message: `Route.model(${route.id}) requires an endpoint baseURL — configure it on the route first`,
-    })
+    throw new Error(`Route.model(${route.id}) requires an endpoint baseURL — configure it on the route first`)
  return LanguageModel.make<Options, Compact>({
    ...mapped,
    provider,
@@ -50,19 +50,6 @@ export class UnsupportedOperationError extends Schema.TaggedError<UnsupportedOpe
  route: Schema.optional(RouteID),
 }) {}

-/**
- * Provider settings that are missing, conflicting, or unsupported, such as
- * Azure without `resourceName` or `baseURL`. Thrown synchronously while a
- * provider facade or package entrypoint configures a model, before any
- * request exists, so it is not an `AIError` reason.
- */
-export class ProviderConfigurationError extends Schema.TaggedError<ProviderConfigurationError>(
-  "AI.Error.ProviderConfiguration",
-)("ProviderConfiguration", {
-  provider: ProviderID,
-  message: Schema.String,
-}) {}
-
 export class NoRouteError extends Schema.TaggedError<NoRouteError>("AI.Error.NoRoute")("NoRoute", {
  ...ReasonFields,
  route: RouteID,
@@ -3,9 +3,6 @@ import { model } from "@opencode/ai/providers/openai"
 import { LLM } from "../src/index.js"
 import { Endpoint } from "../src/route/endpoint.js"

-const configuration = (provider: string, message: string) =>
-  expect.objectContaining({ _tag: "ProviderConfiguration", provider, message })
-
 describe("provider package entrypoints", () => {
  test("semantic API aliases expose the same contract", async () => {
    const modules = await Promise.all([
@@ -325,7 +322,7 @@ describe("provider package entrypoints", () => {
    const AnthropicCompatible = await import("@opencode/ai/providers/anthropic-compatible")
    expect(() =>
      Reflect.apply(AnthropicCompatible.model, undefined, ["compatible-model", { apiKey: "fixture" }]),
-    ).toThrow(configuration("anthropic-compatible", "Anthropic-compatible providers require a baseURL"))
+    ).toThrow("Anthropic-compatible providers require a baseURL")
  })

  test("rejects conflicting Anthropic-compatible auth settings at runtime", async () => {
@@ -340,10 +337,10 @@ describe("provider package entrypoints", () => {
          baseURL: "https://messages.example.test/v1",
        },
      ]),
-    ).toThrow(configuration("anthropic-compatible", "Anthropic-compatible apiKey cannot be combined with authToken"))
+    ).toThrow("Anthropic-compatible apiKey cannot be combined with authToken")
    expect(() =>
      Reflect.apply(Anthropic.model, undefined, ["claude-sonnet-4-6", { apiKey: "fixture", authToken: "token" }]),
-    ).toThrow(configuration("anthropic", "Anthropic apiKey cannot be combined with authToken"))
+    ).toThrow("Anthropic apiKey cannot be combined with authToken")
  })

  test("maps legacy OpenAI organization and project settings to headers", () => {
@@ -493,45 +490,43 @@ describe("provider package entrypoints", () => {
        "gemini-3.5-flash",
        { accessToken: "token", apiKey: "fixture", project: "vertex-project" },
      ]),
-    ).toThrow(configuration("google-vertex", "Google Vertex apiKey cannot be combined with accessToken or auth"))
+    ).toThrow("Google Vertex apiKey cannot be combined with accessToken or auth")
    const configured = Reflect.apply(GoogleVertex.configure, undefined, [
      { accessToken: "token", auth: {}, project: "vertex-project" },
    ])
-    expect(() => configured.model("gemini-3.5-flash")).toThrow(
-      configuration("google-vertex", "Google Vertex accessToken cannot be combined with auth"),
-    )
+    expect(() => configured.model("gemini-3.5-flash")).toThrow("Google Vertex accessToken cannot be combined with auth")
    expect(() =>
      Reflect.apply(GoogleVertexMessages.model, undefined, [
        "claude-sonnet-4-6",
        { apiKey: "fixture", project: "vertex-project" },
      ]),
-    ).toThrow(configuration("google-vertex", "Google Vertex Messages does not support API keys"))
+    ).toThrow("Google Vertex Messages does not support API keys")
    expect(() =>
      Reflect.apply(Providers.GoogleVertexMessages.configure, undefined, [
        { apiKey: "fixture", project: "vertex-project" },
      ]),
-    ).toThrow(configuration("google-vertex", "Google Vertex Messages does not support API keys"))
+    ).toThrow("Google Vertex Messages does not support API keys")
    expect(() =>
      Reflect.apply(GoogleVertexChat.model, undefined, [
        "deepseek-ai/deepseek-v3.2-maas",
        { apiKey: "fixture", project: "vertex-project" },
      ]),
-    ).toThrow(configuration("google-vertex", "Google Vertex Chat does not support API keys"))
+    ).toThrow("Google Vertex Chat does not support API keys")
    expect(() =>
      Reflect.apply(Providers.GoogleVertexChat.configure, undefined, [
        { apiKey: "fixture", project: "vertex-project" },
      ]),
-    ).toThrow(configuration("google-vertex", "Google Vertex Chat does not support API keys"))
+    ).toThrow("Google Vertex Chat does not support API keys")
    expect(() =>
      Reflect.apply(GoogleVertexResponses.model, undefined, [
        "xai/grok-4.20-reasoning",
        { apiKey: "fixture", project: "vertex-project" },
      ]),
-    ).toThrow(configuration("google-vertex", "Google Vertex Responses does not support API keys"))
+    ).toThrow("Google Vertex Responses does not support API keys")
    expect(() =>
      Reflect.apply(Providers.GoogleVertexResponses.configure, undefined, [
        { apiKey: "fixture", project: "vertex-project" },
      ]),
-    ).toThrow(configuration("google-vertex", "Google Vertex Responses does not support API keys"))
+    ).toThrow("Google Vertex Responses does not support API keys")
  })
 })
@@ -76,13 +76,7 @@ it.effect("Alibaba owns regional shared and workspace-specific endpoints", () =>

 test("Alibaba requires explicit placement and supports complete base URL overrides", () => {
  for (const region of ["eu-central-1", "ap-northeast-1", "future-region"])
-    expect(() => Alibaba.configure({ region })).toThrow(
-      expect.objectContaining({
-        _tag: "ProviderConfiguration",
-        provider: "alibaba",
-        message: `Alibaba region ${region} requires workspaceID or baseURL`,
-      }),
-    )
+    expect(() => Alibaba.configure({ region })).toThrow("requires workspaceID or baseURL")
  for (const config of [
    { baseURL: "https://gateway.example/prefix" },
    { region: "future-region", workspaceID: "ignored", baseURL: "https://gateway.example/prefix" },
@@ -1458,13 +1458,7 @@ describe("Bedrock Converse route", () => {
        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(
-        expect.objectContaining({
-          _tag: "ProviderConfiguration",
-          provider: "amazon-bedrock",
-          message: "Amazon Bedrock SigV4 auth does not accept apiKey",
-        }),
-      )
+      expect(() => AmazonBedrock.configure({ auth: "sigv4", apiKey: "k" })).toThrow("does not accept apiKey")
    }).pipe(
      withProcessEnv({
        ...noAmbientAWS,
@@ -378,11 +378,7 @@ describe("Google Vertex providers", () => {

  test("rejects tuned Gemini models in express mode", () => {
    expect(() => GoogleVertex.configure({ apiKey: "fixture" }).model("endpoints/1234567890")).toThrow(
-      expect.objectContaining({
-        _tag: "ProviderConfiguration",
-        provider: "google-vertex",
-        message: "Google Vertex tuned models do not support Express Mode API keys",
-      }),
+      "Google Vertex tuned models do not support Express Mode API keys",
    )
  })
 })
@@ -1,78 +0,0 @@
-import { expect } from "bun:test"
-import { Effect, Schema } from "effect"
-import { LLM, LLMClient } from "../../src/index.js"
-import { OpenResponses } from "../../src/protocols/open-responses.js"
-import { Meta } from "../../src/providers/index.js"
-import { configure } from "../../src/providers/openai-compatible-responses.js"
-import { it } from "../lib/effect.js"
-import { fixedResponse } from "../lib/http.js"
-import { sseEvents } from "../lib/sse.js"
-
-const decodeEvent = Schema.decodeUnknownEffect(OpenResponses.protocol.stream.event)
-
-it.effect("normalizes flat errors in shared SSE and WebSocket decoding", () =>
-  Effect.gen(function* () {
-    const frame = {
-      type: "error",
-      sequence_number: 4,
-      code: "server_shutting_down",
-      message: "Server is shutting down. Please retry your request.",
-      param: null,
-    }
-    for (const decode of [decodeEvent, OpenResponses.decodeChannelEvent]) {
-      const event = yield* decode(JSON.stringify(frame))
-      expect(event).toEqual({
-        type: "error",
-        sequence_number: 4,
-        error: { code: frame.code, message: frame.message, param: null },
-      })
-
-      for (const unchanged of [
-        event,
-        { type: "error" },
-        {
-          type: "response.failed",
-          response: { id: "resp_failed", error: { code: "server_error", message: "Internal server error" } },
-        },
-        { type: "response.output_text.delta", item_id: "msg_text", delta: "Hello" },
-      ]) {
-        expect(yield* decode(JSON.stringify(unchanged))).toEqual(unchanged)
-      }
-    }
-  }),
-)
-
-it.effect("continues to normalize untyped xAI WebSocket errors", () =>
-  Effect.gen(function* () {
-    const frame = { error: { type: "api_error", message: "gRPC error: Response with id=resp_missing not found" } }
-    expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame))).toEqual({ ...frame, type: "error" })
-  }),
-)
-
-it.effect("retains classification and original error bodies through Meta and generic Responses routes", () =>
-  Effect.gen(function* () {
-    const raw = `{
-  "type": "error",
-  "sequence_number": 4,
-  "code": "server_shutting_down",
-  "message": "Server is shutting down. Please retry your request.",
-  "param": null,
-  "diagnostic": "retain-original-frame"
-}`
-    for (const model of [
-      Meta.configure({ apiKey: "fixture" }).responses("muse-spark-1.3"),
-      configure({ apiKey: "fixture", provider: "gateway", baseURL: "https://responses.example.test/v1" }).model(
-        "example-model",
-      ),
-    ]) {
-      const error = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" })).pipe(
-        Effect.provide(fixedResponse(sseEvents(raw.replaceAll("\n", "\ndata: ")))),
-        Effect.flip,
-      )
-      expect(error.reason._tag).toBe("ProviderInternal")
-      expect(error.message).toBe("server_shutting_down: Server is shutting down. Please retry your request.")
-      expect(error.reason.body).toBe(raw)
-      expect(error.reason.http?.status).toBe(200)
-    }
-  }),
-)
@@ -90,11 +90,7 @@ const classifyingChannelDriver = (message: string): WebSocketChannelDriver => {
  }
 }

-const continuationDriver = (
-  request: Readonly<Record<string, unknown>>,
-  base = baseChannelDriver,
-  continuation?: OpenResponsesContinuation.Shape,
-) => {
+const continuationDriver = (request: Readonly<Record<string, unknown>>, base = baseChannelDriver) => {
  const message = ProviderShared.encodeJson(request)
  return OpenResponsesContinuation.driver({
    id: "openai-responses",
@@ -102,7 +98,6 @@ const continuationDriver = (
    request,
    message,
    base: base(message),
-    continuation,
  })
 }

@@ -926,58 +921,6 @@ describe("OpenAI Responses route", () => {
        type: "provider-failure",
        error: { reason: { _tag: "InvalidRequest", classification: "context-overflow" } },
      })
-
-      // A retryable failure stays one: the runner retries it, and the transport has already dropped the
-      // checkpoint, so that retry is a full send. xAI reports every rejection this way.
-      const internal = ProviderShared.encodeJson({
-        type: "error",
-        error: { type: "api_error", message: "gRPC error: Response with id=resp_1 not found" },
-      })
-      expect(yield* second.observe(yield* second.create(saved), internal)).toMatchObject({
-        type: "provider-failure",
-        error: { reason: { _tag: "ProviderInternal" } },
-      })
-    }),
-  )
-
-  it.effect("shapes the incremental send with the route continuation", () =>
-    Effect.gen(function* () {
-      const firstRequest = {
-        type: "response.create",
-        model: "grok-4.6",
-        store: true,
-        instructions: "You are terse.",
-        input: [{ role: "user", content: [{ type: "input_text", text: "First" }] }],
-      }
-      const secondRequest = {
-        ...firstRequest,
-        input: [...firstRequest.input, { role: "user", content: [{ type: "input_text", text: "Second" }] }],
-      }
-      const saved = checkpoint(
-        yield* continuationDriver(firstRequest).observe(
-          yield* continuationDriver(firstRequest).create(undefined),
-          ProviderShared.encodeJson({ type: "response.completed", response: { id: "resp_1" } }),
-        ),
-      )
-
-      const trimmed = yield* continuationDriver(
-        secondRequest,
-        baseChannelDriver,
-        ({ instructions: _, ...rest }) => rest,
-      ).create(saved)
-      expect(trimmed.mode).toBe("incremental")
-      expect(JSON.parse(trimmed.message)).toEqual({
-        type: "response.create",
-        model: "grok-4.6",
-        store: true,
-        previous_response_id: "resp_1",
-        input: [{ role: "user", content: [{ type: "input_text", text: "Second" }] }],
-      })
-
-      // Declining the continuation sends the step in full and never sends a previous_response_id.
-      const declined = yield* continuationDriver(secondRequest, baseChannelDriver, () => undefined).create(saved)
-      expect(declined.mode).toBe("full")
-      expect(JSON.parse(declined.message)).toEqual(secondRequest)
    }),
  )

@@ -1,361 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Schema } from "effect"
-import { LLM, LLMEvent, Message } from "../../src/index.js"
-import { configure } from "../../src/providers/organization-routes.js"
-import { provider } from "../../src/providers/openai-compatible-responses.js"
-import { LLMClient } from "../../src/route.js"
-import { compileRequest } from "../../src/route/client.js"
-import { it } from "../lib/effect.js"
-import { dynamicResponse, fixedResponse } from "../lib/http.js"
-import { sseEvents } from "../lib/sse.js"
-
-const model = configure({
-  apiKey: "session-test",
-  baseURL: "https://console.example.test/inference/route/openai/v1",
-  provider: "opencode-routes-org_test",
-  headers: { "x-opencode-org-id": "org_test" },
-}).model("route/coding")
-
-const fixtures = [
-  {
-    protocol: "openai-responses",
-    content: [
-      {
-        type: "reasoning",
-        id: "rs_native",
-        summary: [{ type: "summary_text", text: "Need a lookup" }],
-        encrypted_content: "opaque-openai-reasoning",
-      },
-      { type: "message", id: "msg_native", role: "assistant", content: [{ type: "output_text", text: "Checking." }] },
-      {
-        type: "function_call",
-        id: "fc_native_lookup",
-        call_id: "call_lookup",
-        name: "lookup",
-        arguments: '{"query":"weather"}',
-      },
-      { type: "function_call", id: "fc_native_clock", call_id: "call_clock", name: "clock", arguments: "{}" },
-    ],
-  },
-  {
-    protocol: "google",
-    content: [
-      { text: "Need a lookup", thought: true },
-      { text: "Checking." },
-      { functionCall: { name: "lookup", args: { query: "weather" } }, thoughtSignature: "opaque-google-signature" },
-      { functionCall: { name: "clock", args: {} } },
-    ],
-  },
-  {
-    protocol: "anthropic-messages",
-    content: [
-      { type: "thinking", thinking: "Need a lookup", signature: "opaque-anthropic-signature" },
-      { type: "text", text: "Checking." },
-      { type: "tool_use", id: "call_lookup", name: "lookup", input: { query: "weather" } },
-      { type: "tool_use", id: "call_clock", name: "clock", input: {} },
-    ],
-  },
-  {
-    protocol: "openai-chat",
-    content: [
-      {
-        role: "assistant",
-        reasoning_content: "Need a lookup",
-        content: "Checking.",
-        tool_calls: [
-          { id: "call_lookup", type: "function", function: { name: "lookup", arguments: '{"query":"weather"}' } },
-          { id: "call_clock", type: "function", function: { name: "clock", arguments: "{}" } },
-        ],
-      },
-    ],
-  },
-]
-
-const finalText = sseEvents(
-  {
-    type: "response.output_item.done",
-    item: { type: "message", id: "msg_final", content: [{ type: "output_text", text: "Sunny." }] },
-  },
-  { type: "response.completed", response: { id: "resp_final" } },
-)
-
-describe("organization routes", () => {
-  it.effect("uses the Responses route endpoint with stateless portable options", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(
-        LLM.request({
-          model,
-          system: "Help with code.",
-          prompt: "Hello",
-          promptCacheKey: "session-cache",
-          providerOptions: {
-            store: true,
-            include: ["reasoning.encrypted_content"],
-            previousResponseId: "resp_old",
-            reasoningEffort: "low",
-            reasoningSummary: "auto",
-            serviceTier: "priority",
-          },
-        }),
-      ).pipe(
-        Effect.provide(
-          dynamicResponse((input) =>
-            Effect.gen(function* () {
-              expect(input.request.url).toBe("https://console.example.test/inference/route/openai/v1/responses")
-              expect(input.request.headers.authorization).toBe("Bearer session-test")
-              expect(input.request.headers["x-opencode-org-id"]).toBe("org_test")
-              expect(yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.Unknown))(input.text)).toEqual({
-                model: "route/coding",
-                input: [{ role: "user", content: [{ type: "input_text", text: "Hello" }] }],
-                instructions: "Help with code.",
-                stream: true,
-                store: false,
-                provider_options: { "openai-responses": { include: ["reasoning.encrypted_content"] } },
-                reasoning: { effort: "low" },
-              })
-              return input.respond(finalText, { headers: { "content-type": "text/event-stream" } })
-            }),
-          ),
-        ),
-      )
-      expect(response.text).toBe("Sunny.")
-    }),
-  )
-
-  it.effect("omits an unknown output limit", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(LLM.request({ model, prompt: "Hello", generation: { maxTokens: 0 } }))
-      expect(prepared.body.max_output_tokens).toBeUndefined()
-    }),
-  )
-
-  for (const fixture of fixtures) {
-    it.effect(`preserves ${fixture.protocol} continuation metadata through a streamed parallel tool loop`, () =>
-      Effect.gen(function* () {
-        const metadata = {
-          protocol: fixture.protocol,
-          model: "native-model",
-          connection_id: "conn_native",
-          endpoint_id: "endpoint_native",
-          content: fixture.content,
-          group_id: "resp_tools",
-        }
-        const marker = { group_id: "resp_tools" }
-        const items = [
-          {
-            type: "reasoning",
-            id: "rs_1",
-            summary: [{ type: "summary_text", text: "Need a lookup" }],
-            provider_metadata: metadata,
-          },
-          {
-            type: "message",
-            id: "msg_1",
-            role: "assistant",
-            content: [{ type: "output_text", text: "Checking." }],
-            provider_metadata: marker,
-          },
-          {
-            type: "function_call",
-            id: "fc_lookup",
-            call_id: "call_lookup",
-            name: "lookup",
-            arguments: '{"query":"weather"}',
-            provider_metadata: marker,
-          },
-          {
-            type: "function_call",
-            id: "fc_clock",
-            call_id: "call_clock",
-            name: "clock",
-            arguments: "{}",
-            provider_metadata: marker,
-          },
-        ]
-        const first = yield* LLMClient.generate(LLM.request({ model, prompt: "Check weather and time." })).pipe(
-          Effect.provide(
-            fixedResponse(
-              sseEvents(
-                {
-                  type: "response.output_item.added",
-                  output_index: 0,
-                  item: { type: "reasoning", id: "rs_1", summary: [] },
-                },
-                {
-                  type: "response.reasoning_summary_text.delta",
-                  item_id: "rs_1",
-                  summary_index: 0,
-                  delta: "Need a lookup",
-                },
-                {
-                  type: "response.output_item.added",
-                  output_index: 1,
-                  item: { type: "message", id: "msg_1", role: "assistant", content: [] },
-                },
-                { type: "response.output_text.delta", item_id: "msg_1", delta: "Checking." },
-                {
-                  type: "response.output_item.added",
-                  output_index: 2,
-                  item: {
-                    type: "function_call",
-                    id: "fc_lookup",
-                    call_id: "call_lookup",
-                    name: "lookup",
-                    arguments: "",
-                  },
-                },
-                { type: "response.function_call_arguments.delta", item_id: "fc_lookup", delta: '{"query":"weather"}' },
-                {
-                  type: "response.output_item.added",
-                  output_index: 3,
-                  item: { type: "function_call", id: "fc_clock", call_id: "call_clock", name: "clock", arguments: "" },
-                },
-                { type: "response.function_call_arguments.delta", item_id: "fc_clock", delta: "{}" },
-                ...items.map((item, output_index) => ({ type: "response.output_item.done", output_index, item })),
-                { type: "response.completed", response: { id: "resp_tools", output: items } },
-              ),
-            ),
-          ),
-        )
-        expect(first.toolCalls).toHaveLength(2)
-        expect(first.events.filter(LLMEvent.is.toolCall)).toHaveLength(2)
-        expect(
-          first.message.content.map((part) => part.providerMetadata?.["opencode-routes-org_test"]?.providerMetadata),
-        ).toEqual([metadata, marker, marker, marker])
-
-        const second = yield* LLMClient.generate(
-          LLM.request({
-            model,
-            providerOptions: { previousResponseId: "resp_tools" },
-            messages: [
-              Message.user("Check weather and time."),
-              first.message,
-              Message.tool({ id: "call_lookup", name: "lookup", result: { weather: "sunny" } }),
-              Message.tool({ id: "call_clock", name: "clock", result: { time: "noon" } }),
-            ],
-          }),
-        ).pipe(
-          Effect.provide(
-            dynamicResponse((input) =>
-              Effect.gen(function* () {
-                const body = yield* Schema.decodeUnknownEffect(
-                  Schema.fromJsonString(
-                    Schema.Struct({
-                      input: Schema.Array(Schema.Record(Schema.String, Schema.Unknown)),
-                      store: Schema.Boolean,
-                      include: Schema.optional(Schema.Array(Schema.String)),
-                      previous_response_id: Schema.optional(Schema.String),
-                    }),
-                  ),
-                )(input.text)
-                expect(body.store).toBe(false)
-                expect(body.include).toBeUndefined()
-                expect(body.previous_response_id).toBeUndefined()
-                expect(body.input.map((item) => item.type ?? item.role)).toEqual([
-                  "user",
-                  "reasoning",
-                  "message",
-                  "function_call",
-                  "function_call",
-                  "function_call_output",
-                  "function_call_output",
-                ])
-                expect(body.input.slice(1, 5).map((item) => item.provider_metadata)).toEqual([
-                  metadata,
-                  marker,
-                  marker,
-                  marker,
-                ])
-                expect(body.input.slice(3, 5).map((item) => item.call_id)).toEqual(["call_lookup", "call_clock"])
-                return input.respond(finalText, { headers: { "content-type": "text/event-stream" } })
-              }),
-            ),
-          ),
-        )
-        expect(second.text).toBe("Sunny.")
-      }),
-    )
-  }
-
-  it.effect("preserves opaque state on an empty reasoning item", () =>
-    Effect.gen(function* () {
-      const metadata = {
-        protocol: "anthropic-messages",
-        content: [{ type: "redacted_thinking", data: "opaque" }],
-        group_id: "resp_empty",
-      }
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think." })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.done",
-                item: { type: "reasoning", id: "rs_empty", summary: [], provider_metadata: metadata },
-              },
-              { type: "response.completed", response: { id: "resp_empty" } },
-            ),
-          ),
-        ),
-      )
-      const replay = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
-      expect(replay.body.input).toEqual([
-        { type: "reasoning", id: "rs_empty", summary: [], encrypted_content: null, provider_metadata: metadata },
-      ])
-    }),
-  )
-
-  it.effect("keeps opaque route metadata out of other Responses providers", () =>
-    Effect.gen(function* () {
-      const other = provider
-        .configure({
-          apiKey: "test-key",
-          baseURL: "https://other.example.test/v1",
-          provider: "opencode-routes-org_test",
-        })
-        .model("other")
-      const response = yield* LLMClient.generate(LLM.request({ model: other, prompt: "Hello" })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.done",
-                item: {
-                  type: "message",
-                  id: "msg_1",
-                  content: [{ type: "output_text", text: "Hi" }],
-                  provider_metadata: { group_id: "resp_1", secret: "opaque" },
-                },
-              },
-              { type: "response.completed", response: { id: "resp_1" } },
-            ),
-          ),
-        ),
-      )
-      expect(response.message.content[0]?.providerMetadata).toEqual({ "opencode-routes-org_test": { itemId: "msg_1" } })
-      const replay = yield* compileRequest(
-        LLM.request({
-          model: other,
-          messages: [
-            Message.assistant({
-              type: "text",
-              text: "Hi",
-              providerMetadata: {
-                "opencode-routes-org_test": { itemId: "msg_1", providerMetadata: { secret: "opaque" } },
-              },
-            }),
-          ],
-        }),
-      )
-      expect(replay.body.input).toEqual([
-        {
-          type: "message",
-          id: "msg_1",
-          role: "assistant",
-          status: "completed",
-          content: [{ type: "output_text", text: "Hi" }],
-        },
-      ])
-      expect(replay.body.include).toEqual(["reasoning.encrypted_content"])
-    }),
-  )
-})
@@ -1,18 +1,11 @@
 import { describe, expect } from "bun:test"
-import { Effect, Layer, Stream } from "effect"
+import { Effect } from "effect"
 import { LLM, LLMEvent, Message } from "../../src/index.js"
 import { XAI } from "../../src/providers.js"
 import { OpenResponses } from "../../src/protocols/open-responses.js"
 import { OpenAIResponses } from "../../src/protocols/openai-responses.js"
-import * as ProviderShared from "../../src/protocols/shared.js"
 import { XAIResponses } from "../../src/protocols/xai-responses.js"
-import {
-  LLMClient,
-  RequestExecutor,
-  WebSocketTransport,
-  type ChannelCheckpoint,
-  type WebSocketChannelDriver,
-} from "../../src/route.js"
+import { LLMClient } from "../../src/route.js"
 import { compileRequest } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
 import { fixedResponse } from "../lib/http.js"
@@ -20,35 +13,6 @@ import { sseEvents } from "../lib/sse.js"

 const model = XAI.configure({ apiKey: "test", baseURL: "https://api.x.ai/v1" }).responses("grok-4.6")

-/** Runs a request through the WebSocket transport and hands back its channel driver; the HTTP fallback answers. */
-const channelDriver = (request: ReturnType<typeof LLM.request>) =>
-  Effect.gen(function* () {
-    let driver: WebSocketChannelDriver | undefined
-    yield* LLMClient.generate(request, {
-      webSocket: {
-        execute: (exchange) =>
-          Effect.sync(() => {
-            driver = exchange.driver
-            return { frames: exchange.fallback(), complete: Effect.void }
-          }),
-      },
-    }).pipe(Effect.provide(fixedResponse(sseEvents({ type: "response.completed", response: { id: "http" } }))))
-    if (!driver) throw new Error("Expected a WebSocket channel driver")
-    return driver
-  })
-
-const completed = (driver: WebSocketChannelDriver, id: string) =>
-  Effect.gen(function* () {
-    const create = yield* driver.create(undefined)
-    yield* driver.observe(create, ProviderShared.encodeJson({ type: "response.created", response: { id } }))
-    const observation = yield* driver.observe(
-      create,
-      ProviderShared.encodeJson({ type: "response.completed", response: { id } }),
-    )
-    if (observation.type !== "completed" || !observation.checkpoint) throw new Error("Expected a checkpoint")
-    return observation.checkpoint
-  })
-
 describe("xAI Responses route", () => {
  it.effect("composes the Open Responses baseline with xAI extensions", () =>
    Effect.gen(function* () {
@@ -198,78 +162,6 @@ describe("xAI Responses route", () => {
    }),
  )

-  it.effect("classifies xAI's untyped WebSocket error envelope", () =>
-    Effect.gen(function* () {
-      // xAI answers a rejected response.create with an error envelope that carries no event type.
-      const envelope = ProviderShared.encodeJson({
-        error: {
-          message:
-            'Request validation error: {"code":"400","error":"Argument not supported: instructions and previous_response_id together"}',
-          type: "api_error",
-        },
-      })
-      const webSocket = WebSocketTransport.makeDirect({
-        open: () =>
-          Effect.succeed({ sendText: () => Effect.void, messages: Stream.make(envelope), close: Effect.void }),
-      })
-      const error = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" }), { webSocket }).pipe(
-        Effect.provide(
-          LLMClient.layer.pipe(
-            Layer.provide(
-              Layer.succeed(
-                RequestExecutor.Service,
-                RequestExecutor.Service.of({ execute: () => Effect.die("unexpected HTTP request") }),
-              ),
-            ),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error.reason._tag).toBe("ProviderInternal")
-      expect(error.message).toContain("Argument not supported: instructions and previous_response_id together")
-      expect(error.reason.body).toBe(envelope)
-    }),
-  )
-
-  it.effect("continues stored responses without instructions and sends unstored steps in full", () =>
-    Effect.gen(function* () {
-      const step = (store: boolean, ...prompts: string[]) =>
-        LLM.request({
-          model,
-          system: "You are terse.",
-          messages: prompts.map((prompt) => Message.user(prompt)),
-          providerOptions: { store },
-        })
-      const send = (store: boolean, checkpoint: ChannelCheckpoint) =>
-        channelDriver(step(store, "First", "Second")).pipe(Effect.flatMap((driver) => driver.create(checkpoint)))
-
-      const stored = yield* send(true, yield* completed(yield* channelDriver(step(true, "First")), "resp_1"))
-      expect(stored.mode).toBe("incremental")
-      expect(JSON.parse(stored.message)).toEqual({
-        type: "response.create",
-        model: "grok-4.6",
-        store: true,
-        include: ["reasoning.encrypted_content"],
-        previous_response_id: "resp_1",
-        input: [{ role: "user", content: [{ type: "input_text", text: "Second" }] }],
-      })
-
-      // The connection cache only serves stored responses, so the default store: false never chains.
-      const unstored = yield* send(false, yield* completed(yield* channelDriver(step(false, "First")), "resp_1"))
-      expect(unstored.mode).toBe("full")
-      expect(JSON.parse(unstored.message)).toMatchObject({
-        instructions: "You are terse.",
-        store: false,
-        input: [
-          { role: "user", content: [{ type: "input_text", text: "First" }] },
-          { role: "user", content: [{ type: "input_text", text: "Second" }] },
-        ],
-      })
-      expect(JSON.parse(unstored.message).previous_response_id).toBeUndefined()
-    }),
-  )
-
  it.effect("parses xAI hosted tool items", () =>
    Effect.gen(function* () {
      const item = { type: "x_search_call", id: "x_search_1", status: "completed", action: { query: "news" } }
@@ -19,13 +19,11 @@ story("cancelling a version mismatch permits reconnecting again", async ({ mount
  const component = await mount("app-dialog-ssh--incompatible-session")
  await component.getByRole("button", { name: "Reconnect", exact: true }).click()
  const dialog = page.getByRole("dialog")
-  await expect(dialog.getByRole("status")).toContainText("Server update required")
-  await expect(dialog.getByRole("textbox")).toHaveCount(0)
+  await expect(dialog.getByRole("alert")).toBeVisible()
  await dialog.getByRole("button", { name: "Cancel", exact: true }).click()
  await expect(dialog).toHaveCount(0)
  await component.getByRole("button", { name: "Reconnect", exact: true }).click()
-  await expect(dialog.getByRole("status")).toContainText("Server update required")
-  await expect(dialog.getByRole("textbox")).toHaveCount(0)
+  await expect(dialog.getByRole("alert")).toBeVisible()
  await dialog.getByRole("button", { name: "Cancel", exact: true }).click()
  await expect(dialog).toHaveCount(0)
 })
@@ -45,17 +43,6 @@ story("adding a server keeps all SSH challenges in the original connection dialo
  await expect(dialog).toHaveCount(0)
 })

-story("adding an incompatible server advances to a dedicated update step", async ({ mount, page }) => {
-  await mount("app-dialog-ssh--incompatible-host")
-  const dialog = page.getByRole("dialog")
-  await dialog.getByRole("textbox", { name: "Host or SSH command" }).fill("ssh devbox")
-  await dialog.getByRole("button", { name: "Add server", exact: true }).click()
-  await expect(dialog.getByRole("status")).toContainText("Server update required")
-  await expect(dialog.getByRole("textbox")).toHaveCount(0)
-  await expect(dialog.getByRole("alert")).toHaveCount(0)
-  await expect(dialog.getByRole("button", { name: "Update and reconnect", exact: true })).toBeVisible()
-})
-
 story("updating an incompatible connection continues authentication in the same dialog", async ({ mount, page }) => {
  const component = await mount("app-dialog-ssh--incompatible-session")
  await component.getByRole("button", { name: "Reconnect", exact: true }).click()
@@ -1,74 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { sessionID, setupTimeline, userMessage } from "../performance/timeline-stability/fixture"
-
-test("keeps a submitted prompt in place while its optimistic rows are measured", async ({ page }) => {
-  await setupTimeline(page, { messages: [userMessage()], seedHistory: true })
-  const release = Promise.withResolvers<void>()
-  await page.route(`**/api/session/${sessionID}/prompt`, async (route) => {
-    if (route.request().method() !== "POST") return route.fallback()
-    await release.promise
-    return route.fallback()
-  })
-
-  const editor = page.locator('[data-component="composer"]').getByRole("textbox")
-  await expect(editor).toBeEditable()
-  await editor.fill("Observe optimistic prompt spacing.")
-  await expect
-    .poll(() =>
-      page.locator("[data-timeline-virtual-content]").evaluate((element) => {
-        const root = element.parentElement!
-        return root.scrollHeight - root.clientHeight - root.scrollTop
-      }),
-    )
-    .toBe(0)
-
-  const observation = await page.evaluateHandle(() => {
-    const frames: { prompt?: number; working: boolean }[] = []
-    let frame = 0
-    const sample = () => {
-      const prompt = [...document.querySelectorAll<HTMLElement>('[data-timeline-row="UserMessage"]')].find((row) =>
-        row.textContent?.includes("Observe optimistic prompt spacing."),
-      )
-      frames.push({
-        ...(prompt ? { prompt: prompt.getBoundingClientRect().y } : {}),
-        working: !!document.querySelector('[data-component="session-working"]'),
-      })
-      frame = requestAnimationFrame(sample)
-    }
-    frame = requestAnimationFrame(sample)
-    return {
-      stop: () => {
-        cancelAnimationFrame(frame)
-        return frames
-      },
-    }
-  })
-  const requested = page.waitForRequest(
-    (request) => request.method() === "POST" && new URL(request.url()).pathname === `/api/session/${sessionID}/prompt`,
-  )
-  try {
-    await editor.press("Enter")
-    await requested
-    const prompt = page
-      .locator('[data-timeline-row="UserMessage"]')
-      .filter({ hasText: "Observe optimistic prompt spacing." })
-    await expect(prompt).toBeInViewport()
-    await expect(page.locator('[data-component="session-working"]')).toBeVisible()
-    await expect
-      .poll(() =>
-        page.locator("[data-timeline-virtual-content]").evaluate((element) => {
-          const root = element.parentElement!
-          return root.scrollHeight - root.clientHeight - root.scrollTop
-        }),
-      )
-      .toBe(0)
-    const frames = await observation.evaluate((value) => value.stop())
-    expect(frames.some((frame) => frame.working && frame.prompt === undefined)).toBe(false)
-    const positions = frames.flatMap((frame) => (frame.prompt === undefined ? [] : [frame.prompt]))
-    expect(positions.length).toBeGreaterThan(0)
-    expect(new Set(positions).size).toBe(1)
-  } finally {
-    release.resolve()
-    await observation.dispose()
-  }
-})
@@ -122,15 +122,7 @@ test("renders compaction progress, summary, and outcome in order", async ({ page
  )
  await expect(compaction.getByRole("heading", { name: "Checkpoint" })).toBeVisible()
  await expect(compaction).toContainText("Streamed implementation details.")
-  const running = compaction.getByRole("status").getByLabel("Compacting", { exact: true })
-  await expect(running).toBeVisible()
-  await expect
-    .poll(async () => {
-      const summary = await compaction.locator('[data-component="text-part"]').boundingBox()
-      const status = await running.boundingBox()
-      return !!summary && !!status && status.y >= summary.y + summary.height
-    })
-    .toBe(true)
+  await expect(compaction.getByRole("status").getByLabel("Compacting", { exact: true })).toBeVisible()
  await expect(compaction.getByText("Session compacted", { exact: true })).toHaveCount(0)

  await timeline.send(
@@ -115,7 +115,7 @@ test("combines follow-up patches into one three-file stack inside Used", async (
  })
  const group = page.locator('[data-component="collapsed-tool-group"]')
  await group.getByRole("button", { name: "Used 2 Shell, Patch", exact: true }).click()
-  await expect(group.locator('[data-slot="apply-patch-filename"]')).toHaveText(["a.ts", "b.ts"])
+  await expect(group.getByText("2 files", { exact: true })).toBeVisible()
  await timeline.send(
    partUpdated(
      toolPart(
@@ -134,6 +134,7 @@ test("combines follow-up patches into one three-file stack inside Used", async (
    "true",
  )
  await expect(group.locator('[data-component="apply-patch-tool"]')).toHaveCount(1)
+  await expect(group.getByText("3 files", { exact: true })).toBeVisible()
  await expect(group.locator('[data-slot="apply-patch-filename"]')).toHaveText(["a.ts", "b.ts", "c.ts"])
 })

@@ -88,12 +88,8 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
      if (value.mode === "normal" && !command) {
        session.handoff?.set(handoffMessage(value))
        const optimisticBusy = !input.adapter.working()
-        if (optimisticBusy && input.adapter.kind === "new-session")
-          session.data.session.setStatus(session.id, "running")
-        const sending = sendPrompt(session, value, input.adapter.controls().model.selection.trackSessionCommit, () => {
-          if (optimisticBusy && input.adapter.kind === "active-session")
-            session.data.session.setStatus(session.id, "running")
-        }).then(
+        if (optimisticBusy) session.data.session.setStatus(session.id, "running")
+        const sending = sendPrompt(session, value, input.adapter.controls().model.selection.trackSessionCommit).then(
          () => ({ ok: true as const }),
          (error) => ({ ok: false as const, error }),
        )
@@ -126,9 +122,15 @@ export function createComposerSubmit(input: ComposerSubmitInput) {

      if (command) {
        clearSubmission(input, submission)
-        void sendCommand(session, value, command, input.adapter.controls().model.selection.trackSessionCommit).catch(
-          (error) => failSubmission(input, session, "command", error, restore, value.id),
-        )
+        // Commands always steer: the server applies a command's configured
+        // agent and model immediately at admission, so queueing one would
+        // reconfigure the turn it is supposed to wait behind.
+        void sendCommand(
+          session,
+          { ...value, delivery: "steer" },
+          command,
+          input.adapter.controls().model.selection.trackSessionCommit,
+        ).catch((error) => failSubmission(input, session, "command", error, restore, value.id))
        return
      }
    } finally {
@@ -320,8 +322,7 @@ async function sendCommand(
  track?: ModelSelection["trackSessionCommit"],
 ) {
  const request = await buildSubmissionRequest(session, value)
-  // Like queued prompts, queued commands must not apply the composer's selection to active work.
-  if (value.delivery === "steer") await applySelection(session, value.selection, track)
+  await applySelection(session, value.selection, track)
  await session.api.command({
    sessionID: session.id,
    command: command.command,
@@ -358,8 +359,7 @@ async function applySelection(
 async function sendPrompt(
  session: ComposerSession,
  value: ComposerSubmission,
-  track: ModelSelection["trackSessionCommit"] | undefined,
-  onAdmit: () => void,
+  track?: ModelSelection["trackSessionCommit"],
 ) {
  const request = await buildSubmissionRequest(session, value)
  // Switching agent or model reconfigures the session immediately, and with it
@@ -389,9 +389,7 @@ async function sendPrompt(
      },
    },
  }
-  const sending = session.data.session.prompt(admission).catch(() => session.data.session.prompt(admission))
-  onAdmit()
-  await sending
+  await session.data.session.prompt(admission).catch(() => session.data.session.prompt(admission))
 }

 async function buildSubmissionRequest(session: ComposerSession, value: ComposerSubmission) {
@@ -1,6 +1,5 @@
 import { type Accessor, createMemo } from "solid-js"
 import { DateTime } from "luxon"
-import { isOrganizationRouteProvider } from "@opencode/util/organization-routes"
 import { filter, firstBy, flat, groupBy, mapValues, pipe, uniqueBy, values } from "remeda"
 import { createSimpleContext } from "@opencode/ui/context"
 import { useProviders } from "@/providers/catalog/providers"
@@ -80,8 +79,8 @@ const createModelsController = (directory: Accessor<string | undefined>) => {
  const list = createMemo(() =>
    available().map((m) => ({
      ...m,
-      name: isOrganizationRouteProvider(m.provider.id) ? m.name : m.name.replace("(latest)", "").trim(),
-      latest: !isOrganizationRouteProvider(m.provider.id) && m.name.includes("(latest)"),
+      name: m.name.replace("(latest)", "").trim(),
+      latest: m.name.includes("(latest)"),
    })),
  )

@@ -101,7 +100,6 @@ const createModelsController = (directory: Accessor<string | undefined>) => {
    const state = visibility().get(key)
    if (state === "hide") return false
    if (state === "show") return true
-    if (isOrganizationRouteProvider(model.providerID)) return true
    if (latestSet().has(key)) return true
    const date = release().get(key)
    if (!date?.isValid) return true
@@ -1,5 +1,4 @@
 import { Popover } from "@kobalte/core/popover"
-import { isOrganizationRouteProvider } from "@opencode/util/organization-routes"
 import { Component, ComponentProps, createEffect, createMemo, For, JSX, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useLocal, type ModelSelection } from "@/providers/models/selection"
@@ -198,9 +197,6 @@ const ModelList: Component<{
                                  >
                                    <span class="min-w-0 truncate">{item.name}</span>
                                  </Tooltip>
-                                  <Show when={isOrganizationRouteProvider(item.provider.id)}>
-                                    <Badge class="shrink-0">{language.t("model.tag.variable")}</Badge>
-                                  </Show>
                                  <Show when={isFree(item.provider.id, item.cost)}>
                                    <Badge class="shrink-0">{language.t("model.tag.free")}</Badge>
                                  </Show>
@@ -493,9 +489,6 @@ function ModelSelectorPopoverView(props: {
                                onSelect={() => selectModel(item)}
                              >
                                <span class="min-w-0 truncate leading-5">{item.name}</span>
-                                <Show when={isOrganizationRouteProvider(item.provider.id)}>
-                                  <Badge class="shrink-0">{language.t("model.tag.variable")}</Badge>
-                                </Show>
                                <Show when={isFree(item.provider.id, item.cost)}>
                                  <Badge class="shrink-0">{language.t("model.tag.free")}</Badge>
                                </Show>
@@ -1,5 +1,4 @@
 import { Show, type Component, type JSX } from "solid-js"
-import { isOrganizationRouteProvider } from "@opencode/util/organization-routes"
 import { useLanguage } from "@/runtime/i18n/language"

 type InputKey = "text" | "image" | "audio" | "video" | "pdf"
@@ -9,7 +8,6 @@ type ModelInfo = {
  id: string
  name: string
  provider: {
-    id?: string
    name: string
  }
  capabilities?: {
@@ -38,9 +36,7 @@ export const ModelTooltip: Component<{ model: ModelInfo; latest?: boolean; free?
  props,
 ) => {
  const language = useLanguage()
-  const route = () => isOrganizationRouteProvider(props.model.provider.id ?? "")
  const sourceName = (model: ModelInfo) => {
-    if (route()) return model.provider.name
    const value = `${model.id} ${model.name}`.toLowerCase()

    if (/claude|anthropic/.test(value)) return language.t("model.provider.anthropic")
@@ -62,16 +58,14 @@ export const ModelTooltip: Component<{ model: ModelInfo; latest?: boolean; free?
  const title = () => {
    const tags: Array<string> = []
    if (props.latest) tags.push(language.t("model.tag.latest"))
-    if (route()) tags.push(language.t("model.tag.variable"))
-    if (!route() && props.free) tags.push(language.t("model.tag.free"))
+    if (props.free) tags.push(language.t("model.tag.free"))
    const suffix = tags.length ? ` (${tags.join(", ")})` : ""
    return `${sourceName(props.model)} ${props.model.name}${suffix}`
  }
  const name = () => {
    const tags: Array<string> = []
    if (props.latest) tags.push(language.t("model.tag.latest"))
-    if (route()) tags.push(language.t("model.tag.variable"))
-    if (!route() && props.free) tags.push(language.t("model.tag.free"))
+    if (props.free) tags.push(language.t("model.tag.free"))
    const suffix = tags.length ? ` (${tags.join(", ")})` : ""
    return `${props.model.name}${suffix}`
  }
@@ -104,13 +98,11 @@ export const ModelTooltip: Component<{ model: ModelInfo; latest?: boolean; free?
      <div class="flex w-[180px] flex-col gap-2">
        <ModelTooltipRow name={language.t("model.tooltip.model")} value={name()} />
        <ModelTooltipRow name={language.t("model.tooltip.provider")} value={props.model.provider.name} />
-        <Show when={!route()}>
-          <Show when={inputs()}>
-            {(value) => <ModelTooltipRow name={language.t("model.tooltip.inputs")} value={value()} />}
-          </Show>
-          <ModelTooltipRow name={language.t("model.tooltip.reasoning")} value={reasoning()} />
-          <ModelTooltipRow name={language.t("model.tooltip.context.label")} value={contextLimit()} />
+        <Show when={inputs()}>
+          {(value) => <ModelTooltipRow name={language.t("model.tooltip.inputs")} value={value()} />}
        </Show>
+        <ModelTooltipRow name={language.t("model.tooltip.reasoning")} value={reasoning()} />
+        <ModelTooltipRow name={language.t("model.tooltip.context.label")} value={contextLimit()} />
      </div>
    )
  }
@@ -118,17 +110,15 @@ export const ModelTooltip: Component<{ model: ModelInfo; latest?: boolean; free?
  return (
    <div class="flex flex-col gap-1 py-1">
      <div class="text-13-medium">{title()}</div>
-      <Show when={!route()}>
-        <Show when={inputs()}>
-          {(value) => (
-            <div class="text-12-regular text-text-invert-base">
-              {language.t("model.tooltip.allows", { inputs: value() })}
-            </div>
-          )}
-        </Show>
-        <div class="text-12-regular text-text-invert-base">{reasoning()}</div>
-        <div class="text-12-regular text-text-invert-base">{context()}</div>
+      <Show when={inputs()}>
+        {(value) => (
+          <div class="text-12-regular text-text-invert-base">
+            {language.t("model.tooltip.allows", { inputs: value() })}
+          </div>
+        )}
      </Show>
+      <div class="text-12-regular text-text-invert-base">{reasoning()}</div>
+      <div class="text-12-regular text-text-invert-base">{context()}</div>
    </div>
  )
 }
@@ -267,7 +267,6 @@ export const dict = {
  "provider.disconnect.toast.disconnected.description": "{{provider}} models are no longer available.",

  "model.tag.free": "Free",
-  "model.tag.variable": "Variable",
  "model.tag.latest": "Latest",
  "model.provider.anthropic": "Anthropic",
  "model.provider.openai": "OpenAI",
@@ -54,12 +54,8 @@ export function createWebPlatform(version: string) {

 function getCurrentServerUrl() {
  if (import.meta.env.VITE_OPENCODE_SERVER_MODE === "none") return undefined
-  if (import.meta.env.DEV) {
-    const loopback =
-      location.hostname === "localhost" || location.hostname === "[::1]" || location.hostname.startsWith("127.")
-    const host = import.meta.env.VITE_OPENCODE_SERVER_HOST ?? (loopback ? location.hostname : "localhost")
-    return `http://${host}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}`
-  }
+  if (import.meta.env.DEV)
+    return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}`
  return location.origin
 }

@@ -10,7 +10,6 @@ import { createData } from "@opencode/client/solid"
 import type { ServerScope } from "@/runtime/server/scope"
 import { createPermissionAutoApprover } from "@/session/requests/auto-approve"
 import { createServerNotificationState } from "@/shell/notifications/notification"
-import { createNotificationCoordinator } from "@/shell/notifications/coordinator"
 import { Persist, persisted } from "@/runtime/persistence/storage"
 import { createDesktopData } from "./data"
 import { ModelState } from "./persistence"
@@ -34,7 +33,6 @@ export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext(
      },
    })
    const models = createGlobalModels()
-    const notificationCoordinator = createNotificationCoordinator()

    const settingsServer = createMemo(() => {
      const list = server.list
@@ -59,7 +57,7 @@ export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext(
      if (existing) return existing
      const serverCtx = createRoot((dispose) => {
        serverCtxDisposers.set(key, dispose)
-        return createServerController(conn, server.scope(key), server.projects.forServer(key), notificationCoordinator)
+        return createServerController(conn, server.scope(key), server.projects.forServer(key))
      }, owner)
      serverCtxs.set(key, serverCtx)
      return serverCtx
@@ -133,7 +131,6 @@ function createServerController(
  conn: ServerConnection.Any,
  scope: ServerScope,
  projects: ReturnType<typeof createServerProjects>,
-  notificationCoordinator: ReturnType<typeof createNotificationCoordinator>,
 ) {
  const language = useLanguage()
  const settings = useSettings()
@@ -162,7 +159,7 @@ function createServerController(
  })
  const sync = createServerSyncContext(sdk, data)
  createPermissionAutoApprover({ sdk, data })
-  const notification = createServerNotificationState({ sdk, data, key: connKey, coordinator: notificationCoordinator })
+  const notification = createServerNotificationState({ sdk, data, key: connKey })

  function enrich(project: { worktree: string; expanded: boolean }) {
    const [childStore] = sync.child(project.worktree, { bootstrap: false })
@@ -278,7 +278,6 @@ function Open(props: { initial?: string }) {
 export default { title: "App/Dialogs/SSH", id: "app-dialog-ssh" }
 export const AuthenticationRequired = { render: () => <Fixture initial="required" /> }
 export const SettingsReconnect = { render: () => <Fixture initial="required" settings connectionDelay={200} /> }
-export const IncompatibleHost = { render: () => <Fixture incompatible /> }
 export const IncompatibleSession = { render: () => <Fixture initial="required" session incompatible /> }
 export const InactiveSession = { render: () => <Fixture initial="required" session connectionDelay={3000} /> }
 export const KeyReconnect = { render: () => <Fixture initial="required" session keyOnly connectionDelay={3000} /> }
@@ -120,13 +120,7 @@ export function DialogSsh(props: {
      <Divider />
      <DialogBody class="flex w-full min-w-0 flex-1 flex-col px-4 pt-4 pb-2">
        <div class="flex w-full min-w-0 flex-col gap-6">
-          <Show
-            when={
-              !props.promptOnly &&
-              item()?.stage !== "incompatible" &&
-              (!state.prompted || (!!error() && !prompt()))
-            }
-          >
+          <Show when={!props.promptOnly && (!state.prompted || (!!error() && !prompt()))}>
            <div class="flex w-full min-w-0 flex-col gap-2">
              <label class="settings-server-dialog-label" for="ssh-target">
                {language.t("ssh.target")}
@@ -166,12 +160,6 @@ export function DialogSsh(props: {
              />
            </div>
          </Show>
-          <Show when={item()?.stage === "incompatible"}>
-            <div class="flex w-full min-w-0 flex-col gap-2" role="status" aria-live="polite">
-              <span class="text-14-medium text-v2-text-text-base">{language.t("ssh.stage.incompatible")}</span>
-              <span class="text-13-regular text-v2-text-text-muted">{language.t("ssh.error.version")}</span>
-            </div>
-          </Show>
          <Show when={prompt()} keyed>
            {(prompt) => (
              <div class="flex w-full min-w-0 flex-col gap-2">
@@ -207,7 +195,7 @@ export function DialogSsh(props: {
              </div>
            )}
          </Show>
-          <Show when={item()?.stage !== "incompatible" && error()}>
+          <Show when={error()}>
            {(error) => (
              <span class="settings-server-dialog-error !leading-[var(--line-height-compact)]" role="alert">
                {error()}
@@ -1,6 +1,6 @@
 import { createMemo, createUniqueId, Show } from "solid-js"
 import { createStore } from "solid-js/store"
-import { createQuery, keepPreviousData } from "@tanstack/solid-query"
+import { createQuery } from "@tanstack/solid-query"
 import { Icon } from "@opencode/ui/icon"
 import { SessionFilePanelV2, SessionFilePanelV2Empty } from "@opencode/session-ui/v2/session-file-panel-v2"
 import { SessionReviewV2Sidebar } from "@opencode/session-ui/v2/session-review-v2"
@@ -56,7 +56,6 @@ export function SessionFileBrowserTab(props: {
      queryKey: [serverSDK.scope, "session-open-file", workspaceKey(), value] as const,
      enabled: serverSDK.connection.status() === "connected" && value.length > 0,
      queryFn: ({ signal }) => file.searchFiles(value, { limit: 200, signal }),
-      placeholderData: keepPreviousData,
    }
  })
  const files = createMemo(() => {
@@ -515,19 +515,6 @@ export function createTimelineVirtualizer(input: Input) {
          <div
            ref={(value) => {
              element = value
-              if (row()._tag !== "UserMessage" || !addedKeys.has(rowProps.rowKey) || !input.pinned() || coldPending)
-                return
-              // The optimistic row can paint before ResizeObserver corrects the tail estimates.
-              // Measure the mounted tail and pin it in this render's microtask instead.
-              queueMicrotask(() => {
-                if (!input.pinned() || !virtualContent?.isConnected) return
-                virtualizer.elementsCache.forEach((item) => {
-                  if (item.isConnected) virtualizer.resizeItem(virtualizer.indexFromElement(item), item.offsetHeight)
-                })
-                virtualizer.resizeItem(item().index, element.offsetHeight)
-                virtualContent.style.height = `${virtualizer.getTotalSize()}px`
-                virtualizer.scrollToEnd()
-              })
            }}
            data-index={item().index}
            style={{ "min-height": ready() ? undefined : `${initialItem.size}px` }}
@@ -1,93 +0,0 @@
-import { onCleanup } from "solid-js"
-
-const FOCUS_LOCK = "opencode:notification-focus"
-const MAX_CLAIMED = 500
-
-export function createNotificationCoordinator() {
-  const locks = typeof navigator === "undefined" ? undefined : navigator.locks
-  const claimed = new Set<string>()
-  const focus = { pending: false, release: undefined as (() => void) | undefined }
-
-  const updateFocus = () => {
-    if (typeof document === "undefined" || !document.hasFocus()) {
-      focus.release?.()
-      return
-    }
-    if (!locks || focus.pending || focus.release) return
-
-    focus.pending = true
-    void locks
-      .request(FOCUS_LOCK, { mode: "shared" }, async () => {
-        focus.pending = false
-        if (!document.hasFocus()) return
-        await new Promise<void>((resolve) => {
-          focus.release = resolve
-        })
-        focus.release = undefined
-      })
-      .catch(() => {
-        focus.pending = false
-      })
-  }
-
-  if (typeof window !== "undefined") {
-    window.addEventListener("focus", updateFocus)
-    window.addEventListener("blur", updateFocus)
-    document.addEventListener("visibilitychange", updateFocus)
-    updateFocus()
-    onCleanup(() => {
-      window.removeEventListener("focus", updateFocus)
-      window.removeEventListener("blur", updateFocus)
-      document.removeEventListener("visibilitychange", updateFocus)
-      focus.release?.()
-    })
-  }
-
-  const once = async (kind: "sound" | "system", eventID: string, run: () => Promise<unknown> | void) => {
-    const key = `${kind}:${eventID}`
-    const execute = async () => {
-      if (!claim(kind, key, claimed)) return
-      await run()
-    }
-    if (!locks) return execute()
-    await locks.request(`opencode:notification:${key}`, execute)
-  }
-
-  return {
-    sound(eventID: string, run: () => Promise<unknown> | void) {
-      return once("sound", eventID, run)
-    },
-    system(eventID: string, run: () => Promise<unknown> | void) {
-      return once("system", eventID, async () => {
-        if (typeof document !== "undefined" && document.hasFocus()) return
-        if (!locks) return run()
-        await locks.request(FOCUS_LOCK, { mode: "exclusive", ifAvailable: true }, async (lock) => {
-          if (!lock) return
-          await run()
-        })
-      })
-    },
-  }
-}
-
-function claim(kind: "sound" | "system", eventID: string, claimed: Set<string>) {
-  if (claimed.has(eventID)) return false
-
-  if (typeof localStorage !== "undefined") {
-    try {
-      const storageKey = `opencode:notification-${kind}`
-      const value: unknown = JSON.parse(localStorage.getItem(storageKey) ?? "[]")
-      const events = Array.isArray(value) ? value.filter((item): item is string => typeof item === "string") : []
-      if (events.includes(eventID)) {
-        claimed.add(eventID)
-        return false
-      }
-      localStorage.setItem(storageKey, JSON.stringify([...events, eventID].slice(-MAX_CLAIMED)))
-    } catch {
-      // The in-memory claim still prevents duplicates in this renderer when storage is unavailable.
-    }
-  }
-
-  claimed.add(eventID)
-  return true
-}
@@ -11,8 +11,7 @@ import { useSettings } from "@/settings/model"
 import { decode64 } from "@/runtime/persistence/base64"
 import { Persist, persisted } from "@/runtime/persistence/storage"
 import { Persistence } from "@/runtime/persistence/schema"
-import { playSoundById } from "@/shell/notifications/sound"
-import type { createNotificationCoordinator } from "@/shell/notifications/coordinator"
+import { playSoundByIdOnce } from "@/shell/notifications/sound"
 import { useGlobal } from "@/runtime/server/runtime"
 import { ServerConnection, useServers } from "@/runtime/server/registry"
 import { sessionIDHasOpenTab, useTabs } from "@/shell/tabs/tabs"
@@ -115,12 +114,7 @@ function buildNotificationIndex(list: Notification[]) {
  return index
 }

-export function createServerNotificationState(input: {
-  sdk: ServerSDK
-  data: Data
-  key: ServerConnection.Key
-  coordinator: ReturnType<typeof createNotificationCoordinator>
-}) {
+export function createServerNotificationState(input: { sdk: ServerSDK; data: Data; key: ServerConnection.Key }) {
  const platform = usePlatform()
  const settings = useSettings()
  const language = useLanguage()
@@ -229,7 +223,7 @@ export function createServerNotificationState(input: {
      if (session.parentID) return

      if (sessionIDHasOpenTab(tabs.store, input.key, sessionID) && settings.sounds.agentEnabled()) {
-        void input.coordinator.sound(`${input.key}\0${eventID}`, () => playSoundById(settings.sounds.agent()))
+        void playSoundByIdOnce(settings.sounds.agent(), `${input.key}\0${eventID}`)
      }

      append({
@@ -241,10 +235,8 @@ export function createServerNotificationState(input: {
      })

      if (settings.notifications.agent()) {
-        void input.coordinator.system(`${input.key}\0${eventID}`, () =>
-          platform.notify(language.t("notification.session.responseReady.title"), session.title ?? sessionID, () =>
-            openNotificationSession(tabs, input.key, sessionID),
-          ),
+        void platform.notify(language.t("notification.session.responseReady.title"), session.title ?? sessionID, () =>
+          openNotificationSession(tabs, input.key, sessionID),
        )
      }
    })
@@ -256,7 +248,7 @@ export function createServerNotificationState(input: {
      if (session?.parentID) return

      if (sessionIDHasOpenTab(tabs.store, input.key, sessionID) && settings.sounds.errorsEnabled()) {
-        void input.coordinator.sound(`${input.key}\0${eventID}`, () => playSoundById(settings.sounds.errors()))
+        void playSoundByIdOnce(settings.sounds.errors(), `${input.key}\0${eventID}`)
      }

      append({
@@ -271,10 +263,8 @@ export function createServerNotificationState(input: {
        session?.title ??
        (typeof error === "string" ? error : language.t("notification.session.error.fallbackDescription"))
      if (settings.notifications.errors()) {
-        void input.coordinator.system(`${input.key}\0${eventID}`, () =>
-          platform.notify(language.t("notification.session.error.title"), description, () =>
-            openNotificationSession(tabs, input.key, sessionID),
-          ),
+        void platform.notify(language.t("notification.session.error.title"), description, () =>
+          openNotificationSession(tabs, input.key, sessionID),
        )
      }
    })
@@ -74,6 +74,9 @@ function getLoads() {
 }

 const cache = new Map<SoundID, Promise<string | undefined>>()
+const claimed = new Set<string>()
+const CLAIMED_STORAGE_KEY = "opencode:notification-sounds"
+const MAX_CLAIMED = 500

 export function soundSrc(id: string | undefined) {
  const loads = getLoads()
@@ -100,3 +103,34 @@ export function playSound(src: string | undefined) {
 export function playSoundById(id: string | undefined) {
  return soundSrc(id).then((src) => playSound(src))
 }
+
+export async function playSoundByIdOnce(id: string | undefined, eventID: string) {
+  const play = async () => {
+    if (!claim(eventID)) return
+    await playSoundById(id)
+  }
+
+  if (typeof navigator === "undefined" || !navigator.locks) return play()
+  await navigator.locks.request(`${CLAIMED_STORAGE_KEY}:${eventID}`, play)
+}
+
+function claim(eventID: string) {
+  if (claimed.has(eventID)) return false
+
+  if (typeof localStorage !== "undefined") {
+    try {
+      const value: unknown = JSON.parse(localStorage.getItem(CLAIMED_STORAGE_KEY) ?? "[]")
+      const events = Array.isArray(value) ? value.filter((item): item is string => typeof item === "string") : []
+      if (events.includes(eventID)) {
+        claimed.add(eventID)
+        return false
+      }
+      localStorage.setItem(CLAIMED_STORAGE_KEY, JSON.stringify([...events, eventID].slice(-MAX_CLAIMED)))
+    } catch {
+      // The in-memory claim still prevents duplicates in this renderer when storage is unavailable.
+    }
+  }
+
+  claimed.add(eventID)
+  return true
+}
@@ -62,7 +62,7 @@ mock.module("@/runtime/platform/platform", () => ({
 }))

 const { LocalProvider, useLocal } = await import("@/providers/models/selection")
-const { ModelsProvider, useModels } = await import("@/providers/models/models")
+const { ModelsProvider } = await import("@/providers/models/models")
 const { Persist } = await import("@/runtime/persistence/storage")
 const { createMemoryComposerState } = await import("@/composer/state")
 const { createComposerModelSelection } = await import("@/composer/selection")
@@ -150,13 +150,11 @@ function fixture(input: { session?: Commit; agents?: Agent[]; config?: ConfigMod
    mount(draft = false) {
      active = result
      let local!: ReturnType<typeof useLocal>
-      let models!: ReturnType<typeof useModels>
      let composer: ReturnType<typeof createComposerModelSelection> | undefined
      const dispose = createRoot((dispose) => {
        createComponent(ModelsProvider, {
          directory,
          get children() {
-            models = useModels()
            return createComponent(LocalProvider, {
              get children() {
                local = useLocal()
@@ -169,7 +167,7 @@ function fixture(input: { session?: Commit; agents?: Agent[]; config?: ConfigMod
        return dispose
      })
      cleanups.push(dispose)
-      return { local, models, composer, dispose }
+      return { local, composer, dispose }
    },
  }
  const target = Persist.serverWorkspace(ServerScope.local, directory, "model-selection")
@@ -459,47 +457,3 @@ test.each([1, -1] as const)("cycles %p from outside recents to the correct end a
  local.model.cycle(direction)
  expect(local.model.current()?.id).toBe(direction === 1 ? "b" : "c")
 })
-
-test("organization routes stay visible and selected by stable ID across catalog refreshes", () => {
-  const f = fixture()
-  const providerID = "opencode-routes-org_first"
-  const ref = { providerID, modelID: "route_1" }
-  f.set("providers", [{ ...f.state.providers[0], id: providerID, name: "First / Routes" }])
-  f.set("models", [{ ...f.state.models[0], providerID, id: ref.modelID, modelID: "coding", name: "Coding (latest)" }])
-  const { local, models } = f.mount()
-  expect(models.visible(ref)).toBe(true)
-  expect(local.model.list()).toHaveLength(1)
-  expect(local.model.list()[0]).toMatchObject({ id: "route_1", name: "Coding (latest)", latest: false })
-  local.model.set(ref, { recent: true })
-  expect(local.model.current()).toMatchObject({ id: "route_1", api: { id: "coding" } })
-  f.set("models", [{ ...f.state.models[0], modelID: "coding-renamed", name: "Renamed route" }])
-  expect(local.model.current()).toMatchObject({ id: "route_1", name: "Renamed route", api: { id: "coding-renamed" } })
-  expect(f.preferences.recent()).toEqual([ref])
-  models.setVisibility(ref, false)
-  expect(models.visible(ref)).toBe(false)
-  f.set("models", [{ ...f.state.models[0], name: "Updated route" }])
-  expect(models.visible(ref)).toBe(false)
-  f.set("models", [])
-  expect(local.model.list()).toEqual([])
-  expect(local.model.current()).toBeUndefined()
-})
-
-test("organization switches replace route catalogs without reusing visibility or recent references", () => {
-  const f = fixture()
-  const firstID = "opencode-routes-org_first"
-  const secondID = "opencode-routes-org_second"
-  const ref = { providerID: firstID, modelID: "route_1" }
-  f.set("providers", [{ ...f.state.providers[0], id: firstID, name: "First / Routes" }])
-  f.set("models", [{ ...f.state.models[0], providerID: firstID, id: ref.modelID, modelID: "coding" }])
-  const { local, models } = f.mount()
-  local.model.set(ref, { recent: true })
-  models.setVisibility(ref, false)
-  f.set("providers", [{ ...f.state.providers[0], id: secondID, name: "Second / Routes" }])
-  f.set("models", [{ ...f.state.models[0], providerID: secondID }])
-  expect(models.find(ref)).toBeUndefined()
-  expect(models.visible({ providerID: secondID, modelID: "route_1" })).toBe(true)
-  expect(local.model.list()).toHaveLength(1)
-  expect(local.model.list()[0].provider.id).toBe(secondID)
-  expect(local.model.current()?.provider.id).not.toBe(firstID)
-  expect(f.preferences.recent()).toEqual([ref])
-})
@@ -1,64 +0,0 @@
-import { expect, mock, test } from "bun:test"
-import { createRequire } from "node:module"
-import { createComponent } from "solid-js"
-import { render } from "solid-js/web"
-import { dict } from "@/runtime/i18n/en"
-
-const require = createRequire(import.meta.url)
-const solid = createRequire(require.resolve("vite-plugin-solid"))
-const { transformSync } = solid("@babel/core")
-Bun.plugin({
-  name: "model-tooltip-solid",
-  setup(build) {
-    build.onLoad({ filter: /[\\/]models[\\/]tooltip\.tsx$/ }, async (args) => ({
-      contents: transformSync(await Bun.file(args.path).text(), {
-        filename: args.path,
-        presets: [solid.resolve("babel-preset-solid"), solid.resolve("@babel/preset-typescript")],
-      }).code,
-      loader: "js",
-    }))
-  },
-})
-mock.module("@/runtime/i18n/language", () => ({
-  useLanguage: () => ({ t: (key: keyof typeof dict) => dict[key], intl: () => "en-US" }),
-}))
-const { ModelTooltip } = await import("@/providers/models/tooltip")
-
-const model = {
-  id: "route_1",
-  name: "Claude coding",
-  provider: { id: "opencode-routes-org_first", name: "First / Routes" },
-  capabilities: { reasoning: false, input: { text: true, image: true, audio: false, video: false, pdf: false } },
-  limit: { context: 200_000 },
-}
-
-test.each([false, true])("route tooltip keeps its organization identity and variable price (v2=%p)", (v2) => {
-  const element = document.createElement("div")
-  const dispose = render(() => createComponent(ModelTooltip, { model, free: true, v2 }), element)
-  expect(element.textContent).toContain("First / Routes")
-  expect(element.textContent).toContain("Claude coding (Variable)")
-  expect(element.textContent).not.toContain("Anthropic")
-  expect(element.textContent).not.toContain("Free")
-  expect(element.textContent).not.toContain("200,000")
-  expect(element.textContent).not.toContain(dict["model.tooltip.reasoning.none"])
-  dispose()
-})
-
-test("ordinary model tooltips retain free pricing and capability details", () => {
-  const element = document.createElement("div")
-  const dispose = render(
-    () =>
-      createComponent(ModelTooltip, {
-        model: { ...model, provider: { id: "opencode", name: "OpenCode Zen" } },
-        free: true,
-        v2: true,
-      }),
-    element,
-  )
-  expect(element.textContent).toContain("Claude coding (Free)")
-  expect(element.textContent).toContain("OpenCode Zen")
-  expect(element.textContent).toContain("200,000")
-  expect(element.textContent).toContain(dict["model.tooltip.reasoning.none"])
-  expect(element.textContent).not.toContain("Variable")
-  dispose()
-})
@@ -1,23 +0,0 @@
-import { expect, test } from "bun:test"
-import { fileURLToPath } from "node:url"
-
-test("model tooltip presentation", async () => {
-  // Isolate the language context substitute and Solid compiler from other tests.
-  const child = Bun.spawn(
-    [
-      process.execPath,
-      "test",
-      "--conditions=browser",
-      "--preload",
-      "./happydom.ts",
-      "./test-browser/fixtures/model-tooltip.ts",
-    ],
-    { cwd: fileURLToPath(new URL("..", import.meta.url)), stdout: "pipe", stderr: "pipe" },
-  )
-  const [status, stdout, stderr] = await Promise.all([
-    child.exited,
-    new Response(child.stdout).text(),
-    new Response(child.stderr).text(),
-  ])
-  expect(status, stdout + stderr).toBe(0)
-}, 30_000)
@@ -47,7 +47,7 @@ const handler = Effect.fn("cli.session.list")(function* (
          null,
          2,
        )
-      : formatList(page.data)) + EOL
+      : formatTable(page.data)) + EOL
  const write = Effect.tryPromise(
    () =>
      new Promise<void>((resolve, reject) => {
@@ -96,14 +96,18 @@ export default Runtime.handler(Commands.commands.session.commands.list, (input)
  ),
 )

-function formatList(sessions: ReadonlyArray<SessionInfo>) {
-  return sessions
-    .map((session) =>
-      [
-        session.id,
-        (session.title ?? "Untitled session").replace(/[\r\n\t]/g, " "),
-        new Date(session.time.updated).toLocaleString(),
-      ].join("\t"),
-    )
-    .join(EOL)
+function formatTable(sessions: ReadonlyArray<SessionInfo>) {
+  const rows = sessions.map((session) => ({
+    id: session.id,
+    title: (session.title ?? "Untitled session").replace(/[\r\n\t]/g, " "),
+    updated: new Date(session.time.updated).toLocaleString(),
+  }))
+  const idWidth = Math.max(20, ...rows.map((row) => row.id.length))
+  const titleWidth = Math.max(25, ...rows.map((row) => row.title.length))
+  const header = `${"Session ID".padEnd(idWidth)}  ${"Title".padEnd(titleWidth)}  Updated`
+  return [
+    header,
+    "─".repeat(header.length),
+    ...rows.map((row) => `${row.id.padEnd(idWidth)}  ${row.title.padEnd(titleWidth)}  ${row.updated}`),
+  ].join(EOL)
 }
@@ -11,7 +11,6 @@ import type { RelativePath } from "@opencode/schema/schema"
 import type { Brand } from "effect"
 import type { Model } from "@opencode/schema/model"
 import type { DateTime } from "effect"
-import type { Permission } from "@opencode/schema/permission"
 import type { SessionMessage } from "@opencode/schema/session-message"
 import type { SessionInbox } from "@opencode/schema/session-inbox"
 import type { PromptInput } from "@opencode/schema/prompt-input"
@@ -27,6 +26,7 @@ import type { Integration } from "@opencode/schema/integration"
 import type { Form } from "@opencode/schema/form"
 import type { Mcp } from "@opencode/schema/mcp"
 import type { Credential } from "@opencode/schema/credential"
+import type { Permission } from "@opencode/schema/permission"
 import type { PermissionSaved } from "@opencode/schema/permission-saved"
 import type { FileSystem } from "@opencode/schema/filesystem"
 import type { Command } from "@opencode/schema/command"
@@ -209,7 +209,6 @@ export type SessionCreateInput = {
  readonly model?: Model.Ref | undefined
  readonly location?: Location.Ref | undefined
  readonly metadata?: Session.Metadata | undefined
-  readonly permissions?: Permission.Ruleset | undefined
 }
 export type SessionCreateOutput = Session.Info
 export type SessionCreateOperation<E = never> = (input?: SessionCreateInput) => Effect.Effect<SessionCreateOutput, E>
@@ -438,7 +437,6 @@ export type SessionLogOutput =
            readonly agent?: Agent.ID | undefined
            readonly model?: Model.Ref | undefined
            readonly metadata?: Session.Metadata | undefined
-            readonly permissions?: Permission.Ruleset | undefined
            readonly version: string
          }
        }
@@ -491,15 +489,6 @@ export type SessionLogOutput =
          readonly location?: Location.Ref | undefined
          readonly data: { readonly sessionID: Session.ID; readonly title: string }
        }
-      | {
-          readonly id: Event.ID
-          readonly created: number
-          readonly metadata?: { readonly [x: string]: unknown } | undefined
-          readonly type: "session.permissions.updated"
-          readonly durable: { readonly aggregateID: string; readonly seq: Event.Seq; readonly version: Event.Version }
-          readonly location?: Location.Ref | undefined
-          readonly data: { readonly sessionID: Session.ID; readonly permissions: Permission.Ruleset }
-        }
      | {
          readonly id: Event.ID
          readonly created: number
@@ -1596,12 +1585,6 @@ export type PermissionReplyOperation<E = never> = (
  input: PermissionReplyInput,
 ) => Effect.Effect<PermissionReplyOutput, E>

-export type PermissionRulesInput = { readonly sessionID: Session.ID; readonly permissions: Permission.Ruleset }
-export type PermissionRulesOutput = void
-export type PermissionRulesOperation<E = never> = (
-  input: PermissionRulesInput,
-) => Effect.Effect<PermissionRulesOutput, E>
-
 export interface PermissionApi<E = never> {
  readonly request: { readonly list: PermissionRequestListOperation<E> }
  readonly saved: { readonly list: PermissionSavedListOperation<E>; readonly remove: PermissionSavedRemoveOperation<E> }
@@ -1609,7 +1592,6 @@ export interface PermissionApi<E = never> {
  readonly list: PermissionListOperation<E>
  readonly get: PermissionGetOperation<E>
  readonly reply: PermissionReplyOperation<E>
-  readonly rules: PermissionRulesOperation<E>
 }

 export type FileListInput = {
@@ -181,8 +181,6 @@ import type {
  PermissionGetOutput,
  PermissionReplyInput,
  PermissionReplyOutput,
-  PermissionRulesInput,
-  PermissionRulesOutput,
  FileListInput,
  FileListOutput,
  FileFindInput,
@@ -397,7 +395,6 @@ const EndpointSessionCreate = (raw: RawClient["server.session"]) => (input?: Ses
        model: input?.["model"],
        location: input?.["location"],
        metadata: input?.["metadata"],
-        permissions: input?.["permissions"],
      },
    }).pipe(
      Effect.mapError(mapClientError),
@@ -1148,14 +1145,6 @@ const EndpointPermissionReply = (raw: RawClient["server.permission"]) => (input:
    }).pipe(Effect.mapError(mapClientError)),
  )

-const EndpointPermissionRules = (raw: RawClient["server.permission"]) => (input: PermissionRulesInput) =>
-  preserveEffect<PermissionRulesOutput>()(
-    raw["session.permission.rules"]({
-      params: { sessionID: input["sessionID"] },
-      payload: { permissions: input["permissions"] },
-    }).pipe(Effect.mapError(mapClientError)),
-  )
-
 const adaptGroupPermission = (raw: RawClient["server.permission"]) => ({
  request: { list: EndpointPermissionRequestList(raw) },
  saved: { list: EndpointPermissionSavedList(raw), remove: EndpointPermissionSavedRemove(raw) },
@@ -1163,7 +1152,6 @@ const adaptGroupPermission = (raw: RawClient["server.permission"]) => ({
  list: EndpointPermissionList(raw),
  get: EndpointPermissionGet(raw),
  reply: EndpointPermissionReply(raw),
-  rules: EndpointPermissionRules(raw),
 })

 const EndpointFileList = (raw: RawClient["server.fs"]) => (input?: FileListInput) =>
@@ -175,8 +175,6 @@ import type {
  PermissionGetOutput,
  PermissionReplyInput,
  PermissionReplyOutput,
-  PermissionRulesInput,
-  PermissionRulesOutput,
  FileReadInput,
  FileReadOutput,
  FileListInput,
@@ -567,7 +565,6 @@ export function make(options: ClientOptions) {
              model: input?.["model"],
              location: input?.["location"],
              metadata: input?.["metadata"],
-              permissions: input?.["permissions"],
            },
            successStatus: 200,
            declaredStatuses: [400, 401],
@@ -1569,18 +1566,6 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      rules: (input: PermissionRulesInput, requestOptions?: RequestOptions) =>
-        request<PermissionRulesOutput>(
-          {
-            method: "PUT",
-            path: `/api/session/${encodeURIComponent(input.sessionID)}/permission/rules`,
-            body: { permissions: input["permissions"] },
-            successStatus: 204,
-            declaredStatuses: [400, 401, 404],
-            empty: true,
-          },
-          requestOptions,
-        ),
    },
    file: {
      read: (input: FileReadInput, requestOptions?: RequestOptions) =>
@@ -551,6 +551,28 @@ export type InstructionEntryInfo = { key: InstructionEntryKey; value: JsonValue

 export type InstructionEntrySnapshot = Array<{ key: InstructionEntryKey; value: JsonValue; removed: boolean }>

+export type SessionCreated = {
+  id: string
+  created: number
+  metadata?: { [x: string]: any }
+  type: "session.created"
+  durable: { aggregateID: string; seq: number; version: 1 }
+  location?: LocationRef
+  data: {
+    sessionID: string
+    projectID: string
+    location: LocationRef
+    subpath?: string
+    parentID?: string
+    slug: string
+    title?: string
+    agent?: string
+    model?: ModelRef
+    metadata?: SessionMetadata
+    version: string
+  }
+}
+
 export type SessionAgentSelected = {
  id: string
  created: number
@@ -1629,6 +1651,24 @@ export type SessionInboxMove = {
  delivery: SessionInboxDelivery
 }

+export type SessionInfo = {
+  id: string
+  parentID?: string
+  fork?: { sessionID: string; boundary: SessionForkBoundary }
+  projectID: string
+  agent?: string
+  model?: ModelRef
+  cost: MoneyUSD
+  tokens: TokenUsageInfo
+  outcome?: "succeeded" | "failed" | "interrupted"
+  time: { created: number; updated: number; idle?: number; viewed?: number; archived?: number }
+  title?: string
+  location: LocationRef
+  subpath?: string
+  metadata?: SessionMetadata
+  revert?: SessionRevert
+}
+
 export type SessionRevertStaged = {
  id: string
  created: number
@@ -1872,58 +1912,6 @@ export type AgentInfo = {
  permissions: PermissionRuleset
 }

-export type SessionPermissionsUpdated = {
-  id: string
-  created: number
-  metadata?: { [x: string]: any }
-  type: "session.permissions.updated"
-  durable: { aggregateID: string; seq: number; version: 1 }
-  location?: LocationRef
-  data: { sessionID: string; permissions: PermissionRuleset }
-}
-
-export type SessionInfo = {
-  id: string
-  parentID?: string
-  fork?: { sessionID: string; boundary: SessionForkBoundary }
-  projectID: string
-  agent?: string
-  model?: ModelRef
-  cost: MoneyUSD
-  tokens: TokenUsageInfo
-  outcome?: "succeeded" | "failed" | "interrupted"
-  time: { created: number; updated: number; idle?: number; viewed?: number; archived?: number }
-  title?: string
-  location: LocationRef
-  subpath?: string
-  metadata?: SessionMetadata
-  permissions?: PermissionRuleset
-  revert?: SessionRevert
-}
-
-export type SessionCreated = {
-  id: string
-  created: number
-  metadata?: { [x: string]: any }
-  type: "session.created"
-  durable: { aggregateID: string; seq: number; version: 1 }
-  location?: LocationRef
-  data: {
-    sessionID: string
-    projectID: string
-    location: LocationRef
-    subpath?: string
-    parentID?: string
-    slug: string
-    title?: string
-    agent?: string
-    model?: ModelRef
-    metadata?: SessionMetadata
-    permissions?: PermissionRuleset
-    version: string
-  }
-}
-
 export type ConfigEntry =
  | {
      type: "document"
@@ -2096,6 +2084,8 @@ export type ConfigEntry =
  | { type: "agents"; path: string }
  | { type: "claude"; path: string }

+export type SessionsResponse = { data: Array<SessionInfo>; cursor: { previous?: string | null; next?: string | null } }
+
 export type SessionInboxUser = {
  id: string
  sessionID: string
@@ -2150,8 +2140,6 @@ export type FormFields = [FormField, ...Array<FormField>]

 export type FormFields2 = [FormField1, ...Array<FormField1>]

-export type SessionsResponse = { data: Array<SessionInfo>; cursor: { previous?: string | null; next?: string | null } }
-
 export type SessionInboxInfo = SessionInboxUser | SessionInboxSynthetic | SessionInboxCompaction | SessionInboxMove

 export type SessionInboxEnqueued = {
@@ -2245,7 +2233,6 @@ export type SessionEventDurable =
  | SessionModelSelected
  | SessionMoved
  | SessionRenamed
-  | SessionPermissionsUpdated
  | SessionViewed
  | SessionDeleted
  | SessionForked
@@ -2305,7 +2292,6 @@ export type V2Event =
  | SessionModelSelected
  | SessionMoved
  | SessionRenamed
-  | SessionPermissionsUpdated
  | SessionViewed
  | SessionUsageUpdated
  | SessionDeleted
@@ -2818,11 +2804,6 @@ export type SessionCreateInput = {
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
    readonly metadata?: { readonly [x: string]: JsonValue } | null
-    readonly permissions?: ReadonlyArray<{
-      readonly action: string
-      readonly resource: string
-      readonly effect: "allow" | "deny" | "ask"
-    }> | null
  }["id"]
  readonly title?: {
    readonly id?: string | null
@@ -2831,11 +2812,6 @@ export type SessionCreateInput = {
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
    readonly metadata?: { readonly [x: string]: JsonValue } | null
-    readonly permissions?: ReadonlyArray<{
-      readonly action: string
-      readonly resource: string
-      readonly effect: "allow" | "deny" | "ask"
-    }> | null
  }["title"]
  readonly agent?: {
    readonly id?: string | null
@@ -2844,11 +2820,6 @@ export type SessionCreateInput = {
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
    readonly metadata?: { readonly [x: string]: JsonValue } | null
-    readonly permissions?: ReadonlyArray<{
-      readonly action: string
-      readonly resource: string
-      readonly effect: "allow" | "deny" | "ask"
-    }> | null
  }["agent"]
  readonly model?: {
    readonly id?: string | null
@@ -2857,11 +2828,6 @@ export type SessionCreateInput = {
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
    readonly metadata?: { readonly [x: string]: JsonValue } | null
-    readonly permissions?: ReadonlyArray<{
-      readonly action: string
-      readonly resource: string
-      readonly effect: "allow" | "deny" | "ask"
-    }> | null
  }["model"]
  readonly location?: {
    readonly id?: string | null
@@ -2870,11 +2836,6 @@ export type SessionCreateInput = {
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
    readonly metadata?: { readonly [x: string]: JsonValue } | null
-    readonly permissions?: ReadonlyArray<{
-      readonly action: string
-      readonly resource: string
-      readonly effect: "allow" | "deny" | "ask"
-    }> | null
  }["location"]
  readonly metadata?: {
    readonly id?: string | null
@@ -2883,25 +2844,7 @@ export type SessionCreateInput = {
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
    readonly metadata?: { readonly [x: string]: JsonValue } | null
-    readonly permissions?: ReadonlyArray<{
-      readonly action: string
-      readonly resource: string
-      readonly effect: "allow" | "deny" | "ask"
-    }> | null
  }["metadata"]
-  readonly permissions?: {
-    readonly id?: string | null
-    readonly title?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
-    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
-    readonly metadata?: { readonly [x: string]: JsonValue } | null
-    readonly permissions?: ReadonlyArray<{
-      readonly action: string
-      readonly resource: string
-      readonly effect: "allow" | "deny" | "ask"
-    }> | null
-  }["permissions"]
 }

 export type SessionCreateOutput = { data: SessionInfo }["data"]
@@ -2939,11 +2882,6 @@ export type SessionImportInput = {
      readonly location: { readonly directory: string; readonly workspaceID?: string }
      readonly subpath?: string
      readonly metadata?: { readonly [x: string]: JsonValue }
-      readonly permissions?: ReadonlyArray<{
-        readonly action: string
-        readonly resource: string
-        readonly effect: "allow" | "deny" | "ask"
-      }>
      readonly revert?: {
        readonly messageID: string
        readonly partID?: string
@@ -3249,11 +3187,6 @@ export type SessionImportInput = {
      readonly location: { readonly directory: string; readonly workspaceID?: string }
      readonly subpath?: string
      readonly metadata?: { readonly [x: string]: JsonValue }
-      readonly permissions?: ReadonlyArray<{
-        readonly action: string
-        readonly resource: string
-        readonly effect: "allow" | "deny" | "ask"
-      }>
      readonly revert?: {
        readonly messageID: string
        readonly partID?: string
@@ -3559,11 +3492,6 @@ export type SessionImportInput = {
      readonly location: { readonly directory: string; readonly workspaceID?: string }
      readonly subpath?: string
      readonly metadata?: { readonly [x: string]: JsonValue }
-      readonly permissions?: ReadonlyArray<{
-        readonly action: string
-        readonly resource: string
-        readonly effect: "allow" | "deny" | "ask"
-      }>
      readonly revert?: {
        readonly messageID: string
        readonly partID?: string
@@ -5825,19 +5753,6 @@ export type PermissionReplyInput = {

 export type PermissionReplyOutput = void

-export type PermissionRulesInput = {
-  readonly sessionID: { readonly sessionID: string }["sessionID"]
-  readonly permissions: {
-    readonly permissions: ReadonlyArray<{
-      readonly action: string
-      readonly resource: string
-      readonly effect: "allow" | "deny" | "ask"
-    }>
-  }["permissions"]
-}
-
-export type PermissionRulesOutput = void
-
 export type FileReadInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -695,10 +695,6 @@ export function createData(config: CreateDataInput) {
        })
        return
      }
-      case "session.permissions.updated":
-        if (store.session.info[event.data.sessionID])
-          setStore("session", "info", event.data.sessionID, "permissions", event.data.permissions)
-        return
      case "session.moved": {
        const current = store.session.info[event.data.sessionID]
        if (current) {
@@ -369,6 +369,9 @@ ultimate source of truth.
 - [x] `atob` and `btoa` with forgiving-base64 decoding and WebIDL string conversion; invalid input throws an Error
      named `InvalidCharacterError`, since there is no `DOMException`.
 - [x] `crypto.randomUUID()`.
+- [x] `structuredClone` over the data model: objects, arrays with holes, Date, RegExp (`lastIndex` reset), Map, Set,
+      URL, URLSearchParams, and Errors (name, message, and cause only); shared references stay shared within one
+      clone; functions, promises, and tool references throw an Error named `DataCloneError`.
 - [ ] `crypto.getRandomValues` and `crypto.subtle`, `TextEncoder`/`TextDecoder`, and `Blob`: these need a binary
      value type, which the JSON-like data model does not have yet.

@@ -138,6 +138,6 @@ const copy = (value: unknown, label: string, mode: Mode, depth: number, seen: Se

 // Own data property regardless of the target's prototype, so a "__proto__" key on a host object or
 // array never reaches the Object.prototype setter.
-const define = (target: object, key: string, value: unknown): void => {
+export const define = (target: object, key: string, value: unknown): void => {
  Object.defineProperty(target, key, { value, enumerable: true, writable: true, configurable: true })
 }
@@ -11,7 +11,7 @@ import { regexpGlobal } from "../stdlib/regexp.js"
 import { stringGlobal } from "../stdlib/string.js"
 import { uriGlobal, urlGlobal, urlSearchParamsGlobal } from "../stdlib/url.js"
 import { coercion, errorConstructors } from "../stdlib/value.js"
-import { atobGlobal, btoaGlobal, cryptoGlobal } from "../stdlib/web.js"
+import { atobGlobal, btoaGlobal, cryptoGlobal, structuredCloneGlobal } from "../stdlib/web.js"
 import { ToolReference } from "../tool-runtime.js"
 import { errorGlobal } from "./errors.js"
 import { HostFunction } from "./host.js"
@@ -75,5 +75,6 @@ export const globals = <R>(host: Host<R>): ReadonlyArray<readonly [string, unkno
  ["atob", atobGlobal],
  ["btoa", btoaGlobal],
  ["crypto", cryptoGlobal],
+  ["structuredClone", structuredCloneGlobal],
  ...[...errorConstructors].map((name) => [name, errorGlobal(name, host.runner)] as const),
 ]
@@ -1,12 +1,16 @@
+import { define, type SafeObject } from "../data.js"
 import { HostNamespace, sync } from "../interpreter/host.js"
-import { InterpreterRuntimeError } from "../interpreter/model.js"
-import { coerceToString } from "./value.js"
+import { type AstNode, InterpreterRuntimeError } from "../interpreter/model.js"
+import { describeValue, isRuntimeReference } from "../interpreter/references.js"
+import { Values } from "../values.js"
+import { coerceToString, createErrorValue, errorBrandName } from "./value.js"

 // WebIDL DOMString conversion: a missing argument is a TypeError, anything else stringifies.
 const base64 = (name: "atob" | "btoa") =>
  sync(name, (args, node) => {
-    if (args.length === 0)
-      throw new InterpreterRuntimeError(`${name} requires 1 argument (a string)`, node).as("TypeError")
+    if (args.length === 0) {
+      throw new InterpreterRuntimeError(`${name} requires 1 argument, but only 0 were provided.`, node).as("TypeError")
+    }
    const input = coerceToString(args[0])
    try {
      return name === "atob" ? atob(input) : btoa(input)
@@ -21,3 +25,56 @@ export const btoaGlobal = base64("btoa")
 export const cryptoGlobal = new HostNamespace("crypto", {
  randomUUID: sync("crypto.randomUUID", () => crypto.randomUUID()),
 })
+
+// HTML structured clone over the data model: wrappers are copied, shared references stay shared within
+// one clone, Errors keep only name, message, and cause, and RegExp lastIndex resets like the spec.
+const cloneValue = (value: unknown, seen: Map<object, unknown>, node: AstNode): unknown => {
+  if (value === null || typeof value !== "object") return value
+  if (value instanceof Values.Promise || (isRuntimeReference(value) && !Values.isValue(value))) {
+    throw new InterpreterRuntimeError(`${describeValue(value)} could not be cloned.`, node).as("DataCloneError")
+  }
+  const existing = seen.get(value)
+  if (existing !== undefined) return existing
+  const remember = <T extends object>(copied: T): T => {
+    seen.set(value, copied)
+    return copied
+  }
+  if (value instanceof Values.Date) return remember(new Values.Date(value.time))
+  if (value instanceof Values.RegExp) return remember(new Values.RegExp(value.regex.source, value.regex.flags))
+  if (value instanceof Values.URL) return remember(new Values.URL(new URL(value.url.href)))
+  if (value instanceof Values.URLSearchParams) {
+    return remember(new Values.URLSearchParams(new URLSearchParams(value.params)))
+  }
+  if (value instanceof Values.Map) {
+    const copied = remember(new Values.Map())
+    for (const [key, item] of value.map) copied.map.set(cloneValue(key, seen, node), cloneValue(item, seen, node))
+    return copied
+  }
+  if (value instanceof Values.Set) {
+    const copied = remember(new Values.Set())
+    for (const item of value.set) copied.set.add(cloneValue(item, seen, node))
+    return copied
+  }
+  if (Array.isArray(value)) {
+    const copied = remember(new Array<unknown>(value.length))
+    for (const [key, item] of Object.entries(value)) define(copied, key, cloneValue(item, seen, node))
+    return copied
+  }
+  const brand = errorBrandName(value)
+  if (brand !== undefined) {
+    const error = value as { name?: unknown; message?: unknown; cause?: unknown }
+    const copied = remember(createErrorValue(brand, coerceToString(error.message)))
+    if (Object.hasOwn(value, "cause")) copied.cause = cloneValue(error.cause, seen, node)
+    return copied
+  }
+  const copied = remember(Object.create(null) as SafeObject)
+  for (const [key, item] of Object.entries(value)) define(copied, key, cloneValue(item, seen, node))
+  return copied
+}
+
+export const structuredCloneGlobal = sync("structuredClone", (args, node) => {
+  if (args.length === 0) {
+    throw new InterpreterRuntimeError("structuredClone requires a value to clone.", node).as("TypeError")
+  }
+  return cloneValue(args[0], new Map(), node)
+})
@@ -0,0 +1,245 @@
+/**
+ * Portions adapted from web-platform-tests at revision 863077959ca8c1a7ceecfbe2534b75d2527b9013:
+ * - html/webappapis/structured-clone/structured-clone-battery-of-tests.js
+ *
+ * Copyright © web-platform-tests contributors. Governed by the 3-Clause BSD license in LICENSE.wpt.
+ *
+ * The battery's `check(description, input, compare)` shape and its `compare_*` helpers are kept, run
+ * inside the interpreter. Ported: primitives, Array/Object of primitives, Date, RegExp, Error, sparse
+ * arrays, identical (shared) property values, and the index-property-plus-length object. Not portable:
+ * boxed primitives, BigInt, Blob/File/ImageData/ArrayBuffer/typed arrays (no binary values), circular
+ * references (rejected at insertion here), property descriptors and prototype properties (no
+ * defineProperty or prototypes), and the throwing-getter case (no getters). `assert_throws_dom` for
+ * `DataCloneError` becomes an `error.name` check.
+ */
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { CodeMode } from "../src/index.js"
+
+const value = async (code: string) => {
+  const result = await Effect.runPromise(CodeMode.execute({ code, tools: {} }))
+  if (!result.ok) throw new Error(`expected success, got ${result.error.kind}: ${result.error.message}`)
+  return result.value
+}
+
+// The WPT harness, minus async: assertions push a failure description instead of throwing so one run
+// reports every failing check.
+const harness = `
+  const failures = []
+  const assert_equals = (a, b, m) => { if (!Object.is(a, b) && !(a !== a && b !== b)) failures.push((m ?? "") + ": " + String(a) + " !== " + String(b)) }
+  const assert_not_equals = (a, b, m) => { if (a === b) failures.push((m ?? "") + ": unexpectedly identical") }
+  const assert_true = (a, m) => { if (a !== true) failures.push((m ?? "") + ": not true") }
+  const assert_false = (a, m) => { if (a !== false) failures.push((m ?? "") + ": not false") }
+  let current = ""
+  function check(description, input, callback) {
+    current = description
+    const newInput = typeof input === "function" ? input() : input
+    const copy = structuredClone(newInput)
+    const before = failures.length
+    callback(copy, newInput)
+    for (let i = before; i < failures.length; i++) failures[i] = description + " — " + failures[i]
+  }
+  function compare_primitive(actual, input) { assert_equals(actual, input) }
+  function compare_Array(callback) {
+    return function (actual, input) {
+      assert_true(Array.isArray(actual), "instanceof Array")
+      assert_not_equals(actual, input)
+      assert_equals(actual.length, input.length, "length")
+      callback(actual, input)
+    }
+  }
+  function compare_Object(callback) {
+    return function (actual, input) {
+      assert_true(actual instanceof Object, "instanceof Object")
+      assert_false(Array.isArray(actual), "instanceof Array")
+      assert_not_equals(actual, input)
+      callback(actual, input)
+    }
+  }
+  function enumerate_props(compare_func) {
+    return function (actual, input) { for (const x in input) compare_func(actual[x], input[x]) }
+  }
+`
+
+describe("structuredClone WPT battery", () => {
+  test("primitives, and arrays and objects of primitives", async () => {
+    expect(
+      await value(`
+        ${harness}
+        check('primitive undefined', undefined, compare_primitive)
+        check('primitive null', null, compare_primitive)
+        check('primitive true', true, compare_primitive)
+        check('primitive false', false, compare_primitive)
+        check('primitive string, empty string', '', compare_primitive)
+        check('primitive string, lone high surrogate', '\\uD800', compare_primitive)
+        check('primitive string, lone low surrogate', '\\uDC00', compare_primitive)
+        check('primitive string, NUL', '\\u0000', compare_primitive)
+        check('primitive string, astral character', '\\uDBFF\\uDFFD', compare_primitive)
+        check('primitive number, 0.2', 0.2, compare_primitive)
+        check('primitive number, 0', 0, compare_primitive)
+        check('primitive number, -0', -0, compare_primitive)
+        check('primitive number, NaN', NaN, compare_primitive)
+        check('primitive number, Infinity', Infinity, compare_primitive)
+        check('primitive number, -Infinity', -Infinity, compare_primitive)
+        check('primitive number, 9007199254740992', 9007199254740992, compare_primitive)
+        check('primitive number, -9007199254740992', -9007199254740992, compare_primitive)
+        check('primitive number, 9007199254740994', 9007199254740994, compare_primitive)
+        check('primitive number, -9007199254740994', -9007199254740994, compare_primitive)
+        check('Array primitives', [undefined, null, true, false, '', '\\uD800', '\\uDC00', '\\u0000', '\\uDBFF\\uDFFD',
+          0.2, 0, -0, NaN, Infinity, -Infinity, 9007199254740992, -9007199254740992, 9007199254740994, -9007199254740994],
+          compare_Array(enumerate_props(compare_primitive)))
+        check('Object primitives', { 'undefined': undefined, 'null': null, 'true': true, 'false': false, 'empty': '',
+          'high surrogate': '\\uD800', 'low surrogate': '\\uDC00', 'nul': '\\u0000', 'astral': '\\uDBFF\\uDFFD',
+          '0.2': 0.2, '0': 0, '-0': -0, 'NaN': NaN, 'Infinity': Infinity, '-Infinity': -Infinity,
+          '9007199254740992': 9007199254740992, '-9007199254740992': -9007199254740992,
+          '9007199254740994': 9007199254740994, '-9007199254740994': -9007199254740994 },
+          compare_Object(enumerate_props(compare_primitive)))
+        return failures
+      `),
+    ).toEqual([])
+  })
+
+  test("Date", async () => {
+    expect(
+      await value(`
+        ${harness}
+        function compare_Date(actual, input) {
+          assert_true(actual instanceof Date, 'instanceof Date')
+          assert_equals(Number(actual), Number(input), 'converted to primitive')
+          assert_not_equals(actual, input)
+        }
+        check('Date 0', new Date(0), compare_Date)
+        check('Date -0', new Date(-0), compare_Date)
+        check('Date -8.64e15', new Date(-8.64e15), compare_Date)
+        check('Date 8.64e15', new Date(8.64e15), compare_Date)
+        check('Array Date objects', [new Date(0), new Date(-0), new Date(-8.64e15), new Date(8.64e15)],
+          compare_Array(enumerate_props(compare_Date)))
+        check('Object Date objects', { '0': new Date(0), '-0': new Date(-0), '-8.64e15': new Date(-8.64e15), '8.64e15': new Date(8.64e15) },
+          compare_Object(enumerate_props(compare_Date)))
+        return failures
+      `),
+    ).toEqual([])
+  })
+
+  test("RegExp: flags copied, lastIndex reset, source escaped", async () => {
+    expect(
+      await value(`
+        ${harness}
+        function compare_RegExp(expected_source) {
+          return function (actual, input) {
+            assert_true(actual instanceof RegExp, 'instanceof RegExp')
+            assert_equals(actual.global, input.global, 'global')
+            assert_equals(actual.ignoreCase, input.ignoreCase, 'ignoreCase')
+            assert_equals(actual.multiline, input.multiline, 'multiline')
+            assert_equals(actual.source, expected_source, 'source')
+            assert_equals(actual.sticky, input.sticky, 'sticky')
+            assert_equals(actual.unicode, input.unicode, 'unicode')
+            assert_equals(actual.lastIndex, 0, 'lastIndex')
+            assert_not_equals(actual, input)
+          }
+        }
+        function func_RegExp_flags_lastIndex() {
+          const r = /foo/gim
+          r.lastIndex = 2
+          return r
+        }
+        function func_RegExp_sticky() { return new RegExp('foo', 'y') }
+        function func_RegExp_unicode() { return new RegExp('foo', 'u') }
+        check('RegExp flags and lastIndex', func_RegExp_flags_lastIndex, compare_RegExp('foo'))
+        check('RegExp sticky flag', func_RegExp_sticky, compare_RegExp('foo'))
+        check('RegExp unicode flag', func_RegExp_unicode, compare_RegExp('foo'))
+        check('RegExp empty', new RegExp(''), compare_RegExp('(?:)'))
+        check('RegExp slash', new RegExp('/'), compare_RegExp('\\\\/'))
+        check('RegExp new line', new RegExp('\\n'), compare_RegExp('\\\\n'))
+        check('Array RegExp object, RegExp flags and lastIndex', [func_RegExp_flags_lastIndex()], compare_Array(enumerate_props(compare_RegExp('foo'))))
+        check('Array RegExp object, RegExp sticky flag', function () { return [func_RegExp_sticky()] }, compare_Array(enumerate_props(compare_RegExp('foo'))))
+        check('Array RegExp object, RegExp unicode flag', function () { return [func_RegExp_unicode()] }, compare_Array(enumerate_props(compare_RegExp('foo'))))
+        check('Array RegExp object, RegExp empty', [new RegExp('')], compare_Array(enumerate_props(compare_RegExp('(?:)'))))
+        check('Array RegExp object, RegExp slash', [new RegExp('/')], compare_Array(enumerate_props(compare_RegExp('\\\\/'))))
+        check('Array RegExp object, RegExp new line', [new RegExp('\\n')], compare_Array(enumerate_props(compare_RegExp('\\\\n'))))
+        check('Object RegExp object, RegExp flags and lastIndex', { 'x': func_RegExp_flags_lastIndex() }, compare_Object(enumerate_props(compare_RegExp('foo'))))
+        check('Object RegExp object, RegExp sticky flag', function () { return { 'x': func_RegExp_sticky() } }, compare_Object(enumerate_props(compare_RegExp('foo'))))
+        check('Object RegExp object, RegExp unicode flag', function () { return { 'x': func_RegExp_unicode() } }, compare_Object(enumerate_props(compare_RegExp('foo'))))
+        check('Object RegExp object, RegExp empty', { 'x': new RegExp('') }, compare_Object(enumerate_props(compare_RegExp('(?:)'))))
+        check('Object RegExp object, RegExp slash', { 'x': new RegExp('/') }, compare_Object(enumerate_props(compare_RegExp('\\\\/'))))
+        check('Object RegExp object, RegExp new line', { 'x': new RegExp('\\n') }, compare_Object(enumerate_props(compare_RegExp('\\\\n'))))
+        return failures
+      `),
+    ).toEqual([])
+  })
+
+  test("Error: name and message kept, custom properties dropped", async () => {
+    expect(
+      await value(`
+        ${harness}
+        function compare_Error(actual, input) {
+          assert_true(actual instanceof Error, "Checking instanceof")
+          assert_equals(actual.name, input.name, "Checking name")
+          assert_equals(Object.hasOwn(actual, "message"), Object.hasOwn(input, "message"), "Checking message existence")
+          assert_equals(actual.message, input.message, "Checking message")
+          assert_equals(actual.foo, undefined, "Checking for absence of custom property")
+        }
+        check('Empty Error object', new Error(), compare_Error)
+        for (const constructor of [Error, RangeError, ReferenceError, SyntaxError, TypeError, URIError]) {
+          check(constructor.name, () => {
+            const error = new constructor("Error message here")
+            error.foo = "testing"
+            return error
+          }, compare_Error)
+        }
+        return failures
+      `),
+    ).toEqual([])
+  })
+
+  test("sparse arrays, index-property objects, and identical property values", async () => {
+    expect(
+      await value(`
+        ${harness}
+        check('Array sparse', new Array(10), compare_Array(enumerate_props(compare_primitive)))
+        check('Object with index property and length', { '0': 'foo', 'length': 1 }, compare_Object(enumerate_props(compare_primitive)))
+        function check_identical_property_values(prop1, prop2) {
+          return function (actual) { assert_equals(actual[prop1], actual[prop2]) }
+        }
+        check('Array with identical property values', function () {
+          const obj = {}
+          return [obj, obj]
+        }, compare_Array(check_identical_property_values('0', '1')))
+        check('Object with identical property values', function () {
+          const obj = {}
+          return { 'x': obj, 'y': obj }
+        }, compare_Object(check_identical_property_values('x', 'y')))
+        return failures
+      `),
+    ).toEqual([])
+  })
+})
+
+describe("structuredClone beyond the WPT battery", () => {
+  test("Map, Set, URL, and URLSearchParams are copied, with shared references preserved across containers", async () => {
+    expect(
+      await value(`
+        const shared = { n: 1 }
+        const input = { m: new Map([[shared, shared]]), s: new Set([shared]), u: new URL("https://a.b/c?d=1") }
+        const copy = structuredClone(input)
+        const [[key, item]] = [...copy.m]
+        copy.u.searchParams.set("d", "2")
+        return [
+          copy.m !== input.m, key !== shared, key === item, key === [...copy.s][0],
+          copy.u !== input.u, input.u.href, copy.u.href,
+        ]
+      `),
+    ).toEqual([true, true, true, true, true, "https://a.b/c?d=1", "https://a.b/c?d=2"])
+  })
+
+  test("functions, promises, and tool references throw DataCloneError", async () => {
+    expect(
+      await value(`
+        return [() => 1, Promise.resolve(1), tools, Math, { nested: [() => 1] }].map((input) => {
+          try { structuredClone(input); return "cloned" } catch (error) { return error.name }
+        })
+      `),
+    ).toEqual(Array(5).fill("DataCloneError"))
+    expect(await value(`try { structuredClone() } catch (error) { return error.name }`)).toBe("TypeError")
+  })
+})
@@ -45,7 +45,6 @@ import m42 from "./migration/20260812181746_session_inbox.js"
 import m43 from "./migration/20260812213948_worktree.js"
 import m44 from "./migration/20260819222447_session_viewed_state.js"
 import m45 from "./migration/20260823191254_nullable_workspace_binding.js"
-import m46 from "./migration/20260910120000_clear_v1_session_permission.js"

 export const migrations = [
  m00,
@@ -94,5 +93,4 @@ export const migrations = [
  m43,
  m44,
  m45,
-  m46,
 ] satisfies DatabaseMigration.Migration[]
@@ -1,13 +0,0 @@
-import { Effect } from "effect"
-import type { DatabaseMigration } from "../migration.js"
-
-const migration: DatabaseMigration.Migration = {
-  id: "20260910120000_clear_v1_session_permission",
-  up(tx) {
-    return Effect.gen(function* () {
-      yield* tx.run(`UPDATE \`session_v2\` SET \`permission\` = NULL;`)
-    })
-  },
-}
-
-export default migration
@@ -600,7 +600,7 @@ export function run(options: Options = {}): Effect.Effect<RunResult, never, Data
                    id, ${projectID}, workspace_id, parent_id, slug, directory, path, title, version, share_url,
                    summary_additions, summary_deletions, summary_files, summary_diffs, metadata, cost,
                    tokens_input, tokens_output, tokens_reasoning, tokens_cache_read, tokens_cache_write,
-                    revert, NULL, agent, model, time_created, time_updated, time_compacting, time_archived
+                    revert, permission, agent, model, time_created, time_updated, time_compacting, time_archived
                  FROM session
                  WHERE id = ${nextID.id}
                `)
@@ -41,8 +41,6 @@ export const layer = Layer.effect(
          [
            "SessionRunnerModel.VariantUnavailableError",
            "SessionRunnerModel.UnsupportedPackageError",
-            "SessionRunnerModel.ModelConfigurationError",
-            "SessionRunnerModel.ModelInitializationError",
            "SessionRunnerModel.UnresolvedProviderVariablesError",
            "SessionRunnerModel.UnsupportedCompactionError",
          ],
@@ -1,7 +1,7 @@
 export * as ModelResolver from "./model-resolver.js"

 import { makeLocationNode } from "@opencode/util/effect/app-node"
-import { LanguageModel, ProviderConfigurationError } from "@opencode/ai"
+import { LanguageModel } from "@opencode/ai"
 import { Auth } from "@opencode/ai/route"
 import { Context, Effect, Layer, Schema, Struct } from "effect"
 import { AISDK } from "./aisdk.js"
@@ -39,40 +39,6 @@ export class UnsupportedPackageError extends Schema.TaggedError<UnsupportedPacka
  }
 }

-export const InitializationPhase = Schema.Literals(["load", "init", "construct"])
-export type InitializationPhase = typeof InitializationPhase.Type
-
-/** Provider settings are missing, conflicting, or unsupported; the provider's own message tells the user what to fix. */
-export class ModelConfigurationError extends Schema.TaggedError<ModelConfigurationError>()(
-  "SessionRunnerModel.ModelConfigurationError",
-  {
-    providerID: Provider.ID,
-    modelID: ID,
-    package: Schema.String,
-    detail: Schema.String,
-  },
-) {
-  override get message() {
-    return `Cannot initialize ${this.providerID}/${this.modelID}: ${this.detail}`
-  }
-}
-
-/** A supported package failed unexpectedly while loading or constructing the model. */
-export class ModelInitializationError extends Schema.TaggedError<ModelInitializationError>()(
-  "SessionRunnerModel.ModelInitializationError",
-  {
-    providerID: Provider.ID,
-    modelID: ID,
-    package: Schema.String,
-    phase: InitializationPhase,
-    detail: Schema.String,
-  },
-) {
-  override get message() {
-    return `Cannot initialize ${this.providerID}/${this.modelID}: ${this.detail}`
-  }
-}
-
 export class UnresolvedProviderVariablesError extends Schema.TaggedError<UnresolvedProviderVariablesError>()(
  "SessionRunnerModel.UnresolvedProviderVariablesError",
  {
@@ -102,8 +68,6 @@ export class UnsupportedCompactionError extends Schema.TaggedError<UnsupportedCo
 export type Error =
  | VariantUnavailableError
  | UnsupportedPackageError
-  | ModelConfigurationError
-  | ModelInitializationError
  | UnresolvedProviderVariablesError
  | UnsupportedCompactionError
  | Integration.AuthorizationError
@@ -171,11 +135,7 @@ export const fromCatalogModel = (
  dependencies?: Dependencies,
 ): Effect.Effect<
  LanguageModel,
-  | UnsupportedPackageError
-  | ModelConfigurationError
-  | ModelInitializationError
-  | UnresolvedProviderVariablesError
-  | UnsupportedCompactionError
+  UnsupportedPackageError | UnresolvedProviderVariablesError | UnsupportedCompactionError
 > =>
  resolveCatalogModel(model, credential, dependencies).pipe(
    Effect.flatMap((resolved) => validateProviderVariables(model, resolved)),
@@ -218,16 +178,14 @@ const resolveCatalogModel = Effect.fn("ModelResolver.resolveCatalogModel")(funct
        ...configuration,
      }) ?? {},
    )
-    return yield* loadAISDK({ ...resolved, settings }).pipe(
-      Effect.mapError((error) => initialization(resolved, "init", error.cause)),
-    )
+    return yield* loadAISDK({ ...resolved, settings }).pipe(Effect.mapError(() => unsupported(resolved)))
  }
  if (!native) return yield* unsupported(resolved)

  const specifier = native
  const mapped = yield* prepareProviderSettings(resolved, mapping?.settings ?? configured)
  const module = yield* (dependencies?.loadPackage ?? Provider.loadPackage)(specifier).pipe(
-    Effect.mapError((error) => initialization(resolved, "load", error.cause)),
+    Effect.mapError(() => unsupported(resolved)),
  )
  const settings = {
    ...(credential ? Struct.omit(mapped, ["accessToken", "apiKey", "authToken"]) : mapped),
@@ -246,15 +204,7 @@ const resolveCatalogModel = Effect.fn("ModelResolver.resolveCatalogModel")(funct
          : runtime.compatibility,
      })
    },
-    catch: (cause) =>
-      cause instanceof ProviderConfigurationError
-        ? new ModelConfigurationError({
-            providerID: resolved.providerID,
-            modelID: resolved.id,
-            package: resolved.package ?? "unknown",
-            detail: cause.message,
-          })
-        : initialization(resolved, "construct", cause),
+    catch: () => unsupported(resolved),
  })
 })

@@ -327,24 +277,6 @@ const unsupported = (model: Info) =>
    package: model.package ?? "unknown",
  })

-const initialization = (model: Info, phase: InitializationPhase, cause: unknown) =>
-  new ModelInitializationError({
-    providerID: model.providerID,
-    modelID: model.id,
-    package: model.package ?? "unknown",
-    phase,
-    detail: causeMessage(cause) ?? `${phase} failed for ${model.package ?? "unknown"}`,
-  })
-
-// Unexpected throws still carry the most useful diagnosis in their message; a stack or an unknown value does not.
-const causeMessage = (cause: unknown): string | undefined => {
-  if (typeof cause === "string") return cause.trim() || undefined
-  if (!(cause instanceof globalThis.Error)) return undefined
-  const message = cause.message.trim()
-  if (message) return message
-  return causeMessage(cause.cause)
-}
-
 export const resolveModel = (
  model: Info,
  variant: VariantID | undefined,
@@ -154,7 +154,7 @@ const layer = Layer.effect(
      const session = yield* sessions.get(sessionID)
      if (!session) return yield* new SessionErrors.NotFoundError({ sessionID })
      const agent = yield* agents.resolve(agentID ?? session.agent)
-      return merge(agent?.permissions ?? missingAgentPermissions, session.permissions ?? [])
+      return agent?.permissions ?? missingAgentPermissions
    })

    function denied(input: Pick<Request, "action" | "resources">, rules: Permission.Ruleset) {
@@ -404,7 +404,6 @@ export const make = Effect.fn("PluginHost.make")(function* (
                : Effect.fail(new Error(`Permission request not found: ${input.requestID}`)),
            ),
          ),
-      rules: sessions.setPermissions,
    },
    plugin: {
      list: () => response(plugin.list()),
@@ -510,8 +509,6 @@ export const make = Effect.fn("PluginHost.make")(function* (
          title: input?.title,
          agent: input?.agent,
          model: input?.model,
-          metadata: input?.metadata,
-          permissions: input?.permissions,
          location:
            input?.location ?? Location.Ref.make({ directory: location.directory, workspaceID: location.workspaceID }),
        }),
@@ -11,7 +11,6 @@ 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"
-import PROMPT_ANTHROPIC from "./system-prompt/anthropic.txt"

 export const OpenAIPlugin = make("opencode.prompt.openai", (model) => {
  const id = model.id.toLowerCase()
@@ -19,19 +18,6 @@ export const OpenAIPlugin = make("opencode.prompt.openai", (model) => {
  return id.includes("gpt-6") ? PROMPT_ASTRA : PROMPT_GPT
 })

-export const AnthropicPlugin = make(
-  "opencode.prompt.anthropic",
-  (model) => {
-    const id = model.id.toLowerCase()
-    if (!id.includes("claude")) return undefined
-    return PROMPT_ANTHROPIC
-  },
-  "append",
-)
-
-// Both OpenAIToolsPlugin and AnthropicToolsPlugin are disabled intentionally until we can figure out a good ux for displaying
-// heavy grep/glob usage done via shell or other mechanisms
-
 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
@@ -59,12 +45,11 @@ export const MetaPlugin = make("opencode.prompt.meta", (model) => {
  return PROMPT_META.replaceAll("{{MODEL_NAME}}", model.name)
 })

-export const Plugins = [OpenAIPlugin, AnthropicPlugin, KimiPlugin, ArceePlugin, MetaPlugin] as const
+export const Plugins = [OpenAIPlugin, KimiPlugin, ArceePlugin, MetaPlugin] as const

 function make(
  id: string,
  optimize: (model: Model.Info, tools: SessionHooks["context"]["tools"]) => string | undefined,
-  mode: "override" | "append" = "override",
 ) {
  return define({
    id,
@@ -81,9 +66,7 @@ function make(
          if ((yield* ctx.agent.get({ agentID: event.agent })).data.system) return
          const system = event.system[0]
          if (!system) return
-          const rendered = SessionSystemPrompt.render(template, Object.keys(event.tools))
-          const text = mode === "append" ? `${system.text}\n\n${rendered}` : rendered
-          event.system[0] = { ...system, text }
+          event.system[0] = { ...system, text: SessionSystemPrompt.render(template, Object.keys(event.tools)) }
        }).pipe(Effect.catch(() => Effect.void))
      yield* ctx.session.hook("context", hook)
      yield* ctx.session.hook("compaction", hook)
@@ -295,7 +295,7 @@ export const OpencodePlugin = define<HttpClient.HttpClient | Bus.Service | Scope

    // Console config can change independently of local credential activity, so re-fetch
    // periodically and only rebuild the catalog and search providers when the snapshot differs.
-    yield* Effect.sleep(Duration.minutes(1)).pipe(
+    yield* Effect.sleep(Duration.minutes(10)).pipe(
      Effect.andThen(
        loading.withPermit(
          load().pipe(Effect.flatMap((next) => (Equal.equals(snapshot, next) ? Effect.void : apply(next)))),
@@ -101,7 +101,6 @@ export const XAIPlugin = define({
      for (const model of provider.models.values()) {
        catalog.model.update(providerID, model.id, (draft) => {
          draft.capabilities.responsesWebsockets = true
-          draft.websocket = true
        })
      }
    })
@@ -1,2 +0,0 @@
-# Code comments
-By default, match the surrounding comment density: where the code has none, add none. Use comments sparingly, only where they are appropriate, such as for behavior that is not obvious from the code itself. Instructions from the user or the project take precedence over this guidance.
@@ -69,7 +69,6 @@ const builtins = new Map<string, () => Promise<unknown>>([
  ["@opencode/ai/providers/openai/chat", () => import("@opencode/ai/providers/openai/chat")],
  ["@opencode/ai/providers/openai/responses", () => import("@opencode/ai/providers/openai/responses")],
  ["@opencode/ai/providers/openai-compatible", () => import("@opencode/ai/providers/openai-compatible")],
-  ["@opencode/ai/providers/organization-routes", () => import("@opencode/ai/providers/organization-routes")],
  ["@opencode/ai/providers/openrouter", () => import("@opencode/ai/providers/openrouter")],
  ["@opencode/ai/providers/togetherai", () => import("@opencode/ai/providers/togetherai")],
  ["@opencode/ai/providers/xai", () => import("@opencode/ai/providers/xai")],
@@ -18,7 +18,6 @@ import { SessionMessageTable } from "./session/sql.js"
 import { SessionSchema } from "./session/schema.js"
 import { RelativePath } from "./schema.js"
 import { Agent } from "@opencode/schema/agent"
-import type { Permission } from "@opencode/schema/permission"
 import { App } from "./app.js"
 import { Slug } from "./util/slug.js"
 import path from "path"
@@ -82,7 +81,6 @@ type CreateBaseInput = {
  agent?: Agent.ID
  model?: Model.Ref
  metadata?: SessionSchema.Metadata
-  permissions?: Permission.Ruleset
 }
 type CreateInput = CreateBaseInput &
  ({ location: Location.Ref; parentID?: never } | { parentID: SessionSchema.ID; location?: never })
@@ -159,10 +157,6 @@ export interface Interface {
  readonly switchAgent: (input: { sessionID: SessionSchema.ID; agent: Agent.ID }) => Effect.Effect<void, NotFoundError>
  readonly switchModel: (input: { sessionID: SessionSchema.ID; model: Model.Ref }) => Effect.Effect<void, NotFoundError>
  readonly rename: (input: { sessionID: SessionSchema.ID; title: string }) => Effect.Effect<void, NotFoundError>
-  readonly setPermissions: (input: {
-    sessionID: SessionSchema.ID
-    permissions: Permission.Ruleset
-  }) => Effect.Effect<void, NotFoundError>
  readonly move: SessionMove.Interface["move"]
  readonly prompt: (
    input: Parameters<Session.Handle["prompt"]>[0] & { sessionID: SessionSchema.ID },
@@ -254,10 +248,9 @@ const layer = Layer.effect(
              subpath: RelativePath.make(path.relative(project.directory, location.directory).replaceAll("\\", "/")),
              title: input.title,
              agent: input.agent,
-              // Children inherit metadata and permissions the way they inherit
-              // location, so host policies that read them treat the family uniformly.
+              // Children inherit metadata the way they inherit location, so
+              // host policies that read it treat the family uniformly.
              metadata: input.metadata ?? parent?.metadata,
-              permissions: input.permissions ?? parent?.permissions,
              model: input.model
                ? {
                    id: Model.ID.make(input.model.id),
@@ -394,7 +387,6 @@ const layer = Layer.effect(
      switchAgent: (input) => sessions.forSession(input.sessionID).switchAgent(input),
      switchModel: (input) => sessions.forSession(input.sessionID).switchModel(input),
      rename: (input) => sessions.forSession(input.sessionID).rename(input),
-      setPermissions: (input) => sessions.forSession(input.sessionID).setPermissions(input),
      move: moves.move,
      compact: (input) => sessions.forSession(input.sessionID).compact(input),
      wait: (sessionID) => sessions.forSession(sessionID).wait(),
@@ -1,7 +1,6 @@
 export * as SessionContext from "./context.js"

 import { Model } from "@opencode/schema/model"
-import { Permission } from "../permission.js"
 import { Context, Effect, Layer } from "effect"
 import { Agent } from "../agent.js"
 import { Catalog } from "../catalog.js"
@@ -130,7 +129,7 @@ const layer = Layer.effect(
      if (!agent.info) return yield* new AgentNotFoundError({ sessionID: session.id, agent: session.agent ?? agent.id })
      const loaded = yield* Effect.all(
        {
-          tools: registry.snapshot(Permission.merge(agent.info.permissions, session.permissions ?? [])),
+          tools: registry.snapshot(agent.info.permissions),
          builtins: builtins.load(sessionID),
          discovery: discovery.load(),
          skills: skillInstructions.load(agent),
@@ -50,7 +50,6 @@ export function fromRow(row: typeof SessionTable.$inferSelect): SessionSchema.In
    }),
    subpath: row.path ? RelativePath.make(row.path) : undefined,
    metadata: row.metadata ?? undefined,
-    permissions: row.permission ?? undefined,
    revert: row.revert ? decodeRevert(row.revert) : undefined,
    outcome: row.idle_outcome ?? undefined,
    time: {
@@ -116,7 +116,6 @@ export function update(adapter: Adapter, event: SessionEvent.DurableEvent) {
          )
        }),
      "session.renamed": () => Effect.void,
-      "session.permissions.updated": () => Effect.void,
      "session.deleted": () => Effect.void,
      "session.forked": () => Effect.void,
      "session.inbox.delivered": () => Effect.void,
@@ -160,7 +160,6 @@ const projectFork = Effect.fn("SessionProjector.projectFork")(function* (
      agent: parent.agent,
      model: parent.model,
      metadata: parent.metadata,
-      permission: parent.permission,
      version: parent.version,
      cost: 0,
      tokens_input: 0,
@@ -451,7 +450,6 @@ const layer = Layer.effectDiscard(
            agent: event.data.agent,
            model: event.data.model,
            metadata: event.data.metadata,
-            permission: event.data.permissions,
            version: event.data.version,
            time_created: event.created,
            time_updated: event.created,
@@ -573,14 +571,6 @@ const layer = Layer.effectDiscard(
        .run()
        .pipe(Effect.orDie),
    )
-    yield* bus.project(SessionEvent.PermissionsUpdated, (event) =>
-      db
-        .update(SessionTable)
-        .set({ permission: event.data.permissions, time_updated: event.created })
-        .where(eq(SessionTable.id, event.data.sessionID))
-        .run()
-        .pipe(Effect.orDie),
-    )
    yield* bus.project(SessionEvent.Viewed, (event) => {
      const idle = event.data.idle
      return db
@@ -33,10 +33,6 @@ export const VariantUnavailableError = ModelResolver.VariantUnavailableError
 export type VariantUnavailableError = ModelResolver.VariantUnavailableError
 export const UnsupportedPackageError = ModelResolver.UnsupportedPackageError
 export type UnsupportedPackageError = ModelResolver.UnsupportedPackageError
-export const ModelConfigurationError = ModelResolver.ModelConfigurationError
-export type ModelConfigurationError = ModelResolver.ModelConfigurationError
-export const ModelInitializationError = ModelResolver.ModelInitializationError
-export type ModelInitializationError = ModelResolver.ModelInitializationError
 export const UnresolvedProviderVariablesError = ModelResolver.UnresolvedProviderVariablesError
 export type UnresolvedProviderVariablesError = ModelResolver.UnresolvedProviderVariablesError
 export const UnsupportedCompactionError = ModelResolver.UnsupportedCompactionError
@@ -3,7 +3,6 @@ export * as Session from "./session.js"
 import { DateTime, Effect, Fiber, Scope } from "effect"
 import type { Agent } from "@opencode/schema/agent"
 import type { Model } from "@opencode/schema/model"
-import type { Permission } from "@opencode/schema/permission"
 import { Event } from "@opencode/schema/event"
 import { FSUtil } from "@opencode/util/fs-util"
 import { Bus } from "../bus.js"
@@ -73,13 +72,6 @@ export const make = Effect.fn("Session.make")(function* () {
    yield* get(sessionID)
    yield* bus.publish(SessionEvent.Renamed, { sessionID, title: input.title })
  })
-  const setPermissions = Effect.fn("Session.setPermissions")(function* (
-    sessionID: SessionSchema.ID,
-    input: { permissions: Permission.Ruleset },
-  ) {
-    yield* get(sessionID)
-    yield* bus.publish(SessionEvent.PermissionsUpdated, { sessionID, permissions: input.permissions })
-  })
  const switchAgent = Effect.fn("Session.switchAgent")(function* (
    sessionID: SessionSchema.ID,
    input: { agent: Agent.ID },
@@ -342,7 +334,6 @@ export const make = Effect.fn("Session.make")(function* () {
    message,
    view,
    rename,
-    setPermissions,
    switchAgent,
    switchModel,
    inbox,
@@ -365,7 +356,6 @@ export const make = Effect.fn("Session.make")(function* () {
    const message = operations.message.bind(undefined, sessionID)
    const view = operations.view.bind(undefined, sessionID)
    const rename = operations.rename.bind(undefined, sessionID)
-    const setPermissions = operations.setPermissions.bind(undefined, sessionID)
    const switchAgent = operations.switchAgent.bind(undefined, sessionID)
    const switchModel = operations.switchModel.bind(undefined, sessionID)
    const inbox = operations.inbox.bind(undefined, sessionID)
@@ -391,7 +381,6 @@ export const make = Effect.fn("Session.make")(function* () {
      message,
      view,
      rename,
-      setPermissions,
      switchAgent,
      switchModel,
      inbox,
@@ -5,7 +5,7 @@ import { ProjectTable } from "../project/sql.js"
 import type { SessionMessage } from "./message.js"
 import type { SessionInbox } from "./inbox.js"
 import type { FileDiff } from "@opencode/schema/file-diff"
-import type { Permission } from "@opencode/schema/permission"
+import type { PermissionV1 } from "@opencode/schema/permission-v1"
 import type { Project } from "@opencode/schema/project"
 import type { SessionSchema } from "./schema.js"
 import type { Workspace } from "@opencode/schema/workspace"
@@ -49,7 +49,7 @@ export const SessionTable = sqliteTable(
    tokens_cache_read: integer().notNull().default(0),
    tokens_cache_write: integer().notNull().default(0),
    revert: text({ mode: "json" }).$type<Session.Revert | RevertV1>(),
-    permission: text({ mode: "json" }).$type<Permission.Ruleset>(),
+    permission: text({ mode: "json" }).$type<PermissionV1.Ruleset>(),
    agent: text(),
    model: text({ mode: "json" }).$type<{
      id: string
@@ -55,8 +55,6 @@ export function toSessionError(cause: unknown): SessionError.Error {
    cause instanceof SessionRunnerModel.ModelUnavailableError ||
    cause instanceof SessionRunnerModel.VariantUnavailableError ||
    cause instanceof SessionRunnerModel.UnsupportedPackageError ||
-    cause instanceof SessionRunnerModel.ModelConfigurationError ||
-    cause instanceof SessionRunnerModel.ModelInitializationError ||
    cause instanceof SessionRunnerModel.UnresolvedProviderVariablesError
  )
    return { type: "provider.no-route", message: cause.message }
@@ -103,7 +103,6 @@ const layer = Layer.effect(
              agent: input.data.info.agent,
              model: input.data.info.model,
              metadata: input.data.info.metadata,
-              permissions: input.data.info.permissions,
            },
            {
              location: input.location,
@@ -99,19 +99,8 @@ export const layer = Layer.effect(
                          },
                    )
                    const text = content.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n")
-                    const output = () => {
-                      if (result.structured !== undefined) return result.structured
-                      if (text === "") return null
-                      // Agents assume JSON returned as text is already an object, so parse it when the server declares no schema.
-                      if (tool.outputSchema === undefined && (text.startsWith("{") || text.startsWith("["))) {
-                        try {
-                          return JSON.parse(text)
-                        } catch {}
-                      }
-                      return text
-                    }
                    return {
-                      output: output(),
+                      output: result.structured ?? (text === "" ? null : text),
                      ...(content.length === 0 ? {} : { content }),
                    }
                  }).pipe(
@@ -324,32 +324,6 @@ const mcp = Layer.mock(Mcp.Service, {
        description: "Status",
        inputSchema: { type: "object", properties: {} },
      }),
-      new Mcp.Tool({
-        server: Mcp.ServerName.make("demo"),
-        name: "issues",
-        description: "Returns JSON as text",
-        inputSchema: { type: "object", properties: {} },
-      }),
-      new Mcp.Tool({
-        server: Mcp.ServerName.make("demo"),
-        name: "count",
-        description: "Returns a number as text",
-        inputSchema: { type: "object", properties: {} },
-      }),
-      new Mcp.Tool({
-        server: Mcp.ServerName.make("demo"),
-        name: "typed",
-        description: "Declares a string output and returns JSON as text",
-        inputSchema: { type: "object", properties: {} },
-        outputSchema: { type: "string" },
-      }),
-      new Mcp.Tool({
-        server: Mcp.ServerName.make("direct"),
-        name: "issues",
-        codemode: false,
-        description: "Returns JSON as text",
-        inputSchema: { type: "object", properties: {} },
-      }),
      new Mcp.Tool({
        server: Mcp.ServerName.make("direct"),
        name: "lookup",
@@ -400,20 +374,6 @@ const mcp = Layer.mock(Mcp.Service, {
          isError: false,
          content: [{ type: "text", text: "hello" }],
        })
-      if (input.name === "issues" || input.name === "typed")
-        return new Mcp.ToolResult({
-          server: Mcp.ServerName.make(input.server),
-          tool: input.name,
-          isError: false,
-          content: [{ type: "text", text: '{"issues":[{"id":1}]}' }],
-        })
-      if (input.name === "count")
-        return new Mcp.ToolResult({
-          server: Mcp.ServerName.make(input.server),
-          tool: input.name,
-          isError: false,
-          content: [{ type: "text", text: "42" }],
-        })
      return new Mcp.ToolResult({
        server: Mcp.ServerName.make(input.server),
        tool: input.name,
@@ -1983,7 +1943,6 @@ it.effect("advertises MCP output schemas to Code Mode", () =>

    expect(toolSet.definitions.map((tool) => tool.name)).toEqual([
      "direct_fail",
-      "direct_issues",
      "direct_lookup",
      "direct_media",
      "execute",
@@ -2074,39 +2033,6 @@ it.effect("returns content-only MCP results through Code Mode", () =>
  }),
 )

-it.effect("parses JSON text results from MCP tools without an output schema", () =>
-  Effect.gen(function* () {
-    assertion = yield* Deferred.make<Permission.AssertInput>()
-    decision = Effect.void
-    const registry = yield* Tool.Service
-    const registration = yield* McpTool.Service
-    yield* registration.flush
-    const toolSet = yield* registry.snapshot()
-
-    const run = (code: string) =>
-      toolSet
-        .execute({
-          sessionID: Session.ID.make("ses_mcp_json_text"),
-          ...toolIdentity,
-          call: { type: "tool-call", id: `call_${code.length}`, name: "execute", input: { code } },
-        })
-        .pipe(Effect.map((execution) => execution.output.output))
-
-    expect(yield* run("return (await tools.demo.issues({})).issues[0].id")).toBe("1")
-    expect(yield* run("return typeof (await tools.demo.count({}))")).toBe("string")
-    expect(yield* run("return typeof (await tools.demo.typed({}))")).toBe("string")
-
-    // Outside Code Mode the content the model reads is the original text.
-    expect(
-      yield* toolSet.execute({
-        sessionID: Session.ID.make("ses_mcp_json_text"),
-        ...toolIdentity,
-        call: { type: "tool-call", id: "call_direct_issues", name: "direct_issues", input: {} },
-      }),
-    ).toMatchObject({ output: { issues: [{ id: 1 }] }, content: [{ type: "text", text: '{"issues":[{"id":1}]}' }] })
-  }),
-)
-
 it.effect("advertises MCP tools directly when Code Mode is disabled for the server", () =>
  Effect.gen(function* () {
    const registry = yield* Tool.Service
@@ -1395,81 +1395,6 @@ describe("ModelResolver", () => {
    }),
  )

-  it.effect("reports provider configuration errors from supported packages", () =>
-    Effect.gen(function* () {
-      const failure = yield* ModelResolver.fromCatalogModel(
-        model(Provider.aisdk("@ai-sdk/azure"), {
-          providerID: Provider.ID.azure,
-          modelID: "gpt-5.4-nano",
-        }),
-        Credential.OAuth.make({
-          type: "oauth",
-          methodID: Integration.MethodID.make("oauth"),
-          access: "oauth-token",
-          refresh: "refresh",
-          expires: Date.now() + 60_000,
-        }),
-      ).pipe(Effect.flip)
-
-      expect(failure).toMatchObject({
-        _tag: "SessionRunnerModel.ModelConfigurationError",
-        providerID: "azure",
-        modelID: "test-model",
-        package: "aisdk:@ai-sdk/azure",
-        detail: "Azure requires resourceName or baseURL",
-      })
-      expect(failure.message).toBe("Cannot initialize azure/test-model: Azure requires resourceName or baseURL")
-    }),
-  )
-
-  it.effect("distinguishes unexpected constructor failures from configuration errors", () =>
-    Effect.gen(function* () {
-      const failure = yield* ModelResolver.fromCatalogModel(model("@opencode/ai/providers/custom"), undefined, {
-        loadPackage: () =>
-          Effect.succeed({
-            model: () => {
-              throw new Error("custom provider crashed")
-            },
-          }),
-      }).pipe(Effect.flip)
-
-      expect(failure).toMatchObject({
-        _tag: "SessionRunnerModel.ModelInitializationError",
-        phase: "construct",
-        detail: "custom provider crashed",
-      })
-    }),
-  )
-
-  it.effect("reports package load and AISDK initialization failures with their causes", () =>
-    Effect.gen(function* () {
-      const load = yield* ModelResolver.fromCatalogModel(model("@opencode/ai/providers/custom"), undefined, {
-        loadPackage: (specifier) =>
-          Effect.fail(
-            new Provider.LoadError({ package: specifier, cause: new Error(`Provider package ${specifier} is broken`) }),
-          ),
-      }).pipe(Effect.flip)
-      expect(load).toMatchObject({
-        _tag: "SessionRunnerModel.ModelInitializationError",
-        phase: "load",
-        detail: "Provider package @opencode/ai/providers/custom is broken",
-      })
-
-      const init = yield* ModelResolver.fromCatalogModel(model(Provider.aisdk("@ai-sdk/cohere")), undefined, {
-        loadAISDK: (runtime) =>
-          Effect.fail(
-            new AISDK.InitError({ providerID: runtime.providerID, cause: new Error("Cohere plugin failed") }),
-          ),
-      }).pipe(Effect.flip)
-      expect(init).toMatchObject({
-        _tag: "SessionRunnerModel.ModelInitializationError",
-        phase: "init",
-        detail: "Cohere plugin failed",
-      })
-      expect(init.message).toBe("Cannot initialize test-provider/test-model: Cohere plugin failed")
-    }),
-  )
-
  it.effect("drops an empty API key before loading an AISDK package", () =>
    Effect.gen(function* () {
      const native = yield* ModelResolver.fromCatalogModel(
@@ -224,34 +224,6 @@ describe("Permission", () => {
    }),
  )

-  it.effect("merges session rules after agent rules and before saved approvals", () =>
-    Effect.gen(function* () {
-      yield* setup([{ action: "*", resource: "*", effect: "allow" }])
-      const { db } = yield* Database.Service
-      const service = yield* Permission.Service
-      const setSession = (permission: Permission.Ruleset) =>
-        db
-          .update(SessionTable)
-          .set({ permission })
-          .where(eq(SessionTable.id, Session.ID.make("ses_test")))
-          .run()
-          .pipe(Effect.orDie)
-
-      yield* setSession([{ action: "edit", resource: "/original/**", effect: "deny" }])
-      expect(yield* service.ask(assertion({ action: "edit", resources: ["/original/src/index.ts"] }))).toMatchObject({
-        effect: "deny",
-      })
-
-      yield* setRules([])
-      const saved = yield* PermissionSaved.Service
-      yield* saved.add({ projectID: Project.ID.global, action: "bash", resources: ["pwd"] })
-      yield* setSession([{ action: "bash", resource: "*", effect: "deny" }])
-      expect(yield* service.ask(assertion({ action: "bash", resources: ["pwd"] }))).toMatchObject({ effect: "deny" })
-      yield* setSession([{ action: "bash", resource: "*", effect: "ask" }])
-      expect(yield* service.ask(assertion({ action: "bash", resources: ["pwd"] }))).toMatchObject({ effect: "allow" })
-    }),
-  )
-
  it.effect("uses saved bash approvals while preserving configured deny precedence", () =>
    Effect.gen(function* () {
      yield* setup()
@@ -108,7 +108,6 @@ export function host(overrides: Overrides = {}): Plugin.Context {
      list: () => Effect.die("unused permission.list"),
      get: () => Effect.die("unused permission.get"),
      reply: () => Effect.die("unused permission.reply"),
-      rules: () => Effect.die("unused permission.rules"),
    },
    plugin: overrides.plugin ?? {
      list: () => Effect.die("unused plugin.list"),
@@ -19,11 +19,9 @@ import PROMPT_GPT from "../../src/plugin/system-prompt/gpt.txt"
 import PROMPT_ASTRA from "../../src/plugin/system-prompt/gpt-astra.txt"
 import PROMPT_KIMI from "../../src/plugin/system-prompt/kimi.txt"
 import PROMPT_TRINITY from "../../src/plugin/system-prompt/trinity.txt"
-import PROMPT_ANTHROPIC from "../../src/plugin/system-prompt/anthropic.txt"

 const it = testEffect(PluginTestLayer)
 const fallback = SessionSystemPrompt.make([])
-const appended = `${fallback}\n\n${SessionSystemPrompt.render(PROMPT_ANTHROPIC, [])}`
 const makeHost = Effect.gen(function* () {
  const agents = yield* Agent.Service
  const plugins = yield* Plugin.Service
@@ -50,7 +48,6 @@ describe("OptimizePlugin", () => {
  test("enables prompt plugins without model-specific tool optimization", () => {
    expect(OptimizePlugin.Plugins.map((plugin) => plugin.id)).toEqual([
      "opencode.prompt.openai",
-      "opencode.prompt.anthropic",
      "opencode.prompt.kimi",
      "opencode.prompt.arcee",
      "opencode.prompt.meta",
@@ -79,7 +76,7 @@ describe("OptimizePlugin", () => {
        ["gpt-5-codex", PROMPT_GPT],
        ["gpt-6-astra", PROMPT_ASTRA],
        ["gemini-2.5-pro", fallback],
-        ["claude-sonnet-4", appended],
+        ["claude-sonnet-4", fallback],
        ["kimi-k2", PROMPT_KIMI],
        ["trinity", PROMPT_TRINITY],
        ["meta/muse-spark-1.1", PROMPT_META.replaceAll("{{MODEL_NAME}}", "Muse Spark")],
@@ -131,30 +128,6 @@ describe("OptimizePlugin", () => {
    }),
  )

-  it.effect("appends the Anthropic prompt to the baseline without changing tools or project instructions", () =>
-    Effect.gen(function* () {
-      const catalog = yield* Catalog.Service
-      const hooks = yield* PluginHooks.Service
-      const pluginHost = yield* makeHost
-      yield* catalog.transform((editor) =>
-        editor.model.update(Provider.ID.make("test"), Model.ID.make("claude-sonnet-4"), () => {}),
-      )
-      yield* OptimizePlugin.AnthropicPlugin.effect(pluginHost)
-      const event = context("claude-sonnet-4")
-      event.system.push(SystemPart.make("Project instructions"))
-
-      yield* hooks.trigger("session", "context", event)
-
-      const baseline = SessionSystemPrompt.render(fallback, Object.keys(event.tools))
-      expect(event.system.map((part) => part.text)).toEqual([
-        `${baseline}\n\n${SessionSystemPrompt.render(PROMPT_ANTHROPIC, Object.keys(event.tools))}`,
-        "Project instructions",
-      ])
-      expect(event.system[0]?.text.startsWith(baseline)).toBe(true)
-      expect(Object.keys(event.tools).sort()).toEqual(["edit", "glob", "grep", "patch", "read", "shell", "write"])
-    }),
-  )
-
  it.effect("curates search tools across providers without changing editing tools", () =>
    Effect.gen(function* () {
      const hooks = yield* PluginHooks.Service
@@ -325,7 +298,7 @@ describe("OptimizePlugin", () => {
        ["codex-family-alias", "custom-deployment", "GPT-CODEX", fallback],
        ["astra-api-alias", "gpt-6-astra", undefined, fallback],
        ["astra-family-alias", "custom-deployment", "gpt-6", fallback],
-        ["claude-catalog-alias", "custom-model", undefined, appended],
+        ["claude-catalog-alias", "custom-model", undefined, fallback],
        ["anthropic-api-alias", "Claude-Opus-4-8", undefined, fallback],
        ["anthropic-family-alias", "custom-deployment", "CLAUDE-SONNET", fallback],
      ] as const
@@ -1,5 +1,5 @@
 import { describe, expect } from "bun:test"
-import { LLM, Message } from "@opencode/ai"
+import { LLM } from "@opencode/ai"
 import { LLMClient, RequestExecutor } from "@opencode/ai/route"
 import { Money } from "@opencode/schema/money"
 import { Effect, Layer, Stream } from "effect"
@@ -538,213 +538,6 @@ describe("OpencodePlugin", () => {
    ),
  )

-  it.effect("refreshes organization routes and replaces the previous organization's catalog", () =>
-    Effect.acquireUseRelease(
-      Effect.sync(() => {
-        const state = { advertised: false, disabled: false, alias: "coding", name: "Coding", requests: 0 }
-        const inference: Array<{ body: unknown; authorization: string | null; orgID: string | null }> = []
-        const server = Bun.serve({
-          port: 0,
-          fetch: async (request) => {
-            if (new URL(request.url).pathname === "/route/openai/v1/responses") {
-              inference.push({
-                body: await request.json(),
-                authorization: request.headers.get("authorization"),
-                orgID: request.headers.get("x-opencode-org-id"),
-              })
-              const events = [
-                {
-                  type: "response.output_item.done",
-                  item: {
-                    type: "message",
-                    id: "msg_route",
-                    role: "assistant",
-                    content: [{ type: "output_text", text: "Hello" }],
-                    provider_metadata: { protocol: "anthropic-messages", connection_id: "conn_first" },
-                  },
-                },
-                { type: "response.completed", response: { id: "resp_route" } },
-              ]
-              return new Response(events.map((event) => `data: ${JSON.stringify(event)}\n\n`).join(""), {
-                headers: { "content-type": "text/event-stream" },
-              })
-            }
-            state.requests++
-            const orgID = request.headers.get("x-org-id")
-            return Response.json({
-              providers: state.advertised
-                ? {
-                    [`opencode-routes-${orgID}`]: {
-                      name: `${orgID} / Routes`,
-                      package: "@opencode/ai/providers/organization-routes",
-                      settings: {
-                        baseURL: `${new URL(request.url).origin}/route/openai/v1`,
-                        provider: `opencode-routes-${orgID}`,
-                      },
-                      headers: { "x-opencode-org-id": orgID },
-                      models: {
-                        route_1: {
-                          name: state.name,
-                          modelID: state.alias,
-                          capabilities: { tools: true, input: ["text"], output: ["text"] },
-                          cost: [],
-                          limit: { context: 0, output: 0 },
-                          disabled: state.disabled,
-                        },
-                      },
-                    },
-                  }
-                : {},
-            })
-          },
-        })
-        return { server, state, inference }
-      }),
-      ({ server, state, inference }) =>
-        Effect.gen(function* () {
-          const credentials = yield* Credential.Service
-          const catalog = yield* Catalog.Service
-          const firstID = Provider.ID.make("opencode-routes-org_first")
-          const secondID = Provider.ID.make("opencode-routes-org_second")
-          const routeID = Model.ID.make("route_1")
-          yield* catalog.transform((editor) => {
-            editor.model.update(Provider.ID.openai, Model.ID.make("coding"), (model) => {
-              model.name = "Upstream coding model"
-              model.cost = cost(10)
-            })
-          })
-          const first = yield* credentials.create({
-            integrationID: Integration.ID.make("opencode"),
-            value: Credential.Key.make({
-              type: "key",
-              key: "first-key",
-              metadata: { server: server.url.origin, orgID: "org_first" },
-            }),
-          })
-          yield* addPlugin()
-          yield* drain
-          expect(yield* catalog.provider.get(firstID)).toBeUndefined()
-
-          state.advertised = true
-          yield* TestClock.adjust("1 minute")
-          yield* drain
-          expect(yield* catalog.provider.get(firstID)).toMatchObject({
-            id: firstID,
-            name: "org_first / Routes",
-            integrationID: "opencode",
-          })
-          const route = required(yield* catalog.model.get(firstID, routeID))
-          expect(route).toMatchObject({
-            id: "route_1",
-            modelID: "coding",
-            name: "Coding",
-            providerID: firstID,
-            package: "@opencode/ai/providers/organization-routes",
-            cost: [],
-            limit: { context: 0, output: 0 },
-            headers: { "x-opencode-org-id": "org_first" },
-          })
-          expect(route.canonical).toBeUndefined()
-          expect((yield* catalog.model.available()).some((model) => model.providerID === firstID)).toBe(true)
-          const firstModel = yield* ModelResolver.resolveModel(route, undefined, first.value)
-          expect(String(firstModel.provider)).toBe(String(firstID))
-          expect(firstModel.route.providerMetadataKey).toBe(firstID)
-          const reply = yield* LLMClient.generate(LLM.request({ model: firstModel, prompt: "Hello" })).pipe(
-            Effect.provide(LLMClient.layer.pipe(Layer.provide(RequestExecutor.layer))),
-          )
-          expect(inference[0]).toMatchObject({
-            authorization: "Bearer first-key",
-            orgID: "org_first",
-            body: { model: "coding", stream: true, store: false },
-          })
-          expect(reply.message.content).toMatchObject([
-            {
-              type: "text",
-              providerMetadata: { [firstID]: { providerMetadata: { protocol: "anthropic-messages" } } },
-            },
-          ])
-
-          state.alias = "coding-renamed"
-          state.name = "Renamed route"
-          yield* TestClock.adjust("1 minute")
-          yield* drain
-          expect(yield* catalog.model.get(firstID, routeID)).toMatchObject({
-            id: "route_1",
-            modelID: "coding-renamed",
-            name: "Renamed route",
-          })
-          expect(yield* catalog.model.get(firstID, Model.ID.make("coding"))).toBeUndefined()
-
-          state.disabled = true
-          yield* TestClock.adjust("1 minute")
-          yield* drain
-          expect((yield* catalog.model.available()).some((model) => model.providerID === firstID)).toBe(false)
-
-          state.advertised = false
-          yield* TestClock.adjust("1 minute")
-          yield* drain
-          expect(yield* catalog.model.get(firstID, routeID)).toBeUndefined()
-          expect(yield* catalog.provider.get(firstID)).toBeUndefined()
-
-          state.advertised = true
-          state.disabled = false
-          yield* TestClock.adjust("1 minute")
-          yield* drain
-          expect(yield* catalog.model.get(firstID, routeID)).toBeDefined()
-          const requests = state.requests
-          const second = yield* credentials.create({
-            integrationID: Integration.ID.make("opencode"),
-            value: Credential.Key.make({
-              type: "key",
-              key: "second-key",
-              metadata: { server: server.url.origin, orgID: "org_second" },
-            }),
-          })
-          yield* eventually(catalog.model.get(secondID, routeID), (model) => model !== undefined)
-          expect(state.requests).toBe(requests + 1)
-          expect(yield* catalog.provider.get(firstID)).toBeUndefined()
-          expect(yield* catalog.model.get(firstID, routeID)).toBeUndefined()
-          expect(yield* catalog.model.get(secondID, routeID)).toMatchObject({
-            providerID: secondID,
-            headers: { "x-opencode-org-id": "org_second" },
-          })
-
-          const secondModel = yield* ModelResolver.resolveModel(
-            required(yield* catalog.model.get(secondID, routeID)),
-            undefined,
-            second.value,
-          )
-          expect(String(secondModel.provider)).toBe(String(secondID))
-          expect(secondModel.route.providerMetadataKey).toBe(secondID)
-          yield* LLMClient.generate(
-            LLM.request({ model: secondModel, messages: [reply.message, Message.user("Continue")] }),
-          ).pipe(Effect.provide(LLMClient.layer.pipe(Layer.provide(RequestExecutor.layer))))
-          expect(inference[1]).toMatchObject({
-            authorization: "Bearer second-key",
-            orgID: "org_second",
-            body: {
-              model: "coding-renamed",
-              input: [
-                { role: "assistant", content: [{ type: "output_text", text: "Hello" }] },
-                { role: "user", content: [{ type: "input_text", text: "Continue" }] },
-              ],
-            },
-          })
-          expect(JSON.stringify(inference[1].body)).not.toContain("conn_first")
-
-          yield* credentials.remove(first.id)
-          yield* credentials.remove(second.id)
-          yield* eventually(catalog.provider.get(secondID), (provider) => provider === undefined)
-          expect(yield* catalog.model.get(secondID, routeID)).toBeUndefined()
-          expect(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("coding"))).toMatchObject({
-            name: "Upstream coding model",
-            cost: cost(10),
-          })
-        }),
-      ({ server }) => Effect.promise(() => server.stop(true)),
-    ),
-  )
-
  it.effect("refreshes hosted search with Console config and skips unchanged snapshots", () =>
    Effect.acquireUseRelease(
      Effect.sync(() => {
@@ -784,26 +577,26 @@ describe("OpencodePlugin", () => {
          expect(yield* websearch.default()).toBeUndefined()

          state.advertised = true
-          yield* TestClock.adjust("50 seconds")
+          yield* TestClock.adjust("9 minutes")
          yield* drain
          expect(state.requests).toBe(1)
          expect(rebuilds).toEqual(initial)
          expect(yield* websearch.default()).toBeUndefined()

-          yield* TestClock.adjust("10 seconds")
+          yield* TestClock.adjust("1 minute")
          yield* drain
          expect(state.requests).toBe(2)
          expect(rebuilds).toEqual({ catalog: initial.catalog + 1, websearch: initial.websearch + 1 })
          expect(yield* websearch.default()).toEqual({ id: WebSearch.ID.make("opencode"), name: "OpenCode Web Search" })

-          yield* TestClock.adjust("1 minute")
+          yield* TestClock.adjust("10 minutes")
          yield* drain
          expect(state.requests).toBe(3)
          expect(rebuilds).toEqual({ catalog: initial.catalog + 1, websearch: initial.websearch + 1 })
          expect(yield* websearch.default()).toEqual({ id: WebSearch.ID.make("opencode"), name: "OpenCode Web Search" })

          state.advertised = false
-          yield* TestClock.adjust("1 minute")
+          yield* TestClock.adjust("10 minutes")
          yield* drain
          expect(state.requests).toBe(4)
          expect(rebuilds).toEqual({ catalog: initial.catalog + 2, websearch: initial.websearch + 2 })
@@ -69,7 +69,7 @@ describe("XAIPlugin", () => {
    }),
  )

-  it.effect("enables xAI Responses WebSockets", () =>
+  it.effect("keeps xAI Responses WebSockets opt-in", () =>
    Effect.gen(function* () {
      const catalog = yield* Catalog.Service
      const providerID = Provider.ID.make("xai")
@@ -84,7 +84,7 @@ describe("XAIPlugin", () => {

      const model = yield* catalog.model.get(providerID, Model.ID.make("grok-4.6"))
      expect(model?.capabilities.responsesWebsockets).toBe(true)
-      expect(model?.websocket).toBe(true)
+      expect(model?.websocket).toBeUndefined()
    }),
  )
 })
@@ -19,7 +19,6 @@ describe("Provider", () => {
      "@opencode/ai/providers/google-vertex/messages",
      "@opencode/ai/providers/groq",
      "@opencode/ai/providers/mistral",
-      "@opencode/ai/providers/organization-routes",
      "@opencode/ai/providers/togetherai",
    ]

@@ -388,32 +388,6 @@ describe("Session.create", () => {
    }),
  )

-  it.effect("stores permission rules, inherits them through children and forks, and replaces them", () =>
-    Effect.gen(function* () {
-      const session = yield* Session.Service
-      const bus = yield* Bus.Service
-      const { db } = yield* Database.Service
-      const permissions = [{ action: "edit", resource: "/original/**", effect: "deny" as const }]
-
-      const created = yield* session.create({ location, permissions })
-      expect(created.permissions).toEqual(permissions)
-      expect((yield* session.create({ parentID: created.id })).permissions).toEqual(permissions)
-      expect((yield* session.create({ parentID: created.id, permissions: [] })).permissions).toEqual([])
-
-      yield* session.prompt({ sessionID: created.id, text: "Fork context", resume: false })
-      yield* SessionInbox.promote(db, bus, created.id, "steer")
-      const forked = yield* session.fork({ sessionID: created.id, boundary: { type: "through" } })
-      expect(forked.permissions).toEqual(permissions)
-
-      const replaced = [{ action: "shell", resource: "*", effect: "ask" as const }]
-      yield* session.setPermissions({ sessionID: created.id, permissions: replaced })
-      expect((yield* session.get(created.id)).permissions).toEqual(replaced)
-      expect(
-        yield* session.setPermissions({ sessionID: Session.ID.create(), permissions: replaced }).pipe(Effect.flip),
-      ).toBeInstanceOf(Session.NotFoundError)
-    }),
-  )
-
  it.effect("inherits location from an existing parent when omitted", () =>
    Effect.gen(function* () {
      const session = yield* Session.Service
@@ -1356,12 +1330,7 @@ describe("SessionTransfer", () => {
      const transfer = yield* SessionTransfer.Service
      const bus = yield* Bus.Service
      const { db } = yield* Database.Service
-      const template = yield* session.create({
-        location,
-        title: "Exported",
-        metadata: { channel: "C123" },
-        permissions: [{ action: "edit", resource: "*", effect: "deny" }],
-      })
+      const template = yield* session.create({ location, title: "Exported", metadata: { channel: "C123" } })
      const sessionID = Session.ID.create()
      const sourceMessageID = SessionMessage.ID.create()
      const errorMessageID = SessionMessage.ID.create()
@@ -1407,13 +1376,7 @@ describe("SessionTransfer", () => {
      })
      const messages = yield* session.messages({ sessionID, order: "asc" })

-      expect(imported).toMatchObject({
-        id: sessionID,
-        title: "Exported",
-        location,
-        metadata: { channel: "C123" },
-        permissions: [{ action: "edit", resource: "*", effect: "deny" }],
-      })
+      expect(imported).toMatchObject({ id: sessionID, title: "Exported", location, metadata: { channel: "C123" } })
      expect(imported.time).toMatchObject({
        updated: DateTime.makeUnsafe(1_000),
        idle: DateTime.makeUnsafe(200),
@@ -140,30 +140,6 @@ describe("toSessionError", () => {
    })
  })

-  test("preserves provider configuration and initialization errors", () => {
-    const configuration = new ModelResolver.ModelConfigurationError({
-      providerID: Provider.ID.make("azure"),
-      modelID: ID.make("gpt-5.4-nano"),
-      package: "aisdk:@ai-sdk/azure",
-      detail: "Azure requires resourceName or baseURL",
-    })
-    expect(toSessionError(configuration)).toEqual({
-      type: "provider.no-route",
-      message: "Cannot initialize azure/gpt-5.4-nano: Azure requires resourceName or baseURL",
-    })
-    const initialization = new ModelResolver.ModelInitializationError({
-      providerID: Provider.ID.make("custom"),
-      modelID: ID.make("model"),
-      package: "@opencode/ai/providers/custom",
-      phase: "load",
-      detail: "Provider package @opencode/ai/providers/custom is broken",
-    })
-    expect(toSessionError(initialization)).toEqual({
-      type: "provider.no-route",
-      message: "Cannot initialize custom/model: Provider package @opencode/ai/providers/custom is broken",
-    })
-  })
-
  test("retries rate limits, provider-internal, transport, and unrecognized failures", () => {
    const eligible = [
      llm(new RateLimitError({ message: "rate" })),
@@ -1151,62 +1151,3 @@ Recent work
    ])
  })
 })
-
-test("organization route history keeps opaque continuation state on its stable model identity", () => {
-  const route = Model.Ref.make({
-    id: Model.ID.make("route_coding"),
-    providerID: Provider.ID.make("opencode-routes-org_test"),
-  })
-  const metadata = {
-    protocol: "google",
-    model: "native-model",
-    group_id: "resp_1",
-    content: [{ functionCall: { name: "lookup", args: {} }, thoughtSignature: "opaque-signature" }],
-  }
-  const marker = { group_id: "resp_1" }
-  const history = [
-    SessionMessage.Assistant.make({
-      id: id("route-tool"),
-      type: "assistant",
-      agent: build,
-      model: route,
-      content: [
-        SessionMessage.AssistantReasoning.make({
-          type: "reasoning",
-          text: "",
-          state: { itemId: "rs_1", providerMetadata: metadata },
-        }),
-        SessionMessage.AssistantText.make({
-          type: "text",
-          text: "Checking.",
-          state: { itemId: "msg_1", providerMetadata: marker },
-        }),
-        SessionMessage.AssistantTool.make({
-          type: "tool",
-          id: "call_1",
-          name: "lookup",
-          providerState: { itemId: "fc_1", providerMetadata: marker },
-          state: SessionMessage.ToolStateCompleted.make({
-            status: "completed",
-            input: {},
-            content: [{ type: "text", text: "Done" }],
-          }),
-          time: { created, completed: created },
-        }),
-      ],
-      time: { created, completed: created },
-    }),
-  ]
-  const replay = toLLMMessages(history, route)
-  expect(
-    replay[0]?.content.map((part) =>
-      part.type === "compaction" ? undefined : part.providerMetadata?.[route.providerID]?.providerMetadata,
-    ),
-  ).toEqual([metadata, marker, marker])
-  expect(replay[1]?.role).toBe("tool")
-  const other = toLLMMessages(history, Model.Ref.make({ ...route, id: Model.ID.make("route_other") }))
-  expect(other[0]?.content.map((part) => (part.type === "compaction" ? undefined : part.providerMetadata))).toEqual([
-    undefined,
-    undefined,
-  ])
-})
@@ -1944,16 +1944,7 @@ describe("SessionRunnerLLM", () => {
    expect(yield* entries.list(sessionID)).toEqual([{ key: "nullable", value: null }])
  })

-  scenario("accepts API instruction entries up to 256 KiB", function* () {
-    const entries = yield* InstructionEntry.Service
-    const value = "x".repeat(InstructionEntry.MaxValueBytes - 2)
-
-    yield* entries.put({ sessionID, key: "large", value })
-
-    expect(yield* entries.list(sessionID)).toEqual([{ key: "large", value }])
-  })
-
-  scenario("rejects API instruction entries larger than 256 KiB", function* () {
+  scenario("rejects API instruction entries larger than 8KB", function* () {
    const entries = yield* InstructionEntry.Service

    const exit = yield* entries
@@ -22,7 +22,7 @@ it.live(
        Effect.provideService(
          HttpClient.HttpClient,
          HttpClient.make((request) => {
-            expect(request.url).toBe("https://registry.npmjs.org/@opencode%2fcli/beta")
+            expect(request.url).toBe("https://registry.npmjs.org/@opencode-ai%2fcli/beta")
            return Effect.succeed(HttpClientResponse.fromWeb(request, response))
          }),
        ),
@@ -65,7 +65,7 @@ posix(

 test("pins platform-specific artifacts and rejects unsafe inputs", () => {
  expect(RemoteCli.archiveUrl("linux-x64-baseline-musl", "2.0.0-beta.1")).toBe(
-    "https://registry.npmjs.org/@opencode/cli-linux-x64-baseline-musl/-/cli-linux-x64-baseline-musl-2.0.0-beta.1.tgz",
+    "https://registry.npmjs.org/@opencode-ai/cli-linux-x64-baseline-musl/-/cli-linux-x64-baseline-musl-2.0.0-beta.1.tgz",
  )
  expect(() => RemoteCli.installScript({ version: '2.0.0"; whoami', source: { type: "installer" } })).toThrow()
  expect(() => RemoteCli.archiveUrl("linux-x64;whoami", "2.0.0")).toThrow()
@@ -68,7 +68,7 @@ printf 'OPENCODE_REMOTE_TARGET=%s\\n' "$target"
 export function archiveUrl(target: string, version: string) {
  if (!/^(linux|darwin)-(x64-baseline|arm64)(-musl)?$/.test(target))
    throw new Failure({ code: "platform", detail: target })
-  return `https://registry.npmjs.org/@opencode/cli-${target}/-/cli-${target}-${requireVersion(version)}.tgz`
+  return `https://registry.npmjs.org/@opencode-ai/cli-${target}/-/cli-${target}-${requireVersion(version)}.tgz`
 }

 type Source = { type: "download"; url: string } | { type: "archive" } | { type: "installer"; binary?: string }
@@ -114,12 +114,12 @@ const Beta = Schema.Struct({ version: Schema.String.check(Schema.isPattern(/^0\.

 export const latestBeta = Effect.fn("RemoteCli.latestBeta")(function* () {
  const http = yield* HttpClient.HttpClient
-  const metadata = yield* http.get("https://registry.npmjs.org/@opencode%2fcli/beta").pipe(
+  const metadata = yield* http.get("https://registry.npmjs.org/@opencode-ai%2fcli/beta").pipe(
    Effect.flatMap(HttpClientResponse.filterStatusOk),
    Effect.flatMap(HttpClientResponse.schemaBodyJson(Beta)),
    Effect.timeout("30 seconds"),
    Effect.mapError(
-      () => new Failure({ code: "install", detail: "https://registry.npmjs.org/@opencode%2fcli/beta" }),
+      () => new Failure({ code: "install", detail: "https://registry.npmjs.org/@opencode-ai%2fcli/beta" }),
    ),
  )
  return metadata.version
@@ -9,7 +9,6 @@ export function createDesktopNotify(api: ElectronAPI): Platform["notify"] {
    const notification = new Notification(title, {
      body: description ?? "",
      icon: "https://opencode.ai/favicon-96x96-v3.png",
-      silent: true,
    })
    notification.onclick = () => {
      void api.showWindow()
@@ -1280,100 +1280,6 @@ flowchart TD
    ])
  })

-  test("expands & node groups into fan-in and fan-out edges", () => {
-    const diagram = parseMermaidFlowchartDiagram(`flowchart LR
-  N[Native] & M[Mapped] & O --> LM["LanguageModel"]
-  LM -->|prepare| REQ & LOG`)
-
-    expect(diagram.nodes).toEqual([
-      { id: "N", label: "Native", shape: "box" },
-      { id: "M", label: "Mapped", shape: "box" },
-      { id: "O", label: "O", shape: "box" },
-      { id: "LM", label: "LanguageModel", shape: "box" },
-      { id: "REQ", label: "REQ", shape: "box" },
-      { id: "LOG", label: "LOG", shape: "box" },
-    ])
-    expect(diagram.edges).toEqual([
-      { from: "N", to: "LM", label: "" },
-      { from: "M", to: "LM", label: "" },
-      { from: "O", to: "LM", label: "" },
-      { from: "LM", to: "REQ", label: "prepare" },
-      { from: "LM", to: "LOG", label: "prepare" },
-    ])
-  })
-
-  test("expands & groups on both sides of an edge and through a chain", () => {
-    const diagram = parseMermaidFlowchartDiagram(`flowchart LR
-  A & B --> C & D --> E`)
-
-    expect(diagram.edges).toEqual([
-      { from: "A", to: "C", label: "" },
-      { from: "A", to: "D", label: "" },
-      { from: "B", to: "C", label: "" },
-      { from: "B", to: "D", label: "" },
-      { from: "C", to: "E", label: "" },
-      { from: "D", to: "E", label: "" },
-    ])
-  })
-
-  test("declares every node of a bare & group inside the current subgraph", () => {
-    const diagram = parseMermaidFlowchartDiagram(`flowchart TD
-  subgraph Runtime
-    A[Alpha] & B[Beta]:::focus
-  end
-  A --> B`)
-
-    expect(diagram.nodes).toEqual([
-      { id: "A", label: "Alpha", shape: "box" },
-      { id: "B", label: "Beta", shape: "box" },
-    ])
-    expect(diagram.subgraphs?.[0]?.nodeIds).toEqual(["A", "B"])
-  })
-
-  test("keeps & inside quoted or bracketed labels as label text", () => {
-    const diagram = parseMermaidFlowchartDiagram(`flowchart LR
-  A["Fetch & parse"] & B[R&D] --> C[Done &amp; dusted]`)
-
-    expect(diagram.nodes).toEqual([
-      { id: "A", label: "Fetch & parse", shape: "box" },
-      { id: "B", label: "R&D", shape: "box" },
-      { id: "C", label: "Done & dusted", shape: "box" },
-    ])
-    expect(diagram.edges).toEqual([
-      { from: "A", to: "C", label: "" },
-      { from: "B", to: "C", label: "" },
-    ])
-  })
-
-  test("keeps & inside edge labels as label text", () => {
-    const diagram = parseMermaidFlowchartDiagram(`flowchart LR
-  X[a & b] -->|x & y| Y`)
-
-    expect(diagram.nodes.find((node) => node.id === "X")?.label).toBe("a & b")
-    expect(diagram.edges).toEqual([{ from: "X", to: "Y", label: "x & y" }])
-  })
-
-  test("rejects empty & group members", () => {
-    for (const statement of ["A & --> B", "& A --> B", "A --> B &", "A &"]) {
-      expect(() => parseMermaidFlowchartDiagram(`flowchart LR\n  ${statement}`)).toThrow(
-        `Unsupported syntax in flowchart diagram at line 2: "${statement}"`,
-      )
-    }
-  })
-
-  test("renders a fan-in expressed with & the same as separate edge statements", () => {
-    const grouped = renderFlowchartDiagram(`flowchart LR
-  N & M & O --> LM[LanguageModel] --> REQ[LLMRequest]`)
-    const separate = renderFlowchartDiagram(`flowchart LR
-  N --> LM[LanguageModel]
-  M --> LM
-  O --> LM
-  LM --> REQ[LLMRequest]`)
-
-    expect(grouped).toBe(separate)
-    expect(grouped).toContain("LanguageModel")
-  })
-
  test("parses chained undirected solid edges", () => {
    const diagram = parseMermaidFlowchartDiagram(`flowchart LR
  A --- B --- C`)
--- a/Show More
+++ b/Show More