fix: 修正 logo 中 N 和 G 字母造型

N 添加对角线笔画（█▄ █），G 添加内横杠（█ ▀█），
避免与 O 字母造型雷同。同步更新 ui.ts 中的硬编码 wordmark。

packages/core/test/agent.test.ts

@@ -0,0 +1,131 @@
+import { describe, expect } from "bun:test"
+import { Effect, Exit, Scope } from "effect"
+import { AgentV2 } from "@opencode-ai/core/agent"
+import { Location } from "@opencode-ai/core/location"
+import { AgentPlugin } from "@opencode-ai/core/plugin/agent"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "./fixture/location"
+import { testEffect } from "./lib/effect"
+
+const it = testEffect(AgentV2.locationLayer)
+
+describe("AgentV2", () => {
+  it.effect("starts without agents", () =>
+    Effect.gen(function* () {
+      const agent = yield* AgentV2.Service
+
+      expect(yield* agent.all()).toEqual([])
+      expect(yield* agent.get(AgentV2.ID.make("build"))).toBeUndefined()
+    }),
+  )
+
+  it.effect("materializes replayable agent transforms", () =>
+    Effect.gen(function* () {
+      const agent = yield* AgentV2.Service
+      const id = AgentV2.ID.make("reviewer")
+      const transform = yield* agent.transform()
+
+      yield* transform((editor) =>
+        editor.update(id, (info) => {
+          info.description = "Reviews code"
+          info.mode = "subagent"
+        }),
+      )
+
+      expect(yield* agent.get(id)).toMatchObject({ id, description: "Reviews code", mode: "subagent" })
+      expect((yield* agent.all()).map((info) => info.id)).toEqual([id])
+    }),
+  )
+
+  it.effect("rebuilds state when a transform is replaced", () =>
+    Effect.gen(function* () {
+      const agent = yield* AgentV2.Service
+      const id = AgentV2.ID.make("reviewer")
+      const transform = yield* agent.transform()
+
+      yield* transform((editor) =>
+        editor.update(id, (info) => {
+          info.description = "Old description"
+          info.hidden = true
+        }),
+      )
+      yield* transform((editor) =>
+        editor.update(id, (info) => {
+          info.description = "New description"
+        }),
+      )
+
+      expect(yield* agent.get(id)).toMatchObject({ description: "New description", hidden: false })
+    }),
+  )
+
+  it.effect("removes a transform when its scope closes", () =>
+    Effect.gen(function* () {
+      const agent = yield* AgentV2.Service
+      const id = AgentV2.ID.make("scoped")
+      const scope = yield* Scope.make()
+      const transform = yield* agent.transform().pipe(Scope.provide(scope))
+
+      yield* transform((editor) => editor.update(id, () => {}))
+      expect(yield* agent.get(id)).toBeDefined()
+
+      yield* Scope.close(scope, Exit.void)
+      expect(yield* agent.get(id)).toBeUndefined()
+    }),
+  )
+
+  it.effect("applies direct agent updates", () =>
+    Effect.gen(function* () {
+      const agent = yield* AgentV2.Service
+      const id = AgentV2.ID.make("build")
+
+      yield* agent.update((editor) =>
+        editor.update(id, (info) => {
+          info.mode = "primary"
+          info.hidden = true
+        }),
+      )
+
+      expect(yield* agent.get(id)).toMatchObject({ id, mode: "primary", hidden: true })
+    }),
+  )
+
+  it.effect("creates agents with runtime defaults and supports direct removal", () =>
+    Effect.gen(function* () {
+      const agent = yield* AgentV2.Service
+      const id = AgentV2.ID.make("custom")
+
+      yield* agent.update((editor) => editor.update(id, () => {}))
+      expect(yield* agent.get(id)).toEqual(AgentV2.Info.empty(id))
+
+      yield* agent.update((editor) => editor.remove(id))
+      expect(yield* agent.get(id)).toBeUndefined()
+    }),
+  )
+
+  it.effect("does not ambiently opt built-in agents into bash", () =>
+    Effect.gen(function* () {
+      const agent = yield* AgentV2.Service
+      yield* AgentPlugin.Plugin.effect.pipe(
+        Effect.provideService(
+          Location.Service,
+          Location.Service.of(location({ directory: AbsolutePath.make("/project") })),
+        ),
+      )
+
+      const agents = yield* agent.all()
+      expect(agents.map((item) => String(item.id)).sort()).toEqual([
+        "build",
+        "compaction",
+        "explore",
+        "general",
+        "plan",
+        "summary",
+        "title",
+      ])
+      for (const item of agents) {
+        expect(item.permissions.some((rule) => rule.action === "bash" && rule.effect !== "deny")).toBe(false)
+      }
+    }),
+  )
+})

packages/core/test/application-tools.test.ts

@@ -0,0 +1,291 @@
+import { describe, expect } from "bun:test"
+import { Tool } from "@opencode-ai/core/public"
+import { ApplicationTools } from "@opencode-ai/core/tool/application-tools"
+import { PermissionV2 } from "@opencode-ai/core/permission"
+import { SessionV2 } from "@opencode-ai/core/session"
+import { SessionMessage } from "@opencode-ai/core/session/message"
+import { AgentV2 } from "@opencode-ai/core/agent"
+import { ToolRegistry } from "@opencode-ai/core/tool/registry"
+import { executeTool, settleTool, toolDefinitions } from "./lib/tool"
+import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
+import { Tools } from "@opencode-ai/core/tool/tools"
+import { Deferred, Effect, Exit, Fiber, Layer, Schema, Scope } from "effect"
+import { testEffect } from "./lib/effect"
+
+const permission = Layer.mock(PermissionV2.Service, {
+  assert: () => Effect.void,
+})
+const applications = ApplicationTools.layer
+const registry = ToolRegistry.layer.pipe(
+  Layer.provide(permission),
+  Layer.provide(applications),
+  Layer.provide(ToolOutputStore.defaultLayer),
+)
+const it = testEffect(Layer.mergeAll(applications, registry))
+
+const sessionID = SessionV2.ID.make("ses_application_tool")
+const agent = AgentV2.ID.make("build")
+const assistantMessageID = SessionMessage.ID.make("msg_application_tool")
+const contextual = (contexts: Tool.Context[]) =>
+  Tool.make({
+    description: "Read application context",
+    input: Schema.Struct({ query: Schema.String }),
+    output: Schema.Struct({ answer: Schema.String }),
+    execute: ({ query }, context) =>
+      Effect.sync(() => {
+        contexts.push(context)
+        return { answer: query.toUpperCase() }
+      }),
+    toModelOutput: ({ output }) => [
+      { type: "text", text: output.answer },
+      { type: "file", data: "aGVsbG8=", mime: "image/png", name: "result.png" },
+    ],
+  })
+
+describe("ApplicationTools", () => {
+  it.effect("keeps the Core carrier opaque and executes its single handler", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const contexts: Tool.Context[] = []
+      const tool = contextual(contexts)
+      expect(Object.keys(tool)).toEqual([])
+
+      yield* applications.register({ opaque: tool })
+      expect(
+        yield* executeTool(registry, {
+          sessionID,
+          agent,
+          assistantMessageID,
+          call: { type: "tool-call", id: "call-opaque", name: "opaque", input: { query: "once" } },
+        }),
+      ).toEqual({
+        type: "content",
+        value: [
+          { type: "text", text: "ONCE" },
+          { type: "file", uri: "data:image/png;base64,aGVsbG8=", mime: "image/png", name: "result.png" },
+        ],
+      })
+      expect(contexts).toEqual([{ sessionID, agent, assistantMessageID, toolCallID: "call-opaque" }])
+    }),
+  )
+
+  it.effect("exposes narrow scoped Location registration and validates names", () =>
+    Effect.gen(function* () {
+      const tools: Tools.Interface = yield* Tools.Service
+      const registry = yield* ToolRegistry.Service
+      const scope = yield* Scope.make()
+
+      yield* tools.register({ location_tool: contextual([]) }).pipe(Scope.provide(scope))
+      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["location_tool"])
+      expect(yield* Effect.flip(tools.register({ "invalid name": contextual([]) }))).toBeInstanceOf(
+        Tool.RegistrationError,
+      )
+
+      yield* Scope.close(scope, Exit.void)
+      expect(yield* toolDefinitions(registry)).toEqual([])
+    }),
+  )
+
+  it.effect("filters an application tool by its name without adding execution authorization", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const contexts: Tool.Context[] = []
+      yield* applications.register({ application_context: contextual(contexts) })
+
+      expect(
+        yield* toolDefinitions(registry, [{ action: "application_context", resource: "*", effect: "deny" }]),
+      ).toEqual([])
+      expect(
+        yield* settleTool(registry, {
+          sessionID,
+          agent,
+          assistantMessageID,
+          call: { type: "tool-call", id: "call-denied", name: "application_context", input: { query: "hello" } },
+        }),
+      ).toMatchObject({ result: { type: "content" } })
+      expect(contexts).toEqual([{ sessionID, agent, assistantMessageID, toolCallID: "call-denied" }])
+    }),
+  )
+
+  it.effect("advertises and executes a scoped application tool with Session context", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const contexts: Tool.Context[] = []
+
+      yield* applications.register({ application_context: contextual(contexts) })
+
+      expect(yield* toolDefinitions(registry)).toMatchObject([
+        { name: "application_context", description: "Read application context" },
+      ])
+      expect(
+        yield* settleTool(registry, {
+          sessionID,
+          agent,
+          assistantMessageID,
+          call: { type: "tool-call", id: "call-context", name: "application_context", input: { query: "hello" } },
+        }),
+      ).toEqual({
+        result: {
+          type: "content",
+          value: [
+            { type: "text", text: "HELLO" },
+            { type: "file", uri: "data:image/png;base64,aGVsbG8=", mime: "image/png", name: "result.png" },
+          ],
+        },
+        output: {
+          structured: { answer: "HELLO" },
+          content: [
+            { type: "text", text: "HELLO" },
+            { type: "file", uri: "data:image/png;base64,aGVsbG8=", mime: "image/png", name: "result.png" },
+          ],
+        },
+      })
+      expect(contexts).toEqual([{ sessionID, agent, assistantMessageID, toolCallID: "call-context" }])
+    }),
+  )
+
+  it.effect("removes an application tool when its registration scope closes", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const scope = yield* Scope.make()
+
+      yield* applications.register({ temporary: contextual([]) }).pipe(Scope.provide(scope))
+      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["temporary"])
+
+      yield* Scope.close(scope, Exit.void)
+      expect(yield* toolDefinitions(registry)).toEqual([])
+    }),
+  )
+
+  it.effect("removes a tool before settling a call produced from an earlier definition", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const registrationScope = yield* Scope.make()
+      yield* applications.register({ contextual: contextual([]) }).pipe(Scope.provide(registrationScope))
+      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["contextual"])
+
+      yield* Scope.close(registrationScope, Exit.void)
+      expect(
+        yield* settleTool(registry, {
+          sessionID,
+          agent,
+          assistantMessageID,
+          call: { type: "tool-call", id: "call-removed", name: "contextual", input: { query: "hello" } },
+        }),
+      ).toEqual({ result: { type: "error", value: "Unknown tool: contextual" } })
+    }),
+  )
+
+  it.effect("does not leak a registration into an already closed scope", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const scope = yield* Scope.make()
+      yield* Scope.close(scope, Exit.void)
+
+      yield* applications.register({ closed: contextual([]) }).pipe(Scope.provide(scope))
+
+      expect(yield* toolDefinitions(registry)).toEqual([])
+    }),
+  )
+
+  it.effect("preserves an interrupted application registration until its scope closes", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const scope = yield* Scope.make()
+      const registered = yield* Deferred.make<void>()
+      const fiber = yield* applications
+        .register({ interrupted: contextual([]) })
+        .pipe(
+          Effect.andThen(Deferred.succeed(registered, undefined)),
+          Effect.andThen(Effect.never),
+          Scope.provide(scope),
+          Effect.forkChild,
+        )
+      yield* Deferred.await(registered)
+      yield* Fiber.interrupt(fiber)
+
+      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["interrupted"])
+      yield* Scope.close(scope, Exit.void)
+      expect(yield* toolDefinitions(registry)).toEqual([])
+    }),
+  )
+
+  it.effect("captures the registered record before later State rebuilds", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const registered = { stable: contextual([]) }
+      yield* applications.register(registered)
+      Object.assign(registered, { late: contextual([]) })
+
+      yield* Effect.scoped(applications.register({ temporary: contextual([]) }))
+
+      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["stable"])
+    }),
+  )
+
+  it.effect("settles with the current same-name application tool and restores earlier registrations", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const firstContexts: Tool.Context[] = []
+      const secondContexts: Tool.Context[] = []
+      const scope = yield* Scope.make()
+      yield* applications.register({ contextual: contextual(firstContexts) })
+      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["contextual"])
+      yield* applications.register({ contextual: contextual(secondContexts) }).pipe(Scope.provide(scope))
+
+      yield* settleTool(registry, {
+        sessionID,
+        agent,
+        assistantMessageID,
+        call: { type: "tool-call", id: "call-second", name: "contextual", input: { query: "second" } },
+      })
+      yield* Scope.close(scope, Exit.void)
+      yield* settleTool(registry, {
+        sessionID,
+        agent,
+        assistantMessageID,
+        call: { type: "tool-call", id: "call-first", name: "contextual", input: { query: "first" } },
+      })
+
+      expect(secondContexts).toEqual([{ sessionID, agent, assistantMessageID, toolCallID: "call-second" }])
+      expect(firstContexts).toEqual([{ sessionID, agent, assistantMessageID, toolCallID: "call-first" }])
+    }),
+  )
+
+  it.effect("keeps the Location tool when an application tool has the same name", () =>
+    Effect.gen(function* () {
+      const applications = yield* ApplicationTools.Service
+      const registry = yield* ToolRegistry.Service
+      const locationContexts: Tool.Context[] = []
+      const applicationContexts: Tool.Context[] = []
+      const location = contextual(locationContexts)
+      yield* registry.register({ shared: location })
+      yield* applications.register({ shared: contextual(applicationContexts) })
+
+      expect(
+        (yield* toolDefinitions(registry, [{ action: "shared", resource: "*", effect: "deny" }])).map(
+          (definition) => definition.name,
+        ),
+      ).toEqual([])
+      expect(
+        yield* settleTool(registry, {
+          sessionID,
+          agent,
+          assistantMessageID,
+          call: { type: "tool-call", id: "call-shared", name: "shared", input: { query: "location" } },
+        }),
+      ).toMatchObject({ result: { type: "content" } })
+      expect(locationContexts).toEqual([{ sessionID, agent, assistantMessageID, toolCallID: "call-shared" }])
+      expect(applicationContexts).toEqual([])
+    }),
+  )
+})

packages/core/test/background-job.test.ts

@@ -0,0 +1,103 @@
+import { describe, expect } from "bun:test"
+import { BackgroundJob } from "@opencode-ai/core/background-job"
+import { Deferred, Effect, Exit, Scope } from "effect"
+import { it } from "./lib/effect"
+
+describe("BackgroundJob", () => {
+  it.live("tracks process-local work through explicit observation", () =>
+    Effect.gen(function* () {
+      const jobs = yield* BackgroundJob.Service
+      const latch = yield* Deferred.make<void>()
+      const job = yield* jobs.start({
+        type: "test",
+        metadata: { durable: false },
+        run: Deferred.await(latch).pipe(Effect.as("done")),
+      })
+
+      expect(job).toMatchObject({ type: "test", status: "running", metadata: { durable: false } })
+      expect(yield* jobs.wait({ id: job.id, timeout: 0 })).toMatchObject({
+        timedOut: true,
+        info: { status: "running" },
+      })
+
+      yield* Deferred.succeed(latch, undefined)
+      expect(yield* jobs.wait({ id: job.id })).toMatchObject({
+        timedOut: false,
+        info: { status: "completed", output: "done" },
+      })
+    }).pipe(Effect.provide(BackgroundJob.layer)),
+  )
+
+  it.live("publishes jobs before starting immediately settling work", () =>
+    Effect.gen(function* () {
+      const jobs = yield* BackgroundJob.Service
+
+      yield* Effect.forEach(Array.from({ length: 100 }), (_, index) => {
+        const id = `job_immediate_start_${index}`
+        return Effect.gen(function* () {
+          const job = yield* jobs.start({
+            id,
+            type: "test",
+            run: jobs
+              .get(id)
+              .pipe(
+                Effect.flatMap((info) =>
+                  info?.status === "running"
+                    ? Effect.succeed(`done-${index}`)
+                    : Effect.fail("job started before publish"),
+                ),
+              ),
+          })
+
+          expect(yield* jobs.wait({ id: job.id })).toMatchObject({
+            timedOut: false,
+            info: { status: "completed", output: `done-${index}` },
+          })
+        })
+      })
+    }).pipe(Effect.provide(BackgroundJob.layer)),
+  )
+
+  it.live("increments pending work before starting immediately settling extensions", () =>
+    Effect.gen(function* () {
+      const jobs = yield* BackgroundJob.Service
+
+      yield* Effect.forEach(Array.from({ length: 100 }), (_, index) =>
+        Effect.gen(function* () {
+          const first = yield* Deferred.make<void>()
+          const job = yield* jobs.start({
+            type: "test",
+            run: Deferred.await(first).pipe(Effect.as(`first-${index}`)),
+          })
+
+          expect(yield* jobs.extend({ id: job.id, run: Effect.succeed(`second-${index}`) })).toBe(true)
+          expect((yield* jobs.get(job.id))?.status).toBe("running")
+
+          yield* Deferred.succeed(first, undefined)
+          expect(yield* jobs.wait({ id: job.id })).toMatchObject({
+            timedOut: false,
+            info: { status: "completed", output: `second-${index}` },
+          })
+        }),
+      )
+    }).pipe(Effect.provide(BackgroundJob.layer)),
+  )
+
+  it.live("interrupts live work without promising settlement after the owning process-local scope closes", () =>
+    Effect.gen(function* () {
+      const scope = yield* Scope.make()
+      const interrupted = yield* Deferred.make<void>()
+      const jobs = yield* BackgroundJob.make.pipe(Scope.provide(scope))
+      const job = yield* jobs.start({
+        type: "test",
+        run: Effect.never.pipe(Effect.ensuring(Deferred.succeed(interrupted, undefined))),
+      })
+
+      yield* Scope.close(scope, Exit.void)
+
+      yield* Deferred.await(interrupted).pipe(Effect.timeout("1 second"))
+      // The abandoned in-memory registry is not a durable observation channel.
+      expect((yield* jobs.get(job.id))?.status).toBe("running")
+    }),
+  )
+})

packages/core/test/catalog.test.ts

@@ -0,0 +1,410 @@
+import { describe, expect } from "bun:test"
+import { DateTime, Effect, Layer, Option } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { Connector } from "@opencode-ai/core/connector"
+import { Credential } from "@opencode-ai/core/credential"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { Policy } from "@opencode-ai/core/policy"
+import { Project } from "@opencode-ai/core/project"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "./fixture/location"
+import { testEffect } from "./lib/effect"
+
+const locationLayer = Layer.succeed(
+  Location.Service,
+  Location.Service.of(location({ directory: AbsolutePath.make("test") })),
+)
+const it = testEffect(
+  Catalog.locationLayer.pipe(
+    Layer.provideMerge(EventV2.defaultLayer),
+    Layer.provideMerge(locationLayer),
+    Layer.provideMerge(Layer.mock(Credential.Service)({ activeAll: () => Effect.succeed(new Map()) })),
+  ),
+)
+
+describe("CatalogV2", () => {
+  it.effect("projects active credentials without rebuilding catalog state", () => {
+    const connectorID = Connector.ID.make("test")
+    const methodID = Connector.MethodID.make("api-key")
+    const first = new Credential.Info({
+      id: Credential.ID.create(),
+      connectorID,
+      methodID,
+      label: "First",
+      value: new Credential.Key({ type: "key", key: "first", metadata: { tenant: "one" } }),
+    })
+    const second = new Credential.Info({
+      id: Credential.ID.create(),
+      connectorID,
+      methodID,
+      label: "Second",
+      value: new Credential.Key({ type: "key", key: "second", metadata: { tenant: "two" } }),
+    })
+    let active = first
+    const layer = Catalog.locationLayer.pipe(
+      Layer.fresh,
+      Layer.provideMerge(EventV2.defaultLayer),
+      Layer.provideMerge(locationLayer),
+      Layer.provideMerge(
+        Layer.mock(Credential.Service)({ activeAll: () => Effect.succeed(new Map([[connectorID, active]])) }),
+      ),
+    )
+
+    return Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const transform = yield* catalog.transform()
+      yield* transform((editor) => editor.provider.update(ProviderV2.ID.make("test"), () => {}))
+
+      expect(yield* catalog.provider.get(ProviderV2.ID.make("test"))).toMatchObject({
+        enabled: { via: "credential", credentialID: first.id },
+        request: { body: { apiKey: "first", tenant: "one" } },
+      })
+      active = second
+      expect(yield* catalog.provider.get(ProviderV2.ID.make("test"))).toMatchObject({
+        enabled: { via: "credential", credentialID: second.id },
+        request: { body: { apiKey: "second", tenant: "two" } },
+      })
+    }).pipe(Effect.provide(layer))
+  })
+
+  it.effect("normalizes provider baseURL into api url", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("test")
+      const transform = yield* catalog.transform()
+
+      yield* transform((catalog) =>
+        catalog.provider.update(providerID, (provider) => {
+          provider.api = {
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://default.example.com",
+          }
+          provider.request.body.baseURL = "https://override.example.com"
+        }),
+      )
+
+      expect((yield* catalog.provider.get(providerID)).api).toEqual({
+        type: "aisdk",
+        package: "@ai-sdk/openai-compatible",
+        url: "https://override.example.com",
+      })
+    }),
+  )
+
+  it.effect("normalizes model baseURL into api url", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("test")
+      const modelID = ModelV2.ID.make("model")
+      const transform = yield* catalog.transform()
+
+      yield* transform((catalog) => {
+        catalog.provider.update(providerID, (provider) => {
+          provider.api = {
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://provider.example.com",
+          }
+        })
+        catalog.model.update(providerID, modelID, (model) => {
+          model.api = {
+            id: modelID,
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://model.example.com",
+          }
+          model.request.body.baseURL = "https://override.example.com"
+        })
+      })
+
+      expect((yield* catalog.model.get(providerID, modelID)).api).toEqual({
+        id: modelID,
+        type: "aisdk",
+        package: "@ai-sdk/openai-compatible",
+        url: "https://override.example.com",
+        settings: {},
+      })
+    }),
+  )
+
+  it.effect("resolves default model api from provider api", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("test")
+      const modelID = ModelV2.ID.make("model")
+      const transform = yield* catalog.transform()
+
+      yield* transform((catalog) => {
+        catalog.provider.update(providerID, (provider) => {
+          provider.api = {
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://provider.example.com",
+          }
+        })
+        catalog.model.update(providerID, modelID, () => {})
+      })
+
+      expect((yield* catalog.model.get(providerID, modelID)).api).toEqual({
+        id: modelID,
+        type: "aisdk",
+        package: "@ai-sdk/openai-compatible",
+        url: "https://provider.example.com",
+      })
+    }),
+  )
+
+  it.effect("runs catalog transform hooks after baseURL is normalized", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const plugin = yield* PluginV2.Service
+      const providerID = ProviderV2.ID.make("test")
+      const seen: unknown[] = []
+      const transform = yield* catalog.transform()
+
+      yield* plugin.add({
+        id: PluginV2.ID.make("test"),
+        effect: Effect.succeed({
+          "catalog.transform": (evt) =>
+            Effect.sync(() => {
+              const item = evt.provider.get(providerID)
+              if (!item) return
+              seen.push(item.provider.api.type)
+              if (item?.provider.api.type === "aisdk") seen.push(item.provider.api.url)
+              seen.push(item?.provider.request.body.baseURL)
+            }),
+        }),
+      })
+      yield* transform((catalog) =>
+        catalog.provider.update(providerID, (provider) => {
+          provider.api = { type: "aisdk", package: "@ai-sdk/openai-compatible" }
+          provider.request.body.baseURL = "https://provider.example.com"
+        }),
+      )
+
+      expect(seen).toEqual(["aisdk", "https://provider.example.com", undefined])
+    }),
+  )
+
+  it.effect("runs catalog transform when a plugin is added", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const plugin = yield* PluginV2.Service
+      const providerID = ProviderV2.ID.make("test")
+      const transform = yield* catalog.transform()
+
+      yield* transform((catalog) =>
+        catalog.provider.update(providerID, (provider) => {
+          provider.name = "Before"
+        }),
+      )
+      yield* plugin.add({
+        id: PluginV2.ID.make("test-transform"),
+        effect: Effect.succeed({
+          "catalog.transform": (evt) =>
+            Effect.sync(() =>
+              evt.provider.update(providerID, (provider) => {
+                provider.name = "After"
+              }),
+            ),
+        }),
+      })
+      yield* Effect.yieldNow
+
+      expect((yield* catalog.provider.get(providerID)).name).toBe("After")
+    }),
+  )
+
+  it.effect("ignores plugin additions from another location", () =>
+    Effect.gen(function* () {
+      const events = yield* EventV2.Service
+      const plugin = yield* PluginV2.Service
+      let invoked = 0
+
+      yield* plugin.add({
+        id: PluginV2.ID.make("test-transform"),
+        effect: Effect.succeed({
+          "catalog.transform": () => Effect.sync(() => invoked++),
+        }),
+      })
+      yield* Effect.yieldNow
+      expect(invoked).toBe(1)
+
+      yield* events.publish(
+        PluginV2.Event.Added,
+        { id: PluginV2.ID.make("test-transform") },
+        {
+          location: new Location.Info({
+            directory: AbsolutePath.make("other"),
+            project: { id: Project.ID.global, directory: AbsolutePath.make("other") },
+          }),
+        },
+      )
+      yield* Effect.yieldNow
+
+      expect(invoked).toBe(1)
+    }),
+  )
+
+  it.effect("resolves provider and model request merges", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("test")
+      const modelID = ModelV2.ID.make("model")
+      const transform = yield* catalog.transform()
+
+      yield* transform((catalog) => {
+        catalog.provider.update(providerID, (provider) => {
+          provider.request.headers.provider = "provider"
+          provider.request.headers.shared = "provider"
+          provider.request.body.provider = true
+        })
+        catalog.model.update(providerID, modelID, (model) => {
+          model.request.headers.model = "model"
+          model.request.headers.shared = "model"
+          model.request.body.model = true
+          model.request.body.request = true
+          const options = (model.request.options ??= {})
+          options.shared = "model"
+          options.model = true
+        })
+      })
+
+      const model = yield* catalog.model.get(providerID, modelID)
+      expect(model.request.headers).toEqual({ provider: "provider", shared: "model", model: "model" })
+      expect(model.request.body).toEqual({ provider: true, model: true, request: true })
+      expect(model.request.options).toEqual({ shared: "model", model: true })
+    }),
+  )
+
+  it.effect("falls back to newest available model when no default is configured", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("test")
+      const transform = yield* catalog.transform()
+
+      yield* transform((catalog) => {
+        catalog.provider.update(providerID, (provider) => {
+          provider.enabled = { via: "custom", data: {} }
+        })
+        catalog.model.update(providerID, ModelV2.ID.make("old"), (model) => {
+          model.time.released = DateTime.makeUnsafe(1000)
+        })
+        catalog.model.update(providerID, ModelV2.ID.make("new"), (model) => {
+          model.time.released = DateTime.makeUnsafe(2000)
+        })
+      })
+
+      expect(Option.getOrUndefined(yield* catalog.model.default())?.id).toMatch("new")
+    }),
+  )
+
+  it.effect("uses a transform-provided default model until that transform is replaced", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("test")
+      const old = ModelV2.ID.make("old")
+      const newest = ModelV2.ID.make("new")
+      const transform = yield* catalog.transform()
+
+      const models = (catalog: Catalog.Editor) => {
+        catalog.provider.update(providerID, (provider) => {
+          provider.enabled = { via: "custom", data: {} }
+        })
+        catalog.model.update(providerID, old, (model) => {
+          model.time.released = DateTime.makeUnsafe(1000)
+        })
+        catalog.model.update(providerID, newest, (model) => {
+          model.time.released = DateTime.makeUnsafe(2000)
+        })
+      }
+
+      yield* transform((catalog) => {
+        models(catalog)
+        catalog.model.default.set(providerID, old)
+      })
+      expect(Option.getOrUndefined(yield* catalog.model.default())?.id).toBe(old)
+
+      yield* transform(models)
+      expect(Option.getOrUndefined(yield* catalog.model.default())?.id).toBe(newest)
+    }),
+  )
+
+  it.effect("ignores a configured default on a disabled provider", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const disabledProvider = ProviderV2.ID.make("disabled")
+      const enabledProvider = ProviderV2.ID.make("enabled")
+      const disabledModel = ModelV2.ID.make("configured")
+      const fallbackModel = ModelV2.ID.make("fallback")
+      const transform = yield* catalog.transform()
+
+      yield* transform((catalog) => {
+        catalog.provider.update(disabledProvider, (provider) => {
+          provider.enabled = false
+        })
+        catalog.model.update(disabledProvider, disabledModel, () => {})
+        catalog.provider.update(enabledProvider, (provider) => {
+          provider.enabled = { via: "custom", data: {} }
+        })
+        catalog.model.update(enabledProvider, fallbackModel, () => {})
+        catalog.model.default.set(disabledProvider, disabledModel)
+      })
+
+      expect(Option.getOrUndefined(yield* catalog.model.default())).toMatchObject({
+        providerID: enabledProvider,
+        id: fallbackModel,
+      })
+    }),
+  )
+
+  it.effect("small model prefers small keyword candidates before cost scoring", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("test")
+      const transform = yield* catalog.transform()
+
+      yield* transform((catalog) => {
+        catalog.provider.update(providerID, () => {})
+        catalog.model.update(providerID, ModelV2.ID.make("cheap-large"), (model) => {
+          model.capabilities.input = ["text"]
+          model.capabilities.output = ["text"]
+          model.cost = [{ input: 1, output: 1, cache: { read: 0, write: 0 } }]
+          model.time.released = DateTime.makeUnsafe(Date.now())
+        })
+        catalog.model.update(providerID, ModelV2.ID.make("expensive-mini"), (model) => {
+          model.capabilities.input = ["text"]
+          model.capabilities.output = ["text"]
+          model.cost = [{ input: 10, output: 10, cache: { read: 0, write: 0 } }]
+          model.time.released = DateTime.makeUnsafe(Date.now())
+        })
+      })
+
+      expect(Option.getOrUndefined(yield* catalog.model.small(providerID))?.id).toMatch("expensive-mini")
+    }),
+  )
+
+  it.effect("removes providers denied by policy after loading", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const policy = yield* Policy.Service
+      const providerID = ProviderV2.ID.make("blocked")
+      const transform = yield* catalog.transform()
+
+      yield* policy.load([new Policy.Info({ effect: "deny", action: "provider.use", resource: "blocked" })])
+      yield* transform((catalog) => {
+        catalog.provider.update(providerID, () => {})
+        catalog.model.update(providerID, ModelV2.ID.make("model"), () => {})
+      })
+
+      expect(yield* catalog.provider.all()).toEqual([])
+      expect(yield* catalog.model.all()).toEqual([])
+      expect(yield* catalog.provider.get(providerID).pipe(Effect.option)).toEqual(Option.none())
+    }),
+  )
+})

packages/core/test/command.test.ts

@@ -0,0 +1,56 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { CommandV2 } from "@opencode-ai/core/command"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { testEffect } from "./lib/effect"
+
+const it = testEffect(CommandV2.locationLayer)
+
+describe("CommandV2", () => {
+  it.effect("applies command transforms and preserves later overrides", () =>
+    Effect.gen(function* () {
+      const command = yield* CommandV2.Service
+      const transform = yield* command.transform()
+      yield* transform((editor) => {
+        editor.update("review", (command) => {
+          command.template = "First"
+          command.description = "Review code"
+        })
+        editor.update("review", (command) => {
+          command.template = "Second"
+          command.model = {
+            id: ModelV2.ID.make("claude"),
+            providerID: ProviderV2.ID.make("anthropic"),
+            variant: ModelV2.VariantID.make("high"),
+          }
+        })
+      })
+
+      expect(yield* command.get("review")).toEqual(
+        new CommandV2.Info({
+          name: "review",
+          template: "Second",
+          description: "Review code",
+          model: {
+            id: ModelV2.ID.make("claude"),
+            providerID: ProviderV2.ID.make("anthropic"),
+            variant: ModelV2.VariantID.make("high"),
+          },
+        }),
+      )
+      expect(yield* command.list()).toEqual([
+        new CommandV2.Info({
+          name: "review",
+          template: "Second",
+          description: "Review code",
+          model: {
+            id: ModelV2.ID.make("claude"),
+            providerID: ProviderV2.ID.make("anthropic"),
+            variant: ModelV2.VariantID.make("high"),
+          },
+        }),
+      ])
+    }),
+  )
+})

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

@@ -0,0 +1,278 @@
+import { describe, expect } from "bun:test"
+import fs from "fs/promises"
+import path from "path"
+import { Effect, Layer, Schema } from "effect"
+import { AgentV2 } from "@opencode-ai/core/agent"
+import { Config } from "@opencode-ai/core/config"
+import { ConfigAgentPlugin } from "@opencode-ai/core/config/plugin/agent"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { PermissionV2 } from "@opencode-ai/core/permission"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { tmpdir } from "../fixture/tmpdir"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(Layer.mergeAll(AgentV2.locationLayer, FSUtil.defaultLayer))
+const decode = Schema.decodeUnknownSync(Config.Info)
+
+describe("ConfigAgentPlugin.Plugin", () => {
+  it.effect("applies all global permissions before agent-specific permissions", () =>
+    Effect.gen(function* () {
+      const agents = yield* AgentV2.Service
+      const build = AgentV2.ID.make("build")
+      const defaults = yield* agents.transform()
+
+      yield* defaults((editor) =>
+        editor.update(build, (agent) => {
+          agent.mode = "primary"
+          agent.permissions.push({ action: "bash", resource: "*", effect: "allow" })
+        }),
+      )
+
+      const config = Config.Service.of({
+        entries: () =>
+          Effect.succeed([
+            new Config.Document({
+              type: "document",
+              info: decode({
+                permissions: [{ action: "bash", resource: "*", effect: "ask" }],
+                agents: {
+                  build: {
+                    permissions: [{ action: "bash", resource: "git *", effect: "allow" }],
+                  },
+                  reviewer: {
+                    model: "openrouter/openai/gpt-5",
+                    description: "Review changes",
+                    mode: "subagent",
+                    permissions: [
+                      { action: "edit", resource: "*", effect: "deny" },
+                      { action: "read", resource: "*", effect: "deny" },
+                    ],
+                  },
+                  removed: { description: "Removed later" },
+                },
+              }),
+            }),
+            new Config.Document({
+              type: "document",
+              info: decode({
+                permissions: [{ action: "read", resource: "*", effect: "allow" }],
+                agents: {
+                  reviewer: { variant: "high", hidden: true },
+                  removed: { disabled: true },
+                  late: {
+                    permissions: [{ action: "edit", resource: "*", effect: "allow" }],
+                  },
+                },
+              }),
+            }),
+          ]),
+      })
+
+      yield* ConfigAgentPlugin.Plugin.effect.pipe(
+        Effect.provideService(Config.Service, config),
+        Effect.provideService(AgentV2.Service, agents),
+      )
+
+      const buildAgent = yield* agents.get(build)
+      if (!buildAgent) throw new Error("expected configured build agent")
+      expect(buildAgent.permissions).toEqual([
+        { action: "bash", resource: "*", effect: "allow" },
+        { action: "bash", resource: "*", effect: "ask" },
+        { action: "read", resource: "*", effect: "allow" },
+        { action: "bash", resource: "git *", effect: "allow" },
+      ])
+      expect(PermissionV2.evaluate("bash", "git status", buildAgent.permissions).effect).toBe("allow")
+      expect(PermissionV2.evaluate("bash", "bun test", buildAgent.permissions).effect).toBe("ask")
+
+      const reviewer = yield* agents.get(AgentV2.ID.make("reviewer"))
+      if (!reviewer) throw new Error("expected configured reviewer agent")
+      expect(reviewer).toMatchObject({
+        description: "Review changes",
+        mode: "subagent",
+        hidden: true,
+        model: { providerID: "openrouter", id: "openai/gpt-5", variant: "high" },
+      })
+      expect(reviewer.permissions).toEqual([
+        { action: "bash", resource: "*", effect: "ask" },
+        { action: "read", resource: "*", effect: "allow" },
+        { action: "edit", resource: "*", effect: "deny" },
+        { action: "read", resource: "*", effect: "deny" },
+      ])
+      expect(PermissionV2.evaluate("read", "README.md", reviewer.permissions).effect).toBe("deny")
+      expect((yield* agents.get(AgentV2.ID.make("late")))?.permissions).toEqual([
+        { action: "bash", resource: "*", effect: "ask" },
+        { action: "read", resource: "*", effect: "allow" },
+        { action: "edit", resource: "*", effect: "allow" },
+      ])
+      expect(yield* agents.get(AgentV2.ID.make("removed"))).toBeUndefined()
+    }),
+  )
+
+  it.effect("maps configured agent fields and preserves an unspecified model variant", () =>
+    Effect.gen(function* () {
+      const agents = yield* AgentV2.Service
+      const config = Config.Service.of({
+        entries: () =>
+          Effect.succeed([
+            new Config.Document({
+              type: "document",
+              info: decode({
+                agents: {
+                  reviewer: {
+                    model: "anthropic/claude-sonnet",
+                    system: "Review carefully.",
+                    description: "Reviews changes",
+                    mode: "subagent",
+                    hidden: true,
+                    color: "warning",
+                    steps: 12,
+                    request: {
+                      headers: { first: "one", shared: "first" },
+                      body: { enabled: true, profile: "review", effort: "medium" },
+                    },
+                  },
+                },
+              }),
+            }),
+            new Config.Document({
+              type: "document",
+              info: decode({
+                agents: {
+                  reviewer: {
+                    request: {
+                      headers: { shared: "last", second: "two" },
+                      body: { retries: 2, effort: "high" },
+                    },
+                  },
+                },
+              }),
+            }),
+          ]),
+      })
+
+      yield* ConfigAgentPlugin.Plugin.effect.pipe(
+        Effect.provideService(Config.Service, config),
+        Effect.provideService(AgentV2.Service, agents),
+      )
+
+      const reviewer = yield* agents.get(AgentV2.ID.make("reviewer"))
+      if (!reviewer) throw new Error("expected configured reviewer agent")
+      expect(reviewer).toMatchObject({
+        system: "Review carefully.",
+        description: "Reviews changes",
+        mode: "subagent",
+        hidden: true,
+        color: "warning",
+        steps: 12,
+        model: { providerID: "anthropic", id: "claude-sonnet", variant: undefined },
+      })
+      expect(reviewer.request).toEqual({
+        headers: { first: "one", shared: "last", second: "two" },
+        body: { enabled: true, profile: "review", retries: 2, effort: "high" },
+      })
+    }),
+  )
+
+  it.effect("removes a built-in agent disabled by configuration", () =>
+    Effect.gen(function* () {
+      const agents = yield* AgentV2.Service
+      const build = AgentV2.ID.make("build")
+      const defaults = yield* agents.transform()
+      yield* defaults((editor) => editor.update(build, () => {}))
+
+      const config = Config.Service.of({
+        entries: () =>
+          Effect.succeed([
+            new Config.Document({
+              type: "document",
+              info: decode({ agents: { build: { disabled: true } } }),
+            }),
+          ]),
+      })
+
+      yield* ConfigAgentPlugin.Plugin.effect.pipe(
+        Effect.provideService(Config.Service, config),
+        Effect.provideService(AgentV2.Service, agents),
+      )
+
+      expect(yield* agents.get(build)).toBeUndefined()
+    }),
+  )
+
+  it.live("loads legacy file-based agents from config directories", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(async () => {
+            await fs.mkdir(path.join(tmp.path, "agents", "team"), { recursive: true })
+            await fs.mkdir(path.join(tmp.path, "modes"), { recursive: true })
+            await fs.writeFile(
+              path.join(tmp.path, "agents", "reviewer.md"),
+              `---
+model: openrouter/openai/gpt-5
+description: Markdown description
+temperature: 0.5
+tools:
+  write: false
+---
+Review carefully.`,
+            )
+            await fs.writeFile(path.join(tmp.path, "agents", "team", "helper.md"), "Help the team.")
+            await fs.writeFile(
+              path.join(tmp.path, "agents", "native.md"),
+              `---
+request:
+  headers:
+    x-agent: native
+  body:
+    effort: high
+permissions:
+  - action: edit
+    resource: "*"
+    effect: deny
+---
+Use native v2 fields.`,
+            )
+            await fs.writeFile(path.join(tmp.path, "agents", "disabled.md"), "---\ndisabled: true\n---\nDisabled")
+            await fs.writeFile(path.join(tmp.path, "modes", "plan.md"), "Make a plan.")
+          })
+          const agents = yield* AgentV2.Service
+          const config = Config.Service.of({
+            entries: () =>
+              Effect.succeed([
+                new Config.Document({
+                  type: "document",
+                  info: decode({ agents: { reviewer: { description: "JSON description" } } }),
+                }),
+                new Config.Directory({ type: "directory", path: AbsolutePath.make(tmp.path) }),
+              ]),
+          })
+
+          yield* ConfigAgentPlugin.Plugin.effect.pipe(
+            Effect.provideService(Config.Service, config),
+            Effect.provideService(AgentV2.Service, agents),
+          )
+
+          expect(yield* agents.get(AgentV2.ID.make("reviewer"))).toMatchObject({
+            model: { providerID: "openrouter", id: "openai/gpt-5" },
+            system: "Review carefully.",
+            description: "Markdown description",
+            request: { body: { temperature: 0.5 } },
+            permissions: [{ action: "edit", resource: "*", effect: "deny" }],
+          })
+          expect(yield* agents.get(AgentV2.ID.make("team/helper"))).toMatchObject({ system: "Help the team." })
+          expect(yield* agents.get(AgentV2.ID.make("native"))).toMatchObject({
+            system: "Use native v2 fields.",
+            request: { headers: { "x-agent": "native" }, body: { effort: "high" } },
+            permissions: [{ action: "edit", resource: "*", effect: "deny" }],
+          })
+          expect(yield* agents.get(AgentV2.ID.make("disabled"))).toBeUndefined()
+          expect(yield* agents.get(AgentV2.ID.make("plan"))).toMatchObject({ system: "Make a plan.", mode: "primary" })
+        }),
+      ),
+    ),
+  )
+})

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

@@ -0,0 +1,81 @@
+import fs from "fs/promises"
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Effect, Layer, Schema } from "effect"
+import { CommandV2 } from "@opencode-ai/core/command"
+import { Config } from "@opencode-ai/core/config"
+import { ConfigCommandPlugin } from "@opencode-ai/core/config/plugin/command"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { tmpdir } from "../fixture/tmpdir"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(Layer.mergeAll(CommandV2.locationLayer, FSUtil.defaultLayer))
+const decode = Schema.decodeUnknownSync(Config.Info)
+
+describe("ConfigCommandPlugin.Plugin", () => {
+  it.live("loads inline and file-based commands in config order", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(async () => {
+            await fs.mkdir(path.join(tmp.path, "commands", "nested"), { recursive: true })
+            await fs.writeFile(
+              path.join(tmp.path, "commands", "review.md"),
+              `---
+description: File review
+agent: reviewer
+model: anthropic/claude
+variant: high
+subtask: true
+---
+Review files`,
+            )
+            await fs.writeFile(path.join(tmp.path, "commands", "nested", "docs.md"), "Write docs")
+            await fs.writeFile(path.join(tmp.path, "commands", "empty.md"), "")
+          })
+
+          const command = yield* CommandV2.Service
+          yield* ConfigCommandPlugin.Plugin.effect.pipe(
+            Effect.provideService(CommandV2.Service, command),
+            Effect.provideService(
+              Config.Service,
+              Config.Service.of({
+                entries: () =>
+                  Effect.succeed([
+                    new Config.Document({
+                      type: "document",
+                      info: decode({ commands: { review: { template: "Inline review" } } }),
+                    }),
+                    new Config.Directory({ type: "directory", path: AbsolutePath.make(tmp.path) }),
+                  ]),
+              }),
+            ),
+          )
+
+          expect(yield* command.list()).toEqual([
+            new CommandV2.Info({
+              name: "review",
+              template: "Review files",
+              description: "File review",
+              agent: "reviewer",
+              model: {
+                providerID: ProviderV2.ID.make("anthropic"),
+                id: ModelV2.ID.make("claude"),
+                variant: ModelV2.VariantID.make("high"),
+              },
+              subtask: true,
+            }),
+            new CommandV2.Info({ name: "empty", template: "" }),
+            new CommandV2.Info({ name: "nested/docs", template: "Write docs" }),
+          ])
+        }),
+      ),
+    ),
+  )
+})

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

@@ -0,0 +1,773 @@
+import path from "path"
+import fs from "fs/promises"
+import { describe, expect } from "bun:test"
+import { Effect, Layer, Schema } from "effect"
+import { FastCheck } from "effect/testing"
+import { Config } from "@opencode-ai/core/config"
+import { ConfigProvider } from "@opencode-ai/core/config/provider"
+import { ConfigMigrateV1 } from "@opencode-ai/core/v1/config/migrate"
+import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Global } from "@opencode-ai/core/global"
+import { Location } from "@opencode-ai/core/location"
+import { Policy } from "@opencode-ai/core/policy"
+import { Project } from "@opencode-ai/core/project"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { tmpdir } from "../fixture/tmpdir"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(Layer.empty)
+
+function testLayer(
+  directory: string,
+  globalDirectory = path.join(directory, "global"),
+  projectDirectory = directory,
+  vcs?: Project.Vcs,
+) {
+  return Config.locationLayer.pipe(
+    Layer.provide(FSUtil.defaultLayer),
+    Layer.provide(Global.layerWith({ config: globalDirectory })),
+    Layer.provide(
+      Layer.succeed(
+        Location.Service,
+        Location.Service.of(
+          location(
+            { directory: AbsolutePath.make(directory) },
+            { projectDirectory: AbsolutePath.make(projectDirectory), vcs },
+          ),
+        ),
+      ),
+    ),
+  )
+}
+
+const provider = {
+  api: { type: "native", settings: {} },
+  request: {
+    headers: {},
+    body: {},
+  },
+  models: {},
+}
+
+describe("Config", () => {
+  it.effect("returns the latest defined scalar from priority-ordered documents", () =>
+    Effect.sync(() => {
+      const entries = [
+        new Config.Document({ type: "document", info: new Config.Info({ model: "openrouter/openai/gpt-5" }) }),
+        new Config.Directory({ type: "directory", path: AbsolutePath.make("/skills") }),
+        new Config.Document({ type: "document", info: new Config.Info({}) }),
+        new Config.Document({ type: "document", info: new Config.Info({ model: "openrouter/openai/gpt-5.5" }) }),
+      ]
+
+      expect(Config.latest(entries, "model")).toBe("openrouter/openai/gpt-5.5")
+      expect(Config.latest(entries, "default_agent")).toBeUndefined()
+    }),
+  )
+
+  it.effect("detects v1 configuration from any v1-only top-level key", () =>
+    Effect.sync(() => {
+      expect(ConfigMigrateV1.isV1({ snapshot: false })).toBe(true)
+      expect(ConfigMigrateV1.isV1({ snapshot: false, agents: {} })).toBe(true)
+      expect(ConfigMigrateV1.isV1({ reference: {} })).toBe(true)
+      expect(ConfigMigrateV1.isV1({ shell: "/bin/zsh", model: "anthropic/claude" })).toBe(false)
+      expect(ConfigMigrateV1.isV1({ references: {} })).toBe(false)
+    }),
+  )
+
+  it.effect("migrates arbitrary v1 configuration into valid v2 configuration", () =>
+    Effect.sync(() => {
+      FastCheck.assert(
+        FastCheck.property(Schema.toArbitrary(ConfigV1.Info), (info) => {
+          Schema.decodeUnknownSync(Config.Info)(ConfigMigrateV1.migrate(info), { errors: "all" })
+        }),
+        { numRuns: 100 },
+      )
+    }),
+  )
+
+  it.effect("migrates v1 provider setup options into AISDK settings", () =>
+    Effect.sync(() => {
+      const migrated = ConfigMigrateV1.migrate({
+        provider: {
+          bedrock: {
+            npm: "@ai-sdk/amazon-bedrock",
+            options: {
+              headers: { "x-test": "1" },
+              body: { trace: true },
+              region: "us-east-1",
+              profile: "dev",
+            },
+          },
+        },
+      })
+
+      expect(migrated.providers?.bedrock?.api).toEqual({
+        type: "aisdk",
+        package: "@ai-sdk/amazon-bedrock",
+        url: undefined,
+        settings: { region: "us-east-1", profile: "dev" },
+      })
+      expect(migrated.providers?.bedrock?.request).toEqual({
+        headers: { "x-test": "1" },
+        body: { trace: true },
+      })
+    }),
+  )
+
+  it.effect("migrates v1 command configuration", () =>
+    Effect.sync(() => {
+      expect(
+        ConfigMigrateV1.migrate({
+          command: {
+            review: {
+              template: "Review changes",
+              description: "Review code",
+              agent: "reviewer",
+              model: "anthropic/claude",
+              variant: "high",
+              subtask: true,
+            },
+          },
+        }).commands,
+      ).toEqual({
+        review: {
+          template: "Review changes",
+          description: "Review code",
+          agent: "reviewer",
+          model: "anthropic/claude",
+          variant: "high",
+          subtask: true,
+        },
+      })
+    }),
+  )
+
+  it.live("returns an empty configuration when directory files do not exist", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const config = yield* Config.Service
+          const entries = yield* config.entries()
+
+          expect(entries).toEqual([
+            new Config.Directory({ type: "directory", path: AbsolutePath.make(path.join(tmp.path, "global")) }),
+          ])
+        }).pipe(Effect.provide(testLayer(tmp.path))),
+      ),
+    ),
+  )
+
+  it.live("loads JSON and JSONC files from lowest to highest priority", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(() =>
+            Promise.all([
+              fs.writeFile(
+                path.join(tmp.path, "config.json"),
+                JSON.stringify({ $schema: "base", providers: { base: provider } }),
+              ),
+              fs.writeFile(
+                path.join(tmp.path, "opencode.json"),
+                JSON.stringify({ $schema: "middle", providers: { middle: provider } }),
+              ),
+              fs.writeFile(
+                path.join(tmp.path, "opencode.jsonc"),
+                `{
+                  // Later global files override scalar fields while retaining providers.
+                  "$schema": "last",
+                  "providers": { "last": ${JSON.stringify(provider)} },
+                }`,
+              ),
+            ]),
+          )
+          return yield* Effect.gen(function* () {
+            const config = yield* Config.Service
+            const documents = (yield* config.entries()).filter((entry) => entry.type === "document")
+
+            expect(documents).toHaveLength(3)
+            expect(documents.map((document) => document.type)).toEqual(["document", "document", "document"])
+            expect(documents.map((document) => document.info.$schema)).toEqual(["base", "middle", "last"])
+            expect(documents[0]).toBeInstanceOf(Config.Document)
+            expect(documents[0]?.path).toBe(path.join(tmp.path, "config.json"))
+            expect(documents[2]?.info.providers?.last).toBeInstanceOf(ConfigProvider.Info)
+
+            yield* Effect.promise(() =>
+              fs.writeFile(path.join(tmp.path, "opencode.jsonc"), JSON.stringify({ $schema: "changed" })),
+            )
+            expect(
+              (yield* config.entries())
+                .filter((entry) => entry.type === "document")
+                .map((document) => document.info.$schema),
+            ).toEqual(["base", "middle", "last"])
+          }).pipe(Effect.provide(testLayer(tmp.path)))
+        }),
+      ),
+    ),
+  )
+
+  it.live("accepts $schema metadata without writing it into config files", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const file = path.join(tmp.path, "opencode.json")
+          const contents = JSON.stringify({
+            shell: "/bin/zsh",
+            experimental: { policies: [{ effect: "deny", action: "provider.use", resource: "openai" }] },
+            providers: { local: provider },
+          })
+          yield* Effect.promise(() => fs.writeFile(file, contents))
+
+          return yield* Effect.gen(function* () {
+            const config = yield* Config.Service
+            const documents = (yield* config.entries()).filter((entry) => entry.type === "document")
+
+            expect(documents[0]?.info.$schema).toBeUndefined()
+            expect(documents[0]?.info.shell).toBe("/bin/zsh")
+            expect(documents[0]?.info.experimental?.policies?.[0]).toEqual({
+              effect: "deny",
+              action: "provider.use",
+              resource: "openai",
+            })
+            expect(yield* Effect.promise(() => fs.readFile(file, "utf8"))).toBe(contents)
+          }).pipe(Effect.provide(testLayer(tmp.path)))
+        }),
+      ),
+    ),
+  )
+
+  it.live("loads supported scalar and resource configuration", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(() =>
+            fs.writeFile(
+              path.join(tmp.path, "opencode.json"),
+              JSON.stringify({
+                shell: "/bin/bash",
+                model: "anthropic/claude",
+                default_agent: "reviewer",
+                autoupdate: "notify",
+                share: "disabled",
+                enterprise: { url: "https://share.example.com" },
+                username: "test-user",
+                permissions: [
+                  { action: "bash", resource: "*", effect: "ask" },
+                  { action: "bash", resource: "git status", effect: "allow" },
+                ],
+                agents: {
+                  reviewer: {
+                    model: "openrouter/openai/gpt-5",
+                    variant: "high",
+                    request: {
+                      headers: { "x-agent": "reviewer" },
+                      body: { reasoningEffort: "high" },
+                    },
+                    description: "Review changes for correctness",
+                    system: "Find regressions.",
+                    mode: "subagent",
+                    hidden: false,
+                    color: "warning",
+                    steps: 12,
+                    disabled: false,
+                    permissions: [{ action: "edit", resource: "*", effect: "deny" }],
+                  },
+                },
+                snapshots: false,
+                watcher: { ignore: ["node_modules/**", "dist/**", ".git"] },
+                formatter: {
+                  prettier: { disabled: true },
+                  custom: { command: ["custom-fmt", "$FILE"], extensions: [".foo"] },
+                },
+                lsp: { typescript: { disabled: true }, custom: { command: ["custom-lsp"], extensions: [".foo"] } },
+                attachments: {
+                  image: { auto_resize: false, max_width: 1200, max_height: 900, max_base64_bytes: 1048576 },
+                },
+                tool_output: { max_lines: 1000, max_bytes: 32768 },
+                mcp: {
+                  timeout: 5000,
+                  servers: {
+                    local: {
+                      type: "local",
+                      command: ["node", "./mcp/server.js"],
+                      environment: { API_KEY: "secret" },
+                      disabled: false,
+                      timeout: 10000,
+                    },
+                    remote: {
+                      type: "remote",
+                      url: "https://mcp.example.com/mcp",
+                      headers: { Authorization: "Bearer token" },
+                      oauth: { client_id: "client", scope: "read write", callback_port: 19876 },
+                      disabled: true,
+                    },
+                  },
+                },
+                compaction: {
+                  auto: true,
+                  prune: false,
+                  keep: { tokens: 2000 },
+                  buffer: 10000,
+                },
+                skills: ["./skills", "~/shared-skills", "https://example.com/.well-known/skills/"],
+                instructions: ["CONTRIBUTING.md", ".cursor/rules/*.md", "https://example.com/shared-rules.md"],
+                references: {
+                  local: { path: "../library" },
+                  sdk: { repository: "github.com/example/sdk", branch: "main" },
+                  shorthand: "github.com/example/docs",
+                },
+                plugins: [
+                  "opencode-helicone-session",
+                  { package: "@my-org/audit-plugin", options: { endpoint: "https://audit.example.com" } },
+                ],
+              }),
+            ),
+          )
+
+          return yield* Effect.gen(function* () {
+            const config = yield* Config.Service
+            const documents = (yield* config.entries()).filter((entry) => entry.type === "document")
+
+            expect(documents).toHaveLength(1)
+            expect(documents[0]?.info.shell).toBe("/bin/bash")
+            expect(documents[0]?.info.model).toBe("anthropic/claude")
+            expect(documents[0]?.info.default_agent).toBe("reviewer")
+            expect(documents[0]?.info.autoupdate).toBe("notify")
+            expect(documents[0]?.info.share).toBe("disabled")
+            expect(documents[0]?.info.enterprise).toEqual({ url: "https://share.example.com" })
+            expect(documents[0]?.info.username).toBe("test-user")
+            expect(documents[0]?.info.permissions).toEqual([
+              { action: "bash", resource: "*", effect: "ask" },
+              { action: "bash", resource: "git status", effect: "allow" },
+            ])
+            const reviewer = documents[0]?.info.agents?.reviewer
+            expect(reviewer?.model).toBe("openrouter/openai/gpt-5")
+            expect(reviewer?.variant).toBe("high")
+            expect(reviewer?.request).toEqual({
+              headers: { "x-agent": "reviewer" },
+              body: { reasoningEffort: "high" },
+            })
+            expect(reviewer?.description).toBe("Review changes for correctness")
+            expect(reviewer?.system).toBe("Find regressions.")
+            expect(reviewer?.mode).toBe("subagent")
+            expect(reviewer?.hidden).toBe(false)
+            expect(reviewer?.color).toBe("warning")
+            expect(reviewer?.steps).toBe(12)
+            expect(reviewer?.disabled).toBe(false)
+            expect(reviewer?.permissions).toEqual([{ action: "edit", resource: "*", effect: "deny" }])
+            expect(documents[0]?.info.snapshots).toBe(false)
+            expect(documents[0]?.info.watcher).toEqual({ ignore: ["node_modules/**", "dist/**", ".git"] })
+            expect(documents[0]?.info.formatter).toEqual({
+              prettier: { disabled: true },
+              custom: { command: ["custom-fmt", "$FILE"], extensions: [".foo"] },
+            })
+            expect(documents[0]?.info.lsp).toEqual({
+              typescript: { disabled: true },
+              custom: { command: ["custom-lsp"], extensions: [".foo"] },
+            })
+            expect(documents[0]?.info.attachments).toEqual({
+              image: { auto_resize: false, max_width: 1200, max_height: 900, max_base64_bytes: 1048576 },
+            })
+            expect(documents[0]?.info.tool_output).toEqual({ max_lines: 1000, max_bytes: 32768 })
+            expect(documents[0]?.info.mcp).toEqual({
+              timeout: 5000,
+              servers: {
+                local: {
+                  type: "local",
+                  command: ["node", "./mcp/server.js"],
+                  environment: { API_KEY: "secret" },
+                  disabled: false,
+                  timeout: 10000,
+                },
+                remote: {
+                  type: "remote",
+                  url: "https://mcp.example.com/mcp",
+                  headers: { Authorization: "Bearer token" },
+                  oauth: { client_id: "client", scope: "read write", callback_port: 19876 },
+                  disabled: true,
+                },
+              },
+            })
+            expect(documents[0]?.info.compaction).toEqual({
+              auto: true,
+              prune: false,
+              keep: { tokens: 2000 },
+              buffer: 10000,
+            })
+            expect(documents[0]?.info.skills).toEqual([
+              "./skills",
+              "~/shared-skills",
+              "https://example.com/.well-known/skills/",
+            ])
+            expect(documents[0]?.info.instructions).toEqual([
+              "CONTRIBUTING.md",
+              ".cursor/rules/*.md",
+              "https://example.com/shared-rules.md",
+            ])
+            expect(documents[0]?.info.references).toEqual({
+              local: { path: "../library" },
+              sdk: { repository: "github.com/example/sdk", branch: "main" },
+              shorthand: "github.com/example/docs",
+            })
+            expect(documents[0]?.info.plugins).toEqual([
+              "opencode-helicone-session",
+              { package: "@my-org/audit-plugin", options: { endpoint: "https://audit.example.com" } },
+            ])
+          }).pipe(Effect.provide(testLayer(tmp.path)))
+        }),
+      ),
+    ),
+  )
+
+  it.live("migrates the deprecated reference key into references", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(() =>
+            fs.writeFile(
+              path.join(tmp.path, "opencode.json"),
+              JSON.stringify({
+                reference: {
+                  local: { path: "../library" },
+                  sdk: { repository: "github.com/example/sdk", branch: "main" },
+                  shorthand: "github.com/example/docs",
+                },
+              }),
+            ),
+          )
+
+          return yield* Effect.gen(function* () {
+            const config = yield* Config.Service
+            const documents = (yield* config.entries()).filter((entry) => entry.type === "document")
+
+            expect(documents).toHaveLength(1)
+            expect(documents[0]?.info.references).toEqual({
+              local: { path: "../library" },
+              sdk: { repository: "github.com/example/sdk", branch: "main" },
+              shorthand: "github.com/example/docs",
+            })
+          }).pipe(Effect.provide(testLayer(tmp.path)))
+        }),
+      ),
+    ),
+  )
+
+  it.live("migrates v1 configuration when a v1-only key is present", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(() =>
+            fs.writeFile(
+              path.join(tmp.path, "opencode.json"),
+              JSON.stringify({
+                shell: "/bin/zsh",
+                default_agent: "reviewer",
+                snapshot: false,
+                autoshare: true,
+                permission: {
+                  bash: "ask",
+                  edit: { "*.md": "allow", "*": "deny" },
+                  question: "deny",
+                },
+                agent: {
+                  reviewer: {
+                    prompt: "Review changes.",
+                    disable: true,
+                    temperature: 0.2,
+                    permission: { read: "allow" },
+                  },
+                },
+                plugin: [
+                  "opencode-helicone-session",
+                  ["@my-org/audit-plugin", { endpoint: "https://audit.example.com" }],
+                ],
+                skills: { paths: ["./skills"], urls: ["https://example.com/.well-known/skills/"] },
+                references: {
+                  docs: { path: "../docs", description: "Use for product documentation", hidden: true },
+                },
+                attachment: { image: { auto_resize: false, max_width: 1200 } },
+                provider: {
+                  custom: {
+                    options: { apiKey: "secret" },
+                    models: {
+                      model: {
+                        options: { reasoningEffort: "high" },
+                        variants: { fast: { temperature: 0.2 } },
+                      },
+                    },
+                  },
+                  openai: {
+                    npm: "@ai-sdk/openai",
+                    options: { apiKey: "secret", organization: "org" },
+                    models: {
+                      model: {
+                        options: { temperature: 0.3, reasoningEffort: "high", serviceTier: "priority" },
+                        variants: { high: { reasoningEffort: "high", reasoningSummary: "auto" } },
+                      },
+                    },
+                  },
+                  anthropic: {
+                    npm: "@ai-sdk/anthropic",
+                    models: {
+                      model: {
+                        options: {
+                          effort: "high",
+                          taskBudget: 4096,
+                          metadata: { userId: "user-1" },
+                        },
+                      },
+                    },
+                  },
+                },
+                compaction: { auto: true, tail_turns: 3, preserve_recent_tokens: 2000, reserved: 10000 },
+                experimental: { mcp_timeout: 5000 },
+                mcp: {
+                  local: { type: "local", command: ["node", "server.js"], enabled: false },
+                  remote: {
+                    type: "remote",
+                    url: "https://mcp.example.com",
+                    oauth: { clientId: "client", callbackPort: 19876 },
+                  },
+                },
+              }),
+            ),
+          )
+
+          return yield* Effect.gen(function* () {
+            const config = yield* Config.Service
+            const documents = (yield* config.entries()).filter((entry) => entry.type === "document")
+
+            expect(documents).toHaveLength(1)
+            expect(documents[0]?.info).toBeInstanceOf(Config.Info)
+            expect(documents[0]?.info.shell).toBe("/bin/zsh")
+            expect(documents[0]?.info.default_agent).toBe("reviewer")
+            expect(documents[0]?.info.snapshots).toBe(false)
+            expect(documents[0]?.info.share).toBe("auto")
+            expect(documents[0]?.info.permissions).toEqual([
+              { action: "bash", resource: "*", effect: "ask" },
+              { action: "edit", resource: "*.md", effect: "allow" },
+              { action: "edit", resource: "*", effect: "deny" },
+              { action: "question", resource: "*", effect: "deny" },
+            ])
+            expect(documents[0]?.info.agents?.reviewer).toMatchObject({
+              system: "Review changes.",
+              disabled: true,
+              request: { body: { temperature: 0.2 } },
+              permissions: [{ action: "read", resource: "*", effect: "allow" }],
+            })
+            expect(documents[0]?.info.plugins).toEqual([
+              "opencode-helicone-session",
+              { package: "@my-org/audit-plugin", options: { endpoint: "https://audit.example.com" } },
+            ])
+            expect(documents[0]?.info.skills).toEqual(["./skills", "https://example.com/.well-known/skills/"])
+            expect(documents[0]?.info.references).toEqual({
+              docs: { path: "../docs", description: "Use for product documentation", hidden: true },
+            })
+            expect(documents[0]?.info.attachments).toEqual({ image: { auto_resize: false, max_width: 1200 } })
+            expect(documents[0]?.info.providers?.custom).toMatchObject({
+              request: { body: { apiKey: "secret" } },
+              models: {
+                model: {
+                  request: { body: { reasoningEffort: "high" } },
+                  variants: [{ id: "fast", body: { temperature: 0.2 } }],
+                },
+              },
+            })
+            expect(documents[0]?.info.providers?.openai).toMatchObject({
+              api: { settings: {} },
+              request: { headers: { Authorization: "Bearer secret", "OpenAI-Organization": "org" } },
+              models: {
+                model: {
+                  request: {
+                    body: { temperature: 0.3, reasoningEffort: "high", serviceTier: "priority" },
+                  },
+                  variants: [{ id: "high", body: { reasoningEffort: "high", reasoningSummary: "auto" } }],
+                },
+              },
+            })
+            expect(documents[0]?.info.providers?.anthropic).toMatchObject({
+              models: {
+                model: {
+                  request: {
+                    body: {
+                      output_config: { effort: "high", task_budget: 4096 },
+                      metadata: { user_id: "user-1" },
+                    },
+                  },
+                },
+              },
+            })
+            expect(documents[0]?.info.compaction).toEqual({
+              auto: true,
+              prune: undefined,
+              keep: { tokens: 2000 },
+              buffer: 10000,
+            })
+            expect(documents[0]?.info.mcp).toMatchObject({
+              timeout: 5000,
+              servers: {
+                local: { type: "local", command: ["node", "server.js"], disabled: true },
+                remote: {
+                  type: "remote",
+                  url: "https://mcp.example.com",
+                  oauth: { client_id: "client", callback_port: 19876 },
+                },
+              },
+            })
+          }).pipe(Effect.provide(testLayer(tmp.path)))
+        }),
+      ),
+    ),
+  )
+
+  it.live("ignores invalid files while loading valid config values", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(() =>
+            Promise.all([
+              fs.writeFile(path.join(tmp.path, "config.json"), JSON.stringify({ $schema: "base" })),
+              fs.writeFile(path.join(tmp.path, "opencode.json"), "{ invalid"),
+              fs.writeFile(path.join(tmp.path, "opencode.jsonc"), JSON.stringify({ providers: { invalid: true } })),
+            ]),
+          )
+          return yield* Effect.gen(function* () {
+            const config = yield* Config.Service
+            const documents = (yield* config.entries()).filter((entry) => entry.type === "document")
+
+            expect(documents.map((document) => document.info.$schema)).toEqual(["base"])
+          }).pipe(Effect.provide(testLayer(tmp.path)))
+        }),
+      ),
+    ),
+  )
+
+  it.live("loads policy statements in reverse config order", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) => {
+        const global = path.join(tmp.path, "global")
+        return Effect.gen(function* () {
+          yield* Effect.promise(async () => {
+            await fs.mkdir(global, { recursive: true })
+            await fs.writeFile(
+              path.join(global, "opencode.json"),
+              JSON.stringify({
+                experimental: { policies: [{ effect: "deny", action: "provider.use", resource: "openai" }] },
+              }),
+            )
+            await fs.writeFile(
+              path.join(tmp.path, "opencode.json"),
+              JSON.stringify({
+                experimental: { policies: [{ effect: "allow", action: "provider.use", resource: "openai" }] },
+              }),
+            )
+          })
+
+          return yield* Effect.gen(function* () {
+            const policy = yield* Policy.Service
+
+            expect(yield* policy.evaluate("provider.use", "openai", "allow")).toBe("deny")
+          }).pipe(Effect.provide(testLayer(tmp.path, global)))
+        })
+      }),
+    ),
+  )
+
+  it.live("loads global, ancestor, and .opencode configuration up to the project boundary", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) => {
+        const global = path.join(tmp.path, "global")
+        const root = path.join(tmp.path, "repo")
+        const parent = path.join(root, "packages")
+        const directory = path.join(parent, "app")
+        return Effect.gen(function* () {
+          yield* Effect.promise(async () => {
+            await fs.mkdir(global, { recursive: true })
+            await fs.mkdir(directory, { recursive: true })
+            await fs.mkdir(path.join(root, ".opencode"), { recursive: true })
+            await fs.mkdir(path.join(directory, ".opencode"), { recursive: true })
+            await Promise.all([
+              fs.writeFile(path.join(tmp.path, "opencode.json"), JSON.stringify({ $schema: "outside" })),
+              fs.writeFile(path.join(global, "opencode.json"), JSON.stringify({ $schema: "global" })),
+              fs.writeFile(path.join(root, "opencode.json"), JSON.stringify({ $schema: "root" })),
+              fs.writeFile(path.join(parent, "opencode.jsonc"), JSON.stringify({ $schema: "parent" })),
+              fs.writeFile(path.join(directory, "config.json"), JSON.stringify({ $schema: "directory" })),
+              fs.writeFile(path.join(root, ".opencode", "opencode.json"), JSON.stringify({ $schema: "root-dot" })),
+              fs.writeFile(
+                path.join(directory, ".opencode", "opencode.jsonc"),
+                JSON.stringify({ $schema: "directory-dot" }),
+              ),
+            ])
+          })
+
+          return yield* Effect.gen(function* () {
+            const config = yield* Config.Service
+            const entries = yield* config.entries()
+            const documents = entries.filter((entry) => entry.type === "document")
+
+            expect(entries.filter((entry) => entry.type === "directory").map((entry) => entry.path)).toEqual([
+              AbsolutePath.make(global),
+              AbsolutePath.make(path.join(root, ".opencode")),
+              AbsolutePath.make(path.join(directory, ".opencode")),
+            ])
+            expect(documents.map((document) => document.info.$schema)).toEqual([
+              "global",
+              "root",
+              "parent",
+              "directory",
+              "root-dot",
+              "directory-dot",
+            ])
+            expect(entries.map((entry) => (entry.type === "document" ? entry.info.$schema : entry.path))).toEqual([
+              "global",
+              AbsolutePath.make(global),
+              "root",
+              "parent",
+              "directory",
+              "root-dot",
+              AbsolutePath.make(path.join(root, ".opencode")),
+              "directory-dot",
+              AbsolutePath.make(path.join(directory, ".opencode")),
+            ])
+          }).pipe(
+            Effect.provide(
+              testLayer(directory, global, root, {
+                type: "git",
+                store: AbsolutePath.make(path.join(root, ".git")),
+              }),
+            ),
+          )
+        })
+      }),
+    ),
+  )
+})

packages/core/test/config/provider-options.test.ts

@@ -0,0 +1,211 @@
+import { describe, expect, test } from "bun:test"
+import { ConfigProviderOptionsV1 } from "@opencode-ai/core/v1/config/provider-options"
+
+describe("ConfigProviderOptionsV1", () => {
+  test("keeps raw provider and request options unchanged", () => {
+    const lowerer = ConfigProviderOptionsV1.get("custom-provider")
+
+    expect(lowerer.provider({ apiKey: "secret", headers: { "x-test": "1" }, nested: { camelCase: true } })).toEqual({
+      body: { apiKey: "secret", headers: { "x-test": "1" }, nested: { camelCase: true } },
+    })
+    expect(lowerer.request({ nested: { camelCase: true } })).toEqual({ nested: { camelCase: true } })
+  })
+
+  test("falls back to raw lowering for prototype property package names", () => {
+    expect(ConfigProviderOptionsV1.get("toString").provider({ enabled: true })).toEqual({ body: { enabled: true } })
+  })
+
+  test("lowers OpenAI provider and request options", () => {
+    const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/openai")
+
+    expect(
+      lowerer.provider({
+        apiKey: "secret",
+        baseURL: "https://openai.example/v1",
+        organization: "org",
+        project: "project",
+        headers: { "x-test": "1" },
+        body: { store: true },
+        timeout: 1000,
+      }),
+    ).toEqual({
+      url: "https://openai.example/v1",
+      headers: {
+        Authorization: "Bearer secret",
+        "OpenAI-Organization": "org",
+        "OpenAI-Project": "project",
+        "x-test": "1",
+      },
+      body: { store: true },
+      settings: { timeout: 1000 },
+    })
+    expect(lowerer.request({ reasoningEffort: "high", nestedValue: { camelCase: true } })).toEqual({
+      reasoning_effort: "high",
+      nested_value: { camel_case: true },
+    })
+  })
+
+  test("lowers Anthropic provider and request options", () => {
+    const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/anthropic")
+
+    expect(
+      lowerer.provider({
+        apiKey: "secret",
+        authToken: "token",
+        baseURL: "https://anthropic.example",
+        headers: { "x-test": "1" },
+        body: { beta: true },
+        generateId: "custom",
+      }),
+    ).toEqual({
+      url: "https://anthropic.example",
+      headers: { "x-api-key": "secret", Authorization: "Bearer token", "x-test": "1" },
+      body: { beta: true },
+      settings: { generateId: "custom" },
+    })
+    expect(
+      lowerer.request({
+        effort: "high",
+        taskBudget: 1024,
+        metadata: { userId: "user", traceId: "trace" },
+        nestedValue: { camelCase: true },
+      }),
+    ).toEqual({
+      output_config: { effort: "high", task_budget: 1024 },
+      metadata: { user_id: "user", trace_id: "trace" },
+      nested_value: { camel_case: true },
+    })
+  })
+
+  test("lowers Google provider and request options", () => {
+    const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/google")
+
+    expect(
+      lowerer.provider({
+        apiKey: "secret",
+        baseURL: "https://google.example",
+        headers: { "x-test": "1" },
+        body: { trace: true },
+        project: "project",
+      }),
+    ).toEqual({
+      url: "https://google.example",
+      headers: { "x-goog-api-key": "secret", "x-test": "1" },
+      body: { trace: true },
+      settings: { project: "project" },
+    })
+    expect(
+      lowerer.request({
+        thinkingConfig: { thinkingBudget: 1024 },
+        responseModalities: ["TEXT"],
+        mediaResolution: "high",
+        imageConfig: { aspectRatio: "16:9" },
+        safetySettings: ["safe"],
+      }),
+    ).toEqual({
+      safetySettings: ["safe"],
+      generationConfig: {
+        thinkingConfig: { thinkingBudget: 1024 },
+        responseModalities: ["TEXT"],
+        mediaResolution: "high",
+        imageConfig: { aspectRatio: "16:9" },
+      },
+    })
+  })
+
+  test("lowers Azure provider options and uses OpenAI request lowering", () => {
+    const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/azure")
+
+    expect(
+      lowerer.provider({
+        apiKey: "secret",
+        baseURL: "https://azure.example",
+        headers: { "x-test": "1" },
+        body: { trace: true },
+        resourceName: "resource",
+      }),
+    ).toEqual({
+      url: "https://azure.example",
+      headers: { "api-key": "secret", "x-test": "1" },
+      body: { trace: true },
+      settings: { resourceName: "resource" },
+    })
+    expect(lowerer.request({ reasoningEffort: "high" })).toEqual({ reasoning_effort: "high" })
+  })
+
+  test("lowers Amazon Bedrock provider and request options", () => {
+    const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/amazon-bedrock")
+
+    expect(
+      lowerer.provider({
+        headers: { "x-test": "1" },
+        body: { trace: true },
+        region: "us-east-1",
+        profile: "dev",
+      }),
+    ).toEqual({
+      headers: { "x-test": "1" },
+      body: { trace: true },
+      settings: { region: "us-east-1", profile: "dev" },
+    })
+    expect(lowerer.request({ temperature: 0.2 })).toEqual({
+      additionalModelRequestFields: { temperature: 0.2 },
+    })
+  })
+
+  test("lowers OpenAI-compatible provider and request options", () => {
+    const lowerer = ConfigProviderOptionsV1.get("@ai-sdk/openai-compatible")
+
+    expect(
+      lowerer.provider({
+        baseURL: "https://compatible.example/v1",
+        headers: { "x-test": "1" },
+        body: { trace: true },
+        apiKey: "secret",
+      }),
+    ).toEqual({
+      url: "https://compatible.example/v1",
+      headers: { "x-test": "1" },
+      body: { trace: true },
+      settings: { apiKey: "secret" },
+    })
+    expect(lowerer.request({ reasoningEffort: "high", serviceTier: "priority" })).toEqual({
+      reasoning_effort: "high",
+      serviceTier: "priority",
+    })
+  })
+
+  test.each([
+    "@ai-sdk/cerebras",
+    "@ai-sdk/deepinfra",
+    "@ai-sdk/groq",
+    "@ai-sdk/mistral",
+    "@ai-sdk/togetherai",
+    "@ai-sdk/xai",
+    "@openrouter/ai-sdk-provider",
+    "ai-gateway-provider",
+    "venice-ai-sdk-provider",
+  ])("uses OpenAI-compatible lowering for %s", (packageName) => {
+    const lowerer = ConfigProviderOptionsV1.get(packageName)
+
+    expect(lowerer.provider({ baseURL: "https://example.test", apiKey: "secret" })).toEqual({
+      url: "https://example.test",
+      headers: undefined,
+      body: undefined,
+      settings: { apiKey: "secret" },
+    })
+    expect(lowerer.request({ reasoningEffort: "high" })).toEqual({ reasoning_effort: "high" })
+  })
+
+  test.each(["@ai-sdk/google-vertex", "@ai-sdk/google-vertex/anthropic"])(
+    "uses provider family lowering for %s",
+    (packageName) => {
+      const lowerer = ConfigProviderOptionsV1.get(packageName)
+
+      expect(lowerer.provider({ baseURL: "https://example.test", profile: "dev" })).toMatchObject({
+        url: "https://example.test",
+        settings: { profile: "dev" },
+      })
+    },
+  )
+})

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

@@ -0,0 +1,248 @@
+import { describe, expect } from "bun:test"
+import { Effect, Option, Schema } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { Config } from "@opencode-ai/core/config"
+import { ConfigProviderPlugin } from "@opencode-ai/core/config/plugin/provider"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { it } from "../plugin/provider-helper"
+
+function request(headers: Record<string, string>, variant?: string) {
+  return {
+    headers,
+    variant,
+  }
+}
+
+const decode = Schema.decodeUnknownSync(Config.Info)
+
+describe("ConfigProviderPlugin.Plugin", () => {
+  it.effect("partitions existing model variant bodies without changing config shape", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const plugin = yield* PluginV2.Service
+      const providerID = ProviderV2.ID.opencode
+      const modelID = ModelV2.ID.make("alpha-gpt-next")
+      const config = Config.Service.of({
+        entries: () =>
+          Effect.succeed([
+            new Config.Document({
+              type: "document",
+              info: decode({
+                providers: {
+                  opencode: {
+                    api: { type: "aisdk", package: "@ai-sdk/openai", url: "https://opencode.test/v1" },
+                    models: {
+                      "alpha-gpt-next": {
+                        variants: [
+                          {
+                            id: "high",
+                            body: {
+                              reasoningEffort: "high",
+                              reasoningSummary: "auto",
+                              include: ["reasoning.encrypted_content"],
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+              }),
+            }),
+          ]),
+      })
+
+      yield* plugin.add({
+        ...ConfigProviderPlugin.Plugin,
+        effect: ConfigProviderPlugin.Plugin.effect.pipe(
+          Effect.provideService(Config.Service, config),
+          Effect.provideService(Catalog.Service, catalog),
+        ),
+      })
+
+      const model = yield* catalog.model.get(providerID, modelID)
+      expect(model.variants).toMatchObject([
+        {
+          id: "high",
+          body: {},
+          options: {
+            reasoningEffort: "high",
+            reasoningSummary: "auto",
+            include: ["reasoning.encrypted_content"],
+          },
+        },
+      ])
+    }),
+  )
+
+  it.effect("uses the effective provider package across layered config", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const plugin = yield* PluginV2.Service
+      const providerID = ProviderV2.ID.opencode
+      const modelID = ModelV2.ID.make("alpha-gpt-next")
+      const config = Config.Service.of({
+        entries: () =>
+          Effect.succeed([
+            new Config.Document({
+              type: "document",
+              info: decode({
+                providers: {
+                  opencode: {
+                    api: { type: "aisdk", package: "@ai-sdk/openai", url: "https://opencode.test/v1" },
+                  },
+                },
+              }),
+            }),
+            new Config.Document({
+              type: "document",
+              info: decode({
+                providers: {
+                  opencode: {
+                    models: {
+                      "alpha-gpt-next": {
+                        variants: [{ id: "high", body: { reasoningEffort: "high" } }],
+                      },
+                    },
+                  },
+                },
+              }),
+            }),
+          ]),
+      })
+
+      yield* plugin.add({
+        ...ConfigProviderPlugin.Plugin,
+        effect: ConfigProviderPlugin.Plugin.effect.pipe(
+          Effect.provideService(Config.Service, config),
+          Effect.provideService(Catalog.Service, catalog),
+        ),
+      })
+
+      const model = yield* catalog.model.get(providerID, modelID)
+      expect(model.variants[0]).toMatchObject({
+        id: "high",
+        body: {},
+        options: { reasoningEffort: "high" },
+      })
+    }),
+  )
+
+  it.effect("loads configured providers and applies later model overrides", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const plugin = yield* PluginV2.Service
+      const providerID = ProviderV2.ID.make("custom")
+      const modelID = ModelV2.ID.make("chat")
+      const config = Config.Service.of({
+        entries: () =>
+          Effect.succeed([
+            new Config.Document({
+              type: "document",
+              info: decode({
+                model: "custom/first",
+                providers: {
+                  custom: {
+                    name: "Configured",
+                    env: ["CUSTOM_API_KEY"],
+                    api: { type: "native", settings: {} },
+                    request: request({ first: "first", shared: "first" }),
+                    models: {
+                      chat: {
+                        name: "First",
+                        capabilities: { tools: true, input: ["text"], output: ["text"] },
+                        disabled: true,
+                        limit: { context: 100, output: 50 },
+                        cost: { input: 1, output: 2 },
+                        request: request({ first: "first", shared: "first" }, "retained"),
+                        variants: [
+                          {
+                            id: "fast",
+                            headers: { first: "first", shared: "first" },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+              }),
+            }),
+            new Config.Document({
+              type: "document",
+              info: decode({
+                model: "custom/default",
+                providers: {
+                  custom: {
+                    api: { type: "aisdk", package: "custom-sdk", url: "https://example.test" },
+                    request: request({ last: "last", shared: "last" }),
+                    models: {
+                      default: {
+                        name: "Default",
+                      },
+                      chat: {
+                        api: { id: "api-chat" },
+                        name: "Last",
+                        limit: { output: 75 },
+                        request: request({ last: "last", shared: "last" }),
+                        variants: [
+                          {
+                            id: "fast",
+                            headers: { last: "last", shared: "last" },
+                          },
+                          {
+                            id: "slow",
+                            headers: { slow: "slow" },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+              }),
+            }),
+            new Config.Document({
+              type: "document",
+              info: decode({
+                providers: {
+                  custom: { name: "Renamed" },
+                },
+              }),
+            }),
+          ]),
+      })
+
+      yield* plugin.add({
+        ...ConfigProviderPlugin.Plugin,
+        effect: ConfigProviderPlugin.Plugin.effect.pipe(
+          Effect.provideService(Config.Service, config),
+          Effect.provideService(Catalog.Service, catalog),
+        ),
+      })
+
+      const provider = yield* catalog.provider.get(providerID)
+      const model = yield* catalog.model.get(providerID, modelID)
+      expect(Option.getOrUndefined(yield* catalog.model.default())?.id).toBe(ModelV2.ID.make("default"))
+      expect(provider.name).toBe("Renamed")
+      expect(provider.env).toEqual(["CUSTOM_API_KEY"])
+      expect(provider.enabled).toEqual({ via: "custom", data: {} })
+      expect(provider.api).toEqual({ type: "aisdk", package: "custom-sdk", url: "https://example.test" })
+      expect(provider.request.headers).toEqual({ first: "first", shared: "last", last: "last" })
+      expect(model.api.id).toBe(ModelV2.ID.make("api-chat"))
+      expect(model.name).toBe("Last")
+      expect(model.capabilities).toEqual({ tools: true, input: ["text"], output: ["text"] })
+      expect(model.enabled).toBe(false)
+      expect(model.limit).toEqual({ context: 100, output: 75 })
+      expect(model.cost).toEqual([{ input: 1, output: 2, cache: { read: 0, write: 0 }, tier: undefined }])
+      expect(model.request.headers).toEqual({ first: "first", shared: "last", last: "last" })
+      expect(model.request.variant).toBe("retained")
+      expect(model.variants.map((variant) => variant.id)).toEqual([
+        ModelV2.VariantID.make("fast"),
+        ModelV2.VariantID.make("slow"),
+      ])
+      expect(model.variants[0]?.headers).toEqual({ first: "first", shared: "last", last: "last" })
+      expect(model.variants[1]?.headers).toEqual({ slow: "slow" })
+    }),
+  )
+})

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

@@ -0,0 +1,77 @@
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Effect, Layer, Schema } from "effect"
+import { Config } from "@opencode-ai/core/config"
+import { ConfigSkillPlugin } from "@opencode-ai/core/config/plugin/skill"
+import { Global } from "@opencode-ai/core/global"
+import { Location } from "@opencode-ai/core/location"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { SkillV2 } from "@opencode-ai/core/skill"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(Layer.empty)
+const decode = Schema.decodeUnknownSync(Config.Info)
+
+describe("ConfigSkillPlugin.Plugin", () => {
+  it.effect("registers configured skill directories and URLs", () =>
+    Effect.gen(function* () {
+      const directory = AbsolutePath.make("/repo/packages/app")
+      const sources: SkillV2.Source[] = []
+      const transform = Effect.fnUntraced(function* () {
+        return Effect.fnUntraced(function* (update: (editor: SkillV2.Editor) => void) {
+          update({
+            source: (source) => sources.push(source),
+            list: () => sources,
+          })
+        })
+      })
+
+      yield* ConfigSkillPlugin.Plugin.effect.pipe(
+        Effect.provideService(
+          Config.Service,
+          Config.Service.of({
+            entries: () =>
+              Effect.succeed([
+                new Config.Directory({ type: "directory", path: AbsolutePath.make("/repo/.opencode") }),
+                new Config.Document({
+                  type: "document",
+                  info: decode({
+                    skills: ["./skills", "~/shared-skills", "/opt/skills", "https://example.test/skills/"],
+                  }),
+                }),
+              ]),
+          }),
+        ),
+        Effect.provideService(Global.Service, Global.Service.of(Global.make({ home: "/home/test" }))),
+        Effect.provideService(Location.Service, Location.Service.of(location({ directory }))),
+        Effect.provideService(
+          SkillV2.Service,
+          SkillV2.Service.of({
+            transform,
+            sources: () => Effect.succeed(sources),
+            list: () => Effect.succeed([]),
+          }),
+        ),
+      )
+
+      expect(sources).toEqual([
+        new SkillV2.DirectorySource({
+          type: "directory",
+          path: AbsolutePath.make(path.join("/repo/.opencode", "skill")),
+        }),
+        new SkillV2.DirectorySource({
+          type: "directory",
+          path: AbsolutePath.make(path.join("/repo/.opencode", "skills")),
+        }),
+        new SkillV2.DirectorySource({ type: "directory", path: AbsolutePath.make(path.join(directory, "skills")) }),
+        new SkillV2.DirectorySource({
+          type: "directory",
+          path: AbsolutePath.make(path.join("/home/test", "shared-skills")),
+        }),
+        new SkillV2.DirectorySource({ type: "directory", path: AbsolutePath.make("/opt/skills") }),
+        new SkillV2.UrlSource({ type: "url", url: "https://example.test/skills/" }),
+      ])
+    }),
+  )
+})

packages/core/test/connector.test.ts

@@ -0,0 +1,401 @@
+import { describe, expect } from "bun:test"
+import { Duration, Effect, Exit, Layer, Scope } from "effect"
+import * as TestClock from "effect/testing/TestClock"
+import { Connector } from "@opencode-ai/core/connector"
+import { Credential } from "@opencode-ai/core/credential"
+import { EventV2 } from "@opencode-ai/core/event"
+import { it } from "./lib/effect"
+
+const layer = Connector.locationLayer.pipe(
+  Layer.provide(EventV2.defaultLayer),
+  Layer.provide(
+    Layer.mock(Credential.Service)({
+      create: () => Effect.die("unexpected credential creation"),
+    }),
+  ),
+)
+
+function connectionLayer(
+  created: Array<{
+    connectorID: Connector.ID
+    methodID: Connector.MethodID
+    label?: string
+    value: Credential.Value
+  }>,
+) {
+  return Connector.locationLayer.pipe(
+    Layer.provide(EventV2.defaultLayer),
+    Layer.provide(
+      Layer.mock(Credential.Service)({
+        create: (input) =>
+          Effect.sync(() => {
+            created.push(input)
+            return new Credential.Info({ id: Credential.ID.create(), ...input, label: input.label ?? "default" })
+          }),
+      }),
+    ),
+  )
+}
+
+describe("Connector", () => {
+  it.effect("registers connectors through the editor", () =>
+    Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      const scope = yield* Scope.fork(yield* Scope.Scope)
+      const openai = Connector.ID.make("openai")
+
+      yield* connectors
+        .update((editor) => editor.update(openai, (connector) => (connector.name = "OpenAI")))
+        .pipe(Scope.provide(scope))
+      expect(yield* connectors.get(openai)).toEqual(new Connector.Info({ id: openai, name: "OpenAI", methods: [] }))
+
+      yield* Scope.close(scope, Exit.void)
+      expect(yield* connectors.get(openai)).toBeUndefined()
+    }).pipe(Effect.provide(layer)),
+  )
+
+  it.effect("reveals the previous registration when an override closes", () =>
+    Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      const id = Connector.ID.make("openai")
+      const first = yield* Scope.fork(yield* Scope.Scope)
+      const second = yield* Scope.fork(yield* Scope.Scope)
+
+      yield* connectors
+        .update((editor) => editor.update(id, (connector) => (connector.name = "OpenAI")))
+        .pipe(Scope.provide(first))
+      yield* connectors
+        .update((editor) => editor.update(id, (connector) => (connector.name = "OpenAI Override")))
+        .pipe(Scope.provide(second))
+      expect((yield* connectors.get(id))?.name).toBe("OpenAI Override")
+
+      yield* Scope.close(second, Exit.void)
+      expect((yield* connectors.get(id))?.name).toBe("OpenAI")
+      expect((yield* connectors.list()).map((connector) => connector.id)).toEqual([id])
+    }).pipe(Effect.provide(layer)),
+  )
+
+  it.effect("registers and overrides methods independently", () =>
+    Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      const connectorID = Connector.ID.make("openai")
+      const methodID = Connector.MethodID.make("chatgpt")
+      const first = yield* Scope.fork(yield* Scope.Scope)
+      const second = yield* Scope.fork(yield* Scope.Scope)
+      const authorize = () =>
+        Effect.succeed({
+          mode: "auto" as const,
+          url: "https://example.com/authorize",
+          instructions: "Sign in",
+          callback: Effect.never,
+        })
+
+      yield* connectors
+        .update((editor) =>
+          editor.method.update({
+            connectorID,
+            method: new Connector.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+            authorize,
+          }),
+        )
+        .pipe(Scope.provide(first))
+      yield* connectors
+        .update((editor) =>
+          editor.method.update({
+            connectorID,
+            method: new Connector.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT Override" }),
+            authorize,
+          }),
+        )
+        .pipe(Scope.provide(second))
+
+      expect((yield* connectors.get(connectorID))?.name).toBe("openai")
+      expect((yield* connectors.get(connectorID))?.methods[0]?.label).toBe("ChatGPT Override")
+
+      yield* Scope.close(second, Exit.void)
+      expect((yield* connectors.get(connectorID))?.methods[0]?.label).toBe("ChatGPT")
+      expect((yield* connectors.get(connectorID))?.methods.map((method) => method.id)).toEqual([methodID])
+    }).pipe(Effect.provide(layer)),
+  )
+
+  it.effect("connects with a key and stores the credential", () => {
+    const created: Array<{
+      connectorID: Connector.ID
+      methodID: Connector.MethodID
+      label?: string
+      value: Credential.Value
+    }> = []
+    return Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      const connectorID = Connector.ID.make("openai")
+      const methodID = Connector.MethodID.make("api-key")
+      yield* connectors.update((editor) =>
+        editor.method.update({
+          connectorID,
+          method: new Connector.KeyMethod({ id: methodID, type: "key", label: "API key" }),
+          authorize: (key, inputs) =>
+            Effect.succeed(
+              new Credential.Key({ type: "key", key, metadata: { organization: inputs.organization ?? "" } }),
+            ),
+        }),
+      )
+
+      yield* connectors.connect.key({
+        connectorID,
+        methodID,
+        key: "secret",
+        inputs: { organization: "acme" },
+        label: "Work",
+      })
+
+      expect(created).toEqual([
+        {
+          connectorID,
+          methodID,
+          label: "Work",
+          value: new Credential.Key({ type: "key", key: "secret", metadata: { organization: "acme" } }),
+        },
+      ])
+    }).pipe(Effect.provide(connectionLayer(created)))
+  })
+
+  it.effect("refreshes OAuth with the originating method", () => {
+    const connectorID = Connector.ID.make("openai")
+    const methodID = Connector.MethodID.make("chatgpt")
+    const credentialID = Credential.ID.create()
+    const current = new Credential.OAuth({
+      type: "oauth",
+      access: "old-access",
+      refresh: "old-refresh",
+      expires: 1,
+      metadata: { accountID: "account" },
+    })
+    const updated: Array<{ id: Credential.ID; value: Credential.Value }> = []
+    const refreshLayer = Connector.locationLayer.pipe(
+      Layer.provide(EventV2.defaultLayer),
+      Layer.provide(
+        Layer.mock(Credential.Service)({
+          get: () =>
+            Effect.succeed(
+              new Credential.Info({
+                id: credentialID,
+                connectorID,
+                methodID,
+                label: "Personal",
+                value: current,
+              }),
+            ),
+          update: (id, input) =>
+            Effect.sync(() => {
+              if (input.value) updated.push({ id, value: input.value })
+            }),
+        }),
+      ),
+    )
+
+    return Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      yield* connectors.update((editor) =>
+        editor.method.update({
+          connectorID,
+          method: new Connector.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+          authorize: () => Effect.die("unexpected authorization"),
+          refresh: (value) =>
+            Effect.succeed(
+              new Credential.OAuth({
+                type: "oauth",
+                access: "new-access",
+                refresh: "new-refresh",
+                expires: 2,
+                metadata: value.metadata,
+              }),
+            ),
+        }),
+      )
+
+      yield* connectors.refresh(credentialID)
+      expect(updated).toEqual([
+        {
+          id: credentialID,
+          value: new Credential.OAuth({
+            type: "oauth",
+            access: "new-access",
+            refresh: "new-refresh",
+            expires: 2,
+            metadata: { accountID: "account" },
+          }),
+        },
+      ])
+    }).pipe(Effect.provide(refreshLayer))
+  })
+
+  it.effect("completes code OAuth once and stores the credential", () => {
+    const created: Array<{
+      connectorID: Connector.ID
+      methodID: Connector.MethodID
+      label?: string
+      value: Credential.Value
+    }> = []
+    return Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      const connectorID = Connector.ID.make("openai")
+      const methodID = Connector.MethodID.make("chatgpt")
+      yield* connectors.update((editor) =>
+        editor.method.update({
+          connectorID,
+          method: new Connector.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+          authorize: () =>
+            Effect.succeed({
+              mode: "code" as const,
+              url: "https://example.com/authorize",
+              instructions: "Paste the code",
+              callback: (code: string) =>
+                Effect.succeed(
+                  new Credential.OAuth({
+                    type: "oauth",
+                    access: "access",
+                    refresh: "refresh",
+                    expires: 1,
+                    metadata: { code },
+                  }),
+                ),
+            }),
+        }),
+      )
+
+      const attempt = yield* connectors.connect.oauth.begin({ connectorID, methodID, inputs: {}, label: "Personal" })
+      expect(attempt.mode).toBe("code")
+      yield* connectors.connect.oauth.complete({ attemptID: attempt.attemptID, code: "1234" })
+
+      expect(created[0]).toEqual({
+        connectorID,
+        methodID,
+        label: "Personal",
+        value: new Credential.OAuth({
+          type: "oauth",
+          access: "access",
+          refresh: "refresh",
+          expires: 1,
+          metadata: { code: "1234" },
+        }),
+      })
+    }).pipe(Effect.provide(connectionLayer(created)))
+  })
+
+  it.effect("keeps code attempts open when the code is missing and closes them on cancel", () => {
+    const created: Array<{
+      connectorID: Connector.ID
+      methodID: Connector.MethodID
+      label?: string
+      value: Credential.Value
+    }> = []
+    return Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      const connectorID = Connector.ID.make("openai")
+      const methodID = Connector.MethodID.make("chatgpt")
+      let closed = false
+      yield* connectors.update((editor) =>
+        editor.method.update({
+          connectorID,
+          method: new Connector.OAuthMethod({ id: methodID, type: "oauth", label: "ChatGPT" }),
+          authorize: () =>
+            Effect.addFinalizer(() => Effect.sync(() => (closed = true))).pipe(
+              Effect.as({
+                mode: "code" as const,
+                url: "https://example.com/authorize",
+                instructions: "Paste the code",
+                callback: () => Effect.die("unexpected callback"),
+              }),
+            ),
+        }),
+      )
+
+      const attempt = yield* connectors.connect.oauth.begin({ connectorID, methodID, inputs: {} })
+      expect(
+        yield* connectors.connect.oauth.complete({ attemptID: attempt.attemptID }).pipe(Effect.flip),
+      ).toBeInstanceOf(Connector.CodeRequiredError)
+      expect(closed).toBe(false)
+      yield* connectors.connect.oauth.cancel(attempt.attemptID)
+      expect(closed).toBe(true)
+      expect(created).toEqual([])
+    }).pipe(Effect.provide(connectionLayer(created)))
+  })
+
+  it.effect("completes auto OAuth in the background", () => {
+    const created: Array<{
+      connectorID: Connector.ID
+      methodID: Connector.MethodID
+      label?: string
+      value: Credential.Value
+    }> = []
+    return Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      const connectorID = Connector.ID.make("openai")
+      const methodID = Connector.MethodID.make("browser")
+      yield* connectors.update((editor) =>
+        editor.method.update({
+          connectorID,
+          method: new Connector.OAuthMethod({ id: methodID, type: "oauth", label: "Browser" }),
+          authorize: () =>
+            Effect.succeed({
+              mode: "auto" as const,
+              url: "https://example.com/authorize",
+              instructions: "Sign in",
+              callback: Effect.succeed(
+                new Credential.OAuth({ type: "oauth", access: "access", refresh: "refresh", expires: 1 }),
+              ),
+            }),
+        }),
+      )
+
+      const attempt = yield* connectors.connect.oauth.begin({ connectorID, methodID, inputs: {} })
+      yield* Effect.yieldNow
+      expect(yield* connectors.connect.oauth.status(attempt.attemptID)).toEqual({
+        status: "complete",
+        time: attempt.time,
+      })
+      expect(created).toHaveLength(1)
+    }).pipe(Effect.provide(connectionLayer(created)))
+  })
+
+  it.effect("expires abandoned OAuth attempts", () => {
+    const created: Array<{
+      connectorID: Connector.ID
+      methodID: Connector.MethodID
+      label?: string
+      value: Credential.Value
+    }> = []
+    return Effect.gen(function* () {
+      const connectors = yield* Connector.Service
+      const connectorID = Connector.ID.make("openai")
+      const methodID = Connector.MethodID.make("browser")
+      let closed = false
+      yield* connectors.update((editor) =>
+        editor.method.update({
+          connectorID,
+          method: new Connector.OAuthMethod({ id: methodID, type: "oauth", label: "Browser" }),
+          authorize: () =>
+            Effect.addFinalizer(() => Effect.sync(() => (closed = true))).pipe(
+              Effect.as({
+                mode: "auto" as const,
+                url: "https://example.com/authorize",
+                instructions: "Sign in",
+                callback: Effect.never,
+              }),
+            ),
+        }),
+      )
+
+      const attempt = yield* connectors.connect.oauth.begin({ connectorID, methodID, inputs: {} })
+      expect(attempt.time.expires - attempt.time.created).toBe(Duration.toMillis(Duration.minutes(10)))
+      yield* TestClock.adjust(Duration.minutes(10))
+      yield* Effect.yieldNow
+      expect(yield* connectors.connect.oauth.status(attempt.attemptID)).toEqual({
+        status: "expired",
+        time: attempt.time,
+      })
+      expect(closed).toBe(true)
+      expect(created).toEqual([])
+    }).pipe(Effect.provide(connectionLayer(created)))
+  })
+})

packages/core/test/credential.test.ts

@@ -0,0 +1,206 @@
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Effect, Fiber, Layer, Stream } from "effect"
+import { Credential } from "@opencode-ai/core/credential"
+import { Connector } from "@opencode-ai/core/connector"
+import { Database } from "@opencode-ai/core/database/database"
+import { EventV2 } from "@opencode-ai/core/event"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Global } from "@opencode-ai/core/global"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+
+const it = testEffect(PluginV2.locationLayer.pipe(Layer.provide(EventV2.defaultLayer)))
+
+function testLayer(directory: string) {
+  return Credential.layer.pipe(
+    Layer.fresh,
+    Layer.provide(Database.layerFromPath(path.join(directory, "credential.db")).pipe(Layer.fresh)),
+    Layer.provideMerge(EventV2.defaultLayer),
+  )
+}
+
+describe("Credential", () => {
+  it.live("imports supported legacy auth.json credentials once", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* Effect.promise(() =>
+            Bun.write(
+              path.join(tmp.path, "auth.json"),
+              JSON.stringify({
+                openai: {
+                  type: "oauth",
+                  refresh: "refresh",
+                  access: "access",
+                  expires: 123,
+                  accountId: "account",
+                },
+                azure: { type: "api", key: "key", metadata: { resourceName: "resource" } },
+                ignored: { type: "wellknown", key: "TOKEN", token: "secret" },
+              }),
+            ),
+          )
+          const database = Database.layerFromPath(path.join(tmp.path, "credential.db")).pipe(Layer.fresh)
+          const global = Global.layerWith({ data: tmp.path })
+          const importer = Credential.legacyImportLayer.pipe(
+            Layer.provide(database),
+            Layer.provide(FSUtil.defaultLayer),
+            Layer.provide(global),
+          )
+          const credentials = Credential.layer.pipe(
+            Layer.provide(database),
+            Layer.provide(EventV2.defaultLayer),
+            Layer.provideMerge(importer),
+          )
+          const result = yield* Effect.gen(function* () {
+            const service = yield* Credential.Service
+            return yield* service.all()
+          }).pipe(Effect.provide(credentials), Effect.scoped)
+
+          expect(result).toHaveLength(2)
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              connectorID: Connector.ID.make("openai"),
+              methodID: Connector.MethodID.make("chatgpt-browser"),
+              label: "Imported",
+              value: expect.objectContaining({
+                type: "oauth",
+                refresh: "refresh",
+                access: "access",
+                expires: 123,
+                metadata: { accountID: "account" },
+              }),
+            }),
+          )
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              connectorID: Connector.ID.make("azure"),
+              methodID: Connector.MethodID.make("api-key"),
+              value: expect.objectContaining({ type: "key", key: "key", metadata: { resourceName: "resource" } }),
+            }),
+          )
+
+          yield* importer.pipe(Layer.build, Effect.scoped)
+          const after = yield* Effect.gen(function* () {
+            return yield* (yield* Credential.Service).all()
+          }).pipe(Effect.provide(credentials), Effect.scoped)
+          expect(after).toHaveLength(2)
+        }),
+      ),
+    ),
+  )
+
+  it.live("emits credential lifecycle events", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const credentials = yield* Credential.Service
+          const eventSvc = yield* EventV2.Service
+          const addedFiber = yield* eventSvc
+            .subscribe(Credential.Event.Added)
+            .pipe(Stream.take(2), Stream.runCollect, Effect.forkScoped)
+          const switchedFiber = yield* eventSvc
+            .subscribe(Credential.Event.Switched)
+            .pipe(Stream.take(3), Stream.runCollect, Effect.forkScoped)
+          const removedFiber = yield* eventSvc
+            .subscribe(Credential.Event.Removed)
+            .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
+
+          yield* Effect.yieldNow
+
+          const first = yield* credentials.create({
+            connectorID: Connector.ID.make("lifecycle"),
+            methodID: Connector.MethodID.make("key"),
+            value: new Credential.Key({ type: "key", key: "raw-key" }),
+          })
+          expect(first).toBeDefined()
+          if (!first) return
+          expect(first.label).toBe("default")
+          expect(first.value.type).toBe("key")
+          if (first.value.type === "key") expect(first.value.key).toBe("raw-key")
+
+          yield* credentials.update(first.id, { label: "keep" })
+          const updated = yield* credentials.get(first.id)
+          expect(updated?.label).toBe("keep")
+          expect(updated?.value.type).toBe("key")
+          if (updated?.value.type === "key") expect(updated.value.key).toBe("raw-key")
+
+          const second = yield* credentials.create({
+            connectorID: Connector.ID.make("lifecycle"),
+            methodID: Connector.MethodID.make("key"),
+            value: new Credential.Key({ type: "key", key: "second-key" }),
+          })
+          expect(second).toBeDefined()
+          if (!second) return
+
+          yield* credentials.remove(second.id)
+          const added = Array.from(yield* Fiber.join(addedFiber))
+          const switched = Array.from(yield* Fiber.join(switchedFiber))
+          const removed = Array.from(yield* Fiber.join(removedFiber))
+          expect(added.map((event) => event.data.credential.id)).toEqual([first.id, second.id])
+          expect(switched.map((event) => event.data)).toEqual([
+            { connectorID: Connector.ID.make("lifecycle"), from: undefined, to: first.id },
+            { connectorID: Connector.ID.make("lifecycle"), from: first.id, to: second.id },
+            { connectorID: Connector.ID.make("lifecycle"), from: second.id, to: first.id },
+          ])
+          expect(removed[0]?.data.credential.id).toBe(second.id)
+        }).pipe(Effect.provide(testLayer(tmp.path))),
+      ),
+    ),
+  )
+
+  it.live("always switches to newly created credentials", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const credentials = yield* Credential.Service
+          const eventSvc = yield* EventV2.Service
+          const switchedFiber = yield* eventSvc
+            .subscribe(Credential.Event.Switched)
+            .pipe(Stream.take(3), Stream.runCollect, Effect.forkScoped)
+
+          yield* Effect.yieldNow
+
+          const first = yield* credentials.create({
+            connectorID: Connector.ID.make("switch"),
+            methodID: Connector.MethodID.make("key"),
+            value: new Credential.Key({ type: "key", key: "first-key" }),
+          })
+          const second = yield* credentials.create({
+            connectorID: Connector.ID.make("switch"),
+            methodID: Connector.MethodID.make("key"),
+            value: new Credential.Key({ type: "key", key: "second-key" }),
+          })
+          const third = yield* credentials.create({
+            connectorID: Connector.ID.make("switch"),
+            methodID: Connector.MethodID.make("key"),
+            value: new Credential.Key({ type: "key", key: "third-key" }),
+          })
+
+          expect(first).toBeDefined()
+          expect(second).toBeDefined()
+          expect(third).toBeDefined()
+          if (!first || !second || !third) return
+
+          expect((yield* credentials.active(Connector.ID.make("switch")))?.id).toBe(third.id)
+          expect(Array.from(yield* Fiber.join(switchedFiber)).map((event) => event.data)).toEqual([
+            { connectorID: Connector.ID.make("switch"), from: undefined, to: first.id },
+            { connectorID: Connector.ID.make("switch"), from: first.id, to: second.id },
+            { connectorID: Connector.ID.make("switch"), from: second.id, to: third.id },
+          ])
+        }).pipe(Effect.provide(testLayer(tmp.path))),
+      ),
+    ),
+  )
+})

packages/core/test/database-migration.test.ts

@@ -0,0 +1,513 @@
+import { describe, expect, test } from "bun:test"
+import { $ } from "bun"
+import { fileURLToPath } from "url"
+import path from "path"
+import { SqliteClient } from "@effect/sql-sqlite-bun"
+import { EffectDrizzleSqlite } from "@opencode-ai/effect-drizzle-sqlite"
+import { Effect, Layer } from "effect"
+import { eq, inArray, sql } from "drizzle-orm"
+import { DatabaseMigration } from "@opencode-ai/core/database/migration"
+import { migrations } from "@opencode-ai/core/database/migration.gen"
+import sessionUsageMigration from "@opencode-ai/core/database/migration/20260510033149_session_usage"
+import normalizeStoragePathsMigration from "@opencode-ai/core/database/migration/20260601010001_normalize_storage_paths"
+import sessionMessageProjectionOrderMigration from "@opencode-ai/core/database/migration/20260603040000_session_message_projection_order"
+import eventSourcedSessionInputMigration from "@opencode-ai/core/database/migration/20260604172448_event_sourced_session_input"
+import contextEpochAgentMigration from "@opencode-ai/core/database/migration/20260605042240_add_context_epoch_agent"
+import { ProjectV2 } from "@opencode-ai/core/project"
+import { ProjectTable } from "@opencode-ai/core/project/sql"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { SessionSchema } from "@opencode-ai/core/session/schema"
+import { SessionTable } from "@opencode-ai/core/session/sql"
+import sessionMetadataMigration from "@opencode-ai/core/database/migration/20260511173437_session-metadata"
+import type { SqlClient as SqlClientService } from "effect/unstable/sql/SqlClient"
+import { Database } from "@opencode-ai/core/database/database"
+import { tmpdir } from "./fixture/tmpdir"
+
+const run = <A, E>(effect: Effect.Effect<A, E, SqlClientService>) =>
+  Effect.runPromise(
+    effect.pipe(Effect.provide(SqliteClient.layer({ filename: ":memory:", disableWAL: true })), Effect.scoped),
+  )
+
+const makeDb = EffectDrizzleSqlite.makeWithDefaults()
+
+describe("DatabaseMigration", () => {
+  test("serializes concurrent embedded initialization for one database path", async () => {
+    await using tmp = await tmpdir()
+    const filename = path.join(tmp.path, "embedded.sqlite")
+    const layers = [Database.layerFromPath(filename), Database.layerFromPath(filename)]
+
+    await Effect.runPromise(
+      Effect.all(
+        layers.map((layer) => Effect.scoped(Layer.build(layer))),
+        { concurrency: "unbounded" },
+      ),
+    )
+  })
+  if (process.platform === "linux") {
+    test("declared schema has no ungenerated migrations", async () => {
+      const result = await $`bun ${fileURLToPath(new URL("../script/migration.ts", import.meta.url))} --check`
+        .quiet()
+        .nothrow()
+      expect(result.exitCode, result.stderr.toString()).toBe(0)
+      expect(result.stdout.toString()).toContain("No schema changes, nothing to migrate")
+    }, 30_000)
+  }
+
+  test("applies tracked migrations to an empty database", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* DatabaseMigration.apply(db)
+
+        expect(yield* db.get(sql`SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'session'`)).toEqual({
+          name: "session",
+        })
+        expect(
+          yield* db.get(sql`SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'session_input'`),
+        ).toEqual({ name: "session_input" })
+        expect(
+          yield* db.get(sql`SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'session_context_epoch'`),
+        ).toEqual({ name: "session_context_epoch" })
+        expect(
+          yield* db.get(
+            sql`SELECT name, dflt_value FROM pragma_table_info('session_context_epoch') WHERE name = 'agent'`,
+          ),
+        ).toEqual({ name: "agent", dflt_value: "'build'" })
+        expect(yield* db.get(sql`SELECT count(*) as count FROM migration`)).toEqual({ count: migrations.length })
+        expect(
+          yield* db.all(
+            sql`SELECT name FROM sqlite_master WHERE type = 'index' AND name IN ('event_aggregate_seq_idx', 'event_aggregate_type_seq_idx', 'session_input_session_pending_seq_idx', 'session_input_session_pending_delivery_seq_idx', 'session_input_session_admitted_seq_idx', 'session_input_session_promoted_seq_idx', 'session_message_session_idx', 'session_message_session_type_idx', 'session_message_session_seq_idx', 'session_message_session_type_seq_idx', 'session_message_session_time_created_id_idx') ORDER BY name`,
+          ),
+        ).toEqual([
+          { name: "event_aggregate_seq_idx" },
+          { name: "event_aggregate_type_seq_idx" },
+          { name: "session_input_session_admitted_seq_idx" },
+          { name: "session_input_session_pending_delivery_seq_idx" },
+          { name: "session_input_session_promoted_seq_idx" },
+          { name: "session_message_session_seq_idx" },
+          { name: "session_message_session_time_created_id_idx" },
+          { name: "session_message_session_type_seq_idx" },
+        ])
+      }),
+    )
+  })
+
+  test("backfills existing Context Epoch rows to the build agent", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(
+          sql`CREATE TABLE session_context_epoch (session_id text PRIMARY KEY, baseline text NOT NULL, snapshot text NOT NULL, baseline_seq integer NOT NULL, replacement_seq integer, revision integer DEFAULT 0 NOT NULL)`,
+        )
+        yield* db.run(
+          sql`INSERT INTO session_context_epoch (session_id, baseline, snapshot, baseline_seq) VALUES ('ses_existing', 'baseline', '{}', 0)`,
+        )
+
+        yield* DatabaseMigration.applyOnly(db, [contextEpochAgentMigration])
+
+        expect(yield* db.get(sql`SELECT agent FROM session_context_epoch WHERE session_id = 'ses_existing'`)).toEqual({
+          agent: "build",
+        })
+      }),
+    )
+  })
+
+  test("resets beta history and rebuilds event-sourced Session input storage", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`CREATE TABLE session (id text PRIMARY KEY, workspace_id text)`)
+        yield* db.run(sql`CREATE TABLE workspace (id text PRIMARY KEY)`)
+        yield* db.run(sql`CREATE TABLE message (id text PRIMARY KEY)`)
+        yield* db.run(sql`CREATE TABLE part (id text PRIMARY KEY)`)
+        yield* db.run(sql`CREATE TABLE event_sequence (aggregate_id text PRIMARY KEY, seq integer NOT NULL)`)
+        yield* db.run(
+          sql`CREATE TABLE event (id text PRIMARY KEY, aggregate_id text NOT NULL, seq integer NOT NULL, type text NOT NULL, data text NOT NULL)`,
+        )
+        yield* db.run(sql`CREATE INDEX event_aggregate_seq_idx ON event (aggregate_id, seq)`)
+        yield* db.run(sql`CREATE INDEX event_aggregate_type_seq_idx ON event (aggregate_id, type, seq)`)
+        yield* db.run(
+          sql`CREATE TABLE session_message (id text PRIMARY KEY, session_id text NOT NULL, type text NOT NULL, seq integer NOT NULL, time_created integer NOT NULL, time_updated integer NOT NULL, data text NOT NULL)`,
+        )
+        yield* db.run(sql`CREATE INDEX session_message_session_seq_idx ON session_message (session_id, seq)`)
+        yield* db.run(
+          sql`CREATE TABLE session_input (seq integer PRIMARY KEY AUTOINCREMENT, id text NOT NULL UNIQUE, session_id text NOT NULL, prompt text NOT NULL, delivery text NOT NULL, promoted_seq integer, time_created integer NOT NULL)`,
+        )
+        yield* db.run(
+          sql`CREATE INDEX session_input_session_pending_delivery_seq_idx ON session_input (session_id, promoted_seq, delivery, seq)`,
+        )
+        yield* db.run(sql`INSERT INTO session (id, workspace_id) VALUES ('session', 'wrk_old')`)
+        yield* db.run(sql`INSERT INTO workspace (id) VALUES ('wrk_old')`)
+        yield* db.run(sql`INSERT INTO message (id) VALUES ('message')`)
+        yield* db.run(sql`INSERT INTO part (id) VALUES ('part')`)
+        yield* db.run(sql`INSERT INTO event_sequence (aggregate_id, seq) VALUES ('session', 0)`)
+        yield* db.run(
+          sql`INSERT INTO event (id, aggregate_id, seq, type, data) VALUES ('evt_old', 'session', 0, 'old.1', '{}')`,
+        )
+        yield* db.run(
+          sql`INSERT INTO session_message (id, session_id, type, seq, time_created, time_updated, data) VALUES ('msg_old', 'session', 'user', 0, 1, 1, '{}')`,
+        )
+        yield* db.run(
+          sql`INSERT INTO session_input (id, session_id, prompt, delivery, time_created) VALUES ('msg_pending', 'session', '{}', 'steer', 1)`,
+        )
+
+        yield* DatabaseMigration.applyOnly(db, [eventSourcedSessionInputMigration])
+
+        expect(yield* db.all(sql`SELECT id, workspace_id FROM session`)).toEqual([
+          { id: "session", workspace_id: null },
+        ])
+        expect(yield* db.all(sql`SELECT id FROM workspace`)).toEqual([])
+        expect(yield* db.all(sql`SELECT id FROM message`)).toEqual([{ id: "message" }])
+        expect(yield* db.all(sql`SELECT id FROM part`)).toEqual([{ id: "part" }])
+        expect(yield* db.all(sql`SELECT id FROM event`)).toEqual([])
+        expect(yield* db.all(sql`SELECT aggregate_id FROM event_sequence`)).toEqual([])
+        expect(yield* db.all(sql`SELECT id FROM session_message`)).toEqual([])
+        expect(yield* db.all(sql`SELECT id FROM session_input`)).toEqual([])
+        expect(
+          (yield* db.all<{ name: string }>(sql`PRAGMA table_info(session_input)`)).map((column) => column.name),
+        ).toEqual(["id", "session_id", "prompt", "delivery", "admitted_seq", "promoted_seq", "time_created"])
+        expect(
+          (yield* db.all<{ name: string; unique: number }>(sql`PRAGMA index_list(session_message)`)).find(
+            (index) => index.name === "session_message_session_seq_idx",
+          ),
+        ).toMatchObject({ unique: 1 })
+        expect(
+          (yield* db.all<{ name: string; unique: number }>(sql`PRAGMA index_list(event)`)).find(
+            (index) => index.name === "event_aggregate_seq_idx",
+          ),
+        ).toMatchObject({ unique: 1 })
+        expect(
+          (yield* db.all<{ name: string; unique: number }>(sql`PRAGMA index_list(session_input)`)).filter((index) =>
+            ["session_input_session_admitted_seq_idx", "session_input_session_promoted_seq_idx"].includes(index.name),
+          ),
+        ).toEqual([
+          expect.objectContaining({ name: "session_input_session_promoted_seq_idx", unique: 1 }),
+          expect.objectContaining({ name: "session_input_session_admitted_seq_idx", unique: 1 }),
+        ])
+      }),
+    )
+  })
+
+  test("resets incompatible projected Session messages before adding sequence order", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`CREATE TABLE session (id text PRIMARY KEY)`)
+        yield* db.run(
+          sql`CREATE TABLE message (id text PRIMARY KEY, session_id text NOT NULL, time_created integer NOT NULL, time_updated integer NOT NULL, data text NOT NULL)`,
+        )
+        yield* db.run(
+          sql`CREATE TABLE part (id text PRIMARY KEY, message_id text NOT NULL, session_id text NOT NULL, time_created integer NOT NULL, time_updated integer NOT NULL, data text NOT NULL)`,
+        )
+        yield* db.run(sql`CREATE TABLE event (id text PRIMARY KEY, seq integer NOT NULL)`)
+        yield* db.run(
+          sql`CREATE TABLE session_message (id text PRIMARY KEY, session_id text NOT NULL, type text NOT NULL, time_created integer NOT NULL, time_updated integer NOT NULL, data text NOT NULL)`,
+        )
+        yield* db.run(
+          sql`CREATE INDEX session_message_session_time_created_id_idx ON session_message (session_id, time_created, id)`,
+        )
+        yield* db.run(
+          sql`CREATE INDEX session_message_session_type_time_created_id_idx ON session_message (session_id, type, time_created, id)`,
+        )
+        yield* db.run(sql`INSERT INTO session (id) VALUES ('session')`)
+        yield* db.run(
+          sql`INSERT INTO message (id, session_id, time_created, time_updated, data) VALUES ('legacy_message', 'session', 1, 1, '{"role":"user"}')`,
+        )
+        yield* db.run(
+          sql`INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES ('legacy_part', 'legacy_message', 'session', 1, 1, '{"type":"text","text":"hello"}')`,
+        )
+        yield* db.run(
+          sql`INSERT INTO session_message (id, session_id, type, time_created, time_updated, data) VALUES ('stale_projection', 'session', 'user', 1, 1, '{}')`,
+        )
+
+        yield* DatabaseMigration.applyOnly(db, [sessionMessageProjectionOrderMigration])
+
+        expect(yield* db.all(sql`SELECT id, session_id, data FROM message`)).toEqual([
+          { id: "legacy_message", session_id: "session", data: '{"role":"user"}' },
+        ])
+        expect(yield* db.all(sql`SELECT id, message_id, session_id, data FROM part`)).toEqual([
+          {
+            id: "legacy_part",
+            message_id: "legacy_message",
+            session_id: "session",
+            data: '{"type":"text","text":"hello"}',
+          },
+        ])
+        expect(yield* db.all(sql`SELECT id FROM session_message`)).toEqual([])
+
+        yield* db.run(
+          sql`INSERT INTO session_message (id, session_id, type, seq, time_created, time_updated, data) VALUES ('fresh_projection', 'session', 'user', 7, 2, 2, '{}')`,
+        )
+        expect(yield* db.get(sql`SELECT id, seq FROM session_message`)).toEqual({ id: "fresh_projection", seq: 7 })
+      }),
+    )
+  })
+
+  test("runs session usage backfill in order with schema changes", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`CREATE TABLE session (id text PRIMARY KEY, time_updated integer NOT NULL)`)
+        yield* db.run(sql`CREATE TABLE message (id text PRIMARY KEY, session_id text NOT NULL, data text NOT NULL)`)
+        yield* db.run(sql`INSERT INTO session (id, time_updated) VALUES ('session_1', 1)`)
+        yield* db.run(
+          sql`INSERT INTO message (id, session_id, data) VALUES ('message_1', 'session_1', '{"role":"assistant","cost":1.25,"tokens":{"input":2,"output":3,"reasoning":4,"cache":{"read":5,"write":6}}}')`,
+        )
+
+        yield* DatabaseMigration.applyOnly(db, [sessionUsageMigration])
+
+        expect(
+          yield* db.get(
+            sql`SELECT cost, tokens_input, tokens_output, tokens_reasoning, tokens_cache_read, tokens_cache_write FROM session WHERE id = 'session_1'`,
+          ),
+        ).toEqual({
+          cost: 1.25,
+          tokens_input: 2,
+          tokens_output: 3,
+          tokens_reasoning: 4,
+          tokens_cache_read: 5,
+          tokens_cache_write: 6,
+        })
+      }),
+    )
+  })
+
+  test("normalizes Windows storage paths and leaves POSIX paths untouched", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`CREATE TABLE project (id text PRIMARY KEY, worktree text NOT NULL, sandboxes text NOT NULL)`)
+        yield* db.run(sql`CREATE TABLE session (id text PRIMARY KEY, directory text NOT NULL, path text)`)
+        // Windows-shaped rows (drive + backslash) must be normalized.
+        yield* db.run(
+          sql`INSERT INTO project (id, worktree, sandboxes) VALUES (${"win"}, ${"C:\\Repo\\Thing"}, ${JSON.stringify([
+            "C:\\Repo\\Thing\\sandbox",
+          ])})`,
+        )
+        yield* db.run(
+          sql`INSERT INTO session (id, directory, path) VALUES (${"win"}, ${"C:\\Repo\\Thing\\packages\\api"}, ${"packages\\api"})`,
+        )
+        // UNC worktrees and their sandboxes must normalize too (not just drive paths).
+        yield* db.run(
+          sql`INSERT INTO project (id, worktree, sandboxes) VALUES (${"unc"}, ${"\\\\server\\share"}, ${JSON.stringify([
+            "\\\\server\\share\\sandbox",
+          ])})`,
+        )
+        // The "/" worktree sentinel and POSIX paths (including a pathological
+        // backslash in a POSIX filename) must survive byte-for-byte.
+        yield* db.run(sql`INSERT INTO project (id, worktree, sandboxes) VALUES (${"global"}, ${"/"}, ${"[]"})`)
+        yield* db.run(
+          sql`INSERT INTO session (id, directory, path) VALUES (${"posix"}, ${"/home/me/we\\ird"}, ${"src\\weird"})`,
+        )
+
+        yield* DatabaseMigration.applyOnly(db, [normalizeStoragePathsMigration])
+
+        expect(yield* db.get(sql`SELECT worktree, sandboxes FROM project WHERE id = 'win'`)).toEqual({
+          worktree: "C:/Repo/Thing",
+          sandboxes: JSON.stringify(["C:/Repo/Thing/sandbox"]),
+        })
+        expect(yield* db.get(sql`SELECT directory, path FROM session WHERE id = 'win'`)).toEqual({
+          directory: "C:/Repo/Thing/packages/api",
+          path: "packages/api",
+        })
+        expect(yield* db.get(sql`SELECT worktree, sandboxes FROM project WHERE id = 'unc'`)).toEqual({
+          worktree: "//server/share",
+          sandboxes: JSON.stringify(["//server/share/sandbox"]),
+        })
+        expect(yield* db.get(sql`SELECT worktree FROM project WHERE id = 'global'`)).toEqual({ worktree: "/" })
+        expect(yield* db.get(sql`SELECT directory, path FROM session WHERE id = 'posix'`)).toEqual({
+          directory: "/home/me/we\\ird",
+          path: "src\\weird",
+        })
+      }),
+    )
+  })
+
+  test("maps native Windows paths through database columns", async () => {
+    if (process.platform !== "win32") return
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* DatabaseMigration.apply(db)
+        const projectID = ProjectV2.ID.make("codec_project")
+        const worktree = AbsolutePath.make("C:\\Repo\\Thing")
+        const sandbox = AbsolutePath.make("C:\\Repo\\Thing\\sandbox")
+        const directory = "C:\\Repo\\Thing\\packages\\api"
+        const sessionID = SessionSchema.ID.make("ses_codec")
+
+        expect(() =>
+          Effect.runSync(
+            db
+              .insert(ProjectTable)
+              .values({
+                id: ProjectV2.ID.make("invalid_path"),
+                worktree: AbsolutePath.make("not-absolute"),
+                sandboxes: [],
+                time_created: 1,
+                time_updated: 1,
+              })
+              .run(),
+          ),
+        ).toThrow()
+
+        yield* db
+          .insert(ProjectTable)
+          .values({
+            id: projectID,
+            worktree,
+            sandboxes: [sandbox],
+            time_created: 1,
+            time_updated: 1,
+          })
+          .run()
+        yield* db
+          .insert(SessionTable)
+          .values({
+            id: sessionID,
+            project_id: projectID,
+            slug: "codec",
+            directory,
+            path: "packages\\api",
+            title: "Codec",
+            version: "test",
+            time_created: 1,
+            time_updated: 1,
+          })
+          .run()
+
+        expect(
+          yield* db.get<{ worktree: string; sandboxes: string }>(
+            sql`SELECT worktree, sandboxes FROM project WHERE id = ${projectID}`,
+          ),
+        ).toEqual({
+          worktree: "C:/Repo/Thing",
+          sandboxes: JSON.stringify(["C:/Repo/Thing/sandbox"]),
+        })
+        expect(
+          yield* db.get<{ directory: string; path: string }>(
+            sql`SELECT directory, path FROM session WHERE id = ${sessionID}`,
+          ),
+        ).toEqual({
+          directory: "C:/Repo/Thing/packages/api",
+          path: "packages/api",
+        })
+
+        const project = yield* db.select().from(ProjectTable).where(eq(ProjectTable.worktree, worktree)).get()
+        const session = yield* db.select().from(SessionTable).where(eq(SessionTable.directory, directory)).get()
+        expect(project?.worktree).toBe(worktree)
+        expect(project?.sandboxes).toEqual([sandbox])
+        expect(session?.directory).toBe(directory)
+        expect(session?.path).toBe("packages/api")
+
+        expect((yield* db.select().from(SessionTable).where(eq(SessionTable.path, "packages\\api")).get())?.id).toBe(
+          sessionID,
+        )
+
+        const moved = AbsolutePath.make("D:\\Moved\\Thing")
+        const updated = yield* db
+          .update(ProjectTable)
+          .set({ worktree: moved, sandboxes: [moved] })
+          .where(eq(ProjectTable.id, projectID))
+          .returning()
+          .get()
+        expect(updated?.worktree).toBe(moved)
+        expect(updated?.sandboxes).toEqual([moved])
+        expect(
+          yield* db.get<{ worktree: string; sandboxes: string }>(
+            sql`SELECT worktree, sandboxes FROM project WHERE id = ${projectID}`,
+          ),
+        ).toEqual({ worktree: "D:/Moved/Thing", sandboxes: JSON.stringify(["D:/Moved/Thing"]) })
+        expect(
+          (yield* db
+            .select()
+            .from(ProjectTable)
+            .where(inArray(ProjectTable.worktree, [moved]))
+            .get())?.id,
+        ).toBe(projectID)
+
+        yield* db.run(sql`UPDATE project SET worktree = ${"not-absolute"} WHERE id = ${projectID}`)
+        expect(() =>
+          Effect.runSync(db.select().from(ProjectTable).where(eq(ProjectTable.id, projectID)).get()),
+        ).toThrow()
+      }),
+    )
+  })
+
+  test("imports existing drizzle migration state", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(
+          sql`CREATE TABLE __drizzle_migrations (id INTEGER PRIMARY KEY, hash text NOT NULL, created_at numeric, name text, applied_at TEXT)`,
+        )
+        yield* db.run(sql`
+          INSERT INTO __drizzle_migrations (hash, created_at, name, applied_at)
+          VALUES ('hash', 1, '20260127222353_familiar_lady_ursula', ${new Date().toISOString()})
+        `)
+
+        yield* DatabaseMigration.applyOnly(db, [])
+
+        expect(yield* db.get(sql`SELECT id FROM migration`)).toEqual({ id: "20260127222353_familiar_lady_ursula" })
+      }),
+    )
+  })
+
+  test("does not replay a migrated session metadata column", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`CREATE TABLE session (id text PRIMARY KEY, metadata text)`)
+        yield* db.run(
+          sql`CREATE TABLE __drizzle_migrations (id INTEGER PRIMARY KEY, hash text NOT NULL, created_at numeric, name text, applied_at TEXT)`,
+        )
+        yield* db.run(sql`
+          INSERT INTO __drizzle_migrations (hash, created_at, name, applied_at)
+          VALUES ('hash', 1, '20260511173437_session-metadata', ${new Date().toISOString()})
+        `)
+
+        yield* DatabaseMigration.applyOnly(db, [sessionMetadataMigration])
+
+        expect(yield* db.all(sql`SELECT id FROM migration`)).toEqual([{ id: "20260511173437_session-metadata" }])
+      }),
+    )
+  })
+
+  test("accepts the temporary replacement session metadata migration id", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`CREATE TABLE session (id text PRIMARY KEY, metadata text)`)
+        yield* db.run(sql`CREATE TABLE migration (id TEXT PRIMARY KEY, time_completed INTEGER NOT NULL)`)
+        yield* db.run(sql`INSERT INTO migration (id, time_completed) VALUES ('20260530232709_lovely_romulus', 1)`)
+
+        yield* DatabaseMigration.applyOnly(db, [sessionMetadataMigration])
+
+        expect(yield* db.all(sql`SELECT id FROM migration ORDER BY id`)).toEqual([
+          { id: "20260511173437_session-metadata" },
+          { id: "20260530232709_lovely_romulus" },
+        ])
+      }),
+    )
+  })
+
+  test("skips drizzle import when migration table already has state", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`CREATE TABLE migration (id TEXT PRIMARY KEY, time_completed INTEGER NOT NULL)`)
+        yield* db.run(sql`INSERT INTO migration (id, time_completed) VALUES ('existing', 1)`)
+        yield* db.run(
+          sql`CREATE TABLE __drizzle_migrations (id INTEGER PRIMARY KEY, hash text NOT NULL, created_at numeric, name text, applied_at TEXT)`,
+        )
+        yield* db.run(sql`
+          INSERT INTO __drizzle_migrations (hash, created_at, name, applied_at)
+          VALUES ('hash', 1, '20260127222353_familiar_lady_ursula', ${new Date().toISOString()})
+        `)
+
+        yield* DatabaseMigration.applyOnly(db, [])
+
+        expect(yield* db.all(sql`SELECT id FROM migration ORDER BY id`)).toEqual([{ id: "existing" }])
+      }),
+    )
+  })
+})

packages/core/test/effect/cross-spawn-spawner.test.ts

@@ -0,0 +1,425 @@
+import { describe, expect } from "bun:test"
+import fs from "node:fs/promises"
+import os from "node:os"
+import path from "node:path"
+import { Effect, Exit, Stream } from "effect"
+import type * as PlatformError from "effect/PlatformError"
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
+import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
+import { testEffect } from "../lib/effect"
+
+const live = CrossSpawnSpawner.defaultLayer
+const fx = testEffect(live)
+
+function js(code: string, opts?: ChildProcess.CommandOptions) {
+  return ChildProcess.make("node", ["-e", code], opts)
+}
+
+function decodeByteStream(stream: Stream.Stream<Uint8Array, PlatformError.PlatformError>) {
+  return Stream.runCollect(stream).pipe(
+    Effect.map((chunks) => {
+      const total = chunks.reduce((acc, x) => acc + x.length, 0)
+      const out = new Uint8Array(total)
+      let off = 0
+      for (const chunk of chunks) {
+        out.set(chunk, off)
+        off += chunk.length
+      }
+      return new TextDecoder("utf-8").decode(out).trim()
+    }),
+  )
+}
+
+function alive(pid: number) {
+  try {
+    process.kill(pid, 0)
+    return true
+  } catch {
+    return false
+  }
+}
+
+async function tmpdir() {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-core-test-"))
+  return {
+    path: dir,
+    async [Symbol.asyncDispose]() {
+      await fs.rm(dir, { recursive: true, force: true })
+    },
+  }
+}
+
+async function gone(pid: number, timeout = 5_000) {
+  const end = Date.now() + timeout
+  while (Date.now() < end) {
+    if (!alive(pid)) return true
+    await new Promise((resolve) => setTimeout(resolve, 50))
+  }
+  return !alive(pid)
+}
+
+describe("cross-spawn spawner", () => {
+  describe("basic spawning", () => {
+    fx.effect(
+      "captures stdout",
+      Effect.gen(function* () {
+        const out = yield* ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+          svc.string(ChildProcess.make(process.execPath, ["-e", 'process.stdout.write("ok")'])),
+        )
+        expect(out).toBe("ok")
+      }),
+    )
+
+    fx.effect(
+      "captures multiple lines",
+      Effect.gen(function* () {
+        const handle = yield* js('console.log("line1"); console.log("line2"); console.log("line3")')
+        const out = yield* decodeByteStream(handle.stdout)
+        expect(out).toBe("line1\nline2\nline3")
+      }),
+    )
+
+    fx.effect(
+      "returns exit code",
+      Effect.gen(function* () {
+        const handle = yield* js("process.exit(0)")
+        const code = yield* handle.exitCode
+        expect(code).toBe(ChildProcessSpawner.ExitCode(0))
+      }),
+    )
+
+    fx.effect(
+      "returns non-zero exit code",
+      Effect.gen(function* () {
+        const handle = yield* js("process.exit(42)")
+        const code = yield* handle.exitCode
+        expect(code).toBe(ChildProcessSpawner.ExitCode(42))
+      }),
+    )
+  })
+
+  describe("cwd option", () => {
+    fx.effect(
+      "uses cwd when spawning commands",
+      Effect.gen(function* () {
+        const tmp = yield* Effect.acquireRelease(
+          Effect.promise(() => tmpdir()),
+          (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+        )
+        const out = yield* ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+          svc.string(
+            ChildProcess.make(process.execPath, ["-e", "process.stdout.write(process.cwd())"], { cwd: tmp.path }),
+          ),
+        )
+        expect(yield* Effect.promise(() => fs.realpath(out))).toBe(yield* Effect.promise(() => fs.realpath(tmp.path)))
+      }),
+    )
+
+    fx.effect(
+      "fails for invalid cwd",
+      Effect.gen(function* () {
+        const exit = yield* Effect.exit(
+          ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+            svc.spawn(ChildProcess.make("echo", ["test"], { cwd: "/nonexistent/directory/path" })),
+          ),
+        )
+        expect(Exit.isFailure(exit)).toBe(true)
+      }),
+    )
+  })
+
+  describe("env option", () => {
+    fx.effect(
+      "passes environment variables with extendEnv",
+      Effect.gen(function* () {
+        const handle = yield* js('process.stdout.write(process.env.TEST_VAR ?? "")', {
+          env: { TEST_VAR: "test_value" },
+          extendEnv: true,
+        })
+        const out = yield* decodeByteStream(handle.stdout)
+        expect(out).toBe("test_value")
+      }),
+    )
+
+    fx.effect(
+      "passes multiple environment variables",
+      Effect.gen(function* () {
+        const handle = yield* js(
+          "process.stdout.write(`${process.env.VAR1}-${process.env.VAR2}-${process.env.VAR3}`)",
+          {
+            env: { VAR1: "one", VAR2: "two", VAR3: "three" },
+            extendEnv: true,
+          },
+        )
+        const out = yield* decodeByteStream(handle.stdout)
+        expect(out).toBe("one-two-three")
+      }),
+    )
+  })
+
+  describe("stderr", () => {
+    fx.effect(
+      "captures stderr output",
+      Effect.gen(function* () {
+        const handle = yield* js('process.stderr.write("error message")')
+        const err = yield* decodeByteStream(handle.stderr)
+        expect(err).toBe("error message")
+      }),
+    )
+
+    fx.effect(
+      "captures both stdout and stderr",
+      Effect.gen(function* () {
+        const handle = yield* js(
+          [
+            "let pending = 2",
+            "const done = () => {",
+            "  pending -= 1",
+            "  if (pending === 0) setTimeout(() => process.exit(0), 0)",
+            "}",
+            'process.stdout.write("stdout\\n", done)',
+            'process.stderr.write("stderr\\n", done)',
+          ].join("\n"),
+        )
+        const [stdout, stderr] = yield* Effect.all([decodeByteStream(handle.stdout), decodeByteStream(handle.stderr)], {
+          concurrency: 2,
+        })
+        expect(stdout).toBe("stdout")
+        expect(stderr).toBe("stderr")
+      }),
+    )
+  })
+
+  describe("combined output (all)", () => {
+    fx.effect(
+      "captures stdout via .all when no stderr",
+      Effect.gen(function* () {
+        const handle = yield* ChildProcess.make("echo", ["hello from stdout"])
+        const all = yield* decodeByteStream(handle.all)
+        expect(all).toBe("hello from stdout")
+      }),
+    )
+
+    fx.effect(
+      "captures stderr via .all when no stdout",
+      Effect.gen(function* () {
+        const handle = yield* js('process.stderr.write("hello from stderr")')
+        const all = yield* decodeByteStream(handle.all)
+        expect(all).toBe("hello from stderr")
+      }),
+    )
+  })
+
+  describe("stdin", () => {
+    fx.effect(
+      "allows providing standard input to a command",
+      Effect.gen(function* () {
+        const input = "a b c"
+        const stdin = Stream.make(Buffer.from(input, "utf-8"))
+        const handle = yield* js(
+          'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out))',
+          { stdin },
+        )
+        const out = yield* decodeByteStream(handle.stdout)
+        yield* handle.exitCode
+        expect(out).toBe("a b c")
+      }),
+    )
+  })
+
+  describe("process control", () => {
+    fx.effect(
+      "kills a running process",
+      Effect.gen(function* () {
+        const exit = yield* Effect.exit(
+          Effect.gen(function* () {
+            const handle = yield* js("setTimeout(() => {}, 10_000)")
+            yield* handle.kill()
+            return yield* handle.exitCode
+          }),
+        )
+        expect(Exit.isFailure(exit) ? true : exit.value !== ChildProcessSpawner.ExitCode(0)).toBe(true)
+      }),
+    )
+
+    fx.effect(
+      "kills a child when scope exits",
+      Effect.gen(function* () {
+        const pid = yield* Effect.scoped(
+          Effect.gen(function* () {
+            const handle = yield* js("setInterval(() => {}, 10_000)")
+            return Number(handle.pid)
+          }),
+        )
+        const done = yield* Effect.promise(() => gone(pid))
+        expect(done).toBe(true)
+      }),
+    )
+
+    fx.effect(
+      "forceKillAfter escalates for stubborn processes",
+      Effect.gen(function* () {
+        if (process.platform === "win32") return
+
+        const started = Date.now()
+        const exit = yield* Effect.exit(
+          Effect.gen(function* () {
+            const handle = yield* js('process.on("SIGTERM", () => {}); setInterval(() => {}, 10_000)')
+            yield* handle.kill({ forceKillAfter: 100 })
+            return yield* handle.exitCode
+          }),
+        )
+
+        expect(Date.now() - started).toBeLessThan(1_000)
+        expect(Exit.isFailure(exit) ? true : exit.value !== ChildProcessSpawner.ExitCode(0)).toBe(true)
+      }),
+    )
+
+    fx.effect(
+      "isRunning reflects process state",
+      Effect.gen(function* () {
+        const handle = yield* js('process.stdout.write("done")')
+        yield* handle.exitCode
+        const running = yield* handle.isRunning
+        expect(running).toBe(false)
+      }),
+    )
+  })
+
+  describe("error handling", () => {
+    fx.effect(
+      "fails for invalid command",
+      Effect.gen(function* () {
+        const exit = yield* Effect.exit(
+          Effect.gen(function* () {
+            const handle = yield* ChildProcess.make("nonexistent-command-12345")
+            return yield* handle.exitCode
+          }),
+        )
+        expect(Exit.isFailure(exit) ? true : exit.value !== ChildProcessSpawner.ExitCode(0)).toBe(true)
+      }),
+    )
+  })
+
+  describe("pipeline", () => {
+    fx.effect(
+      "pipes stdout of one command to stdin of another",
+      Effect.gen(function* () {
+        const handle = yield* js('process.stdout.write("hello world")').pipe(
+          ChildProcess.pipeTo(
+            js(
+              'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out.toUpperCase()))',
+            ),
+          ),
+        )
+        const out = yield* decodeByteStream(handle.stdout)
+        yield* handle.exitCode
+        expect(out).toBe("HELLO WORLD")
+      }),
+    )
+
+    fx.effect(
+      "three-stage pipeline",
+      Effect.gen(function* () {
+        const handle = yield* js('process.stdout.write("hello world")').pipe(
+          ChildProcess.pipeTo(
+            js(
+              'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out.toUpperCase()))',
+            ),
+          ),
+          ChildProcess.pipeTo(
+            js(
+              'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out.replaceAll(" ", "-")))',
+            ),
+          ),
+        )
+        const out = yield* decodeByteStream(handle.stdout)
+        yield* handle.exitCode
+        expect(out).toBe("HELLO-WORLD")
+      }),
+    )
+
+    fx.effect(
+      "pipes stderr with { from: 'stderr' }",
+      Effect.gen(function* () {
+        const handle = yield* js('process.stderr.write("error")').pipe(
+          ChildProcess.pipeTo(
+            js(
+              'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out))',
+            ),
+            { from: "stderr" },
+          ),
+        )
+        const out = yield* decodeByteStream(handle.stdout)
+        yield* handle.exitCode
+        expect(out).toBe("error")
+      }),
+    )
+
+    fx.effect(
+      "pipes combined output with { from: 'all' }",
+      Effect.gen(function* () {
+        const handle = yield* js('process.stdout.write("stdout\\n"); process.stderr.write("stderr\\n")').pipe(
+          ChildProcess.pipeTo(
+            js(
+              'process.stdin.setEncoding("utf8"); let out = ""; process.stdin.on("data", (chunk) => out += chunk); process.stdin.on("end", () => process.stdout.write(out))',
+            ),
+            { from: "all" },
+          ),
+        )
+        const out = yield* decodeByteStream(handle.stdout)
+        yield* handle.exitCode
+        expect(out).toContain("stdout")
+        expect(out).toContain("stderr")
+      }),
+    )
+  })
+
+  describe("Windows-specific", () => {
+    fx.effect(
+      "uses shell routing on Windows",
+      Effect.gen(function* () {
+        if (process.platform !== "win32") return
+
+        const out = yield* ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+          svc.string(
+            ChildProcess.make("set", ["OPENCODE_TEST_SHELL"], {
+              shell: true,
+              extendEnv: true,
+              env: { OPENCODE_TEST_SHELL: "ok" },
+            }),
+          ),
+        )
+        expect(out).toContain("OPENCODE_TEST_SHELL=ok")
+      }),
+    )
+
+    fx.effect(
+      "runs cmd scripts with spaces on Windows without shell",
+      Effect.gen(function* () {
+        if (process.platform !== "win32") return
+
+        const tmp = yield* Effect.acquireRelease(
+          Effect.promise(() => tmpdir()),
+          (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+        )
+        const dir = path.join(tmp.path, "with space")
+        const file = path.join(dir, "echo cmd.cmd")
+
+        yield* Effect.promise(() => fs.mkdir(dir, { recursive: true }))
+        yield* Effect.promise(() => fs.writeFile(file, "@echo off\r\nif %~1==--stdio exit /b 0\r\nexit /b 7\r\n"))
+
+        const code = yield* ChildProcessSpawner.ChildProcessSpawner.use((svc) =>
+          svc.exitCode(
+            ChildProcess.make(file, ["--stdio"], {
+              stdin: "pipe",
+              stdout: "pipe",
+              stderr: "pipe",
+            }),
+          ),
+        )
+        expect(code).toBe(ChildProcessSpawner.ExitCode(0))
+      }),
+    )
+  })
+})

packages/core/test/effect/keyed-mutex.test.ts

@@ -0,0 +1,73 @@
+import { describe, expect } from "bun:test"
+import { Deferred, Effect, Fiber } from "effect"
+import { KeyedMutex } from "@opencode-ai/core/effect/keyed-mutex"
+import { it } from "../lib/effect"
+
+describe("KeyedMutex", () => {
+  it.effect("serializes effects with the same key", () =>
+    Effect.gen(function* () {
+      const mutex = yield* KeyedMutex.make<string>()
+      const firstStarted = yield* Deferred.make<void>()
+      const releaseFirst = yield* Deferred.make<void>()
+      const secondStarted = yield* Deferred.make<void>()
+
+      const first = yield* mutex
+        .withLock("shared")(
+          Deferred.succeed(firstStarted, undefined).pipe(Effect.andThen(Deferred.await(releaseFirst))),
+        )
+        .pipe(Effect.forkChild)
+      yield* Deferred.await(firstStarted)
+      const second = yield* mutex.withLock("shared")(Deferred.succeed(secondStarted, undefined)).pipe(Effect.forkChild)
+      yield* Effect.yieldNow
+      expect(yield* Deferred.isDone(secondStarted)).toBe(false)
+
+      yield* Deferred.succeed(releaseFirst, undefined)
+      yield* Fiber.join(first)
+      yield* Fiber.join(second)
+      expect(yield* mutex.size).toBe(0)
+    }),
+  )
+
+  it.effect("allows different keys to proceed independently", () =>
+    Effect.gen(function* () {
+      const mutex = yield* KeyedMutex.make<string>()
+      const firstStarted = yield* Deferred.make<void>()
+      const releaseFirst = yield* Deferred.make<void>()
+      const secondFinished = yield* Deferred.make<void>()
+
+      const first = yield* mutex
+        .withLock("first")(Deferred.succeed(firstStarted, undefined).pipe(Effect.andThen(Deferred.await(releaseFirst))))
+        .pipe(Effect.forkChild)
+      yield* Deferred.await(firstStarted)
+      yield* mutex.withLock("second")(Deferred.succeed(secondFinished, undefined))
+      expect(yield* Deferred.isDone(secondFinished)).toBe(true)
+
+      yield* Deferred.succeed(releaseFirst, undefined)
+      yield* Fiber.join(first)
+      expect(yield* mutex.size).toBe(0)
+    }),
+  )
+
+  it.effect("removes an interrupted waiter without dropping the holder lock", () =>
+    Effect.gen(function* () {
+      const mutex = yield* KeyedMutex.make<string>()
+      const firstStarted = yield* Deferred.make<void>()
+      const releaseFirst = yield* Deferred.make<void>()
+
+      const first = yield* mutex
+        .withLock("shared")(
+          Deferred.succeed(firstStarted, undefined).pipe(Effect.andThen(Deferred.await(releaseFirst))),
+        )
+        .pipe(Effect.forkChild)
+      yield* Deferred.await(firstStarted)
+      const interrupted = yield* mutex.withLock("shared")(Effect.void).pipe(Effect.forkChild)
+      yield* Effect.yieldNow
+      yield* Fiber.interrupt(interrupted)
+      expect(yield* mutex.size).toBe(1)
+
+      yield* Deferred.succeed(releaseFirst, undefined)
+      yield* Fiber.join(first)
+      expect(yield* mutex.size).toBe(0)
+    }),
+  )
+})

packages/core/test/effect/observability.test.ts

@@ -0,0 +1,109 @@
+import { afterEach, describe, expect, test } from "bun:test"
+import { NodeFileSystem } from "@effect/platform-node"
+import { Effect, Layer, Logger } from "effect"
+import fs from "fs/promises"
+import os from "os"
+import path from "path"
+import { fileLogger } from "../../src/observability/logging"
+import { resource } from "../../src/observability/otlp"
+
+const otelResourceAttributes = process.env.OTEL_RESOURCE_ATTRIBUTES
+const opencodeClient = process.env.OPENCODE_CLIENT
+
+afterEach(() => {
+  if (otelResourceAttributes === undefined) delete process.env.OTEL_RESOURCE_ATTRIBUTES
+  else process.env.OTEL_RESOURCE_ATTRIBUTES = otelResourceAttributes
+
+  if (opencodeClient === undefined) delete process.env.OPENCODE_CLIENT
+  else process.env.OPENCODE_CLIENT = opencodeClient
+})
+
+describe("resource", () => {
+  test("parses and decodes OTEL resource attributes", () => {
+    process.env.OTEL_RESOURCE_ATTRIBUTES =
+      "service.namespace=anomalyco,team=platform%2Cobservability,label=hello%3Dworld,key%2Fname=value%20here"
+
+    expect(resource().attributes).toMatchObject({
+      "service.namespace": "anomalyco",
+      team: "platform,observability",
+      label: "hello=world",
+      "key/name": "value here",
+    })
+  })
+
+  test("drops OTEL resource attributes when any entry is invalid", () => {
+    process.env.OTEL_RESOURCE_ATTRIBUTES = "service.namespace=anomalyco,broken"
+
+    expect(resource().attributes["service.namespace"]).toBeUndefined()
+    expect(resource().attributes["opencode.client"]).toBeDefined()
+  })
+
+  test("keeps built-in attributes when env values conflict", () => {
+    process.env.OPENCODE_CLIENT = "cli"
+    process.env.OTEL_RESOURCE_ATTRIBUTES =
+      "opencode.client=web,service.instance.id=override,service.namespace=anomalyco"
+
+    expect(resource().attributes).toMatchObject({
+      "opencode.client": "cli",
+      "service.namespace": "anomalyco",
+    })
+    expect(resource().attributes["service.instance.id"]).not.toBe("override")
+    expect(resource().attributes["opencode.run"]).toMatch(/^[0-9a-f]{8}$/)
+  })
+})
+
+test("file logger appends concurrent runs with a run on every line", async () => {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-log-test-"))
+  await using _ = {
+    async [Symbol.asyncDispose]() {
+      await fs.rm(dir, { recursive: true, force: true })
+    },
+  }
+  const file = path.join(dir, "opencode.log")
+  const write = (runID: string) =>
+    Effect.forEach(
+      Array.from({ length: 50 }, (_, index) => index),
+      (index) => Effect.logInfo(`entry-${index}`),
+    ).pipe(
+      Effect.provide(Logger.layer([fileLogger(file, runID)]).pipe(Layer.provide(NodeFileSystem.layer), Layer.orDie)),
+      Effect.scoped,
+    )
+
+  await Effect.runPromise(Effect.all([write("run-a"), write("run-b")], { concurrency: "unbounded" }))
+
+  const lines = (await Bun.file(file).text()).trim().split("\n")
+  expect(lines).toHaveLength(100)
+  expect(lines.filter((line) => line.includes("run=run-a"))).toHaveLength(50)
+  expect(lines.filter((line) => line.includes("run=run-b"))).toHaveLength(50)
+  expect(lines.every((line) => line.startsWith("timestamp=") && line.includes(" level=INFO "))).toBe(true)
+  expect(lines.every((line) => !line.includes(" fiber="))).toBe(true)
+  expect(lines.every((line) => !line.startsWith("{"))).toBe(true)
+})
+
+test("file logger flattens nested objects", async () => {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-log-test-"))
+  await using _ = {
+    async [Symbol.asyncDispose]() {
+      await fs.rm(dir, { recursive: true, force: true })
+    },
+  }
+  const file = path.join(dir, "opencode.log")
+
+  await Effect.logInfo("request complete", {
+    request: { method: "GET", timing: { duration: 42 } },
+    tags: ["api", "test"],
+  }).pipe(
+    Effect.annotateLogs({ session: { id: "session-1" } }),
+    Effect.provide(Logger.layer([fileLogger(file, "run-a")]).pipe(Layer.provide(NodeFileSystem.layer), Layer.orDie)),
+    Effect.scoped,
+    Effect.runPromise,
+  )
+
+  const line = (await Bun.file(file).text()).trim()
+  expect(line).toContain('message="request complete"')
+  expect(line).toContain("request.method=GET")
+  expect(line).toContain("request.timing.duration=42")
+  expect(line).toContain('tags="[\\\"api\\\",\\\"test\\\"]"')
+  expect(line).toContain("session.id=session-1")
+  expect(line).not.toContain("request={")
+})

packages/core/test/file-mutation.test.ts

@@ -0,0 +1,363 @@
+import fs from "fs/promises"
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Deferred, Effect, Fiber, Layer } from "effect"
+import { FileMutation } from "@opencode-ai/core/file-mutation"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Location } from "@opencode-ai/core/location"
+import { LocationMutation } from "@opencode-ai/core/location-mutation"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "./fixture/location"
+import { tmpdir } from "./fixture/tmpdir"
+import { it } from "./lib/effect"
+
+function provide(directory: string, filesystem = FSUtil.defaultLayer) {
+  const activeLocation = Layer.succeed(
+    Location.Service,
+    Location.Service.of(location({ directory: AbsolutePath.make(directory) })),
+  )
+  const resolution = LocationMutation.layer.pipe(Layer.provide(filesystem), Layer.provide(activeLocation))
+  const mutation = FileMutation.layer.pipe(Layer.provide(filesystem))
+  return Effect.provide(Layer.mergeAll(resolution, mutation))
+}
+
+function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {
+  return Effect.acquireRelease(
+    Effect.promise(() => tmpdir()),
+    (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+  ).pipe(Effect.flatMap((tmp) => f(tmp.path)))
+}
+
+describe("FileMutation", () => {
+  it.live("writes an existing internal file and returns a stable result", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "hello.txt")
+        yield* Effect.promise(() => fs.writeFile(targetPath, "before"))
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: "hello.txt" })
+
+        expect(yield* (yield* FileMutation.Service).write({ target, content: "after" })).toEqual({
+          operation: "write",
+          target: target.canonical,
+          resource: "hello.txt",
+          existed: true,
+        })
+        expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("after")
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("writes a prospective internal file and creates parent directories", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const target = yield* (yield* LocationMutation.Service).resolve({
+          path: path.join("src", "nested", "hello.txt"),
+        })
+        const result = yield* (yield* FileMutation.Service).write({ target, content: "hello" })
+
+        expect(result).toEqual({
+          operation: "write",
+          target: target.canonical,
+          resource: "src/nested/hello.txt",
+          existed: false,
+        })
+        expect(yield* Effect.promise(() => fs.readFile(result.target, "utf8"))).toBe("hello")
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("preserves exactly one BOM for text writes and normalizes created text", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const preservedPath = path.join(directory, "preserved.txt")
+        yield* Effect.promise(() => fs.writeFile(preservedPath, "\uFEFFbefore"))
+        const preserved = yield* (yield* LocationMutation.Service).resolve({ path: "preserved.txt" })
+        const created = yield* (yield* LocationMutation.Service).resolve({ path: "created.txt" })
+        const files = yield* FileMutation.Service
+
+        yield* files.writeTextPreservingBom({ target: preserved, content: "\uFEFFafter" })
+        yield* files.writeTextPreservingBom({ target: created, content: "\uFEFF\uFEFF\uFEFFcreated" })
+
+        expect(yield* Effect.promise(() => fs.readFile(preservedPath, "utf8"))).toBe("\uFEFFafter")
+        expect(yield* Effect.promise(() => fs.readFile(created.canonical, "utf8"))).toBe("\uFEFFcreated")
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("rejects create when a prospective target appears after resolution", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "appeared.txt")
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: "appeared.txt" })
+        yield* Effect.promise(() => fs.writeFile(targetPath, "winner"))
+
+        expect(
+          yield* (yield* FileMutation.Service).create({ target, content: "replacement" }).pipe(Effect.flip),
+        ).toMatchObject({
+          _tag: "FileMutation.TargetExistsError",
+        })
+        expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("winner")
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("creates when an existing target disappears after resolution", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "removed.txt")
+        yield* Effect.promise(() => fs.writeFile(targetPath, "before"))
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: "removed.txt" })
+        yield* Effect.promise(() => fs.rm(targetPath))
+
+        expect(yield* (yield* FileMutation.Service).create({ target, content: "after" })).toEqual({
+          operation: "write",
+          target: target.canonical,
+          resource: "removed.txt",
+          existed: false,
+        })
+        expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("after")
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("removes an existing internal file", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "remove.txt")
+        yield* Effect.promise(() => fs.writeFile(targetPath, "remove"))
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: "remove.txt" })
+        const result = yield* (yield* FileMutation.Service).remove({ target })
+
+        expect(result).toEqual({
+          operation: "remove",
+          target: target.canonical,
+          resource: "remove.txt",
+          existed: true,
+        })
+        expect(
+          yield* Effect.promise(() =>
+            fs.stat(targetPath).then(
+              () => true,
+              () => false,
+            ),
+          ),
+        ).toBe(false)
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("writes an explicitly resolved external target", () =>
+    withTmp((directory) =>
+      withTmp((outside) =>
+        Effect.gen(function* () {
+          const targetPath = path.join(outside, "external.txt")
+          const target = yield* (yield* LocationMutation.Service).resolve({ path: targetPath })
+          const result = yield* (yield* FileMutation.Service).write({ target, content: "external" })
+
+          expect(result).toEqual({
+            operation: "write",
+            target: target.canonical,
+            resource: target.resource,
+            existed: false,
+          })
+          expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("external")
+        }).pipe(provide(directory)),
+      ),
+    ),
+  )
+
+  it.live("removes an explicitly resolved external target", () =>
+    withTmp((directory) =>
+      withTmp((outside) =>
+        Effect.gen(function* () {
+          const targetPath = path.join(outside, "external.txt")
+          yield* Effect.promise(() => fs.writeFile(targetPath, "external"))
+          const target = yield* (yield* LocationMutation.Service).resolve({ path: targetPath })
+          const result = yield* (yield* FileMutation.Service).remove({ target })
+
+          expect(result).toEqual({
+            operation: "remove",
+            target: target.canonical,
+            resource: target.resource,
+            existed: true,
+          })
+          expect(
+            yield* Effect.promise(() =>
+              fs.stat(targetPath).then(
+                () => true,
+                () => false,
+              ),
+            ),
+          ).toBe(false)
+        }).pipe(provide(directory)),
+      ),
+    ),
+  )
+
+  it.live("reports a missing target as not removed without checking existence first", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: "missing.txt" })
+
+        expect(yield* (yield* FileMutation.Service).remove({ target })).toEqual({
+          operation: "remove",
+          target: target.canonical,
+          resource: "missing.txt",
+          existed: false,
+        })
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("serializes concurrent writes to the same canonical target", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "shared.txt")
+        yield* Effect.promise(() => fs.writeFile(targetPath, "initial"))
+        const firstStarted = yield* Deferred.make<void>()
+        const releaseFirst = yield* Deferred.make<void>()
+        const secondStarted = yield* Deferred.make<void>()
+        let writes = 0
+        const filesystem = instrumentWrites((write) =>
+          Effect.gen(function* () {
+            writes++
+            if (writes === 1) {
+              yield* Deferred.succeed(firstStarted, undefined)
+              yield* Deferred.await(releaseFirst)
+            } else {
+              yield* Deferred.succeed(secondStarted, undefined)
+            }
+            yield* write
+          }),
+        )
+
+        yield* Effect.gen(function* () {
+          const mutation = yield* LocationMutation.Service
+          const files = yield* FileMutation.Service
+          const firstPlan = yield* mutation.resolve({ path: "shared.txt" })
+          const secondPlan = yield* mutation.resolve({ path: "shared.txt" })
+          const first = yield* files.write({ target: firstPlan, content: "first" }).pipe(Effect.forkChild)
+          yield* Deferred.await(firstStarted)
+          const second = yield* files.write({ target: secondPlan, content: "second" }).pipe(Effect.forkChild)
+          yield* Effect.yieldNow
+          expect(yield* Deferred.isDone(secondStarted)).toBe(false)
+
+          yield* Deferred.succeed(releaseFirst, undefined)
+          yield* Deferred.await(secondStarted)
+          yield* Fiber.join(first)
+          yield* Fiber.join(second)
+          expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("second")
+        }).pipe(provide(directory, filesystem))
+      }),
+    ),
+  )
+
+  it.live("allows only one concurrent conditional write based on the same bytes", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "shared.txt")
+        yield* Effect.promise(() => fs.writeFile(targetPath, "initial"))
+        const firstStarted = yield* Deferred.make<void>()
+        const releaseFirst = yield* Deferred.make<void>()
+        let writes = 0
+        const filesystem = instrumentWrites((write) =>
+          Effect.gen(function* () {
+            writes++
+            if (writes === 1) {
+              yield* Deferred.succeed(firstStarted, undefined)
+              yield* Deferred.await(releaseFirst)
+            }
+            yield* write
+          }),
+        )
+
+        yield* Effect.gen(function* () {
+          const mutation = yield* LocationMutation.Service
+          const files = yield* FileMutation.Service
+          const target = yield* mutation.resolve({ path: "shared.txt" })
+          const expected = new TextEncoder().encode("initial")
+          const first = yield* files.writeIfUnchanged({ target, expected, content: "first" }).pipe(Effect.forkChild)
+          yield* Deferred.await(firstStarted)
+          const second = yield* files
+            .writeIfUnchanged({ target, expected, content: "second" })
+            .pipe(Effect.flip, Effect.forkChild)
+
+          yield* Deferred.succeed(releaseFirst, undefined)
+          yield* Fiber.join(first)
+          expect(yield* Fiber.join(second)).toMatchObject({ _tag: "FileMutation.StaleContentError" })
+          expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("first")
+          expect(writes).toBe(1)
+        }).pipe(provide(directory, filesystem))
+      }),
+    ),
+  )
+
+  it.live("rejects a conditional write when target content is already stale", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "stale.txt")
+        yield* Effect.promise(() => fs.writeFile(targetPath, "current"))
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: "stale.txt" })
+
+        expect(
+          yield* (yield* FileMutation.Service)
+            .writeIfUnchanged({ target, expected: new TextEncoder().encode("older"), content: "replacement" })
+            .pipe(Effect.flip),
+        ).toMatchObject({ _tag: "FileMutation.StaleContentError", path: target.canonical })
+        expect(yield* Effect.promise(() => fs.readFile(targetPath, "utf8"))).toBe("current")
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("allows distinct canonical targets to proceed independently", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const firstStarted = yield* Deferred.make<void>()
+        const releaseFirst = yield* Deferred.make<void>()
+        const secondFinished = yield* Deferred.make<void>()
+        const secondPath = path.join(directory, "second.txt")
+        let writes = 0
+        const filesystem = instrumentWrites((write) =>
+          ++writes === 1
+            ? Deferred.succeed(firstStarted, undefined).pipe(
+                Effect.andThen(Deferred.await(releaseFirst)),
+                Effect.andThen(write),
+              )
+            : write.pipe(Effect.andThen(Deferred.succeed(secondFinished, undefined))),
+        )
+
+        yield* Effect.gen(function* () {
+          const mutation = yield* LocationMutation.Service
+          const files = yield* FileMutation.Service
+          const firstPlan = yield* mutation.resolve({ path: "first.txt" })
+          const secondPlan = yield* mutation.resolve({ path: "second.txt" })
+          const first = yield* files.write({ target: firstPlan, content: "first" }).pipe(Effect.forkChild)
+          yield* Deferred.await(firstStarted)
+          const second = yield* files.write({ target: secondPlan, content: "second" }).pipe(Effect.forkChild)
+          yield* Deferred.await(secondFinished)
+          expect(yield* Effect.promise(() => fs.readFile(secondPath, "utf8"))).toBe("second")
+
+          yield* Deferred.succeed(releaseFirst, undefined)
+          yield* Fiber.join(first)
+          yield* Fiber.join(second)
+        }).pipe(provide(directory, filesystem))
+      }),
+    ),
+  )
+})
+
+function instrumentWrites(run: <E>(write: Effect.Effect<void, E>, target: string) => Effect.Effect<void, E>) {
+  return Layer.effect(
+    FSUtil.Service,
+    Effect.gen(function* () {
+      const filesystem = yield* FSUtil.Service
+      return FSUtil.Service.of({
+        ...filesystem,
+        writeWithDirs: (target, content, mode) => run(filesystem.writeWithDirs(target, content, mode), target),
+        writeFile: (target, content, options) => run(filesystem.writeFile(target, content, options), target),
+        writeFileString: (target, content, options) =>
+          run(filesystem.writeFileString(target, content, options), target),
+      })
+    }),
+  ).pipe(Layer.provide(FSUtil.defaultLayer))
+}

packages/core/test/filesystem/filesystem.test.ts

@@ -0,0 +1,386 @@
+import { describe, test, expect } from "bun:test"
+import { Effect, Layer, FileSystem } from "effect"
+import { NodeFileSystem } from "@effect/platform-node"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { testEffect } from "../lib/effect"
+import path from "path"
+
+const live = FSUtil.layer.pipe(Layer.provideMerge(NodeFileSystem.layer))
+const { effect: it } = testEffect(live)
+
+describe("FSUtil", () => {
+  describe("isDir", () => {
+    it(
+      "returns true for directories",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        expect(yield* fs.isDir(tmp)).toBe(true)
+      }),
+    )
+
+    it(
+      "returns false for files",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "test.txt")
+        yield* filesys.writeFileString(file, "hello")
+        expect(yield* fs.isDir(file)).toBe(false)
+      }),
+    )
+
+    it(
+      "returns false for non-existent paths",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        expect(yield* fs.isDir("/tmp/nonexistent-" + Math.random())).toBe(false)
+      }),
+    )
+  })
+
+  describe("isFile", () => {
+    it(
+      "returns true for files",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "test.txt")
+        yield* filesys.writeFileString(file, "hello")
+        expect(yield* fs.isFile(file)).toBe(true)
+      }),
+    )
+
+    it(
+      "returns false for directories",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        expect(yield* fs.isFile(tmp)).toBe(false)
+      }),
+    )
+  })
+
+  describe("readFileStringSafe", () => {
+    it(
+      "returns file contents when file exists",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "exists.txt")
+        yield* filesys.writeFileString(file, "hello")
+
+        const result = yield* fs.readFileStringSafe(file)
+        expect(result).toBe("hello")
+      }),
+    )
+
+    it(
+      "returns undefined for missing file (NotFound)",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+
+        const result = yield* fs.readFileStringSafe(path.join(tmp, "does-not-exist.txt"))
+        expect(result).toBeUndefined()
+      }),
+    )
+  })
+
+  describe("readJson / writeJson", () => {
+    it(
+      "round-trips JSON data",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "data.json")
+        const data = { name: "test", count: 42, nested: { ok: true } }
+
+        yield* fs.writeJson(file, data)
+        const result = yield* fs.readJson(file)
+
+        expect(result).toEqual(data)
+      }),
+    )
+
+    it(
+      "fails invalid JSON through the error channel",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "broken.json")
+        yield* filesys.writeFileString(file, "{")
+
+        const result = yield* fs.readJson(file).pipe(Effect.catch((error) => Effect.succeed(error)))
+
+        expect(result).toHaveProperty("_tag", "FileSystemError")
+      }),
+    )
+  })
+
+  describe("ensureDir", () => {
+    it(
+      "creates nested directories",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const nested = path.join(tmp, "a", "b", "c")
+
+        yield* fs.ensureDir(nested)
+
+        const info = yield* filesys.stat(nested)
+        expect(info.type).toBe("Directory")
+      }),
+    )
+
+    it(
+      "is idempotent",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const dir = path.join(tmp, "existing")
+        yield* filesys.makeDirectory(dir)
+
+        yield* fs.ensureDir(dir)
+
+        const info = yield* filesys.stat(dir)
+        expect(info.type).toBe("Directory")
+      }),
+    )
+  })
+
+  describe("writeWithDirs", () => {
+    it(
+      "creates parent directories if missing",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "deep", "nested", "file.txt")
+
+        yield* fs.writeWithDirs(file, "hello")
+
+        expect(yield* filesys.readFileString(file)).toBe("hello")
+      }),
+    )
+
+    it(
+      "writes directly when parent exists",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "direct.txt")
+
+        yield* fs.writeWithDirs(file, "world")
+
+        expect(yield* filesys.readFileString(file)).toBe("world")
+      }),
+    )
+
+    it(
+      "writes Uint8Array content",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "binary.bin")
+        const content = new Uint8Array([0x00, 0x01, 0x02, 0x03])
+
+        yield* fs.writeWithDirs(file, content)
+
+        const result = yield* filesys.readFile(file)
+        expect(new Uint8Array(result)).toEqual(content)
+      }),
+    )
+  })
+
+  describe("findUp", () => {
+    it(
+      "finds target in start directory",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        yield* filesys.writeFileString(path.join(tmp, "target.txt"), "found")
+
+        const result = yield* fs.findUp("target.txt", tmp)
+        expect(result).toEqual([path.join(tmp, "target.txt")])
+      }),
+    )
+
+    it(
+      "finds target in parent directories",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        yield* filesys.writeFileString(path.join(tmp, "marker"), "root")
+        const child = path.join(tmp, "a", "b")
+        yield* filesys.makeDirectory(child, { recursive: true })
+
+        const result = yield* fs.findUp("marker", child, tmp)
+        expect(result).toEqual([path.join(tmp, "marker")])
+      }),
+    )
+
+    it(
+      "returns empty array when not found",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const result = yield* fs.findUp("nonexistent", tmp, tmp)
+        expect(result).toEqual([])
+      }),
+    )
+  })
+
+  describe("up", () => {
+    it(
+      "finds multiple targets walking up",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        yield* filesys.writeFileString(path.join(tmp, "a.txt"), "a")
+        yield* filesys.writeFileString(path.join(tmp, "b.txt"), "b")
+        const child = path.join(tmp, "sub")
+        yield* filesys.makeDirectory(child)
+        yield* filesys.writeFileString(path.join(child, "a.txt"), "a-child")
+
+        const result = yield* fs.up({ targets: ["a.txt", "b.txt"], start: child, stop: tmp })
+
+        expect(result).toContain(path.join(child, "a.txt"))
+        expect(result).toContain(path.join(tmp, "a.txt"))
+        expect(result).toContain(path.join(tmp, "b.txt"))
+      }),
+    )
+  })
+
+  describe("glob", () => {
+    it(
+      "finds files matching pattern",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        yield* filesys.writeFileString(path.join(tmp, "a.ts"), "a")
+        yield* filesys.writeFileString(path.join(tmp, "b.ts"), "b")
+        yield* filesys.writeFileString(path.join(tmp, "c.json"), "c")
+
+        const result = yield* fs.glob("*.ts", { cwd: tmp })
+        expect(result.sort()).toEqual(["a.ts", "b.ts"])
+      }),
+    )
+
+    it(
+      "supports absolute paths",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        yield* filesys.writeFileString(path.join(tmp, "file.txt"), "hello")
+
+        const result = yield* fs.glob("*.txt", { cwd: tmp, absolute: true })
+        expect(result).toEqual([path.join(tmp, "file.txt")])
+      }),
+    )
+  })
+
+  describe("globMatch", () => {
+    it(
+      "matches patterns",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        expect(fs.globMatch("*.ts", "foo.ts")).toBe(true)
+        expect(fs.globMatch("*.ts", "foo.json")).toBe(false)
+        expect(fs.globMatch("src/**", "src/a/b.ts")).toBe(true)
+      }),
+    )
+  })
+
+  describe("globUp", () => {
+    it(
+      "finds files walking up directories",
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        yield* filesys.writeFileString(path.join(tmp, "root.md"), "root")
+        const child = path.join(tmp, "a", "b")
+        yield* filesys.makeDirectory(child, { recursive: true })
+        yield* filesys.writeFileString(path.join(child, "leaf.md"), "leaf")
+
+        const result = yield* fs.globUp("*.md", child, tmp)
+        expect(result).toContain(path.join(child, "leaf.md"))
+        expect(result).toContain(path.join(tmp, "root.md"))
+      }),
+    )
+  })
+
+  describe("built-in passthrough", () => {
+    it(
+      "exists works",
+      Effect.gen(function* () {
+        yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "exists.txt")
+        yield* filesys.writeFileString(file, "yes")
+
+        expect(yield* filesys.exists(file)).toBe(true)
+        expect(yield* filesys.exists(file + ".nope")).toBe(false)
+      }),
+    )
+
+    it(
+      "remove works",
+      Effect.gen(function* () {
+        yield* FSUtil.Service
+        const filesys = yield* FileSystem.FileSystem
+        const tmp = yield* filesys.makeTempDirectoryScoped()
+        const file = path.join(tmp, "delete-me.txt")
+        yield* filesys.writeFileString(file, "bye")
+
+        yield* filesys.remove(file)
+
+        expect(yield* filesys.exists(file)).toBe(false)
+      }),
+    )
+  })
+
+  describe("pure helpers", () => {
+    test("mimeType returns correct types", () => {
+      expect(FSUtil.mimeType("file.json")).toBe("application/json")
+      expect(FSUtil.mimeType("image.png")).toBe("image/png")
+      expect(FSUtil.mimeType("unknown.qzx")).toBe("application/octet-stream")
+    })
+
+    test("contains checks path containment", () => {
+      expect(FSUtil.contains("/a/b", "/a/b/c")).toBe(true)
+      expect(FSUtil.contains("/a/b", "/a/b")).toBe(true)
+      expect(FSUtil.contains("/a/b", "/a/c")).toBe(false)
+      expect(FSUtil.contains("/a/b", "/a/bad")).toBe(false)
+      if (process.platform === "win32") expect(FSUtil.contains("C:\\a", "D:\\b")).toBe(false)
+    })
+
+    test("overlaps detects overlapping paths", () => {
+      expect(FSUtil.overlaps("/a/b", "/a/b/c")).toBe(true)
+      expect(FSUtil.overlaps("/a/b/c", "/a/b")).toBe(true)
+      expect(FSUtil.overlaps("/a", "/b")).toBe(false)
+      expect(FSUtil.overlaps("/a/b", "/a/bad")).toBe(false)
+      if (process.platform === "win32") expect(FSUtil.overlaps("C:\\a", "D:\\b")).toBe(false)
+    })
+  })
+})

packages/core/test/filesystem/ignore.test.ts

@@ -0,0 +1,10 @@
+import { expect, test } from "bun:test"
+import { Ignore } from "@opencode-ai/core/filesystem/ignore"
+
+test("match nested and non-nested", () => {
+  expect(Ignore.match("node_modules/index.js")).toBe(true)
+  expect(Ignore.match("node_modules")).toBe(true)
+  expect(Ignore.match("node_modules/")).toBe(true)
+  expect(Ignore.match("node_modules/bar")).toBe(true)
+  expect(Ignore.match("node_modules/bar/")).toBe(true)
+})

packages/core/test/filesystem/search.test.ts

@@ -0,0 +1,43 @@
+import { describe, expect } from "bun:test"
+import fs from "fs/promises"
+import path from "path"
+import { Effect } from "effect"
+import { Ripgrep } from "@opencode-ai/core/ripgrep"
+import { AbsolutePath, RelativePath } from "@opencode-ai/core/schema"
+import { tmpdir } from "../fixture/tmpdir"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(Ripgrep.defaultLayer)
+
+const withTmp = <A, E, R>(f: (directory: AbsolutePath) => Effect.Effect<A, E, R>) =>
+  Effect.acquireRelease(
+    Effect.promise(() => tmpdir()),
+    (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+  ).pipe(Effect.flatMap((tmp) => f(AbsolutePath.make(tmp.path))))
+
+describe("Ripgrep", () => {
+  it.live("globs files as an array", () =>
+    withTmp((cwd) =>
+      Effect.gen(function* () {
+        yield* Effect.promise(() => fs.mkdir(path.join(cwd, "src")))
+        yield* Effect.promise(() => fs.writeFile(path.join(cwd, "src", "match.ts"), "needle\n"))
+        const result = yield* (yield* Ripgrep.Service).glob({ cwd, pattern: "**/*.ts", limit: 10 })
+        expect(result.map((item) => item.path)).toEqual([RelativePath.make(path.join("src", "match.ts"))])
+      }),
+    ),
+  )
+
+  it.live("greps files with include filtering", () =>
+    withTmp((cwd) =>
+      Effect.gen(function* () {
+        yield* Effect.promise(() => fs.mkdir(path.join(cwd, "src")))
+        yield* Effect.promise(() => fs.writeFile(path.join(cwd, "src", "match.ts"), "needle\n"))
+        yield* Effect.promise(() => fs.writeFile(path.join(cwd, "src", "skip.txt"), "needle\n"))
+        const result = yield* (yield* Ripgrep.Service).grep({ cwd, pattern: "needle", include: "*.ts", limit: 10 })
+        expect(result).toHaveLength(1)
+        expect(result[0]?.entry.path).toBe(RelativePath.make(path.join("src", "match.ts")))
+        expect(result[0]?.submatches[0]?.text).toBe("needle")
+      }),
+    ),
+  )
+})

packages/core/test/filesystem/watcher.test.ts

@@ -0,0 +1,271 @@
+import { $ } from "bun"
+import { describe, expect } from "bun:test"
+import fs from "fs/promises"
+import path from "path"
+import { ConfigProvider, Deferred, Duration, Effect, Fiber, Layer, Option, Stream } from "effect"
+import { Config } from "@opencode-ai/core/config"
+import { EventV2 } from "@opencode-ai/core/event"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Watcher } from "@opencode-ai/core/filesystem/watcher"
+import { Git } from "@opencode-ai/core/git"
+import { Location } from "@opencode-ai/core/location"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { tmpdir } from "../fixture/tmpdir"
+import { testEffect } from "../lib/effect"
+
+const describeWatcher = Watcher.hasNativeBinding() && !process.env.CI ? describe : describe.skip
+
+type WatcherEvent = { file: string; event: "add" | "change" | "unlink" }
+
+const it = testEffect(Layer.mergeAll(FSUtil.defaultLayer, EventV2.defaultLayer))
+
+const configLayer = Layer.succeed(
+  Config.Service,
+  Config.Service.of({
+    entries: () => Effect.succeed([]),
+  }),
+)
+
+const flagsLayer = ConfigProvider.layer(
+  ConfigProvider.fromUnknown({
+    OPENCODE_EXPERIMENTAL_FILEWATCHER: "true",
+    OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER: "false",
+  }),
+)
+
+function provide(directory: string, vcs?: Location.Interface["vcs"]) {
+  const locationLayer = Layer.succeed(
+    Location.Service,
+    Location.Service.of(location({ directory: AbsolutePath.make(directory) }, { vcs })),
+  )
+  return Effect.provide(
+    Watcher.layer.pipe(
+      Layer.provide(configLayer),
+      Layer.provide(Git.defaultLayer),
+      Layer.provide(locationLayer),
+      Layer.provide(flagsLayer),
+    ),
+  )
+}
+
+function withTmp<A, E, R>(
+  f: (directory: string, vcs?: Location.Interface["vcs"]) => Effect.Effect<A, E, R>,
+  options?: { git?: boolean; init?: (directory: string) => Promise<void> },
+) {
+  return Effect.acquireRelease(
+    Effect.promise(async () => {
+      const tmp = await tmpdir()
+      if (!options?.git) return { tmp, vcs: undefined }
+      await $`git init`.cwd(tmp.path).quiet()
+      await $`git config core.fsmonitor false`.cwd(tmp.path).quiet()
+      await $`git config commit.gpgsign false`.cwd(tmp.path).quiet()
+      await $`git config user.email test@opencode.test`.cwd(tmp.path).quiet()
+      await $`git config user.name Test`.cwd(tmp.path).quiet()
+      await $`git commit --allow-empty -m root`.cwd(tmp.path).quiet()
+      await options.init?.(tmp.path)
+      return { tmp, vcs: { type: "git" as const, store: AbsolutePath.make(path.join(tmp.path, ".git")) } }
+    }),
+    ({ tmp }) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+  ).pipe(Effect.flatMap(({ tmp, vcs }) => f(tmp.path, vcs).pipe(provide(tmp.path, vcs))))
+}
+
+function wait(check: (event: WatcherEvent) => boolean) {
+  return Effect.gen(function* () {
+    const events = yield* EventV2.Service
+    const deferred = yield* Deferred.make<WatcherEvent>()
+    const fiber = yield* events.subscribe(Watcher.Event.Updated).pipe(
+      Stream.runForEach((event) => {
+        if (!check(event.data)) return Effect.void
+        return Deferred.succeed(deferred, event.data).pipe(Effect.asVoid)
+      }),
+      Effect.forkScoped,
+    )
+    yield* Effect.yieldNow
+    return { deferred, fiber }
+  })
+}
+
+function maybeNextUpdate<E>(
+  check: (event: WatcherEvent) => boolean,
+  trigger: Effect.Effect<void, E>,
+  timeout: Duration.Input = "5 seconds",
+) {
+  return Effect.acquireUseRelease(
+    wait(check),
+    ({ deferred }) => trigger.pipe(Effect.andThen(Deferred.await(deferred)), Effect.timeoutOption(timeout)),
+    ({ fiber }) => Fiber.interrupt(fiber),
+  )
+}
+
+function nextUpdate<E>(check: (event: WatcherEvent) => boolean, trigger: Effect.Effect<void, E>) {
+  return Effect.gen(function* () {
+    const result = yield* maybeNextUpdate(check, trigger)
+    if (Option.isSome(result)) return result.value
+    return yield* Effect.fail(new Error("timed out waiting for file watcher update"))
+  })
+}
+
+function eventuallyUpdate<E>(check: (event: WatcherEvent) => boolean, trigger: () => Effect.Effect<void, E>) {
+  return Effect.gen(function* () {
+    while (true) {
+      const result = yield* maybeNextUpdate(check, trigger(), "250 millis")
+      if (Option.isSome(result)) return result.value
+    }
+  }).pipe(
+    Effect.timeoutOrElse({
+      duration: "5 seconds",
+      orElse: () => Effect.fail(new Error("timed out waiting for file watcher readiness")),
+    }),
+  )
+}
+
+function noUpdate<E>(check: (event: WatcherEvent) => boolean, trigger: Effect.Effect<void, E>, timeout = 500) {
+  return Effect.acquireUseRelease(
+    wait(check),
+    ({ deferred }) =>
+      trigger.pipe(
+        Effect.andThen(Deferred.await(deferred)),
+        Effect.timeoutOption(`${timeout} millis`),
+        Effect.tap((result) => Effect.sync(() => expect(result).toEqual(Option.none()))),
+      ),
+    ({ fiber }) => Fiber.interrupt(fiber),
+  )
+}
+
+function ready(directory: string) {
+  const file = path.join(directory, `.watcher-${Math.random().toString(36).slice(2)}`)
+  return Effect.gen(function* () {
+    const fs = yield* FSUtil.Service
+    yield* eventuallyUpdate(
+      (event) => event.file === file,
+      () => fs.writeFileString(file, `ready-${Math.random()}`),
+    ).pipe(Effect.ensuring(fs.remove(file, { force: true }).pipe(Effect.ignore)), Effect.asVoid)
+  })
+}
+
+describeWatcher("Watcher", () => {
+  it.live("publishes root create, update, and delete events", () =>
+    withTmp(
+      (directory) =>
+        Effect.gen(function* () {
+          const fs = yield* FSUtil.Service
+          const file = path.join(directory, "watch.txt")
+          yield* ready(directory)
+          for (const item of [
+            { event: "add" as const, trigger: fs.writeFileString(file, "a") },
+            { event: "change" as const, trigger: fs.writeFileString(file, "b") },
+            { event: "unlink" as const, trigger: fs.remove(file) },
+          ]) {
+            expect(
+              yield* nextUpdate((event) => event.file === file && event.event === item.event, item.trigger),
+            ).toEqual({
+              file,
+              event: item.event,
+            })
+          }
+        }),
+      { git: true },
+    ),
+  )
+
+  it.live("watches non-git roots", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const fs = yield* FSUtil.Service
+        const file = path.join(directory, "plain.txt")
+        yield* ready(directory)
+        expect(yield* nextUpdate((event) => event.file === file, fs.writeFileString(file, "plain"))).toEqual({
+          file,
+          event: "add",
+        })
+      }),
+    ),
+  )
+
+  it.live("cleanup stops publishing events", () =>
+    Effect.gen(function* () {
+      const events = yield* EventV2.Service
+      const fs = yield* FSUtil.Service
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* ready(tmp.path).pipe(provide(tmp.path), Effect.scoped)
+      const file = path.join(tmp.path, "after-dispose.txt")
+      yield* noUpdate((event) => event.file === file, fs.writeFileString(file, "gone")).pipe(
+        Effect.provideService(EventV2.Service, events),
+      )
+    }).pipe(Effect.provide(Layer.mergeAll(FSUtil.defaultLayer, EventV2.defaultLayer))),
+  )
+
+  it.live("ignores .git/index changes", () =>
+    withTmp(
+      (directory) =>
+        Effect.gen(function* () {
+          const fs = yield* FSUtil.Service
+          const index = path.join(directory, ".git", "index")
+          yield* ready(directory)
+          yield* noUpdate(
+            (event) => event.file === index,
+            fs
+              .writeFileString(path.join(directory, "tracked.txt"), "a")
+              .pipe(Effect.andThen(Effect.promise(() => $`git add .`.cwd(directory).quiet())), Effect.asVoid),
+          )
+        }),
+      { git: true },
+    ),
+  )
+
+  it.live("publishes .git/HEAD events", () =>
+    withTmp(
+      (directory) =>
+        Effect.gen(function* () {
+          const fs = yield* FSUtil.Service
+          const head = path.join(directory, ".git", "HEAD")
+          const branch = `watch-${Math.random().toString(36).slice(2)}`
+          yield* ready(directory)
+          yield* Effect.promise(() => $`git branch ${branch}`.cwd(directory).quiet())
+          expect(
+            yield* nextUpdate((event) => event.file === head, fs.writeFileString(head, `ref: refs/heads/${branch}\n`)),
+          ).toEqual({
+            file: head,
+            event: "change",
+          })
+        }),
+      { git: true },
+    ),
+  )
+
+  const describeSymlink = process.platform !== "win32" ? describe : describe.skip
+  describeSymlink("symlinked .git", () => {
+    it.live("publishes .git/HEAD events through a symlinked .git directory", () =>
+      withTmp(
+        (directory) =>
+          Effect.gen(function* () {
+            const afs = yield* FSUtil.Service
+            const actual = path.join(directory, "..", `actual_${path.basename(directory)}`)
+            yield* Effect.addFinalizer(() => Effect.promise(() => fs.rm(actual, { recursive: true, force: true })))
+            yield* ready(directory)
+            const head = path.join(directory, ".git", "HEAD")
+            const branch = `watch-${Math.random().toString(36).slice(2)}`
+            yield* Effect.promise(() => $`git branch ${branch}`.cwd(directory).quiet())
+            expect(
+              yield* nextUpdate(
+                (event) => event.file === path.join(actual, "HEAD"),
+                afs.writeFileString(head, `ref: refs/heads/${branch}\n`),
+              ),
+            ).toEqual({ file: path.join(actual, "HEAD"), event: "change" })
+          }),
+        {
+          git: true,
+          init: async (directory) => {
+            const actual = path.join(directory, "..", `actual_${path.basename(directory)}`)
+            await fs.rename(path.join(directory, ".git"), actual)
+            await fs.symlink(actual, path.join(directory, ".git"))
+          },
+        },
+      ),
+    )
+  })
+})

packages/core/test/fixture/effect-flock-worker.ts

@@ -0,0 +1,60 @@
+import fs from "fs/promises"
+import os from "os"
+import { Effect, Layer } from "effect"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
+import { Global } from "@opencode-ai/core/global"
+
+type Msg = {
+  key: string
+  dir: string
+  holdMs?: number
+  ready?: string
+  active?: string
+  done?: string
+}
+
+function sleep(ms: number) {
+  return new Promise<void>((resolve) => setTimeout(resolve, ms))
+}
+
+const msg: Msg = JSON.parse(process.argv[2])
+
+const testGlobal = Global.layerWith({
+  home: os.homedir(),
+  data: os.tmpdir(),
+  cache: os.tmpdir(),
+  config: os.tmpdir(),
+  state: os.tmpdir(),
+  bin: os.tmpdir(),
+  log: os.tmpdir(),
+})
+
+const testLayer = EffectFlock.layer.pipe(Layer.provide(testGlobal), Layer.provide(FSUtil.defaultLayer))
+
+async function job() {
+  if (msg.ready) await fs.writeFile(msg.ready, String(process.pid))
+  if (msg.active) await fs.writeFile(msg.active, String(process.pid), { flag: "wx" })
+
+  try {
+    if (msg.holdMs && msg.holdMs > 0) await sleep(msg.holdMs)
+    if (msg.done) await fs.appendFile(msg.done, "1\n")
+  } finally {
+    if (msg.active) await fs.rm(msg.active, { force: true })
+  }
+}
+
+await Effect.runPromise(
+  Effect.gen(function* () {
+    const flock = yield* EffectFlock.Service
+    yield* flock.withLock(
+      Effect.promise(() => job()),
+      msg.key,
+      msg.dir,
+    )
+  }).pipe(Effect.provide(testLayer)),
+).catch((err) => {
+  const text = err instanceof Error ? (err.stack ?? err.message) : String(err)
+  process.stderr.write(text)
+  process.exit(1)
+})

packages/core/test/fixture/flock-worker.ts

@@ -0,0 +1,72 @@
+import fs from "fs/promises"
+import { Flock } from "@opencode-ai/core/util/flock"
+
+type Msg = {
+  key: string
+  dir: string
+  staleMs?: number
+  timeoutMs?: number
+  baseDelayMs?: number
+  maxDelayMs?: number
+  holdMs?: number
+  ready?: string
+  active?: string
+  done?: string
+}
+
+function sleep(ms: number) {
+  return new Promise<void>((resolve) => {
+    setTimeout(resolve, ms)
+  })
+}
+
+function input() {
+  const raw = process.argv[2]
+  if (!raw) {
+    throw new Error("Missing flock worker input")
+  }
+
+  return JSON.parse(raw) as Msg
+}
+
+async function job(input: Msg) {
+  if (input.ready) {
+    await fs.writeFile(input.ready, String(process.pid))
+  }
+
+  if (input.active) {
+    await fs.writeFile(input.active, String(process.pid), { flag: "wx" })
+  }
+
+  try {
+    if (input.holdMs && input.holdMs > 0) {
+      await sleep(input.holdMs)
+    }
+
+    if (input.done) {
+      await fs.appendFile(input.done, "1\n")
+    }
+  } finally {
+    if (input.active) {
+      await fs.rm(input.active, { force: true })
+    }
+  }
+}
+
+async function main() {
+  const msg = input()
+
+  await Flock.withLock(msg.key, () => job(msg), {
+    dir: msg.dir,
+    staleMs: msg.staleMs,
+    timeoutMs: msg.timeoutMs,
+    baseDelayMs: msg.baseDelayMs,
+    maxDelayMs: msg.maxDelayMs,
+  })
+}
+
+await main().catch((err) => {
+  const text = err instanceof Error ? (err.stack ?? err.message) : String(err)
+  process.stderr.write(text)
+  process.exit(1)
+})

packages/core/test/fixture/git.ts

@@ -0,0 +1,49 @@
+import { execFile } from "child_process"
+import fs from "fs/promises"
+import path from "path"
+import { promisify } from "util"
+import { pathToFileURL } from "url"
+import { Repository } from "@opencode-ai/core/repository"
+
+const exec = promisify(execFile)
+
+export async function gitRemote(root: string) {
+  const origin = path.join(root, "origin.git")
+  const source = path.join(root, "source")
+  await git(root, "init", "--bare", origin)
+  await git(root, "init", source)
+  await git(source, "config", "user.email", "test@example.com")
+  await git(source, "config", "user.name", "Test")
+  await fs.writeFile(path.join(source, "README.md"), "one\n")
+  await git(source, "add", "README.md")
+  await git(source, "commit", "-m", "initial")
+  await git(source, "branch", "-M", "main")
+  await git(source, "remote", "add", "origin", pathToFileURL(origin).href)
+  await git(source, "push", "-u", "origin", "main")
+  await git(root, "--git-dir", origin, "symbolic-ref", "HEAD", "refs/heads/main")
+  return {
+    root,
+    source,
+    remote: pathToFileURL(origin).href,
+    reference: { ...Repository.parseRemote("owner/repo"), remote: pathToFileURL(origin).href },
+  }
+}
+
+export async function commit(source: string, content: string, message: string) {
+  await fs.writeFile(path.join(source, "README.md"), content)
+  await git(source, "add", "README.md")
+  await git(source, "commit", "-m", message)
+  await git(source, "push")
+}
+
+export async function branch(source: string, name: string, content: string) {
+  await git(source, "checkout", "-b", name)
+  await fs.writeFile(path.join(source, "README.md"), content)
+  await git(source, "add", "README.md")
+  await git(source, "commit", "-m", name)
+  await git(source, "push", "-u", "origin", name)
+}
+
+export async function git(cwd: string, ...args: string[]) {
+  await exec("git", args, { cwd })
+}

packages/core/test/fixture/location.ts

@@ -0,0 +1,12 @@
+import { Location } from "@opencode-ai/core/location"
+import { Project } from "@opencode-ai/core/project"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+
+export function location(ref: Location.Ref, input: { projectDirectory?: AbsolutePath; vcs?: Project.Vcs } = {}) {
+  return {
+    directory: ref.directory,
+    workspaceID: ref.workspaceID,
+    project: { id: Project.ID.global, directory: input.projectDirectory ?? ref.directory },
+    vcs: input.vcs,
+  } satisfies Location.Interface
+}

packages/core/test/fixture/tmpdir.ts

@@ -0,0 +1,25 @@
+import fs from "fs/promises"
+import { tmpdir as osTmpdir } from "os"
+import path from "path"
+
+export const tmpdir = async () => {
+  const dir = await fs.realpath(await fs.mkdtemp(path.join(osTmpdir(), "opencode-core-test-")))
+  return {
+    path: dir,
+    async [Symbol.asyncDispose]() {
+      await remove(dir)
+    },
+  }
+}
+
+async function remove(dir: string, retries = 30): Promise<void> {
+  try {
+    await fs.rm(dir, { recursive: true, force: true })
+  } catch (error) {
+    if (retries === 0 || !error || typeof error !== "object" || !("code" in error) || error.code !== "EBUSY")
+      throw error
+    Bun.gc(true)
+    await Bun.sleep(100)
+    return remove(dir, retries - 1)
+  }
+}

packages/core/test/fixtures/recordings/session-runner/openai-chat-streams-text.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "metadata": {
+    "name": "session-runner/openai-chat-streams-text",
+    "recordedAt": "2026-06-02T19:52:25.084Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://api.openai.com/v1/chat/completions",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"gpt-4o-mini\",\"messages\":[{\"role\":\"user\",\"content\":\"Say hello in one short sentence.\"}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":20,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "data: {\"id\":\"chatcmpl-DmPRwO9SjY0GJZ3TFFe1Be72wysEG\",\"object\":\"chat.completion.chunk\",\"created\":1780429944,\"model\":\"gpt-4o-mini-2024-07-18\",\"service_tier\":\"default\",\"system_fingerprint\":\"fp_40bf7dabb5\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"refusal\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"f3yrdno80\"}\n\ndata: {\"id\":\"chatcmpl-DmPRwO9SjY0GJZ3TFFe1Be72wysEG\",\"object\":\"chat.completion.chunk\",\"created\":1780429944,\"model\":\"gpt-4o-mini-2024-07-18\",\"service_tier\":\"default\",\"system_fingerprint\":\"fp_40bf7dabb5\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hello\"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"fDsGzJ\"}\n\ndata: {\"id\":\"chatcmpl-DmPRwO9SjY0GJZ3TFFe1Be72wysEG\",\"object\":\"chat.completion.chunk\",\"created\":1780429944,\"model\":\"gpt-4o-mini-2024-07-18\",\"service_tier\":\"default\",\"system_fingerprint\":\"fp_40bf7dabb5\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"!\"},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null,\"obfuscation\":\"RqaP5kpPNU\"}\n\ndata: {\"id\":\"chatcmpl-DmPRwO9SjY0GJZ3TFFe1Be72wysEG\",\"object\":\"chat.completion.chunk\",\"created\":1780429944,\"model\":\"gpt-4o-mini-2024-07-18\",\"service_tier\":\"default\",\"system_fingerprint\":\"fp_40bf7dabb5\",\"choices\":[{\"index\":0,\"delta\":{},\"logprobs\":null,\"finish_reason\":\"stop\"}],\"usage\":null,\"obfuscation\":\"B19l5\"}\n\ndata: {\"id\":\"chatcmpl-DmPRwO9SjY0GJZ3TFFe1Be72wysEG\",\"object\":\"chat.completion.chunk\",\"created\":1780429944,\"model\":\"gpt-4o-mini-2024-07-18\",\"service_tier\":\"default\",\"system_fingerprint\":\"fp_40bf7dabb5\",\"choices\":[],\"usage\":{\"prompt_tokens\":22,\"completion_tokens\":2,\"total_tokens\":24,\"prompt_tokens_details\":{\"cached_tokens\":0,\"audio_tokens\":0},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"audio_tokens\":0,\"accepted_prediction_tokens\":0,\"rejected_prediction_tokens\":0}},\"obfuscation\":\"kbiJobM55YE\"}\n\ndata: [DONE]\n\n"
+      }
+    }
+  ]
+}

packages/core/test/git.test.ts

@@ -0,0 +1,106 @@
+import { describe, expect } from "bun:test"
+import { $ } from "bun"
+import fs from "fs/promises"
+import path from "path"
+import { Effect } from "effect"
+import { Git } from "@opencode-ai/core/git"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { branch, commit, gitRemote } from "./fixture/git"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+
+const it = testEffect(Git.defaultLayer)
+
+describe("Git", () => {
+  it.live("clones a remote and reads checkout metadata", () =>
+    withRemote((fixture) =>
+      Effect.gen(function* () {
+        const git = yield* Git.Service
+        const target = path.join(fixture.root, "checkout")
+        const result = yield* git.clone({ remote: fixture.remote, target })
+
+        expect(result.exitCode).toBe(0)
+        expect(yield* git.origin(target)).toBe(fixture.remote)
+        expect(yield* git.head(target)).toBeString()
+        expect(yield* git.branch(target)).toBe("main")
+        expect(yield* git.remoteHead(target)).toBe("origin/main")
+        expect(yield* read(path.join(target, "README.md"))).toBe("one\n")
+      }),
+    ),
+  )
+
+  it.live("fetches, checks out, and resets remote changes", () =>
+    withRemote((fixture) =>
+      Effect.gen(function* () {
+        const git = yield* Git.Service
+        const target = path.join(fixture.root, "checkout")
+        yield* git.clone({ remote: fixture.remote, target })
+
+        yield* Effect.promise(() => commit(fixture.source, "two\n", "second"))
+        expect((yield* git.fetch(target)).exitCode).toBe(0)
+        expect((yield* git.reset(target, "origin/main")).exitCode).toBe(0)
+        expect(yield* read(path.join(target, "README.md"))).toBe("two\n")
+
+        yield* Effect.promise(() => branch(fixture.source, "feature/docs", "feature\n"))
+        expect((yield* git.fetchBranch(target, "feature/docs")).exitCode).toBe(0)
+        expect((yield* git.checkout(target, "feature/docs")).exitCode).toBe(0)
+        expect((yield* git.reset(target, "origin/feature/docs")).exitCode).toBe(0)
+        expect(yield* git.branch(target)).toBe("feature/docs")
+        expect(yield* read(path.join(target, "README.md"))).toBe("feature\n")
+      }),
+    ),
+  )
+})
+
+function withRemote<A, E, R>(body: (fixture: Awaited<ReturnType<typeof gitRemote>>) => Effect.Effect<A, E, R>) {
+  return Effect.acquireUseRelease(
+    Effect.promise(async () => {
+      const root = await tmpdir()
+      return { root, fixture: await gitRemote(root.path) }
+    }),
+    (input) => body(input.fixture),
+    (input) => Effect.promise(() => input.root[Symbol.asyncDispose]()),
+  )
+}
+
+function read(file: string) {
+  return Effect.promise(() => fs.readFile(file, "utf8")).pipe(Effect.map((content) => content.replace(/\r\n/g, "\n")))
+}
+
+async function initRepo(directory: string) {
+  await $`git init`.cwd(directory).quiet()
+  await $`git config core.fsmonitor false`.cwd(directory).quiet()
+  await $`git config commit.gpgsign false`.cwd(directory).quiet()
+  await $`git config user.email test@opencode.test`.cwd(directory).quiet()
+  await $`git config user.name Test`.cwd(directory).quiet()
+  await $`git commit --allow-empty -m root`.cwd(directory).quiet()
+}
+
+describe("Git worktrees", () => {
+  it.live("creates, lists, and removes linked worktrees", () =>
+    Effect.gen(function* () {
+      const root = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(root.path))
+      const directory = AbsolutePath.make(yield* Effect.promise(() => fs.realpath(root.path)))
+      const worktree = AbsolutePath.make(`${root.path}-git-worktree`)
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(worktree, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      const git = yield* Git.Service
+      const repo = { directory, store: AbsolutePath.make(path.join(directory, ".git")) }
+
+      yield* git.worktreeCreate({ repo, directory: worktree })
+
+      expect((yield* git.worktreeList(repo)).some((entry) => entry.endsWith("-git-worktree"))).toBe(true)
+      const linked = yield* git.find(worktree)
+      expect(linked?.directory).toBe(AbsolutePath.make(yield* Effect.promise(() => fs.realpath(worktree))))
+      expect(linked?.store).toBe(repo.store)
+      if (!linked) throw new Error("Linked worktree not found")
+      yield* git.worktreeRemove({ repo: linked, directory: worktree, force: false })
+      expect((yield* git.worktreeList(repo)).some((entry) => entry.endsWith("-git-worktree"))).toBe(false)
+    }),
+  )
+})

packages/core/test/github-copilot/convert-to-copilot-messages.test.ts

@@ -0,0 +1,523 @@
+import { convertToOpenAICompatibleChatMessages as convertToCopilotMessages } from "@opencode-ai/core/github-copilot/chat/convert-to-openai-compatible-chat-messages"
+import { describe, test, expect } from "bun:test"
+
+describe("system messages", () => {
+  test("should convert system message content to string", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "system",
+        content: "You are a helpful assistant with AGENTS.md instructions.",
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "system",
+        content: "You are a helpful assistant with AGENTS.md instructions.",
+      },
+    ])
+  })
+})
+
+describe("user messages", () => {
+  test("should convert messages with only a text part to a string content", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "user",
+        content: [{ type: "text", text: "Hello" }],
+      },
+    ])
+
+    expect(result).toEqual([{ role: "user", content: "Hello" }])
+  })
+
+  test("should convert messages with image parts", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "user",
+        content: [
+          { type: "text", text: "Hello" },
+          {
+            type: "file",
+            data: Buffer.from([0, 1, 2, 3]).toString("base64"),
+            mediaType: "image/png",
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "user",
+        content: [
+          { type: "text", text: "Hello" },
+          {
+            type: "image_url",
+            image_url: { url: "data:image/png;base64,AAECAw==" },
+          },
+        ],
+      },
+    ])
+  })
+
+  test("should convert messages with image parts from Uint8Array", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "user",
+        content: [
+          { type: "text", text: "Hi" },
+          {
+            type: "file",
+            data: new Uint8Array([0, 1, 2, 3]),
+            mediaType: "image/png",
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "user",
+        content: [
+          { type: "text", text: "Hi" },
+          {
+            type: "image_url",
+            image_url: { url: "data:image/png;base64,AAECAw==" },
+          },
+        ],
+      },
+    ])
+  })
+
+  test("should handle URL-based images", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "user",
+        content: [
+          {
+            type: "file",
+            data: new URL("https://example.com/image.jpg"),
+            mediaType: "image/*",
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "user",
+        content: [
+          {
+            type: "image_url",
+            image_url: { url: "https://example.com/image.jpg" },
+          },
+        ],
+      },
+    ])
+  })
+
+  test("should handle multiple text parts without flattening", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "user",
+        content: [
+          { type: "text", text: "Part 1" },
+          { type: "text", text: "Part 2" },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "user",
+        content: [
+          { type: "text", text: "Part 1" },
+          { type: "text", text: "Part 2" },
+        ],
+      },
+    ])
+  })
+})
+
+describe("assistant messages", () => {
+  test("should convert assistant text messages", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [{ type: "text", text: "Hello back!" }],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "assistant",
+        content: "Hello back!",
+        tool_calls: undefined,
+        reasoning_text: undefined,
+        reasoning_opaque: undefined,
+      },
+    ])
+  })
+
+  test("should handle assistant message with null content when only tool calls", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "tool-call",
+            toolCallId: "call1",
+            toolName: "calculator",
+            input: { a: 1, b: 2 },
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "assistant",
+        content: null,
+        tool_calls: [
+          {
+            id: "call1",
+            type: "function",
+            function: {
+              name: "calculator",
+              arguments: JSON.stringify({ a: 1, b: 2 }),
+            },
+          },
+        ],
+        reasoning_text: undefined,
+        reasoning_opaque: undefined,
+      },
+    ])
+  })
+
+  test("should concatenate multiple text parts", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [
+          { type: "text", text: "First part. " },
+          { type: "text", text: "Second part." },
+        ],
+      },
+    ])
+
+    expect(result[0].content).toBe("First part. Second part.")
+  })
+})
+
+describe("tool calls", () => {
+  test("should stringify arguments to tool calls", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "tool-call",
+            input: { foo: "bar123" },
+            toolCallId: "quux",
+            toolName: "thwomp",
+          },
+        ],
+      },
+      {
+        role: "tool",
+        content: [
+          {
+            type: "tool-result",
+            toolCallId: "quux",
+            toolName: "thwomp",
+            output: { type: "json", value: { oof: "321rab" } },
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "assistant",
+        content: null,
+        tool_calls: [
+          {
+            id: "quux",
+            type: "function",
+            function: {
+              name: "thwomp",
+              arguments: JSON.stringify({ foo: "bar123" }),
+            },
+          },
+        ],
+        reasoning_text: undefined,
+        reasoning_opaque: undefined,
+      },
+      {
+        role: "tool",
+        tool_call_id: "quux",
+        content: JSON.stringify({ oof: "321rab" }),
+      },
+    ])
+  })
+
+  test("should handle text output type in tool results", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "tool",
+        content: [
+          {
+            type: "tool-result",
+            toolCallId: "call-1",
+            toolName: "getWeather",
+            output: { type: "text", value: "It is sunny today" },
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "tool",
+        tool_call_id: "call-1",
+        content: "It is sunny today",
+      },
+    ])
+  })
+
+  test("should handle multiple tool results as separate messages", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "tool",
+        content: [
+          {
+            type: "tool-result",
+            toolCallId: "call1",
+            toolName: "api1",
+            output: { type: "text", value: "Result 1" },
+          },
+          {
+            type: "tool-result",
+            toolCallId: "call2",
+            toolName: "api2",
+            output: { type: "text", value: "Result 2" },
+          },
+        ],
+      },
+    ])
+
+    expect(result).toHaveLength(2)
+    expect(result[0]).toEqual({
+      role: "tool",
+      tool_call_id: "call1",
+      content: "Result 1",
+    })
+    expect(result[1]).toEqual({
+      role: "tool",
+      tool_call_id: "call2",
+      content: "Result 2",
+    })
+  })
+
+  test("should handle text plus multiple tool calls", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [
+          { type: "text", text: "Checking... " },
+          {
+            type: "tool-call",
+            toolCallId: "call1",
+            toolName: "searchTool",
+            input: { query: "Weather" },
+          },
+          { type: "text", text: "Almost there..." },
+          {
+            type: "tool-call",
+            toolCallId: "call2",
+            toolName: "mapsTool",
+            input: { location: "Paris" },
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "assistant",
+        content: "Checking... Almost there...",
+        tool_calls: [
+          {
+            id: "call1",
+            type: "function",
+            function: {
+              name: "searchTool",
+              arguments: JSON.stringify({ query: "Weather" }),
+            },
+          },
+          {
+            id: "call2",
+            type: "function",
+            function: {
+              name: "mapsTool",
+              arguments: JSON.stringify({ location: "Paris" }),
+            },
+          },
+        ],
+        reasoning_text: undefined,
+        reasoning_opaque: undefined,
+      },
+    ])
+  })
+})
+
+describe("reasoning (copilot-specific)", () => {
+  test("should omit reasoning_text without reasoning_opaque", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [
+          { type: "reasoning", text: "Let me think about this..." },
+          { type: "text", text: "The answer is 42." },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "assistant",
+        content: "The answer is 42.",
+        tool_calls: undefined,
+        reasoning_text: undefined,
+        reasoning_opaque: undefined,
+      },
+    ])
+  })
+
+  test("should include reasoning_opaque from providerOptions", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "reasoning",
+            text: "Thinking...",
+            providerOptions: {
+              copilot: { reasoningOpaque: "opaque-signature-123" },
+            },
+          },
+          { type: "text", text: "Done!" },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "assistant",
+        content: "Done!",
+        tool_calls: undefined,
+        reasoning_text: "Thinking...",
+        reasoning_opaque: "opaque-signature-123",
+      },
+    ])
+  })
+
+  test("should include reasoning_opaque from text part providerOptions", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "text",
+            text: "Done!",
+            providerOptions: {
+              copilot: { reasoningOpaque: "opaque-text-456" },
+            },
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "assistant",
+        content: "Done!",
+        tool_calls: undefined,
+        reasoning_text: undefined,
+        reasoning_opaque: "opaque-text-456",
+      },
+    ])
+  })
+
+  test("should handle reasoning-only assistant message", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "reasoning",
+            text: "Just thinking, no response yet",
+            providerOptions: {
+              copilot: { reasoningOpaque: "sig-abc" },
+            },
+          },
+        ],
+      },
+    ])
+
+    expect(result).toEqual([
+      {
+        role: "assistant",
+        content: null,
+        tool_calls: undefined,
+        reasoning_text: "Just thinking, no response yet",
+        reasoning_opaque: "sig-abc",
+      },
+    ])
+  })
+})
+
+describe("full conversation", () => {
+  test("should convert a multi-turn conversation with reasoning", () => {
+    const result = convertToCopilotMessages([
+      {
+        role: "system",
+        content: "You are a helpful assistant.",
+      },
+      {
+        role: "user",
+        content: [{ type: "text", text: "What is 2+2?" }],
+      },
+      {
+        role: "assistant",
+        content: [
+          {
+            type: "reasoning",
+            text: "Let me calculate 2+2...",
+            providerOptions: {
+              copilot: { reasoningOpaque: "sig-abc" },
+            },
+          },
+          { type: "text", text: "2+2 equals 4." },
+        ],
+      },
+      {
+        role: "user",
+        content: [{ type: "text", text: "What about 3+3?" }],
+      },
+    ])
+
+    expect(result).toHaveLength(4)
+
+    const systemMsg = result[0]
+    expect(systemMsg.role).toBe("system")
+
+    // Assistant message should have reasoning fields
+    const assistantMsg = result[2] as {
+      reasoning_text?: string
+      reasoning_opaque?: string
+    }
+    expect(assistantMsg.reasoning_text).toBe("Let me calculate 2+2...")
+    expect(assistantMsg.reasoning_opaque).toBe("sig-abc")
+  })
+})

packages/core/test/github-copilot/copilot-chat-model.test.ts

@@ -0,0 +1,592 @@
+import { OpenAICompatibleChatLanguageModel } from "@opencode-ai/core/github-copilot/chat/openai-compatible-chat-language-model"
+import { describe, test, expect, mock } from "bun:test"
+import type { LanguageModelV3Prompt } from "@ai-sdk/provider"
+
+async function convertReadableStreamToArray<T>(stream: ReadableStream<T>): Promise<T[]> {
+  const reader = stream.getReader()
+  const result: T[] = []
+  while (true) {
+    const { done, value } = await reader.read()
+    if (done) break
+    result.push(value)
+  }
+  return result
+}
+
+const TEST_PROMPT: LanguageModelV3Prompt = [{ role: "user", content: [{ type: "text", text: "Hello" }] }]
+
+// Fixtures from copilot_test.exs
+const FIXTURES = {
+  basicText: [
+    `data: {"id":"chatcmpl-123","object":"chat.completion.chunk","created":1677652288,"model":"gemini-2.0-flash-001","choices":[{"index":0,"delta":{"role":"assistant","content":"Hello"},"finish_reason":null}]}`,
+    `data: {"id":"chatcmpl-123","object":"chat.completion.chunk","created":1677652288,"model":"gemini-2.0-flash-001","choices":[{"index":0,"delta":{"content":" world"},"finish_reason":null}]}`,
+    `data: {"id":"chatcmpl-123","object":"chat.completion.chunk","created":1677652288,"model":"gemini-2.0-flash-001","choices":[{"index":0,"delta":{"content":"!"},"finish_reason":"stop"}]}`,
+    `data: [DONE]`,
+  ],
+
+  reasoningWithToolCalls: [
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Understanding Dayzee's Purpose**\\n\\nI'm starting to get a better handle on \`dayzee\`.\\n\\n"}}],"created":1764940861,"id":"OdwyabKMI9yel7oPlbzgwQM","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-pro-preview"}`,
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Assessing Dayzee's Functionality**\\n\\nI've reviewed the files.\\n\\n"}}],"created":1764940862,"id":"OdwyabKMI9yel7oPlbzgwQM","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-pro-preview"}`,
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","tool_calls":[{"function":{"arguments":"{\\"filePath\\":\\"/README.md\\"}","name":"read_file"},"id":"call_abc123","index":0,"type":"function"}],"reasoning_opaque":"4CUQ6696CwSXOdQ5rtvDimqA91tBzfmga4ieRbmZ5P67T2NLW3"}}],"created":1764940862,"id":"OdwyabKMI9yel7oPlbzgwQM","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-pro-preview"}`,
+    `data: {"choices":[{"finish_reason":"tool_calls","index":0,"delta":{"content":null,"role":"assistant","tool_calls":[{"function":{"arguments":"{\\"filePath\\":\\"/mix.exs\\"}","name":"read_file"},"id":"call_def456","index":1,"type":"function"}]}}],"created":1764940862,"id":"OdwyabKMI9yel7oPlbzgwQM","usage":{"completion_tokens":53,"prompt_tokens":19581,"prompt_tokens_details":{"cached_tokens":17068},"total_tokens":19768,"reasoning_tokens":134},"model":"gemini-3-pro-preview"}`,
+    `data: [DONE]`,
+  ],
+
+  reasoningWithOpaqueAtEnd: [
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Analyzing the Inquiry's Nature**\\n\\nI'm currently parsing the user's question.\\n\\n"}}],"created":1765201729,"id":"Ptc2afqsCIHqlOoP653UiAI","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-pro-preview"}`,
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Reconciling User's Input**\\n\\nI'm grappling with the context.\\n\\n"}}],"created":1765201730,"id":"Ptc2afqsCIHqlOoP653UiAI","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-pro-preview"}`,
+    `data: {"choices":[{"index":0,"delta":{"content":"I am Tidewave, a highly skilled AI coding agent.\\n\\n","role":"assistant"}}],"created":1765201730,"id":"Ptc2afqsCIHqlOoP653UiAI","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-pro-preview"}`,
+    `data: {"choices":[{"finish_reason":"stop","index":0,"delta":{"content":"How can I help you?","role":"assistant","reasoning_opaque":"/PMlTqxqSJZnUBDHgnnJKLVI4eZQ"}}],"created":1765201730,"id":"Ptc2afqsCIHqlOoP653UiAI","usage":{"completion_tokens":59,"prompt_tokens":5778,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":5932,"reasoning_tokens":95},"model":"gemini-3-pro-preview"}`,
+    `data: [DONE]`,
+  ],
+
+  // Case where reasoning_opaque and content come in the SAME chunk
+  reasoningWithOpaqueAndContentSameChunk: [
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Understanding the Query's Nature**\\n\\nI'm currently grappling with the user's philosophical query.\\n\\n"}}],"created":1766062103,"id":"FPhDacixL9zrlOoPqLSuyQ4","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-2.5-pro"}`,
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Framing the Response's Core**\\n\\nNow, I'm structuring my response.\\n\\n"}}],"created":1766062103,"id":"FPhDacixL9zrlOoPqLSuyQ4","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-2.5-pro"}`,
+    `data: {"choices":[{"index":0,"delta":{"content":"Of course. I'm thinking right now.","role":"assistant","reasoning_opaque":"ExXaGwW7jBo39OXRe9EPoFGN1rOtLJBx"}}],"created":1766062103,"id":"FPhDacixL9zrlOoPqLSuyQ4","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-2.5-pro"}`,
+    `data: {"choices":[{"finish_reason":"stop","index":0,"delta":{"content":" What's on your mind?","role":"assistant"}}],"created":1766062103,"id":"FPhDacixL9zrlOoPqLSuyQ4","usage":{"completion_tokens":78,"prompt_tokens":3767,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":3915,"reasoning_tokens":70},"model":"gemini-2.5-pro"}`,
+    `data: [DONE]`,
+  ],
+
+  // Case where reasoning_opaque and content come in same chunk, followed by tool calls
+  reasoningWithOpaqueContentAndToolCalls: [
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Analyzing the Structure**\\n\\nI'm currently trying to get a handle on the project's layout. My initial focus is on the file structure itself, specifically the directory organization. I'm hoping this will illuminate how different components interact. I'll need to identify the key modules and their dependencies.\\n\\n\\n"}}],"created":1766066995,"id":"MQtEafqbFYTZsbwPwuCVoAg","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-2.5-pro"}`,
+    `data: {"choices":[{"index":0,"delta":{"content":"Okay, I need to check out the project's file structure.","role":"assistant","reasoning_opaque":"WHOd3dYFnxEBOsKUXjbX6c2rJa0fS214FHbsj+A3Q+i63SFo7H/92RsownAzyo0h2qEy3cOcrvAatsMx51eCKiMSqt4dYWZhd5YVSgF0CehkpDbWBP/SoRqLU1dhCmUJV/6b5uYFBOzKLBGNadyhI7T1gWFlXntwc6SNjH6DujnFPeVr+L8DdOoUJGJrw2aOfm9NtkXA6wZh9t7dt+831yIIImjD9MHczuXoXj8K7tyLpIJ9KlVXMhnO4IKSYNdKRtoHlGTmudAp5MgH/vLWb6oSsL+ZJl/OdF3WBOeanGhYNoByCRDSvR7anAR/9m5zf9yUax+u/nFg+gzmhFacnzZGtSmcvJ4/4HWKNtUkRASTKeN94DXB8j1ptB/i6ldaMAz2ZyU+sbjPWI8aI4fKJ2MuO01u3uE87xVwpWiM+0rahIzJsllI5edwOaOFtF4tnlCTQafbxHwCZR62uON2E+IjGzW80MzyfYrbLBJKS5zTeHCgPYQSNaKzPfpzkQvdwo3JUnJYcEHgGeKzkq5sbvS5qitCYI7Xue0V98S6/KnUSPnDQBjNnas2i6BqJV2vuCEU/Y3ucrlKVbuRIFCZXCyLzrsGeRLRKlrf5S/HDAQ04IOPQVQhBPvhX0nDjhZB"}}],"created":1766066995,"id":"MQtEafqbFYTZsbwPwuCVoAg","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-2.5-pro"}`,
+    `data: {"choices":[{"finish_reason":"tool_calls","index":0,"delta":{"content":null,"role":"assistant","tool_calls":[{"function":{"arguments":"{}","name":"list_project_files"},"id":"call_MHxqRDd5WVo3NU8wUXRaMmc0MFE","index":0,"type":"function"}]}}],"created":1766066995,"id":"MQtEafqbFYTZsbwPwuCVoAg","usage":{"completion_tokens":19,"prompt_tokens":3767,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":3797,"reasoning_tokens":11},"model":"gemini-2.5-pro"}`,
+    `data: [DONE]`,
+  ],
+
+  // Case where reasoning goes directly to tool_calls with NO content
+  // reasoning_opaque and tool_calls come in the same chunk
+  reasoningDirectlyToToolCalls: [
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Executing and Analyzing HTML**\\n\\nI've successfully captured the HTML snapshot using the \`browser_eval\` tool, giving me a solid understanding of the page structure. Now, I'm shifting focus to Elixir code execution with \`project_eval\` to assess my ability to work within the project's environment.\\n\\n\\n"}}],"created":1766068643,"id":"oBFEaafzD9DVlOoPkY3l4Qs","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-pro-preview"}`,
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","reasoning_text":"**Testing Project Contexts**\\n\\nI've got the HTML body snapshot from \`browser_eval\`, which is a helpful reference. Next, I'm testing my ability to run Elixir code in the project with \`project_eval\`. I'm starting with a simple sum: \`1 + 1\`. This will confirm I'm set up to interact with the project's codebase.\\n\\n\\n"}}],"created":1766068644,"id":"oBFEaafzD9DVlOoPkY3l4Qs","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-pro-preview"}`,
+    `data: {"choices":[{"finish_reason":"tool_calls","index":0,"delta":{"content":null,"role":"assistant","tool_calls":[{"function":{"arguments":"{\\"code\\":\\"1 + 1\\"}","name":"project_eval"},"id":"call_MHw3RDhmT1J5Z3B6WlhpVjlveTc","index":0,"type":"function"}],"reasoning_opaque":"ytGNWFf2doK38peANDvm7whkLPKrd+Fv6/k34zEPBF6Qwitj4bTZT0FBXleydLb6"}}],"created":1766068644,"id":"oBFEaafzD9DVlOoPkY3l4Qs","usage":{"completion_tokens":12,"prompt_tokens":8677,"prompt_tokens_details":{"cached_tokens":3692},"total_tokens":8768,"reasoning_tokens":79},"model":"gemini-3-pro-preview"}`,
+    `data: [DONE]`,
+  ],
+
+  reasoningOpaqueWithToolCallsNoReasoningText: [
+    `data: {"choices":[{"index":0,"delta":{"content":null,"role":"assistant","tool_calls":[{"function":{"arguments":"{}","name":"read_file"},"id":"call_reasoning_only","index":0,"type":"function"}],"reasoning_opaque":"opaque-xyz"}}],"created":1769917420,"id":"opaque-only","usage":{"completion_tokens":0,"prompt_tokens":0,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":0,"reasoning_tokens":0},"model":"gemini-3-flash-preview"}`,
+    `data: {"choices":[{"finish_reason":"tool_calls","index":0,"delta":{"content":null,"role":"assistant","tool_calls":[{"function":{"arguments":"{}","name":"read_file"},"id":"call_reasoning_only_2","index":1,"type":"function"}]}}],"created":1769917420,"id":"opaque-only","usage":{"completion_tokens":12,"prompt_tokens":123,"prompt_tokens_details":{"cached_tokens":0},"total_tokens":135,"reasoning_tokens":0},"model":"gemini-3-flash-preview"}`,
+    `data: [DONE]`,
+  ],
+}
+
+function createMockFetch(chunks: string[]) {
+  return mock(async () => {
+    const body = new ReadableStream({
+      start(controller) {
+        for (const chunk of chunks) {
+          controller.enqueue(new TextEncoder().encode(chunk + "\n\n"))
+        }
+        controller.close()
+      },
+    })
+
+    return new Response(body, {
+      status: 200,
+      headers: { "Content-Type": "text/event-stream" },
+    })
+  })
+}
+
+function createModel(fetchFn: ReturnType<typeof mock>) {
+  return new OpenAICompatibleChatLanguageModel("test-model", {
+    provider: "copilot.chat",
+    url: () => "https://api.test.com/chat/completions",
+    headers: () => ({ Authorization: "Bearer test-token" }),
+    fetch: fetchFn as any,
+  })
+}
+
+describe("doStream", () => {
+  test("should stream text deltas", async () => {
+    const mockFetch = createMockFetch(FIXTURES.basicText)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    // Filter to just the key events
+    const textParts = parts.filter(
+      (p) => p.type === "text-start" || p.type === "text-delta" || p.type === "text-end" || p.type === "finish",
+    )
+
+    expect(textParts).toMatchObject([
+      { type: "text-start", id: "txt-0" },
+      { type: "text-delta", id: "txt-0", delta: "Hello" },
+      { type: "text-delta", id: "txt-0", delta: " world" },
+      { type: "text-delta", id: "txt-0", delta: "!" },
+      { type: "text-end", id: "txt-0" },
+      { type: "finish", finishReason: { unified: "stop" } },
+    ])
+  })
+
+  test("should stream reasoning with tool calls and capture reasoning_opaque", async () => {
+    const mockFetch = createMockFetch(FIXTURES.reasoningWithToolCalls)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    // Check reasoning parts
+    const reasoningParts = parts.filter(
+      (p) => p.type === "reasoning-start" || p.type === "reasoning-delta" || p.type === "reasoning-end",
+    )
+
+    expect(reasoningParts[0]).toEqual({
+      type: "reasoning-start",
+      id: "reasoning-0",
+    })
+
+    expect(reasoningParts[1]).toMatchObject({
+      type: "reasoning-delta",
+      id: "reasoning-0",
+    })
+    expect((reasoningParts[1] as { delta: string }).delta).toContain("**Understanding Dayzee's Purpose**")
+
+    expect(reasoningParts[2]).toMatchObject({
+      type: "reasoning-delta",
+      id: "reasoning-0",
+    })
+    expect((reasoningParts[2] as { delta: string }).delta).toContain("**Assessing Dayzee's Functionality**")
+
+    // reasoning_opaque should be in reasoning-end providerMetadata
+    const reasoningEnd = reasoningParts.find((p) => p.type === "reasoning-end")
+    expect(reasoningEnd).toMatchObject({
+      type: "reasoning-end",
+      id: "reasoning-0",
+      providerMetadata: {
+        copilot: {
+          reasoningOpaque: "4CUQ6696CwSXOdQ5rtvDimqA91tBzfmga4ieRbmZ5P67T2NLW3",
+        },
+      },
+    })
+
+    // Check tool calls
+    const toolParts = parts.filter(
+      (p) => p.type === "tool-input-start" || p.type === "tool-call" || p.type === "tool-input-end",
+    )
+
+    expect(toolParts).toContainEqual({
+      type: "tool-input-start",
+      id: "call_abc123",
+      toolName: "read_file",
+    })
+
+    expect(toolParts).toContainEqual(
+      expect.objectContaining({
+        type: "tool-call",
+        toolCallId: "call_abc123",
+        toolName: "read_file",
+      }),
+    )
+
+    expect(toolParts).toContainEqual({
+      type: "tool-input-start",
+      id: "call_def456",
+      toolName: "read_file",
+    })
+
+    // Check finish
+    const finish = parts.find((p) => p.type === "finish")
+    expect(finish).toMatchObject({
+      type: "finish",
+      finishReason: { unified: "tool-calls" },
+      usage: {
+        inputTokens: { total: 19581 },
+        outputTokens: { total: 53 },
+      },
+    })
+  })
+
+  test("should handle reasoning_opaque that comes at end with text in between", async () => {
+    const mockFetch = createMockFetch(FIXTURES.reasoningWithOpaqueAtEnd)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    // Check that reasoning comes first
+    const reasoningStart = parts.findIndex((p) => p.type === "reasoning-start")
+    const textStart = parts.findIndex((p) => p.type === "text-start")
+    expect(reasoningStart).toBeLessThan(textStart)
+
+    // Check reasoning deltas
+    const reasoningDeltas = parts.filter((p) => p.type === "reasoning-delta")
+    expect(reasoningDeltas).toHaveLength(2)
+    expect((reasoningDeltas[0] as { delta: string }).delta).toContain("**Analyzing the Inquiry's Nature**")
+    expect((reasoningDeltas[1] as { delta: string }).delta).toContain("**Reconciling User's Input**")
+
+    // Check text deltas
+    const textDeltas = parts.filter((p) => p.type === "text-delta")
+    expect(textDeltas).toHaveLength(2)
+    expect((textDeltas[0] as { delta: string }).delta).toContain("I am Tidewave")
+    expect((textDeltas[1] as { delta: string }).delta).toContain("How can I help you?")
+
+    // reasoning-end should be emitted before text-start
+    const reasoningEndIndex = parts.findIndex((p) => p.type === "reasoning-end")
+    const textStartIndex = parts.findIndex((p) => p.type === "text-start")
+    expect(reasoningEndIndex).toBeGreaterThan(-1)
+    expect(reasoningEndIndex).toBeLessThan(textStartIndex)
+
+    // In this fixture, reasoning_opaque comes AFTER content has started (in chunk 4)
+    // So it arrives too late to be attached to reasoning-end. But it should still
+    // be captured and included in the finish event's providerMetadata.
+    const reasoningEnd = parts.find((p) => p.type === "reasoning-end")
+    expect(reasoningEnd).toMatchObject({
+      type: "reasoning-end",
+      id: "reasoning-0",
+    })
+
+    // reasoning_opaque should be in the finish event's providerMetadata
+    const finish = parts.find((p) => p.type === "finish")
+    expect(finish).toMatchObject({
+      type: "finish",
+      finishReason: { unified: "stop" },
+      usage: {
+        inputTokens: { total: 5778 },
+        outputTokens: { total: 59 },
+      },
+      providerMetadata: {
+        copilot: {
+          reasoningOpaque: "/PMlTqxqSJZnUBDHgnnJKLVI4eZQ",
+        },
+      },
+    })
+  })
+
+  test("should handle reasoning_opaque and content in the same chunk", async () => {
+    const mockFetch = createMockFetch(FIXTURES.reasoningWithOpaqueAndContentSameChunk)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    // The critical test: reasoning-end should come BEFORE text-start
+    const reasoningEndIndex = parts.findIndex((p) => p.type === "reasoning-end")
+    const textStartIndex = parts.findIndex((p) => p.type === "text-start")
+    expect(reasoningEndIndex).toBeGreaterThan(-1)
+    expect(textStartIndex).toBeGreaterThan(-1)
+    expect(reasoningEndIndex).toBeLessThan(textStartIndex)
+
+    // Check reasoning deltas
+    const reasoningDeltas = parts.filter((p) => p.type === "reasoning-delta")
+    expect(reasoningDeltas).toHaveLength(2)
+    expect((reasoningDeltas[0] as { delta: string }).delta).toContain("**Understanding the Query's Nature**")
+    expect((reasoningDeltas[1] as { delta: string }).delta).toContain("**Framing the Response's Core**")
+
+    // reasoning_opaque should be in reasoning-end even though it came with content
+    const reasoningEnd = parts.find((p) => p.type === "reasoning-end")
+    expect(reasoningEnd).toMatchObject({
+      type: "reasoning-end",
+      id: "reasoning-0",
+      providerMetadata: {
+        copilot: {
+          reasoningOpaque: "ExXaGwW7jBo39OXRe9EPoFGN1rOtLJBx",
+        },
+      },
+    })
+
+    // Check text deltas
+    const textDeltas = parts.filter((p) => p.type === "text-delta")
+    expect(textDeltas).toHaveLength(2)
+    expect((textDeltas[0] as { delta: string }).delta).toContain("Of course. I'm thinking right now.")
+    expect((textDeltas[1] as { delta: string }).delta).toContain("What's on your mind?")
+
+    // Check finish
+    const finish = parts.find((p) => p.type === "finish")
+    expect(finish).toMatchObject({
+      type: "finish",
+      finishReason: { unified: "stop" },
+    })
+  })
+
+  test("should handle reasoning_opaque and content followed by tool calls", async () => {
+    const mockFetch = createMockFetch(FIXTURES.reasoningWithOpaqueContentAndToolCalls)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    // Check that reasoning comes first, then text, then tool calls
+    const reasoningEndIndex = parts.findIndex((p) => p.type === "reasoning-end")
+    const textStartIndex = parts.findIndex((p) => p.type === "text-start")
+    const toolStartIndex = parts.findIndex((p) => p.type === "tool-input-start")
+
+    expect(reasoningEndIndex).toBeGreaterThan(-1)
+    expect(textStartIndex).toBeGreaterThan(-1)
+    expect(toolStartIndex).toBeGreaterThan(-1)
+    expect(reasoningEndIndex).toBeLessThan(textStartIndex)
+    expect(textStartIndex).toBeLessThan(toolStartIndex)
+
+    // Check reasoning content
+    const reasoningDeltas = parts.filter((p) => p.type === "reasoning-delta")
+    expect(reasoningDeltas).toHaveLength(1)
+    expect((reasoningDeltas[0] as { delta: string }).delta).toContain("**Analyzing the Structure**")
+
+    // reasoning_opaque should be in reasoning-end (comes with content in same chunk)
+    const reasoningEnd = parts.find((p) => p.type === "reasoning-end")
+    expect(reasoningEnd).toMatchObject({
+      type: "reasoning-end",
+      id: "reasoning-0",
+      providerMetadata: {
+        copilot: {
+          reasoningOpaque: expect.stringContaining("WHOd3dYFnxEBOsKUXjbX6c2rJa0fS214"),
+        },
+      },
+    })
+
+    // Check text content
+    const textDeltas = parts.filter((p) => p.type === "text-delta")
+    expect(textDeltas).toHaveLength(1)
+    expect((textDeltas[0] as { delta: string }).delta).toContain(
+      "Okay, I need to check out the project's file structure.",
+    )
+
+    // Check tool call
+    const toolParts = parts.filter(
+      (p) => p.type === "tool-input-start" || p.type === "tool-call" || p.type === "tool-input-end",
+    )
+
+    expect(toolParts).toContainEqual({
+      type: "tool-input-start",
+      id: "call_MHxqRDd5WVo3NU8wUXRaMmc0MFE",
+      toolName: "list_project_files",
+    })
+
+    expect(toolParts).toContainEqual(
+      expect.objectContaining({
+        type: "tool-call",
+        toolCallId: "call_MHxqRDd5WVo3NU8wUXRaMmc0MFE",
+        toolName: "list_project_files",
+      }),
+    )
+
+    // Check finish
+    const finish = parts.find((p) => p.type === "finish")
+    expect(finish).toMatchObject({
+      type: "finish",
+      finishReason: { unified: "tool-calls" },
+      usage: {
+        inputTokens: { total: 3767 },
+        outputTokens: { total: 19 },
+      },
+    })
+  })
+
+  test("should emit reasoning-end before tool-input-start when reasoning goes directly to tool calls", async () => {
+    const mockFetch = createMockFetch(FIXTURES.reasoningDirectlyToToolCalls)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    // Critical check: reasoning-end MUST come before tool-input-start
+    const reasoningEndIndex = parts.findIndex((p) => p.type === "reasoning-end")
+    const toolStartIndex = parts.findIndex((p) => p.type === "tool-input-start")
+
+    expect(reasoningEndIndex).toBeGreaterThan(-1)
+    expect(toolStartIndex).toBeGreaterThan(-1)
+    expect(reasoningEndIndex).toBeLessThan(toolStartIndex)
+
+    // Check reasoning parts
+    const reasoningDeltas = parts.filter((p) => p.type === "reasoning-delta")
+    expect(reasoningDeltas).toHaveLength(2)
+    expect((reasoningDeltas[0] as { delta: string }).delta).toContain("**Executing and Analyzing HTML**")
+    expect((reasoningDeltas[1] as { delta: string }).delta).toContain("**Testing Project Contexts**")
+
+    // reasoning_opaque should be in reasoning-end providerMetadata
+    const reasoningEnd = parts.find((p) => p.type === "reasoning-end")
+    expect(reasoningEnd).toMatchObject({
+      type: "reasoning-end",
+      id: "reasoning-0",
+      providerMetadata: {
+        copilot: {
+          reasoningOpaque: "ytGNWFf2doK38peANDvm7whkLPKrd+Fv6/k34zEPBF6Qwitj4bTZT0FBXleydLb6",
+        },
+      },
+    })
+
+    // No text parts should exist
+    const textParts = parts.filter((p) => p.type === "text-start" || p.type === "text-delta" || p.type === "text-end")
+    expect(textParts).toHaveLength(0)
+
+    // Check tool call
+    const toolCall = parts.find((p) => p.type === "tool-call")
+    expect(toolCall).toMatchObject({
+      type: "tool-call",
+      toolCallId: "call_MHw3RDhmT1J5Z3B6WlhpVjlveTc",
+      toolName: "project_eval",
+    })
+
+    // Check finish
+    const finish = parts.find((p) => p.type === "finish")
+    expect(finish).toMatchObject({
+      type: "finish",
+      finishReason: { unified: "tool-calls" },
+    })
+  })
+
+  test("should attach reasoning_opaque to tool calls without reasoning_text", async () => {
+    const mockFetch = createMockFetch(FIXTURES.reasoningOpaqueWithToolCallsNoReasoningText)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+    const reasoningParts = parts.filter(
+      (p) => p.type === "reasoning-start" || p.type === "reasoning-delta" || p.type === "reasoning-end",
+    )
+
+    expect(reasoningParts).toHaveLength(0)
+
+    const toolCall = parts.find((p) => p.type === "tool-call" && p.toolCallId === "call_reasoning_only")
+    expect(toolCall).toMatchObject({
+      type: "tool-call",
+      toolCallId: "call_reasoning_only",
+      toolName: "read_file",
+      providerMetadata: {
+        copilot: {
+          reasoningOpaque: "opaque-xyz",
+        },
+      },
+    })
+  })
+
+  test("should include response metadata from first chunk", async () => {
+    const mockFetch = createMockFetch(FIXTURES.basicText)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    const metadata = parts.find((p) => p.type === "response-metadata")
+    expect(metadata).toMatchObject({
+      type: "response-metadata",
+      id: "chatcmpl-123",
+      modelId: "gemini-2.0-flash-001",
+    })
+  })
+
+  test("should emit stream-start with warnings", async () => {
+    const mockFetch = createMockFetch(FIXTURES.basicText)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: false,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    const streamStart = parts.find((p) => p.type === "stream-start")
+    expect(streamStart).toEqual({
+      type: "stream-start",
+      warnings: [],
+    })
+  })
+
+  test("should include raw chunks when requested", async () => {
+    const mockFetch = createMockFetch(FIXTURES.basicText)
+    const model = createModel(mockFetch)
+
+    const { stream } = await model.doStream({
+      prompt: TEST_PROMPT,
+      includeRawChunks: true,
+    })
+
+    const parts = await convertReadableStreamToArray(stream)
+
+    const rawChunks = parts.filter((p) => p.type === "raw")
+    expect(rawChunks.length).toBeGreaterThan(0)
+  })
+})
+
+describe("request body", () => {
+  test("should send tools in OpenAI format", async () => {
+    let capturedBody: unknown
+    const mockFetch = mock(async (_url: string, init?: RequestInit) => {
+      capturedBody = JSON.parse(init?.body as string)
+      return new Response(
+        new ReadableStream({
+          start(controller) {
+            controller.enqueue(new TextEncoder().encode(`data: [DONE]\n\n`))
+            controller.close()
+          },
+        }),
+        { status: 200, headers: { "Content-Type": "text/event-stream" } },
+      )
+    })
+
+    const model = createModel(mockFetch)
+
+    await model.doStream({
+      prompt: TEST_PROMPT,
+      tools: [
+        {
+          type: "function",
+          name: "get_weather",
+          description: "Get the weather for a location",
+          inputSchema: {
+            type: "object",
+            properties: {
+              location: { type: "string" },
+            },
+            required: ["location"],
+          },
+        },
+      ],
+      includeRawChunks: false,
+    })
+
+    expect((capturedBody as { tools: unknown[] }).tools).toEqual([
+      {
+        type: "function",
+        function: {
+          name: "get_weather",
+          description: "Get the weather for a location",
+          parameters: {
+            type: "object",
+            properties: {
+              location: { type: "string" },
+            },
+            required: ["location"],
+          },
+        },
+      },
+    ])
+  })
+})

packages/core/test/global.test.ts

@@ -0,0 +1,16 @@
+import { describe, expect, test } from "bun:test"
+import fs from "fs/promises"
+import os from "os"
+import path from "path"
+import { Global } from "@opencode-ai/core/global"
+
+describe("global paths", () => {
+  test("tmp path is under the system temp directory", () => {
+    expect(Global.Path.tmp).toBe(path.join(os.tmpdir(), "opencode"))
+    expect(Global.make().tmp).toBe(Global.Path.tmp)
+  })
+
+  test("tmp path is created on module load", async () => {
+    expect((await fs.stat(Global.Path.tmp)).isDirectory()).toBe(true)
+  })
+})

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

@@ -0,0 +1,297 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import fs from "fs/promises"
+import path from "path"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Global } from "@opencode-ai/core/global"
+import { InstructionContext } from "@opencode-ai/core/instruction-context"
+import { Location } from "@opencode-ai/core/location"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { SystemContext } from "@opencode-ai/core/system-context"
+import { SystemContextRegistry } from "@opencode-ai/core/system-context/registry"
+import { location } from "./fixture/location"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+
+const it = testEffect(Layer.empty)
+
+describe("InstructionContext", () => {
+  it.live("loads global and upward project AGENTS.md files as one aggregate context", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const global = path.join(tmp.path, "global")
+          const project = path.join(tmp.path, "project")
+          const directory = path.join(project, "packages", "core")
+          const outside = path.join(tmp.path, "AGENTS.md")
+          const globalFile = path.join(global, "AGENTS.md")
+          const projectFile = path.join(project, "AGENTS.md")
+          const packageFile = path.join(directory, "AGENTS.md")
+          yield* Effect.promise(async () => {
+            await fs.mkdir(global, { recursive: true })
+            await fs.mkdir(directory, { recursive: true })
+            await fs.writeFile(outside, "outside")
+            await fs.writeFile(globalFile, "global")
+            await fs.writeFile(projectFile, "project")
+            await fs.writeFile(packageFile, "package")
+          })
+
+          const load = SystemContextRegistry.Service.pipe(
+            Effect.flatMap((service) => service.load()),
+            Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
+            Effect.provide(FSUtil.defaultLayer),
+            Effect.provide(Global.layerWith({ config: global })),
+            Effect.provide(
+              Layer.succeed(
+                Location.Service,
+                Location.Service.of(
+                  location(
+                    { directory: AbsolutePath.make(directory) },
+                    { projectDirectory: AbsolutePath.make(project) },
+                  ),
+                ),
+              ),
+            ),
+          )
+
+          const initialized = yield* SystemContext.initialize(yield* load)
+          expect(initialized.baseline).toBe(
+            [
+              `Instructions from: ${globalFile}\nglobal`,
+              `Instructions from: ${packageFile}\npackage`,
+              `Instructions from: ${projectFile}\nproject`,
+            ].join("\n\n"),
+          )
+          expect(initialized.baseline).not.toContain("outside")
+
+          yield* Effect.promise(() => fs.writeFile(packageFile, "changed"))
+          expect(yield* SystemContext.reconcile(yield* load, initialized.snapshot)).toMatchObject({
+            _tag: "Updated",
+            text: expect.stringContaining(`Instructions from: ${packageFile}\nchanged`),
+          })
+
+          yield* Effect.promise(() => fs.rm(packageFile))
+          const partial = yield* SystemContext.reconcile(yield* load, initialized.snapshot)
+          expect(partial).toEqual({
+            _tag: "Updated",
+            text: [
+              "These instructions replace all previously loaded ambient instructions.",
+              `Instructions from: ${globalFile}\nglobal`,
+              `Instructions from: ${projectFile}\nproject`,
+            ].join("\n\n"),
+            snapshot: expect.any(Object),
+          })
+
+          yield* Effect.promise(() => Promise.all([fs.rm(globalFile), fs.rm(projectFile)]))
+          expect(yield* SystemContext.reconcile(yield* load, initialized.snapshot)).toEqual({
+            _tag: "Updated",
+            text: "Previously loaded instructions no longer apply.",
+            snapshot: {},
+          })
+        }),
+      ),
+    ),
+  )
+
+  it.live("keeps an empty AGENTS.md as available context", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          const file = path.join(tmp.path, "AGENTS.md")
+          yield* Effect.promise(() => fs.writeFile(file, ""))
+          const context = yield* SystemContextRegistry.Service.pipe(
+            Effect.flatMap((service) => service.load()),
+            Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
+            Effect.provide(FSUtil.defaultLayer),
+            Effect.provide(Global.layerWith({ config: path.join(tmp.path, "global") })),
+            Effect.provide(
+              Layer.succeed(
+                Location.Service,
+                Location.Service.of(location({ directory: AbsolutePath.make(tmp.path) })),
+              ),
+            ),
+          )
+
+          expect((yield* SystemContext.initialize(context)).baseline).toBe(`Instructions from: ${file}\n`)
+        }),
+      ),
+    ),
+  )
+
+  it.effect("preserves admitted instructions while observation is unavailable", () =>
+    Effect.gen(function* () {
+      const failingFS = Layer.effect(
+        FSUtil.Service,
+        FSUtil.Service.pipe(
+          Effect.map((fs) =>
+            FSUtil.Service.of({ ...fs, up: () => Effect.fail(new FSUtil.FileSystemError({ method: "up" })) }),
+          ),
+        ),
+      ).pipe(Layer.provide(FSUtil.defaultLayer))
+      const context = yield* SystemContextRegistry.Service.pipe(
+        Effect.flatMap((service) => service.load()),
+        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
+        Effect.provide(failingFS),
+        Effect.provide(Global.layerWith({ config: "/global" })),
+        Effect.provide(
+          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("/repo") }))),
+        ),
+      )
+
+      expect(
+        yield* SystemContext.reconcile(context, {
+          "core/instructions": {
+            value: [{ path: "/repo/AGENTS.md", content: "old" }],
+            removed: "Previously loaded instructions no longer apply.",
+          },
+        }),
+      ).toEqual({ _tag: "Unchanged" })
+    }),
+  )
+
+  it.effect("preserves admitted instructions when a discovered file disappears before read", () =>
+    Effect.gen(function* () {
+      const file = AbsolutePath.make("/repo/AGENTS.md")
+      const racingFS = Layer.effect(
+        FSUtil.Service,
+        FSUtil.Service.pipe(
+          Effect.map((fs) =>
+            FSUtil.Service.of({
+              ...fs,
+              up: () => Effect.succeed([file]),
+              readFileStringSafe: () => Effect.succeed(undefined),
+            }),
+          ),
+        ),
+      ).pipe(Layer.provide(FSUtil.defaultLayer))
+      const context = yield* SystemContextRegistry.Service.pipe(
+        Effect.flatMap((service) => service.load()),
+        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
+        Effect.provide(racingFS),
+        Effect.provide(Global.layerWith({ config: "/global" })),
+        Effect.provide(
+          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("/repo") }))),
+        ),
+      )
+
+      expect(
+        yield* SystemContext.reconcile(context, {
+          "core/instructions": {
+            value: [{ path: file, content: "old" }],
+            removed: "Previously loaded instructions no longer apply.",
+          },
+        }),
+      ).toEqual({ _tag: "Unchanged" })
+    }),
+  )
+
+  it.effect("canonicalizes upward discovery boundaries", () =>
+    Effect.gen(function* () {
+      let observed: { targets: string[]; start: string; stop?: string } | undefined
+      const observingFS = Layer.effect(
+        FSUtil.Service,
+        FSUtil.Service.pipe(
+          Effect.map((fs) =>
+            FSUtil.Service.of({
+              ...fs,
+              up: (options) =>
+                Effect.sync(() => {
+                  observed = options
+                  return []
+                }),
+            }),
+          ),
+        ),
+      ).pipe(Layer.provide(FSUtil.defaultLayer))
+
+      yield* SystemContextRegistry.Service.pipe(
+        Effect.flatMap((service) => service.load()),
+        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
+        Effect.provide(observingFS),
+        Effect.provide(Global.layerWith({ config: "/global" })),
+        Effect.provide(
+          Layer.succeed(
+            Location.Service,
+            Location.Service.of(
+              location({ directory: AbsolutePath.make("/repo/") }, { projectDirectory: AbsolutePath.make("/repo") }),
+            ),
+          ),
+        ),
+      )
+
+      expect(observed).toEqual({
+        targets: ["AGENTS.md"],
+        start: FSUtil.resolve("/repo"),
+        stop: FSUtil.resolve("/repo"),
+      })
+    }),
+  )
+
+  it.effect("honors the project instruction opt-out", () =>
+    Effect.gen(function* () {
+      const previous = process.env.OPENCODE_DISABLE_PROJECT_CONFIG
+      let scanned = false
+      process.env.OPENCODE_DISABLE_PROJECT_CONFIG = "1"
+
+      yield* SystemContextRegistry.Service.pipe(
+        Effect.flatMap((service) => service.load()),
+        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
+        Effect.provide(
+          Layer.effect(
+            FSUtil.Service,
+            FSUtil.Service.pipe(
+              Effect.map((fs) => FSUtil.Service.of({ ...fs, up: () => Effect.sync(() => ((scanned = true), [])) })),
+            ),
+          ).pipe(Layer.provide(FSUtil.defaultLayer)),
+        ),
+        Effect.provide(Global.layerWith({ config: "/global" })),
+        Effect.provide(
+          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("/repo") }))),
+        ),
+        Effect.ensuring(
+          Effect.sync(() => {
+            if (previous === undefined) delete process.env.OPENCODE_DISABLE_PROJECT_CONFIG
+            else process.env.OPENCODE_DISABLE_PROJECT_CONFIG = previous
+          }),
+        ),
+      )
+
+      expect(scanned).toBe(false)
+    }),
+  )
+
+  it.effect("does not discover project instructions outside the canonical project root", () =>
+    Effect.gen(function* () {
+      let scanned = false
+      yield* SystemContextRegistry.Service.pipe(
+        Effect.flatMap((service) => service.load()),
+        Effect.provide(InstructionContext.layer.pipe(Layer.provideMerge(SystemContextRegistry.layer))),
+        Effect.provide(
+          Layer.effect(
+            FSUtil.Service,
+            FSUtil.Service.pipe(
+              Effect.map((fs) => FSUtil.Service.of({ ...fs, up: () => Effect.sync(() => ((scanned = true), [])) })),
+            ),
+          ).pipe(Layer.provide(FSUtil.defaultLayer)),
+        ),
+        Effect.provide(Global.layerWith({ config: "/global" })),
+        Effect.provide(
+          Layer.succeed(
+            Location.Service,
+            Location.Service.of(
+              location({ directory: AbsolutePath.make("/outside") }, { projectDirectory: AbsolutePath.make("/repo") }),
+            ),
+          ),
+        ),
+      )
+
+      expect(scanned).toBe(false)
+    }),
+  )
+})

packages/core/test/lib/effect.ts

@@ -0,0 +1,53 @@
+import { test, type TestOptions } from "bun:test"
+import { Cause, Effect, Exit, Layer } from "effect"
+import type * as Scope from "effect/Scope"
+import * as TestClock from "effect/testing/TestClock"
+import * as TestConsole from "effect/testing/TestConsole"
+
+type Body<A, E, R> = Effect.Effect<A, E, R> | (() => Effect.Effect<A, E, R>)
+
+const body = <A, E, R>(value: Body<A, E, R>) => Effect.suspend(() => (typeof value === "function" ? value() : value))
+
+const run = <A, E, R, E2>(value: Body<A, E, R | Scope.Scope>, layer: Layer.Layer<R, E2>) =>
+  Effect.gen(function* () {
+    const exit = yield* body(value).pipe(Effect.scoped, Effect.provide(layer), Effect.exit)
+    if (Exit.isFailure(exit)) {
+      for (const err of Cause.prettyErrors(exit.cause)) {
+        yield* Effect.logError(err)
+      }
+    }
+    return yield* exit
+  }).pipe(Effect.runPromise)
+
+const make = <R, E>(testLayer: Layer.Layer<R, E>, liveLayer: Layer.Layer<R, E>) => {
+  const effect = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
+    test(name, () => run(value, testLayer), opts)
+
+  effect.only = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
+    test.only(name, () => run(value, testLayer), opts)
+
+  effect.skip = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
+    test.skip(name, () => run(value, testLayer), opts)
+
+  const live = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
+    test(name, () => run(value, liveLayer), opts)
+
+  live.only = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
+    test.only(name, () => run(value, liveLayer), opts)
+
+  live.skip = <A, E2>(name: string, value: Body<A, E2, R | Scope.Scope>, opts?: number | TestOptions) =>
+    test.skip(name, () => run(value, liveLayer), opts)
+
+  return { effect, live }
+}
+
+// Test environment with TestClock and TestConsole
+const testEnv = Layer.mergeAll(TestConsole.layer, TestClock.layer())
+
+// Live environment - uses real clock, but keeps TestConsole for output capture
+const liveEnv = TestConsole.layer
+
+export const it = make(testEnv, liveEnv)
+
+export const testEffect = <R, E>(layer: Layer.Layer<R, E>) =>
+  make(Layer.provideMerge(layer, testEnv), Layer.provideMerge(layer, liveEnv))

packages/core/test/lib/tool.ts

@@ -0,0 +1,20 @@
+import { AgentV2 } from "@opencode-ai/core/agent"
+import { SessionMessage } from "@opencode-ai/core/session/message"
+import { ToolRegistry } from "@opencode-ai/core/tool/registry"
+import { Effect } from "effect"
+
+export const toolIdentity = {
+  agent: AgentV2.ID.make("build"),
+  assistantMessageID: SessionMessage.ID.make("msg_tool_test"),
+}
+
+export const toolDefinitions = (
+  registry: ToolRegistry.Interface,
+  permissions?: Parameters<typeof registry.materialize>[0],
+) => registry.materialize(permissions).pipe(Effect.map((materialized) => materialized.definitions))
+
+export const settleTool = (registry: ToolRegistry.Interface, input: ToolRegistry.ExecuteInput) =>
+  registry.materialize().pipe(Effect.flatMap((materialized) => materialized.settle(input)))
+
+export const executeTool = (registry: ToolRegistry.Interface, input: ToolRegistry.ExecuteInput) =>
+  settleTool(registry, input).pipe(Effect.map((settlement) => settlement.result))

packages/core/test/location-filesystem.test.ts

@@ -0,0 +1,73 @@
+import fs from "fs/promises"
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Effect, Exit, Layer } from "effect"
+import { FileSystem } from "@opencode-ai/core/filesystem"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Location } from "@opencode-ai/core/location"
+import { Ripgrep } from "@opencode-ai/core/ripgrep"
+import { AbsolutePath, RelativePath } from "@opencode-ai/core/schema"
+import { location } from "./fixture/location"
+import { tmpdir } from "./fixture/tmpdir"
+import { it } from "./lib/effect"
+
+const provide = (directory: string) =>
+  Effect.provide(
+    FileSystem.layer.pipe(
+      Layer.provide(
+        Layer.mergeAll(
+          FSUtil.defaultLayer,
+          Ripgrep.defaultLayer,
+          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
+        ),
+      ),
+    ),
+  )
+
+const withTmp = <A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) =>
+  Effect.acquireRelease(
+    Effect.promise(() => tmpdir()),
+    (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+  ).pipe(Effect.flatMap((tmp) => f(tmp.path)))
+
+describe("FileSystem", () => {
+  it.live("reads text and binary files", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        yield* Effect.promise(() => fs.writeFile(path.join(directory, "text.txt"), "hello"))
+        yield* Effect.promise(() => fs.writeFile(path.join(directory, "data.bin"), Buffer.from([0, 1, 2])))
+        const service = yield* FileSystem.Service
+        const text = yield* service.read({ path: RelativePath.make("text.txt") })
+        const binary = yield* service.read({ path: RelativePath.make("data.bin") })
+        expect(new TextDecoder().decode(text.content)).toBe("hello")
+        expect(text.mime).toBe("text/plain")
+        expect(binary.content).toEqual(new Uint8Array([0, 1, 2]))
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("lists direct children", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        yield* Effect.promise(() => fs.mkdir(path.join(directory, "src")))
+        yield* Effect.promise(() => fs.writeFile(path.join(directory, "README.md"), "# Test"))
+        const entries = yield* (yield* FileSystem.Service).list()
+        expect(entries.map((entry) => ({ path: entry.path, type: entry.type }))).toEqual([
+          { path: RelativePath.make("src" + path.sep), type: "directory" },
+          { path: RelativePath.make("README.md"), type: "file" },
+        ])
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("rejects lexical escapes", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const result = yield* (yield* FileSystem.Service)
+          .read({ path: RelativePath.make("../outside.txt") })
+          .pipe(Effect.exit)
+        expect(Exit.isFailure(result)).toBe(true)
+      }).pipe(provide(directory)),
+    ),
+  )
+})

packages/core/test/location-layer.test.ts

@@ -0,0 +1,140 @@
+import fs from "fs/promises"
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Effect, Equal, Hash, Layer, Schema } from "effect"
+import { Tool } from "@opencode-ai/core/public"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { LocationServiceMap } from "@opencode-ai/core/location-layer"
+import { Location } from "@opencode-ai/core/location"
+import { PluginBoot } from "@opencode-ai/core/plugin/boot"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+import { toolDefinitions } from "./lib/tool"
+import { FSUtil } from "../src/fs-util"
+import { Credential } from "../src/credential"
+import { Database } from "../src/database/database"
+import { EventV2 } from "../src/event"
+import { Global } from "../src/global"
+import { ModelsDev } from "../src/models-dev"
+import { Npm } from "../src/npm"
+import { Project } from "../src/project"
+import { Reference } from "../src/reference"
+import { ToolRegistry } from "../src/tool/registry"
+import { ApplicationTools } from "../src/tool/application-tools"
+
+const applicationTools = ApplicationTools.layer
+const it = testEffect(
+  Layer.merge(
+    applicationTools,
+    LocationServiceMap.layer.pipe(
+      Layer.provide(applicationTools),
+      Layer.provide(
+        Layer.mergeAll(
+          Project.defaultLayer,
+          EventV2.defaultLayer,
+          Credential.layer.pipe(
+            Layer.provide(Database.layerFromPath(":memory:").pipe(Layer.fresh)),
+            Layer.provide(EventV2.defaultLayer),
+          ),
+          Npm.defaultLayer,
+          ModelsDev.defaultLayer,
+          FSUtil.defaultLayer,
+          Global.defaultLayer,
+        ),
+      ),
+    ),
+  ),
+)
+
+describe("LocationServiceMap", () => {
+  it.effect("compares equivalent location refs by value", () =>
+    Effect.sync(() => {
+      const directory = AbsolutePath.make("/project")
+      expect(Equal.equals(Location.Ref.make({ directory }), Location.Ref.make({ directory }))).toBe(true)
+      expect(Hash.hash(Location.Ref.make({ directory }))).toBe(
+        Hash.hash(Location.Ref.make({ directory, workspaceID: undefined })),
+      )
+    }),
+  )
+
+  it.live("isolates location state while sharing location policy with catalog", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => Promise.all([tmpdir(), tmpdir()])),
+      (dirs) => Effect.promise(() => Promise.all(dirs.map((dir) => dir[Symbol.asyncDispose]())).then(() => undefined)),
+    ).pipe(
+      Effect.flatMap(([blocked, allowed]) =>
+        Effect.gen(function* () {
+          yield* (yield* ApplicationTools.Service).register({
+            application_context: Tool.make({
+              description: "Read application context",
+              input: Schema.Struct({}),
+              output: Schema.Struct({ ok: Schema.Boolean }),
+              execute: () => Effect.succeed({ ok: true }),
+            }),
+          })
+          yield* Effect.promise(() =>
+            fs.writeFile(
+              path.join(blocked.path, "opencode.json"),
+              JSON.stringify({
+                experimental: { policies: [{ effect: "deny", action: "provider.use", resource: "test" }] },
+              }),
+            ),
+          )
+
+          const update = (directory: string) =>
+            Effect.gen(function* () {
+              yield* PluginBoot.Service.use((boot) => boot.wait())
+              yield* Reference.Service
+              const catalog = yield* Catalog.Service
+              const transform = yield* catalog.transform()
+              yield* transform((editor) => editor.provider.update(ProviderV2.ID.make("test"), () => {}))
+              return {
+                providers: yield* catalog.provider.all(),
+                tools: yield* toolDefinitions(yield* ToolRegistry.Service),
+              }
+            }).pipe(
+              Effect.scoped,
+              Effect.provide(LocationServiceMap.get(Location.Ref.make({ directory: AbsolutePath.make(directory) }))),
+            )
+
+          const blockedState = yield* update(blocked.path)
+          expect(blockedState.providers.some((provider) => provider.id === ProviderV2.ID.make("test"))).toBe(false)
+          expect(blockedState.tools.map((tool) => tool.name).sort()).toEqual([
+            "application_context",
+            "apply_patch",
+            "bash",
+            "edit",
+            "glob",
+            "grep",
+            "question",
+            "read",
+            "skill",
+            "todowrite",
+            "webfetch",
+            "websearch",
+            "write",
+          ])
+          const allowedState = yield* update(allowed.path)
+          expect(allowedState.providers.some((provider) => provider.id === ProviderV2.ID.make("test"))).toBe(true)
+          expect(allowedState.tools.map((tool) => tool.name).sort()).toEqual([
+            "application_context",
+            "apply_patch",
+            "bash",
+            "edit",
+            "glob",
+            "grep",
+            "question",
+            "read",
+            "skill",
+            "todowrite",
+            "webfetch",
+            "websearch",
+            "write",
+          ])
+        }),
+      ),
+    ),
+  )
+})

packages/core/test/location-mutation.test.ts

@@ -0,0 +1,180 @@
+import fs from "fs/promises"
+import path from "path"
+import { describe, expect, test } from "bun:test"
+import { Effect, Layer, Schema } from "effect"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Location } from "@opencode-ai/core/location"
+import { LocationMutation } from "@opencode-ai/core/location-mutation"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { tmpdir } from "./fixture/tmpdir"
+import { location } from "./fixture/location"
+import { it } from "./lib/effect"
+
+function provide(directory: string) {
+  return Effect.provide(
+    LocationMutation.layer.pipe(
+      Layer.provide(
+        Layer.mergeAll(
+          FSUtil.defaultLayer,
+          Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make(directory) }))),
+        ),
+      ),
+    ),
+  )
+}
+
+function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {
+  return Effect.acquireRelease(
+    Effect.promise(() => tmpdir()),
+    (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+  ).pipe(Effect.flatMap((tmp) => f(tmp.path)))
+}
+
+describe("LocationMutation", () => {
+  it.live("resolves an active relative existing file target", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "hello.txt")
+        yield* Effect.promise(() => fs.writeFile(targetPath, "hello"))
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: "hello.txt" })
+
+        expect(target).toMatchObject({
+          canonical: yield* Effect.promise(() => fs.realpath(targetPath)),
+          resource: "hello.txt",
+        })
+        expect(target.externalDirectory).toBeUndefined()
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("resolves an active relative prospective file target", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        yield* Effect.promise(() => fs.mkdir(path.join(directory, "src")))
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: path.join("src", "new.txt") })
+        const root = yield* Effect.promise(() => fs.realpath(directory))
+
+        expect(target).toMatchObject({
+          canonical: path.join(root, "src", "new.txt"),
+          resource: "src/new.txt",
+        })
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("rejects a relative lexical escape instead of promoting it to external authority", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const error = yield* Effect.flip((yield* LocationMutation.Service).resolve({ path: "../outside.txt" }))
+        expect(error).toMatchObject({ _tag: "LocationMutation.PathError", reason: "relative_escape" })
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("rejects a prospective target below an escaping symlink ancestor", () =>
+    withTmp((directory) => {
+      const outside = `${directory}-outside`
+      return Effect.gen(function* () {
+        if (process.platform === "win32") return
+        yield* Effect.promise(async () => {
+          await fs.mkdir(outside)
+          await fs.symlink(outside, path.join(directory, "escape"))
+        })
+        const error = yield* Effect.flip(
+          (yield* LocationMutation.Service).resolve({ path: path.join("escape", "new.txt") }),
+        )
+        expect(error).toMatchObject({ _tag: "LocationMutation.PathError", reason: "location_escape" })
+        yield* Effect.promise(() => fs.rm(outside, { recursive: true, force: true }))
+      }).pipe(provide(directory))
+    }),
+  )
+
+  it.live("follows an in-location symlink using ordinary filesystem semantics", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        if (process.platform === "win32") return
+        yield* Effect.promise(async () => {
+          await fs.mkdir(path.join(directory, "actual"))
+          await fs.symlink(path.join(directory, "actual"), path.join(directory, "linked"))
+        })
+
+        expect(yield* (yield* LocationMutation.Service).resolve({ path: "linked/new.txt" })).toMatchObject({
+          canonical: path.join(yield* Effect.promise(() => fs.realpath(directory)), "actual", "new.txt"),
+          resource: "actual/new.txt",
+        })
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("accepts an explicit absolute in-location target without external approval", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const targetPath = path.join(directory, "new.txt")
+        const target = yield* (yield* LocationMutation.Service).resolve({ path: targetPath })
+        expect(target).toMatchObject({
+          canonical: path.join(yield* Effect.promise(() => fs.realpath(directory)), "new.txt"),
+          resource: "new.txt",
+        })
+        expect(target.externalDirectory).toBeUndefined()
+      }).pipe(provide(directory)),
+    ),
+  )
+
+  it.live("requires external-directory authorization for an explicit external absolute target", () =>
+    withTmp((directory) =>
+      withTmp((outside) =>
+        Effect.gen(function* () {
+          const targetPath = path.join(outside, "new.txt")
+          const target = yield* (yield* LocationMutation.Service).resolve({ path: targetPath })
+          const root = yield* Effect.promise(() => fs.realpath(outside))
+          expect(target).toMatchObject({
+            canonical: path.join(root, "new.txt"),
+            resource: path.join(root, "new.txt").replaceAll("\\", "/"),
+          })
+          expect(target.externalDirectory).toMatchObject({
+            directory: root,
+            resource: path.join(root, "*").replaceAll("\\", "/"),
+          })
+        }).pipe(provide(directory)),
+      ),
+    ),
+  )
+
+  it.live("resolves an existing external file target", () =>
+    withTmp((directory) =>
+      withTmp((outside) =>
+        Effect.gen(function* () {
+          const targetPath = path.join(outside, "existing.txt")
+          yield* Effect.promise(() => fs.writeFile(targetPath, "existing"))
+          const target = yield* (yield* LocationMutation.Service).resolve({ path: targetPath })
+          const root = yield* Effect.promise(() => fs.realpath(outside))
+          expect(target).toMatchObject({ canonical: path.join(root, "existing.txt") })
+          expect(target.externalDirectory?.directory).toBe(root)
+        }).pipe(provide(directory)),
+      ),
+    ),
+  )
+
+  it.live("anchors prospective external descendants at their stable existing directory", () =>
+    withTmp((directory) =>
+      withTmp((outside) =>
+        Effect.gen(function* () {
+          const targetPath = path.join(outside, "new", "nested", "file.txt")
+          const target = yield* (yield* LocationMutation.Service).resolve({ path: targetPath })
+          const root = yield* Effect.promise(() => fs.realpath(outside))
+          expect(target.externalDirectory).toMatchObject({
+            directory: root,
+            resource: path.join(root, "*").replaceAll("\\", "/"),
+          })
+        }).pipe(provide(directory)),
+      ),
+    ),
+  )
+
+  test("ignores unknown mutation input fields", () => {
+    expect(Object.keys(LocationMutation.ResolveInput.fields)).toEqual(["path", "kind"])
+    expect(Schema.decodeUnknownSync(LocationMutation.ResolveInput)({ path: "README.md", reference: "docs" })).toEqual({
+      path: "README.md",
+    })
+  })
+})

packages/core/test/location.test.ts

@@ -0,0 +1,41 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { Location } from "@opencode-ai/core/location"
+import { Project } from "@opencode-ai/core/project"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { WorkspaceV2 } from "@opencode-ai/core/workspace"
+import { testEffect } from "./lib/effect"
+
+const workspaceID = WorkspaceV2.ID.make("wrk_test")
+const ref = { directory: AbsolutePath.make("/repo/packages/app"), workspaceID }
+const projectLayer = Layer.succeed(
+  Project.Service,
+  Project.Service.of({
+    directories: () => Effect.succeed([]),
+    resolve: () =>
+      Effect.succeed({
+        id: Project.ID.make("project"),
+        directory: AbsolutePath.make("/repo"),
+        vcs: { type: "git", store: AbsolutePath.make("/repo/.git") },
+      }),
+    commit: () => Effect.void,
+  }),
+)
+const it = testEffect(Location.layer(ref).pipe(Layer.provide(projectLayer)))
+
+describe("Location", () => {
+  it.effect("resolves the current project and vcs information", () =>
+    Effect.gen(function* () {
+      const location = yield* Location.Service
+
+      expect(location.directory).toBe(AbsolutePath.make("/repo/packages/app"))
+      expect(location.workspaceID).toBe(workspaceID)
+      expect(location.project.id).toBe(Project.ID.make("project"))
+      expect(location.project.directory).toBe(AbsolutePath.make("/repo"))
+      expect(location.vcs).toEqual({
+        type: "git",
+        store: AbsolutePath.make("/repo/.git"),
+      })
+    }),
+  )
+})

packages/core/test/model-request.test.ts

@@ -0,0 +1,44 @@
+import { describe, expect, test } from "bun:test"
+import { ModelRequest } from "@opencode-ai/core/model-request"
+
+describe("ModelRequest", () => {
+  test("partitions AI SDK model and models.dev mode options", () => {
+    expect(
+      ModelRequest.normalizeAiSdkOptions("@ai-sdk/openai", {
+        maxOutputTokens: 4096,
+        temperature: 0.2,
+        reasoningEffort: "high",
+        serviceTier: "priority",
+        custom_extension: { enabled: true },
+      }),
+    ).toEqual({
+      generation: { maxTokens: 4096, temperature: 0.2 },
+      options: { reasoningEffort: "high", serviceTier: "priority" },
+      body: { custom_extension: { enabled: true } },
+    })
+  })
+
+  test("keeps unknown-provider options as compatibility fields", () => {
+    expect(ModelRequest.normalizeAiSdkOptions(undefined, { temperature: 0.2, reasoningEffort: "high" })).toEqual({
+      generation: { temperature: 0.2 },
+      options: {},
+      body: { reasoningEffort: "high" },
+    })
+  })
+
+  test("does not consult inherited package-name properties", () => {
+    expect(ModelRequest.normalizeAiSdkOptions("__proto__", { reasoningEffort: "high" })).toEqual({
+      generation: {},
+      options: {},
+      body: { reasoningEffort: "high" },
+    })
+  })
+
+  test("normalizes models.dev wire aliases owned by native protocols", () => {
+    expect(ModelRequest.normalizeAiSdkOptions("@ai-sdk/openai", { service_tier: "priority" })).toEqual({
+      generation: {},
+      options: { serviceTier: "priority" },
+      body: {},
+    })
+  })
+})

packages/core/test/model.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, test } from "bun:test"
+import { Schema } from "effect"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+
+const decode = Schema.decodeUnknownSync(ModelV2.Ref)
+
+describe("ModelV2.Ref", () => {
+  test("accepts a model selection without a variant", () => {
+    expect(decode({ id: "claude-sonnet", providerID: "anthropic" })).toEqual({
+      id: ModelV2.ID.make("claude-sonnet"),
+      providerID: ProviderV2.ID.make("anthropic"),
+    })
+  })
+
+  test("preserves an explicit model variant", () => {
+    expect(decode({ id: "claude-sonnet", providerID: "anthropic", variant: "high" })).toEqual({
+      id: ModelV2.ID.make("claude-sonnet"),
+      providerID: ProviderV2.ID.make("anthropic"),
+      variant: ModelV2.VariantID.make("high"),
+    })
+  })
+})

packages/core/test/models.test.ts

@@ -0,0 +1,292 @@
+import { describe, expect, beforeAll, beforeEach, afterAll } from "bun:test"
+import { Effect, Layer, Ref } from "effect"
+import { HttpClient, HttpClientResponse } from "effect/unstable/http"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Flag } from "@opencode-ai/core/flag/flag"
+import { Global } from "@opencode-ai/core/global"
+import { ModelsDev } from "@opencode-ai/core/models-dev"
+import { EventV2 } from "@opencode-ai/core/event"
+import { it } from "./lib/effect"
+import { readFile, rm, writeFile, utimes, mkdir } from "fs/promises"
+import path from "path"
+
+// test/preload.ts pins OPENCODE_MODELS_PATH to a fixture so other tests can
+// resolve providers without network. These tests need to drive the on-disk
+// cache themselves and silence the eager refresh fork. Save/restore around
+// the suite — never leak the mutation to subsequent test files in the same
+// bun process.
+const ORIGINAL_MODELS_PATH = Flag.OPENCODE_MODELS_PATH
+const ORIGINAL_DISABLE_FETCH = Flag.OPENCODE_DISABLE_MODELS_FETCH
+beforeAll(() => {
+  Flag.OPENCODE_MODELS_PATH = undefined
+  Flag.OPENCODE_DISABLE_MODELS_FETCH = true
+})
+afterAll(() => {
+  Flag.OPENCODE_MODELS_PATH = ORIGINAL_MODELS_PATH
+  Flag.OPENCODE_DISABLE_MODELS_FETCH = ORIGINAL_DISABLE_FETCH
+})
+
+const cacheFile = path.join(Global.Path.cache, "models.json")
+
+const fixture: Record<string, ModelsDev.Provider> = {
+  acme: {
+    id: "acme",
+    name: "Acme",
+    env: ["ACME_API_KEY"],
+    models: {
+      "acme-1": {
+        id: "acme-1",
+        name: "Acme One",
+        release_date: "2026-01-01",
+        attachment: false,
+        reasoning: false,
+        temperature: true,
+        tool_call: true,
+        limit: { context: 128000, output: 8192 },
+      },
+    },
+  },
+}
+
+const fixture2: Record<string, ModelsDev.Provider> = {
+  beta: {
+    id: "beta",
+    name: "Beta",
+    env: ["BETA_API_KEY"],
+    models: {
+      "beta-1": {
+        id: "beta-1",
+        name: "Beta One",
+        release_date: "2026-02-01",
+        attachment: false,
+        reasoning: true,
+        temperature: false,
+        tool_call: false,
+        limit: { context: 64000, output: 4096 },
+      },
+    },
+  },
+}
+
+interface MockState {
+  body: string
+  status: number
+  calls: Array<{ url: string; userAgent: string | null }>
+}
+
+const makeMockClient = (state: Ref.Ref<MockState>) =>
+  HttpClient.make((request) =>
+    Effect.gen(function* () {
+      yield* Ref.update(state, (s) => ({
+        ...s,
+        calls: [...s.calls, { url: request.url, userAgent: request.headers["user-agent"] ?? null }],
+      }))
+      const s = yield* Ref.get(state)
+      return HttpClientResponse.fromWeb(request, new Response(s.body, { status: s.status }))
+    }),
+  )
+
+const buildLayer = (state: Ref.Ref<MockState>) =>
+  // Layer.fresh is required: ModelsDev.layer is a module-level Layer constant,
+  // and Effect.provide uses a process-global MemoMap by default — without fresh,
+  // every test would reuse the cachedInvalidateWithTTL state from the first run.
+  Layer.fresh(ModelsDev.layer).pipe(
+    Layer.provide(Layer.succeed(HttpClient.HttpClient, makeMockClient(state))),
+    Layer.provide(FSUtil.defaultLayer),
+    Layer.provide(EventV2.defaultLayer),
+  )
+
+const writeCacheText = (text: string, mtimeMs?: number) =>
+  Effect.promise(async () => {
+    await mkdir(Global.Path.cache, { recursive: true })
+    await writeFile(cacheFile, text)
+    if (mtimeMs !== undefined) {
+      const t = mtimeMs / 1000
+      await utimes(cacheFile, t, t)
+    }
+  })
+
+const writeCache = (data: object, mtimeMs?: number) => writeCacheText(JSON.stringify(data), mtimeMs)
+
+const provided = <A, E>(state: Ref.Ref<MockState>, eff: Effect.Effect<A, E, ModelsDev.Service>) =>
+  eff.pipe(Effect.provide(buildLayer(state)))
+
+beforeEach(async () => {
+  await rm(cacheFile, { force: true })
+})
+
+afterAll(async () => {
+  await rm(cacheFile, { force: true })
+})
+
+const initialState: MockState = {
+  body: JSON.stringify(fixture),
+  status: 200,
+  calls: [],
+}
+
+describe("ModelsDev Service", () => {
+  it.live("get() returns providers from disk when cache file exists", () =>
+    Effect.gen(function* () {
+      yield* writeCache(fixture)
+      const state = yield* Ref.make(initialState)
+      const result = yield* provided(
+        state,
+        ModelsDev.Service.use((s) => s.get()),
+      )
+      expect(result).toEqual(fixture)
+      const final = yield* Ref.get(state)
+      expect(final.calls).toEqual([])
+    }),
+  )
+
+  it.live("get() returns empty catalog when disk empty, fetch disabled, and no bundled snapshot is injected", () =>
+    Effect.gen(function* () {
+      const state = yield* Ref.make(initialState)
+      const result = yield* provided(
+        state,
+        ModelsDev.Service.use((s) => s.get()),
+      )
+      expect(result).toEqual({})
+      const final = yield* Ref.get(state)
+      expect(final.calls).toEqual([])
+    }),
+  )
+
+  it.live("get() recovers from a corrupted cache file by fetching a fresh catalog", () =>
+    Effect.gen(function* () {
+      yield* writeCacheText("{")
+      const state = yield* Ref.make({ ...initialState, body: JSON.stringify(fixture2) })
+      const result = yield* Effect.acquireUseRelease(
+        Effect.sync(() => {
+          Flag.OPENCODE_DISABLE_MODELS_FETCH = false
+        }),
+        () =>
+          provided(
+            state,
+            ModelsDev.Service.use((s) => s.get()),
+          ),
+        () =>
+          Effect.sync(() => {
+            Flag.OPENCODE_DISABLE_MODELS_FETCH = true
+          }),
+      )
+      expect(result).toEqual(fixture2)
+      expect(yield* Effect.promise(() => readFile(cacheFile, "utf8"))).toBe(JSON.stringify(fixture2))
+      const final = yield* Ref.get(state)
+      expect(final.calls.length).toBe(1)
+    }),
+  )
+
+  it.live("get() is single-flight under concurrent calls", () =>
+    Effect.gen(function* () {
+      yield* writeCache(fixture)
+      const state = yield* Ref.make(initialState)
+      const results = yield* provided(
+        state,
+        Effect.gen(function* () {
+          const svc = yield* ModelsDev.Service
+          return yield* Effect.all([svc.get(), svc.get(), svc.get(), svc.get(), svc.get()], {
+            concurrency: "unbounded",
+          })
+        }),
+      )
+      for (const result of results) expect(result).toEqual(fixture)
+    }),
+  )
+
+  it.live("get() caches across calls (later disk writes are ignored until invalidate)", () =>
+    Effect.gen(function* () {
+      yield* writeCache(fixture)
+      const state = yield* Ref.make(initialState)
+      const first = yield* provided(
+        state,
+        Effect.gen(function* () {
+          const svc = yield* ModelsDev.Service
+          const a = yield* svc.get()
+          // mutate disk between calls — cache should mask the change
+          yield* writeCache(fixture2)
+          const b = yield* svc.get()
+          return { a, b }
+        }),
+      )
+      expect(first.a).toEqual(fixture)
+      expect(first.b).toEqual(fixture)
+    }),
+  )
+
+  it.live("refresh(true) fetches via HttpClient and updates the cache", () =>
+    Effect.gen(function* () {
+      yield* writeCache(fixture)
+      const state = yield* Ref.make({ ...initialState, body: JSON.stringify(fixture2) })
+      const result = yield* provided(
+        state,
+        Effect.gen(function* () {
+          const svc = yield* ModelsDev.Service
+          const before = yield* svc.get()
+          yield* svc.refresh(true)
+          const after = yield* svc.get()
+          return { before, after }
+        }),
+      )
+      expect(result.before).toEqual(fixture)
+      expect(result.after).toEqual(fixture2)
+      const final = yield* Ref.get(state)
+      expect(final.calls.length).toBe(1)
+      expect(final.calls[0].url).toContain("/api.json")
+      expect(final.calls[0].userAgent).toContain("/cli")
+    }),
+  )
+
+  it.live("refresh(false) skips fetch when on-disk file is fresh", () =>
+    Effect.gen(function* () {
+      // Fresh: mtime within the 5-minute TTL.
+      yield* writeCache(fixture, Date.now() - 1000)
+      const state = yield* Ref.make({ ...initialState, body: JSON.stringify(fixture2) })
+      yield* provided(
+        state,
+        ModelsDev.Service.use((s) => s.refresh(false)),
+      )
+      const final = yield* Ref.get(state)
+      expect(final.calls).toEqual([])
+    }),
+  )
+
+  it.live("refresh(false) fetches when on-disk file is stale", () =>
+    Effect.gen(function* () {
+      // Stale: mtime 10 minutes ago, beyond the 5-minute TTL.
+      yield* writeCache(fixture, Date.now() - 10 * 60 * 1000)
+      const state = yield* Ref.make({ ...initialState, body: JSON.stringify(fixture2) })
+      const after = yield* provided(
+        state,
+        Effect.gen(function* () {
+          const svc = yield* ModelsDev.Service
+          yield* svc.refresh(false)
+          return yield* svc.get()
+        }),
+      )
+      const final = yield* Ref.get(state)
+      expect(final.calls.length).toBe(1)
+      expect(after).toEqual(fixture2)
+    }),
+  )
+
+  it.live("refresh swallows HTTP errors and leaves cache intact", () =>
+    Effect.gen(function* () {
+      yield* writeCache(fixture)
+      const state = yield* Ref.make({ ...initialState, status: 500, body: "boom" })
+      const result = yield* provided(
+        state,
+        Effect.gen(function* () {
+          const svc = yield* ModelsDev.Service
+          yield* svc.refresh(true)
+          return yield* svc.get()
+        }),
+      )
+      expect(result).toEqual(fixture)
+      // retryTransient retries 5xx, so calls may be > 1.
+      const final = yield* Ref.get(state)
+      expect(final.calls.length).toBeGreaterThanOrEqual(1)
+    }),
+  )
+})

packages/core/test/move-session.test.ts

@@ -0,0 +1,249 @@
+import { describe, expect } from "bun:test"
+import { $ } from "bun"
+import fs from "fs/promises"
+import path from "path"
+import { eq } from "drizzle-orm"
+import { Effect, Layer } from "effect"
+import { MoveSession } from "@opencode-ai/core/control-plane/move-session"
+import { Database } from "@opencode-ai/core/database/database"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Git } from "@opencode-ai/core/git"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Project } from "@opencode-ai/core/project"
+import { ProjectTable } from "@opencode-ai/core/project/sql"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { SessionV2 } from "@opencode-ai/core/session"
+import { SessionExecution } from "@opencode-ai/core/session/execution"
+import { SessionProjector } from "@opencode-ai/core/session/projector"
+import { SessionTable } from "@opencode-ai/core/session/sql"
+import { SessionStore } from "@opencode-ai/core/session/store"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+
+const database = Database.layerFromPath(":memory:")
+const events = EventV2.layer.pipe(Layer.provide(database))
+const projector = SessionProjector.layer.pipe(Layer.provide(database), Layer.provide(events))
+const project = Project.layer.pipe(
+  Layer.provide(database),
+  Layer.provide(FSUtil.defaultLayer),
+  Layer.provide(Git.defaultLayer),
+)
+const store = SessionStore.layer.pipe(Layer.provide(database))
+const sessions = SessionV2.layer.pipe(
+  Layer.provide(database),
+  Layer.provide(events),
+  Layer.provide(project),
+  Layer.provide(store),
+  Layer.provide(SessionExecution.noopLayer),
+)
+const layer = MoveSession.layer.pipe(
+  Layer.provide(database),
+  Layer.provide(FSUtil.defaultLayer),
+  Layer.provide(Git.defaultLayer),
+  Layer.provide(events),
+  Layer.provide(project),
+  Layer.provide(sessions),
+)
+const it = testEffect(
+  Layer.mergeAll(layer, database, events, project, projector, store, SessionExecution.noopLayer, sessions),
+)
+
+function abs(input: string) {
+  return AbsolutePath.make(input)
+}
+
+async function initRepo(directory: string) {
+  await $`git init`.cwd(directory).quiet()
+  await $`git config core.autocrlf false`.cwd(directory).quiet()
+  await $`git config core.fsmonitor false`.cwd(directory).quiet()
+  await $`git config commit.gpgsign false`.cwd(directory).quiet()
+  await $`git config user.email test@opencode.test`.cwd(directory).quiet()
+  await $`git config user.name Test`.cwd(directory).quiet()
+  await fs.writeFile(path.join(directory, "tracked.txt"), "initial\n")
+  await $`git add tracked.txt`.cwd(directory).quiet()
+  await $`git commit -m root`.cwd(directory).quiet()
+}
+
+describe("MoveSession", () => {
+  it.live("moves session changes to another project directory", () =>
+    Effect.gen(function* () {
+      const root = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(root.path))
+      const source = abs(yield* Effect.promise(() => fs.realpath(root.path)))
+      const destination = abs(`${root.path}-move-destination`)
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(destination, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      yield* Effect.promise(() => $`git worktree add --detach ${destination} HEAD`.cwd(root.path).quiet())
+      const moved = abs(yield* Effect.promise(() => fs.realpath(destination)))
+      yield* Effect.promise(() => fs.writeFile(path.join(source, "tracked.txt"), "changed\n"))
+      yield* Effect.promise(() => fs.writeFile(path.join(source, "untracked.txt"), "new\n"))
+
+      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
+      const sessionID = SessionV2.ID.make("ses_move")
+      const { db } = yield* Database.Service
+      yield* db
+        .insert(ProjectTable)
+        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
+        .run()
+        .pipe(Effect.orDie)
+      yield* db
+        .insert(SessionTable)
+        .values({
+          id: sessionID,
+          project_id: projectID,
+          slug: "move",
+          directory: source,
+          title: "move",
+          version: "test",
+          time_created: 1,
+          time_updated: 1,
+        })
+        .run()
+        .pipe(Effect.orDie)
+
+      yield* MoveSession.Service.use((service) =>
+        service.moveSession({ sessionID, destination: { directory: moved }, moveChanges: true }),
+      )
+
+      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "tracked.txt"), "utf8"))).toBe("changed\n")
+      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "untracked.txt"), "utf8"))).toBe("new\n")
+      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "tracked.txt"), "utf8"))).toBe("initial\n")
+      expect(yield* Effect.promise(() => Bun.file(path.join(source, "untracked.txt")).exists())).toBe(false)
+      expect(
+        yield* db
+          .select({ directory: SessionTable.directory, path: SessionTable.path })
+          .from(SessionTable)
+          .where(eq(SessionTable.id, sessionID))
+          .get(),
+      ).toEqual({ directory: moved, path: "" })
+    }),
+  )
+
+  it.live("moves within a checkout without transferring existing changes", () =>
+    Effect.gen(function* () {
+      const root = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(root.path))
+      const source = abs(yield* Effect.promise(() => fs.realpath(root.path)))
+      const destination = abs(path.join(source, "packages"))
+      yield* Effect.promise(() => fs.mkdir(destination))
+      yield* Effect.promise(() => fs.writeFile(path.join(source, "tracked.txt"), "changed\n"))
+      yield* Effect.promise(() => fs.writeFile(path.join(source, "untracked.txt"), "new\n"))
+
+      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
+      const sessionID = SessionV2.ID.make("ses_move_nested")
+      const { db } = yield* Database.Service
+      yield* db
+        .insert(ProjectTable)
+        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
+        .run()
+        .pipe(Effect.orDie)
+      yield* db
+        .insert(SessionTable)
+        .values({
+          id: sessionID,
+          project_id: projectID,
+          slug: "move-nested",
+          directory: source,
+          title: "move nested",
+          version: "test",
+          time_created: 1,
+          time_updated: 1,
+        })
+        .run()
+        .pipe(Effect.orDie)
+
+      yield* MoveSession.Service.use((service) =>
+        service.moveSession({ sessionID, destination: { directory: destination }, moveChanges: true }),
+      )
+
+      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "tracked.txt"), "utf8"))).toBe("changed\n")
+      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "untracked.txt"), "utf8"))).toBe("new\n")
+      expect(
+        yield* db
+          .select({ directory: SessionTable.directory, path: SessionTable.path })
+          .from(SessionTable)
+          .where(eq(SessionTable.id, sessionID))
+          .get(),
+      ).toEqual({ directory: destination, path: "packages" })
+    }),
+  )
+
+  it.live("moves nested session changes without cleaning unrelated files", () =>
+    Effect.gen(function* () {
+      const root = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(root.path))
+      const source = abs(yield* Effect.promise(() => fs.realpath(root.path)))
+      const sourceDirectory = abs(path.join(source, "packages"))
+      yield* Effect.promise(() => fs.mkdir(sourceDirectory))
+      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "tracked.txt"), "initial\n"))
+      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "staged.txt"), "initial\n"))
+      yield* Effect.promise(() => $`git add packages/tracked.txt packages/staged.txt`.cwd(source).quiet())
+      yield* Effect.promise(() => $`git commit -m packages`.cwd(source).quiet())
+      const destination = abs(`${root.path}-move-nested-destination`)
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(destination, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      yield* Effect.promise(() => $`git worktree add --detach ${destination} HEAD`.cwd(source).quiet())
+      const moved = abs(path.join(yield* Effect.promise(() => fs.realpath(destination)), "packages"))
+      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "tracked.txt"), "changed\n"))
+      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "staged.txt"), "staged\n"))
+      yield* Effect.promise(() => $`git add packages/staged.txt`.cwd(source).quiet())
+      yield* Effect.promise(() => fs.writeFile(path.join(sourceDirectory, "untracked.txt"), "new\n"))
+      yield* Effect.promise(() => fs.writeFile(path.join(source, "tracked.txt"), "unrelated\n"))
+      yield* Effect.promise(() => fs.writeFile(path.join(source, "untracked.txt"), "unrelated\n"))
+
+      const projectID = (yield* Project.Service.use((service) => service.resolve(source))).id
+      const sessionID = SessionV2.ID.make("ses_move_nested_checkout")
+      const { db } = yield* Database.Service
+      yield* db
+        .insert(ProjectTable)
+        .values({ id: projectID, worktree: source, sandboxes: [], time_created: 1, time_updated: 1 })
+        .run()
+        .pipe(Effect.orDie)
+      yield* db
+        .insert(SessionTable)
+        .values({
+          id: sessionID,
+          project_id: projectID,
+          slug: "move-nested-checkout",
+          directory: sourceDirectory,
+          title: "move nested checkout",
+          version: "test",
+          time_created: 1,
+          time_updated: 1,
+        })
+        .run()
+        .pipe(Effect.orDie)
+
+      yield* MoveSession.Service.use((service) =>
+        service.moveSession({ sessionID, destination: { directory: moved }, moveChanges: true }),
+      )
+
+      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "tracked.txt"), "utf8"))).toBe("changed\n")
+      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "staged.txt"), "utf8"))).toBe("staged\n")
+      expect(yield* Effect.promise(() => fs.readFile(path.join(moved, "untracked.txt"), "utf8"))).toBe("new\n")
+      expect(yield* Effect.promise(() => fs.readFile(path.join(sourceDirectory, "tracked.txt"), "utf8"))).toBe(
+        "initial\n",
+      )
+      expect(yield* Effect.promise(() => Bun.file(path.join(sourceDirectory, "untracked.txt")).exists())).toBe(false)
+      expect(yield* Effect.promise(() => fs.readFile(path.join(sourceDirectory, "staged.txt"), "utf8"))).toBe(
+        "staged\n",
+      )
+      expect(yield* Effect.promise(() => $`git status --porcelain -- packages/staged.txt`.cwd(source).text())).toBe(
+        "M  packages/staged.txt\n",
+      )
+      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "tracked.txt"), "utf8"))).toBe("unrelated\n")
+      expect(yield* Effect.promise(() => fs.readFile(path.join(source, "untracked.txt"), "utf8"))).toBe("unrelated\n")
+    }),
+  )
+})

packages/core/test/npm-config.test.ts

@@ -0,0 +1,51 @@
+import path from "path"
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { NpmConfig } from "@opencode-ai/core/npm-config"
+import { tmpdir } from "./fixture/tmpdir"
+
+describe("NpmConfig.load", () => {
+  test("reads registry from project .npmrc", async () => {
+    await using tmp = await tmpdir()
+    await Bun.write(path.join(tmp.path, ".npmrc"), "registry=https://registry.example.test/\n")
+
+    const config = await Effect.runPromise(NpmConfig.load(tmp.path))
+
+    expect(config.registry).toBe("https://registry.example.test/")
+  })
+
+  test("reads scoped registries from project .npmrc", async () => {
+    await using tmp = await tmpdir()
+    await Bun.write(path.join(tmp.path, ".npmrc"), "@acme:registry=https://npm.acme.test/\n")
+
+    const config = await Effect.runPromise(NpmConfig.load(tmp.path))
+
+    expect(config["@acme:registry"]).toBe("https://npm.acme.test/")
+  })
+
+  test("flattens boolean and list options", async () => {
+    await using tmp = await tmpdir()
+    await Bun.write(path.join(tmp.path, ".npmrc"), "ignore-scripts=true\nomit[]=dev\nomit[]=optional\n")
+
+    const config = await Effect.runPromise(NpmConfig.load(tmp.path))
+
+    expect(config.ignoreScripts).toBe(true)
+    expect(config.omit).toEqual(["dev", "optional"])
+  })
+})
+
+describe("NpmConfig.registry", () => {
+  test("normalizes configured registry without trailing slash", async () => {
+    await using tmp = await tmpdir()
+    await Bun.write(path.join(tmp.path, ".npmrc"), "registry=https://registry.example.test/\n")
+
+    await expect(Effect.runPromise(NpmConfig.registry(tmp.path))).resolves.toBe("https://registry.example.test")
+  })
+
+  test("leaves configured registry without trailing slash unchanged", async () => {
+    await using tmp = await tmpdir()
+    await Bun.write(path.join(tmp.path, ".npmrc"), "registry=https://registry.example.test\n")
+
+    await expect(Effect.runPromise(NpmConfig.registry(tmp.path))).resolves.toBe("https://registry.example.test")
+  })
+})

packages/core/test/npm.test.ts

@@ -0,0 +1,91 @@
+import fs from "fs/promises"
+import path from "path"
+import { describe, expect, test } from "bun:test"
+import { NodeFileSystem } from "@effect/platform-node"
+import { Effect, Layer, Option } from "effect"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Global } from "@opencode-ai/core/global"
+import { Npm } from "@opencode-ai/core/npm"
+import { EffectFlock } from "@opencode-ai/core/util/effect-flock"
+import { tmpdir } from "./fixture/tmpdir"
+
+const win = process.platform === "win32"
+
+const writePackage = (dir: string, pkg: Record<string, unknown>) =>
+  Bun.write(
+    path.join(dir, "package.json"),
+    JSON.stringify({
+      version: "1.0.0",
+      ...pkg,
+    }),
+  )
+
+const npmLayer = (cache: string) =>
+  Npm.layer.pipe(
+    Layer.provide(EffectFlock.layer),
+    Layer.provide(FSUtil.layer),
+    Layer.provide(Global.layerWith({ cache, state: path.join(cache, "state") })),
+    Layer.provide(NodeFileSystem.layer),
+  )
+
+describe("Npm.sanitize", () => {
+  test("keeps normal scoped package specs unchanged", () => {
+    expect(Npm.sanitize("@opencode/acme")).toBe("@opencode/acme")
+    expect(Npm.sanitize("@opencode/acme@1.0.0")).toBe("@opencode/acme@1.0.0")
+    expect(Npm.sanitize("prettier")).toBe("prettier")
+  })
+
+  test("handles git https specs", () => {
+    const spec = "acme@git+https://github.com/opencode/acme.git"
+    const expected = win ? "acme@git+https_//github.com/opencode/acme.git" : spec
+    expect(Npm.sanitize(spec)).toBe(expected)
+  })
+})
+
+describe("Npm.add", () => {
+  test("reifies when package cache directory exists without the package installed", async () => {
+    await using tmp = await tmpdir()
+    await fs.mkdir(path.join(tmp.path, "fixture-provider"))
+    await writePackage(path.join(tmp.path, "fixture-provider"), {
+      name: "fixture-provider",
+      main: "index.js",
+    })
+    await Bun.write(path.join(tmp.path, "fixture-provider", "index.js"), "export const fixture = true\n")
+
+    const spec = `fixture-provider@file:${path.join(tmp.path, "fixture-provider")}`
+    await fs.mkdir(path.join(tmp.path, "cache", "packages", Npm.sanitize(spec)), { recursive: true })
+
+    const entry = await Effect.gen(function* () {
+      const npm = yield* Npm.Service
+      return yield* npm.add(spec)
+    }).pipe(Effect.scoped, Effect.provide(npmLayer(path.join(tmp.path, "cache"))), Effect.runPromise)
+
+    expect(Option.isSome(entry.entrypoint)).toBe(true)
+  })
+})
+
+describe("Npm.install", () => {
+  test("respects omit from project .npmrc", async () => {
+    await using tmp = await tmpdir()
+
+    await writePackage(tmp.path, {
+      name: "fixture",
+      dependencies: {
+        "prod-pkg": "file:./prod-pkg",
+      },
+      devDependencies: {
+        "dev-pkg": "file:./dev-pkg",
+      },
+    })
+    await Bun.write(path.join(tmp.path, ".npmrc"), "omit=dev\n")
+    await fs.mkdir(path.join(tmp.path, "prod-pkg"))
+    await fs.mkdir(path.join(tmp.path, "dev-pkg"))
+    await writePackage(path.join(tmp.path, "prod-pkg"), { name: "prod-pkg" })
+    await writePackage(path.join(tmp.path, "dev-pkg"), { name: "dev-pkg" })
+
+    await Npm.install(tmp.path)
+
+    await expect(fs.stat(path.join(tmp.path, "node_modules", "prod-pkg"))).resolves.toBeDefined()
+    await expect(fs.stat(path.join(tmp.path, "node_modules", "dev-pkg"))).rejects.toThrow()
+  })
+})

packages/core/test/patch.test.ts

@@ -0,0 +1,68 @@
+import { describe, expect, test } from "bun:test"
+import { Patch } from "@opencode-ai/core/patch"
+
+describe("Patch", () => {
+  test("parses add, update, and delete hunks", () => {
+    expect(
+      Patch.parse(
+        "*** Begin Patch\n*** Add File: add.txt\n+added\n*** Update File: update.txt\n@@ section\n-old\n+new\n*** Delete File: delete.txt\n*** End Patch",
+      ),
+    ).toEqual([
+      { type: "add", path: "add.txt", contents: "added" },
+      {
+        type: "update",
+        path: "update.txt",
+        chunks: [{ oldLines: ["old"], newLines: ["new"], changeContext: "section", endOfFile: undefined }],
+        movePath: undefined,
+      },
+      { type: "delete", path: "delete.txt" },
+    ])
+  })
+
+  test("strips a heredoc wrapper", () => {
+    expect(Patch.parse("cat <<'EOF'\n*** Begin Patch\n*** Add File: add.txt\n+added\n*** End Patch\nEOF")).toEqual([
+      { type: "add", path: "add.txt", contents: "added" },
+    ])
+  })
+
+  test("derives fuzzy line updates while preserving BOM", () => {
+    const update = Patch.derive("update.txt", [{ oldLines: ["  old   "], newLines: ["new"] }], "\uFEFFold\n")
+    expect(update).toEqual({ content: "new\n", bom: true })
+    expect(Patch.joinBom(update.content, update.bom)).toBe("\uFEFFnew\n")
+  })
+
+  test("matches EOF-anchored chunks from the end", () => {
+    expect(
+      Patch.derive(
+        "update.txt",
+        [{ oldLines: ["marker", "end"], newLines: ["marker changed", "end"], endOfFile: true }],
+        "marker\nmiddle\nmarker\nend\n",
+      ).content,
+    ).toBe("marker\nmiddle\nmarker changed\nend\n")
+  })
+
+  test("parses the EOF marker inside update chunks", () => {
+    expect(
+      Patch.parse("*** Begin Patch\n*** Update File: update.txt\n@@\n-last\n+end\n*** End of File\n*** End Patch"),
+    ).toEqual([
+      {
+        type: "update",
+        path: "update.txt",
+        movePath: undefined,
+        chunks: [{ oldLines: ["last"], newLines: ["end"], changeContext: undefined, endOfFile: true }],
+      },
+    ])
+  })
+
+  test("rejects malformed hunk bodies", () => {
+    expect(() => Patch.parse("*** Begin Patch\n*** Add File: add.txt\nmissing plus\n*** End Patch")).toThrow(
+      "Invalid add file line",
+    )
+    expect(() => Patch.parse("*** Begin Patch\n*** Update File: update.txt\n*** End Patch")).toThrow(
+      "expected at least one @@ chunk",
+    )
+    expect(() => Patch.parse("*** Begin Patch\n*** Delete File: delete.txt\nunexpected body\n*** End Patch")).toThrow(
+      "Invalid patch line",
+    )
+  })
+})

packages/core/test/permission.test.ts

@@ -0,0 +1,306 @@
+import { describe, expect } from "bun:test"
+import { Deferred, Effect, Fiber, Layer } from "effect"
+import { AgentV2 } from "@opencode-ai/core/agent"
+import { Database } from "@opencode-ai/core/database/database"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { PermissionV2 } from "@opencode-ai/core/permission"
+import { PermissionTable } from "@opencode-ai/core/permission/sql"
+import { PermissionSaved } from "@opencode-ai/core/permission/saved"
+import { Project } from "@opencode-ai/core/project"
+import { ProjectTable } from "@opencode-ai/core/project/sql"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { SessionV2 } from "@opencode-ai/core/session"
+import { SessionTable } from "@opencode-ai/core/session/sql"
+import { SessionExecution } from "@opencode-ai/core/session/execution"
+import { SessionStore } from "@opencode-ai/core/session/store"
+import { eq } from "drizzle-orm"
+import { location } from "./fixture/location"
+import { testEffect } from "./lib/effect"
+
+const database = Database.layerFromPath(":memory:")
+const current = Layer.succeed(
+  Location.Service,
+  Location.Service.of(location({ directory: AbsolutePath.make("/project") })),
+)
+const events = EventV2.layer.pipe(Layer.provide(database))
+const store = SessionStore.layer.pipe(Layer.provide(database))
+const sessions = SessionV2.layer.pipe(
+  Layer.provide(events),
+  Layer.provide(database),
+  Layer.provide(store),
+  Layer.provide(Project.defaultLayer),
+  Layer.provide(SessionExecution.noopLayer),
+)
+const saved = PermissionSaved.layer.pipe(Layer.provide(database))
+const layer = PermissionV2.locationLayer.pipe(
+  Layer.provideMerge(database),
+  Layer.provideMerge(store),
+  Layer.provideMerge(events),
+  Layer.provideMerge(current),
+  Layer.provideMerge(sessions),
+  Layer.provideMerge(SessionExecution.noopLayer),
+  Layer.provideMerge(saved),
+)
+const it = testEffect(layer)
+
+function setup(rules: PermissionV2.Ruleset = []) {
+  return Effect.gen(function* () {
+    const { db } = yield* Database.Service
+    yield* db
+      .insert(ProjectTable)
+      .values({ id: Project.ID.global, worktree: AbsolutePath.make("/project"), sandboxes: [] })
+      .onConflictDoNothing()
+      .run()
+      .pipe(Effect.orDie)
+    yield* db
+      .insert(SessionTable)
+      .values({
+        id: SessionV2.ID.make("ses_test"),
+        project_id: Project.ID.global,
+        slug: "test",
+        directory: "/project",
+        title: "test",
+        version: "test",
+        agent: "test",
+      })
+      .onConflictDoNothing()
+      .run()
+      .pipe(Effect.orDie)
+    yield* setRules(rules)
+  })
+}
+
+function setRules(rules: PermissionV2.Ruleset) {
+  return Effect.gen(function* () {
+    const agents = yield* AgentV2.Service
+    const update = yield* agents.transform()
+    yield* update((editor) =>
+      editor.update(AgentV2.ID.make("test"), (agent) => {
+        agent.permissions = [...rules]
+      }),
+    )
+  })
+}
+
+function assertion(input: Partial<PermissionV2.AssertInput> = {}) {
+  return {
+    id: PermissionV2.ID.create("per_test"),
+    sessionID: SessionV2.ID.make("ses_test"),
+    action: "read",
+    resources: ["src/index.ts"],
+    ...input,
+  } satisfies PermissionV2.AssertInput
+}
+
+function waitForRequest() {
+  return Effect.gen(function* () {
+    const service = yield* PermissionV2.Service
+    const events = yield* EventV2.Service
+    const asked = yield* Deferred.make<PermissionV2.Request>()
+    const unsubscribe = yield* events.listen((event) =>
+      event.type === PermissionV2.Event.Asked.type
+        ? Deferred.succeed(asked, event.data as PermissionV2.Request).pipe(Effect.asVoid)
+        : Effect.void,
+    )
+    yield* Effect.addFinalizer(() => unsubscribe)
+    const fiber = yield* service.assert(assertion()).pipe(Effect.forkScoped)
+    const request = yield* Deferred.await(asked)
+    return { service, fiber, request }
+  })
+}
+
+describe("PermissionV2", () => {
+  it.effect("returns the evaluated effect and only queues prompts", () =>
+    Effect.gen(function* () {
+      yield* setup([{ action: "read", resource: "*", effect: "allow" }])
+      const service = yield* PermissionV2.Service
+      expect(yield* service.ask(assertion())).toEqual({ id: PermissionV2.ID.create("per_test"), effect: "allow" })
+      expect(yield* service.list()).toEqual([])
+      yield* setRules([{ action: "read", resource: "*", effect: "deny" }])
+      expect(yield* service.ask(assertion())).toEqual({ id: PermissionV2.ID.create("per_test"), effect: "deny" })
+      expect(yield* service.list()).toEqual([])
+      yield* setRules([])
+      expect(yield* service.ask(assertion())).toEqual({ id: PermissionV2.ID.create("per_test"), effect: "ask" })
+      expect(yield* service.get(PermissionV2.ID.create("per_test"))).toBeDefined()
+    }),
+  )
+
+  it.effect("evaluates against an explicit provider-turn agent", () =>
+    Effect.gen(function* () {
+      yield* setup([{ action: "read", resource: "*", effect: "allow" }])
+      const agents = yield* AgentV2.Service
+      yield* agents.update((editor) =>
+        editor.update(AgentV2.ID.make("reviewer"), (agent) => {
+          agent.permissions.push({ action: "read", resource: "*", effect: "deny" })
+        }),
+      )
+      const service = yield* PermissionV2.Service
+
+      expect(yield* service.ask(assertion())).toMatchObject({ effect: "allow" })
+      expect(yield* service.ask(assertion({ agent: AgentV2.ID.make("reviewer") }))).toMatchObject({ effect: "deny" })
+      yield* agents.update((editor) =>
+        editor.update(AgentV2.ID.make("reviewer"), (agent) => {
+          agent.permissions = []
+        }),
+      )
+      expect(yield* service.ask(assertion({ agent: AgentV2.ID.make("reviewer") }))).toMatchObject({ effect: "ask" })
+      expect(yield* service.get(PermissionV2.ID.create("per_test"))).not.toHaveProperty("agent")
+    }),
+  )
+
+  it.effect("allows and denies from explicit rules without asking", () =>
+    Effect.gen(function* () {
+      yield* setup([{ action: "read", resource: "*", effect: "allow" }])
+      const service = yield* PermissionV2.Service
+      yield* service.assert(assertion())
+      yield* setRules([{ action: "read", resource: "*", effect: "deny" }])
+      const denied = yield* service.assert(assertion()).pipe(Effect.flip)
+      expect(denied).toBeInstanceOf(PermissionV2.DeniedError)
+      expect(yield* service.list()).toEqual([])
+    }),
+  )
+
+  it.effect("allows managed output reads without granting external directory access", () =>
+    Effect.gen(function* () {
+      yield* setup([
+        { action: "*", resource: "*", effect: "deny" },
+        { action: "read", resource: "*", effect: "allow" },
+      ])
+      const service = yield* PermissionV2.Service
+
+      expect(yield* service.ask(assertion({ resources: ["tool_123"] }))).toMatchObject({ effect: "allow" })
+      expect(
+        yield* service.ask(assertion({ action: "external_directory", resources: ["/tmp/tool-output/*"] })),
+      ).toMatchObject({ effect: "deny" })
+    }),
+  )
+
+  it.effect("uses build permissions when the Session agent is omitted", () =>
+    Effect.gen(function* () {
+      yield* setup()
+      const { db } = yield* Database.Service
+      yield* db
+        .update(SessionTable)
+        .set({ agent: null })
+        .where(eq(SessionTable.id, SessionV2.ID.make("ses_test")))
+        .run()
+        .pipe(Effect.orDie)
+      const agents = yield* AgentV2.Service
+      const update = yield* agents.transform()
+      yield* update((editor) =>
+        editor.update(AgentV2.ID.make("build"), (agent) => {
+          agent.permissions = [{ action: "todowrite", resource: "*", effect: "allow" }]
+        }),
+      )
+
+      const service = yield* PermissionV2.Service
+      expect(yield* service.ask(assertion({ action: "todowrite", resources: ["*"] }))).toEqual({
+        id: PermissionV2.ID.create("per_test"),
+        effect: "allow",
+      })
+      expect(yield* service.list()).toEqual([])
+    }),
+  )
+
+  it.effect("denies omitted-agent permissions when no primary default agent exists", () =>
+    Effect.gen(function* () {
+      yield* setup()
+      const { db } = yield* Database.Service
+      yield* db
+        .update(SessionTable)
+        .set({ agent: null })
+        .where(eq(SessionTable.id, SessionV2.ID.make("ses_test")))
+        .run()
+        .pipe(Effect.orDie)
+      const agents = yield* AgentV2.Service
+      yield* agents.update((editor) => {
+        editor.remove(AgentV2.ID.make("test"))
+        editor.remove(AgentV2.ID.make("build"))
+      })
+
+      const service = yield* PermissionV2.Service
+      expect(yield* service.ask(assertion())).toEqual({ id: PermissionV2.ID.create("per_test"), effect: "deny" })
+      expect(yield* service.list()).toEqual([])
+    }),
+  )
+
+  it.effect("evaluates bash with the normal configured-rule semantics", () =>
+    Effect.gen(function* () {
+      yield* setup([{ action: "*", resource: "*", effect: "allow" }])
+      const service = yield* PermissionV2.Service
+      const bash = assertion({ action: "bash", resources: ["pwd"] })
+      expect(yield* service.ask(bash)).toEqual({ id: PermissionV2.ID.create("per_test"), effect: "allow" })
+
+      yield* setRules([])
+      expect(yield* service.ask(bash)).toEqual({ id: PermissionV2.ID.create("per_test"), effect: "ask" })
+      expect(yield* service.get(PermissionV2.ID.create("per_test"))).toBeDefined()
+    }),
+  )
+
+  it.effect("uses saved bash approvals while preserving configured deny precedence", () =>
+    Effect.gen(function* () {
+      yield* setup()
+      const saved = yield* PermissionSaved.Service
+      yield* saved.add({ projectID: Project.ID.global, action: "bash", resources: ["pwd"] })
+
+      const service = yield* PermissionV2.Service
+      expect(yield* service.ask(assertion({ action: "bash", resources: ["pwd"] }))).toEqual({
+        id: PermissionV2.ID.create("per_test"),
+        effect: "allow",
+      })
+      expect(yield* service.list()).toEqual([])
+
+      yield* setRules([{ action: "bash", resource: "*", effect: "deny" }])
+      expect(yield* service.ask(assertion({ action: "bash", resources: ["pwd"] }))).toEqual({
+        id: PermissionV2.ID.create("per_test"),
+        effect: "deny",
+      })
+    }),
+  )
+
+  it.effect("resolves an asked permission once", () =>
+    Effect.gen(function* () {
+      yield* setup()
+      const { service, fiber, request } = yield* waitForRequest()
+      expect(yield* service.list()).toEqual([request])
+      expect(yield* service.forSession(request.sessionID)).toEqual([request])
+      expect(yield* service.forSession(SessionV2.ID.make("ses_other"))).toEqual([])
+      expect(yield* service.get(request.id)).toEqual(request)
+      yield* service.reply({ requestID: request.id, reply: "once" })
+      yield* Fiber.join(fiber)
+      expect(yield* service.list()).toEqual([])
+      expect(yield* service.get(request.id)).toBeUndefined()
+    }),
+  )
+
+  it.effect("stores and removes saved resources for a project", () =>
+    Effect.gen(function* () {
+      yield* setup()
+      const service = yield* PermissionV2.Service
+      const asked = yield* Deferred.make<PermissionV2.Request>()
+      const events = yield* EventV2.Service
+      const unsubscribe = yield* events.listen((event) =>
+        event.type === PermissionV2.Event.Asked.type
+          ? Deferred.succeed(asked, event.data as PermissionV2.Request).pipe(Effect.asVoid)
+          : Effect.void,
+      )
+      yield* Effect.addFinalizer(() => unsubscribe)
+      const fiber = yield* service.assert(assertion({ save: ["src/*"] })).pipe(Effect.forkScoped)
+      const request = yield* Deferred.await(asked)
+      yield* service.reply({ requestID: request.id, reply: "always" })
+      yield* Fiber.join(fiber)
+
+      const { db } = yield* Database.Service
+      expect(
+        yield* db.select().from(PermissionTable).where(eq(PermissionTable.project_id, Project.ID.global)).all(),
+      ).toMatchObject([{ action: "read", resource: "src/*" }])
+      const saved = yield* PermissionSaved.Service
+      const id = (yield* saved.list())[0]!.id
+      expect(yield* saved.list()).toEqual([{ id, projectID: Project.ID.global, action: "read", resource: "src/*" }])
+      yield* service.assert(assertion({ id: PermissionV2.ID.create("per_next"), resources: ["src/next.ts"] }))
+      yield* saved.remove(id)
+      expect(yield* saved.list()).toEqual([])
+    }),
+  )
+})

packages/core/test/plugin.test.ts

@@ -0,0 +1,90 @@
+import { describe, expect } from "bun:test"
+import { Context, Deferred, Effect, Exit, Fiber, Layer, Scope } from "effect"
+import { EventV2 } from "@opencode-ai/core/event"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { State } from "@opencode-ai/core/state"
+import { it } from "./lib/effect"
+
+const events = Layer.mock(EventV2.Service)({
+  publish: (definition, data) =>
+    Effect.succeed({
+      id: EventV2.ID.make("evt_plugin_test"),
+      type: definition.type,
+      data,
+    }),
+})
+const plugins = PluginV2.layer.pipe(Layer.provide(events))
+
+function state() {
+  return State.create({
+    initial: () => ({ values: [] as string[] }),
+    editor: (draft) => ({
+      add: (value: string) => draft.values.push(value),
+    }),
+  })
+}
+
+describe("PluginV2", () => {
+  it.effect("closes plugin-owned scopes when the registry layer finalizes", () =>
+    Effect.gen(function* () {
+      const values = state()
+      const layerScope = yield* Scope.fork(yield* Scope.Scope)
+      const plugin = Context.get(yield* Layer.buildWithScope(Layer.fresh(plugins), layerScope), PluginV2.Service)
+
+      yield* plugin.add({
+        id: PluginV2.ID.make("scoped"),
+        effect: Effect.gen(function* () {
+          const transform = yield* values.transform()
+          yield* transform((editor) => editor.add("scoped"))
+        }),
+      })
+      expect(values.get().values).toEqual(["scoped"])
+
+      yield* Scope.close(layerScope, Exit.void)
+      expect(values.get().values).toEqual([])
+    }),
+  )
+
+  it.effect("serializes same-ID additions and leaves one removable attachment", () =>
+    Effect.gen(function* () {
+      const values = state()
+      const layerScope = yield* Scope.fork(yield* Scope.Scope)
+      const plugin = Context.get(yield* Layer.buildWithScope(Layer.fresh(plugins), layerScope), PluginV2.Service)
+      const id = PluginV2.ID.make("shared")
+      const firstStarted = yield* Deferred.make<void>()
+      const releaseFirst = yield* Deferred.make<void>()
+
+      const first = yield* plugin
+        .add({
+          id,
+          effect: Effect.gen(function* () {
+            const transform = yield* values.transform()
+            yield* transform((editor) => editor.add("first"))
+            yield* Deferred.succeed(firstStarted, undefined)
+            yield* Deferred.await(releaseFirst)
+          }),
+        })
+        .pipe(Effect.forkChild)
+      yield* Deferred.await(firstStarted)
+
+      const second = yield* plugin
+        .add({
+          id,
+          effect: Effect.gen(function* () {
+            const transform = yield* values.transform()
+            yield* transform((editor) => editor.add("second"))
+          }),
+        })
+        .pipe(Effect.forkChild({ startImmediately: true }))
+      expect(values.get().values).toEqual(["first"])
+
+      yield* Deferred.succeed(releaseFirst, undefined)
+      yield* Fiber.join(first)
+      yield* Fiber.join(second)
+      expect(values.get().values).toEqual(["second"])
+
+      yield* plugin.remove(id)
+      expect(values.get().values).toEqual([])
+    }),
+  )
+})

packages/core/test/plugin/command.test.ts

@@ -0,0 +1,44 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { CommandV2 } from "@opencode-ai/core/command"
+import { Location } from "@opencode-ai/core/location"
+import { CommandPlugin } from "@opencode-ai/core/plugin/command"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+
+const directory = AbsolutePath.make("/repo/packages/app")
+const project = AbsolutePath.make("/repo")
+const it = testEffect(
+  CommandV2.locationLayer.pipe(
+    Layer.provide(
+      Layer.succeed(Location.Service, Location.Service.of(location({ directory }, { projectDirectory: project }))),
+    ),
+  ),
+)
+
+describe("CommandPlugin.Plugin", () => {
+  it.effect("registers built-in init and review commands", () =>
+    Effect.gen(function* () {
+      const command = yield* CommandV2.Service
+      yield* CommandPlugin.Plugin.effect.pipe(
+        Effect.provideService(CommandV2.Service, command),
+        Effect.provideService(
+          Location.Service,
+          Location.Service.of(location({ directory }, { projectDirectory: project })),
+        ),
+      )
+
+      expect(yield* command.get("init")).toMatchObject({
+        name: "init",
+        description: "guided AGENTS.md setup",
+      })
+      expect((yield* command.get("init"))?.template).toContain("`/repo`")
+      expect(yield* command.get("review")).toMatchObject({
+        name: "review",
+        description: "review changes [commit|branch|pr], defaults to uncommitted",
+        subtask: true,
+      })
+    }),
+  )
+})

packages/core/test/plugin/fixtures/models-dev.json

@@ -0,0 +1,14 @@
+{
+  "acme": {
+    "id": "acme",
+    "name": "Acme",
+    "env": ["ACME_API_KEY"],
+    "models": {}
+  },
+  "local": {
+    "id": "local",
+    "name": "Local",
+    "env": [],
+    "models": {}
+  }
+}

packages/core/test/plugin/fixtures/provider-factory.ts

@@ -0,0 +1,9 @@
+export function createFixtureProvider(options: Record<string, unknown>) {
+  const captured = Object.fromEntries(Object.entries(options))
+  return Object.assign((modelID: string) => ({ modelID, options: captured }), {
+    options: captured,
+    languageModel(modelID: string) {
+      return { modelID, options: captured }
+    },
+  })
+}

packages/core/test/plugin/models-dev.test.ts

@@ -0,0 +1,65 @@
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { Connector } from "@opencode-ai/core/connector"
+import { Credential } from "@opencode-ai/core/credential"
+import { Database } from "@opencode-ai/core/database/database"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Flag } from "@opencode-ai/core/flag/flag"
+import { Location } from "@opencode-ai/core/location"
+import { ModelsDev } from "@opencode-ai/core/models-dev"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { ModelsDevPlugin } from "@opencode-ai/core/plugin/models-dev"
+import { Policy } from "@opencode-ai/core/policy"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+
+const events = EventV2.defaultLayer
+const locationLayer = Layer.succeed(
+  Location.Service,
+  Location.Service.of(location({ directory: AbsolutePath.make(import.meta.dir) })),
+)
+const plugins = PluginV2.layer.pipe(Layer.provide(events))
+const policy = Policy.layer.pipe(Layer.provide(locationLayer))
+const credentials = Credential.layer.pipe(Layer.provide(Database.layerFromPath(":memory:")), Layer.provide(events))
+const catalog = Catalog.layer.pipe(Layer.provide(Layer.mergeAll(events, locationLayer, plugins, policy, credentials)))
+const connectors = Connector.locationLayer.pipe(Layer.provide(credentials), Layer.provide(events))
+const layer = Layer.mergeAll(catalog, connectors, credentials, events, locationLayer, plugins)
+const it = testEffect(layer)
+
+describe("ModelsDevPlugin", () => {
+  it.effect("registers key connectors for providers with environment variables", () =>
+    Effect.acquireUseRelease(
+      Effect.sync(() => {
+        const previous = {
+          path: Flag.OPENCODE_MODELS_PATH,
+          disabled: Flag.OPENCODE_DISABLE_MODELS_FETCH,
+        }
+        Flag.OPENCODE_MODELS_PATH = path.join(import.meta.dir, "fixtures", "models-dev.json")
+        Flag.OPENCODE_DISABLE_MODELS_FETCH = true
+        return previous
+      }),
+      () =>
+        Effect.gen(function* () {
+          yield* ModelsDevPlugin.effect
+          const connectors = yield* Connector.Service
+          expect(yield* connectors.list()).toEqual([
+            new Connector.Info({
+              id: Connector.ID.make("acme"),
+              name: "Acme",
+              methods: [
+                new Connector.KeyMethod({ id: Connector.MethodID.make("api-key"), type: "key", label: "API Key" }),
+              ],
+            }),
+          ])
+        }).pipe(Effect.provide(ModelsDev.defaultLayer)),
+      (previous) =>
+        Effect.sync(() => {
+          Flag.OPENCODE_MODELS_PATH = previous.path
+          Flag.OPENCODE_DISABLE_MODELS_FETCH = previous.disabled
+        }),
+    ),
+  )
+})

packages/core/test/plugin/provider-alibaba.test.ts

@@ -0,0 +1,67 @@
+import { describe, expect } from "bun:test"
+import { createAlibaba } from "@ai-sdk/alibaba"
+import { Effect } from "effect"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { AlibabaPlugin } from "@opencode-ai/core/plugin/provider/alibaba"
+import { it, model } from "./provider-helper"
+
+describe("AlibabaPlugin", () => {
+  it.effect("creates an Alibaba SDK for @ai-sdk/alibaba", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(AlibabaPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("alibaba", "qwen"), package: "@ai-sdk/alibaba", options: { name: "alibaba" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("ignores non-Alibaba SDK packages", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(AlibabaPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("alibaba", "qwen"), package: "@ai-sdk/openai-compatible", options: { name: "alibaba" } },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("matches the old bundled Alibaba SDK provider naming", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(AlibabaPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-alibaba", "qwen"),
+          package: "@ai-sdk/alibaba",
+          options: { name: "custom-alibaba", apiKey: "test" },
+        },
+        {},
+      )
+      const expected = createAlibaba({ apiKey: "test", ...{ name: "custom-alibaba" } }).languageModel("qwen")
+      const actual = result.sdk?.languageModel("qwen")
+      expect(actual?.provider).toBe(expected.provider)
+      expect(actual?.modelId).toBe(expected.modelId)
+    }),
+  )
+
+  it.effect("uses the old default languageModel(api.id) behavior", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(AlibabaPlugin)
+      const item = model("alibaba", "alias", { api: { id: ModelV2.ID.make("qwen-plus") } })
+      const result = yield* plugin.trigger("aisdk.sdk", { model: item, package: "@ai-sdk/alibaba", options: {} }, {})
+      const language = result.sdk?.languageModel(item.api.id)
+      expect(language?.modelId).toBe("qwen-plus")
+      expect(language?.provider).toBe("alibaba.chat")
+    }),
+  )
+})

packages/core/test/plugin/provider-amazon-bedrock.test.ts

@@ -0,0 +1,555 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { AmazonBedrockPlugin } from "@opencode-ai/core/plugin/provider/amazon-bedrock"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { fakeSelectorSdk, it, model, provider, withEnv } from "./provider-helper"
+
+function bedrockBaseURL(sdk: unknown, modelID = "anthropic.claude-sonnet-4-5") {
+  const language = (sdk as { languageModel: (id: string) => unknown }).languageModel(modelID)
+  return (language as { config: { baseUrl: () => string } }).config.baseUrl()
+}
+
+function bedrockFetch(sdk: unknown, modelID = "anthropic.claude-sonnet-4-5") {
+  const language = (sdk as { languageModel: (id: string) => unknown }).languageModel(modelID)
+  return (
+    language as { config: { fetch: (input: Parameters<typeof fetch>[0], init?: RequestInit) => Promise<Response> } }
+  ).config.fetch
+}
+
+function openAIUrl(language: unknown, path: string, modelId: string) {
+  return (language as { config: { url: (input: { path: string; modelId: string }) => string } }).config.url({
+    path,
+    modelId,
+  })
+}
+
+describe("AmazonBedrockPlugin", () => {
+  it.effect("moves endpoint option to api URL", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(AmazonBedrockPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const bedrock = provider("amazon-bedrock", {
+          api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock" },
+          request: {
+            headers: {},
+            body: { endpoint: "https://bedrock.example" },
+          },
+        })
+        catalog.provider.update(bedrock.id, (item) => {
+          item.api = bedrock.api
+          item.request = bedrock.request
+        })
+      })
+      const result = yield* catalog.provider.get(ProviderV2.ID.amazonBedrock)
+      expect(result.api).toEqual({
+        type: "aisdk",
+        package: "@ai-sdk/amazon-bedrock",
+        url: "https://bedrock.example",
+      })
+      expect(result.request.body.endpoint).toBeUndefined()
+    }),
+  )
+
+  it.effect("prefers endpoint over baseURL for SDK base URL", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined, AWS_ACCESS_KEY_ID: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+            package: "@ai-sdk/amazon-bedrock",
+            options: {
+              name: "amazon-bedrock",
+              bearerToken: "token",
+              baseURL: "https://base.example",
+              endpoint: "https://endpoint.example",
+              region: "us-east-1",
+            },
+          },
+          {},
+        )
+        expect(bedrockBaseURL(result.sdk)).toBe("https://endpoint.example")
+      }),
+    ),
+  )
+
+  it.effect("uses baseURL as SDK base URL", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined, AWS_ACCESS_KEY_ID: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+            package: "@ai-sdk/amazon-bedrock",
+            options: {
+              name: "amazon-bedrock",
+              bearerToken: "token",
+              baseURL: "https://base.example",
+              region: "us-east-1",
+            },
+          },
+          {},
+        )
+        expect(bedrockBaseURL(result.sdk)).toBe("https://base.example")
+      }),
+    ),
+  )
+
+  it.effect("creates SDK without explicit credential env so the default AWS chain can resolve credentials", () =>
+    withEnv(
+      {
+        AWS_ACCESS_KEY_ID: undefined,
+        AWS_BEARER_TOKEN_BEDROCK: undefined,
+        AWS_CONTAINER_CREDENTIALS_FULL_URI: undefined,
+        AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: undefined,
+        AWS_PROFILE: undefined,
+        AWS_REGION: undefined,
+        AWS_WEB_IDENTITY_TOKEN_FILE: undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(AmazonBedrockPlugin)
+          const result = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+              package: "@ai-sdk/amazon-bedrock",
+              options: { name: "amazon-bedrock" },
+            },
+            {},
+          )
+          expect(result.sdk).toBeDefined()
+          expect(bedrockBaseURL(result.sdk)).toBe("https://bedrock-runtime.us-east-1.amazonaws.com")
+        }),
+    ),
+  )
+
+  it.effect("uses config region over AWS_REGION for SDK base URL", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: "token", AWS_REGION: "us-east-1" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+            package: "@ai-sdk/amazon-bedrock",
+            options: { name: "amazon-bedrock", region: "eu-west-1" },
+          },
+          {},
+        )
+        expect(bedrockBaseURL(result.sdk)).toBe("https://bedrock-runtime.eu-west-1.amazonaws.com")
+      }),
+    ),
+  )
+
+  it.effect("uses AWS_REGION for SDK base URL when config region is absent", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: "token", AWS_REGION: "eu-west-1" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+            package: "@ai-sdk/amazon-bedrock",
+            options: { name: "amazon-bedrock" },
+          },
+          {},
+        )
+        expect(bedrockBaseURL(result.sdk)).toBe("https://bedrock-runtime.eu-west-1.amazonaws.com")
+      }),
+    ),
+  )
+
+  it.effect("defaults SDK region to us-east-1", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: "token", AWS_REGION: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+            package: "@ai-sdk/amazon-bedrock",
+            options: { name: "amazon-bedrock" },
+          },
+          {},
+        )
+        expect(bedrockBaseURL(result.sdk)).toBe("https://bedrock-runtime.us-east-1.amazonaws.com")
+      }),
+    ),
+  )
+
+  it.effect("loads bearer token option into env and uses bearer auth", () =>
+    withEnv({ AWS_ACCESS_KEY_ID: undefined, AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const headers: Array<string | null> = []
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+            package: "@ai-sdk/amazon-bedrock",
+            options: {
+              name: "amazon-bedrock",
+              bearerToken: "option-token",
+              fetch: async (_input: Parameters<typeof fetch>[0], init?: RequestInit) => {
+                headers.push(new Headers(init?.headers).get("Authorization"))
+                return new Response("{}")
+              },
+            },
+          },
+          {},
+        )
+        yield* Effect.promise(() => bedrockFetch(result.sdk)("https://bedrock.example", { method: "POST" }))
+        expect(process.env.AWS_BEARER_TOKEN_BEDROCK).toBe("option-token")
+        expect(headers).toEqual(["Bearer option-token"])
+      }),
+    ),
+  )
+
+  it.effect("prefers bearer token env over bearer token option", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: "env-token" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const headers: Array<string | null> = []
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+            package: "@ai-sdk/amazon-bedrock",
+            options: {
+              name: "amazon-bedrock",
+              bearerToken: "option-token",
+              fetch: async (_input: Parameters<typeof fetch>[0], init?: RequestInit) => {
+                headers.push(new Headers(init?.headers).get("Authorization"))
+                return new Response("{}")
+              },
+            },
+          },
+          {},
+        )
+        yield* Effect.promise(() => bedrockFetch(result.sdk)("https://bedrock.example", { method: "POST" }))
+        expect(process.env.AWS_BEARER_TOKEN_BEDROCK).toBe("env-token")
+        expect(headers).toEqual(["Bearer env-token"])
+      }),
+    ),
+  )
+
+  it.effect("creates Mantle SDK with GPT-5 OpenAI base path", () =>
+    withEnv({ AWS_BEARER_TOKEN_BEDROCK: undefined, AWS_PROFILE: undefined, AWS_ACCESS_KEY_ID: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AmazonBedrockPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("amazon-bedrock", "openai.gpt-5.5", {
+              api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock/mantle" },
+            }),
+            package: "@ai-sdk/amazon-bedrock/mantle",
+            options: {
+              name: "amazon-bedrock",
+              bearerToken: "token",
+              baseURL: "https://bedrock-mantle.us-east-2.api.aws/openai/v1",
+              region: "us-east-2",
+            },
+          },
+          {},
+        )
+        const language = result.sdk.responses("openai.gpt-5.5")
+        expect(openAIUrl(language, "/responses", "openai.gpt-5.5")).toBe(
+          "https://bedrock-mantle.us-east-2.api.aws/openai/v1/responses",
+        )
+      }),
+    ),
+  )
+
+  it.effect("selects Mantle APIs without Bedrock cross-region prefixes", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AmazonBedrockPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "openai.gpt-5.5", {
+            api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock/mantle" },
+          }),
+          sdk: fakeSelectorSdk(calls),
+          options: { baseURL: "https://bedrock-mantle.us-east-2.api.aws/openai/v1", region: "us-east-2" },
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "openai.gpt-oss-safeguard-120b", {
+            api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock/mantle" },
+          }),
+          sdk: fakeSelectorSdk(calls),
+          options: { region: "us-east-1" },
+        },
+        {},
+      )
+      expect(calls).toEqual(["responses:openai.gpt-5.5", "chat:openai.gpt-oss-safeguard-120b"])
+    }),
+  )
+
+  it.effect("ignores other Bedrock provider subpaths", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(AmazonBedrockPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5", {
+            api: { type: "aisdk", package: "@ai-sdk/amazon-bedrock/anthropic" },
+          }),
+          package: "@ai-sdk/amazon-bedrock/anthropic",
+          options: { name: "amazon-bedrock" },
+        },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("uses SigV4 credential env when bearer token is absent", () =>
+    withEnv(
+      {
+        AWS_ACCESS_KEY_ID: "test-access-key",
+        AWS_BEARER_TOKEN_BEDROCK: undefined,
+        AWS_REGION: "us-east-1",
+        AWS_SECRET_ACCESS_KEY: "test-secret-key",
+        AWS_SESSION_TOKEN: "test-session-token",
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          const headers: Array<string | null> = []
+          yield* plugin.add(AmazonBedrockPlugin)
+          const result = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+              package: "@ai-sdk/amazon-bedrock",
+              options: {
+                name: "amazon-bedrock",
+                fetch: async (_input: Parameters<typeof fetch>[0], init?: RequestInit) => {
+                  headers.push(new Headers(init?.headers).get("Authorization"))
+                  return new Response("{}")
+                },
+              },
+            },
+            {},
+          )
+          yield* Effect.promise(() =>
+            bedrockFetch(result.sdk)("https://bedrock-runtime.us-east-1.amazonaws.com/model/test/invoke", {
+              body: "{}",
+              method: "POST",
+            }),
+          )
+          expect(headers[0]?.startsWith("AWS4-HMAC-SHA256 ")).toBe(true)
+        }),
+    ),
+  )
+
+  it.effect("applies legacy cross-region inference prefixes", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AmazonBedrockPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: {},
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: { region: "eu-west-1" },
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "global.anthropic.claude-sonnet-4-5"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: { region: "eu-west-1" },
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: { region: "ap-northeast-1" },
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: { region: "ap-southeast-2" },
+        },
+        {},
+      )
+      expect(calls).toEqual([
+        "languageModel:us.anthropic.claude-sonnet-4-5",
+        "languageModel:eu.anthropic.claude-sonnet-4-5",
+        "languageModel:global.anthropic.claude-sonnet-4-5",
+        "languageModel:jp.anthropic.claude-sonnet-4-5",
+        "languageModel:au.anthropic.claude-sonnet-4-5",
+      ])
+    }),
+  )
+
+  it.effect("uses AWS_REGION for language prefixes when region option is absent", () =>
+    withEnv({ AWS_REGION: "eu-west-1" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const calls: string[] = []
+        yield* plugin.add(AmazonBedrockPlugin)
+        yield* plugin.trigger(
+          "aisdk.language",
+          {
+            model: model("amazon-bedrock", "anthropic.claude-sonnet-4-5"),
+            sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+            options: {},
+          },
+          {},
+        )
+        expect(calls).toEqual(["languageModel:eu.anthropic.claude-sonnet-4-5"])
+      }),
+    ),
+  )
+
+  it.effect("applies the full legacy cross-region prefix matrix", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      const cases = [
+        { region: "us-east-1", modelID: "amazon.nova-micro-v1:0", expected: "us.amazon.nova-micro-v1:0" },
+        { region: "us-east-1", modelID: "amazon.nova-lite-v1:0", expected: "us.amazon.nova-lite-v1:0" },
+        { region: "us-east-1", modelID: "amazon.nova-pro-v1:0", expected: "us.amazon.nova-pro-v1:0" },
+        { region: "us-east-1", modelID: "amazon.nova-premier-v1:0", expected: "us.amazon.nova-premier-v1:0" },
+        { region: "us-east-1", modelID: "amazon.nova-2-lite-v1:0", expected: "us.amazon.nova-2-lite-v1:0" },
+        { region: "us-east-1", modelID: "anthropic.claude-sonnet-4-5", expected: "us.anthropic.claude-sonnet-4-5" },
+        { region: "us-east-1", modelID: "deepseek.r1-v1:0", expected: "us.deepseek.r1-v1:0" },
+        { region: "us-gov-west-1", modelID: "anthropic.claude-sonnet-4-5", expected: "anthropic.claude-sonnet-4-5" },
+        { region: "us-east-1", modelID: "cohere.command-r-plus-v1:0", expected: "cohere.command-r-plus-v1:0" },
+        { region: "eu-west-1", modelID: "anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },
+        { region: "eu-west-2", modelID: "amazon.nova-lite-v1:0", expected: "eu.amazon.nova-lite-v1:0" },
+        { region: "eu-west-3", modelID: "amazon.nova-micro-v1:0", expected: "eu.amazon.nova-micro-v1:0" },
+        {
+          region: "eu-north-1",
+          modelID: "meta.llama3-70b-instruct-v1:0",
+          expected: "eu.meta.llama3-70b-instruct-v1:0",
+        },
+        { region: "eu-central-1", modelID: "mistral.pixtral-large-v1:0", expected: "eu.mistral.pixtral-large-v1:0" },
+        { region: "eu-south-1", modelID: "anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },
+        { region: "eu-south-2", modelID: "anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },
+        { region: "eu-central-2", modelID: "anthropic.claude-sonnet-4-5", expected: "anthropic.claude-sonnet-4-5" },
+        { region: "eu-west-1", modelID: "cohere.command-r-plus-v1:0", expected: "cohere.command-r-plus-v1:0" },
+        {
+          region: "ap-southeast-2",
+          modelID: "anthropic.claude-sonnet-4-5",
+          expected: "au.anthropic.claude-sonnet-4-5",
+        },
+        {
+          region: "ap-southeast-4",
+          modelID: "anthropic.claude-haiku-v1:0",
+          expected: "au.anthropic.claude-haiku-v1:0",
+        },
+        { region: "ap-southeast-2", modelID: "anthropic.claude-opus-4", expected: "apac.anthropic.claude-opus-4" },
+        {
+          region: "ap-northeast-1",
+          modelID: "anthropic.claude-sonnet-4-5",
+          expected: "jp.anthropic.claude-sonnet-4-5",
+        },
+        { region: "ap-northeast-1", modelID: "amazon.nova-pro-v1:0", expected: "jp.amazon.nova-pro-v1:0" },
+        { region: "ap-south-1", modelID: "anthropic.claude-sonnet-4-5", expected: "apac.anthropic.claude-sonnet-4-5" },
+        { region: "ap-south-1", modelID: "amazon.nova-lite-v1:0", expected: "apac.amazon.nova-lite-v1:0" },
+        { region: "ca-central-1", modelID: "anthropic.claude-sonnet-4-5", expected: "anthropic.claude-sonnet-4-5" },
+        {
+          region: "us-east-1",
+          modelID: "global.anthropic.claude-sonnet-4-5",
+          expected: "global.anthropic.claude-sonnet-4-5",
+        },
+        { region: "us-east-1", modelID: "us.anthropic.claude-sonnet-4-5", expected: "us.anthropic.claude-sonnet-4-5" },
+        { region: "eu-west-1", modelID: "eu.anthropic.claude-sonnet-4-5", expected: "eu.anthropic.claude-sonnet-4-5" },
+        {
+          region: "ap-northeast-1",
+          modelID: "jp.anthropic.claude-sonnet-4-5",
+          expected: "jp.anthropic.claude-sonnet-4-5",
+        },
+        {
+          region: "ap-south-1",
+          modelID: "apac.anthropic.claude-sonnet-4-5",
+          expected: "apac.anthropic.claude-sonnet-4-5",
+        },
+        {
+          region: "ap-southeast-2",
+          modelID: "au.anthropic.claude-sonnet-4-5",
+          expected: "au.anthropic.claude-sonnet-4-5",
+        },
+      ]
+      yield* plugin.add(AmazonBedrockPlugin)
+      for (const item of cases) {
+        yield* plugin.trigger(
+          "aisdk.language",
+          {
+            model: model("amazon-bedrock", item.modelID),
+            sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+            options: { region: item.region },
+          },
+          {},
+        )
+      }
+      expect(calls).toEqual(cases.map((item) => `languageModel:${item.expected}`))
+    }),
+  )
+
+  it.effect("ignores non-Bedrock providers for language selection", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AmazonBedrockPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("openai", "anthropic.claude-sonnet-4-5"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: { region: "eu-west-1" },
+        },
+        {},
+      )
+      expect(calls).toEqual([])
+      expect(result.language).toBeUndefined()
+    }),
+  )
+})

packages/core/test/plugin/provider-anthropic.test.ts

@@ -0,0 +1,97 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { AnthropicPlugin } from "@opencode-ai/core/plugin/provider/anthropic"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { it, model, provider } from "./provider-helper"
+
+describe("AnthropicPlugin", () => {
+  it.effect("applies legacy beta headers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(AnthropicPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("anthropic", {
+          api: { type: "aisdk", package: "@ai-sdk/anthropic" },
+          request: { headers: { Existing: "1" }, body: {} },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+          draft.request = item.request
+        })
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.anthropic)).request.headers["anthropic-beta"]).toBe(
+        "interleaved-thinking-2025-05-14,fine-grained-tool-streaming-2025-05-14",
+      )
+      expect((yield* catalog.provider.get(ProviderV2.ID.anthropic)).request.headers.Existing).toBe("1")
+    }),
+  )
+
+  it.effect("ignores non-Anthropic providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(AnthropicPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => catalog.provider.update(provider("openai").id, () => {}))
+      expect((yield* catalog.provider.get(ProviderV2.ID.openai)).request.headers["anthropic-beta"]).toBeUndefined()
+    }),
+  )
+
+  it.effect("creates Anthropic SDKs with the model provider ID as the SDK name", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const providers: string[] = []
+      yield* plugin.add(AnthropicPlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("anthropic-sdk-inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              providers.push(evt.sdk.languageModel("claude-sonnet-4-5").provider)
+            }),
+        }),
+      })
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-anthropic", "claude-sonnet-4-5"),
+          package: "@ai-sdk/anthropic",
+          options: { name: "custom-anthropic", apiKey: "test" },
+        },
+        {},
+      )
+      expect(providers).toEqual(["custom-anthropic"])
+    }),
+  )
+
+  it.effect("uses the Anthropic provider ID as the SDK name for the bundled Anthropic provider", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const providers: string[] = []
+      yield* plugin.add(AnthropicPlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("anthropic-sdk-inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              providers.push(evt.sdk.languageModel("claude-sonnet-4-5").provider)
+            }),
+        }),
+      })
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("anthropic", "claude-sonnet-4-5"),
+          package: "@ai-sdk/anthropic",
+          options: { name: "anthropic", apiKey: "test" },
+        },
+        {},
+      )
+      expect(providers).toEqual(["anthropic"])
+    }),
+  )
+})

packages/core/test/plugin/provider-azure-cognitive-services.test.ts

@@ -0,0 +1,141 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { AzureCognitiveServicesPlugin } from "@opencode-ai/core/plugin/provider/azure"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { fakeSelectorSdk, it, model, provider, withEnv } from "./provider-helper"
+
+describe("AzureCognitiveServicesPlugin", () => {
+  it.effect("maps the resource env var to the Azure SDK baseURL", () =>
+    withEnv({ AZURE_COGNITIVE_SERVICES_RESOURCE_NAME: "cognitive" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(AzureCognitiveServicesPlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          catalog.provider.update(ProviderV2.ID.make("azure-cognitive-services"), (item) => {
+            item.api = { type: "aisdk", package: "@ai-sdk/openai-compatible" }
+          })
+        })
+        const result = yield* catalog.provider.get(ProviderV2.ID.make("azure-cognitive-services"))
+        expect(result.api).toEqual({
+          type: "aisdk",
+          package: "@ai-sdk/openai-compatible",
+          url: "https://cognitive.cognitiveservices.azure.com/openai",
+        })
+        expect(result.request.body.baseURL).toBeUndefined()
+        expect(result.request.body.resourceName).toBeUndefined()
+      }),
+    ),
+  )
+
+  it.effect("leaves baseURL unset without resource env and ignores other providers", () =>
+    withEnv({ AZURE_COGNITIVE_SERVICES_RESOURCE_NAME: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(AzureCognitiveServicesPlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const azure = provider("azure-cognitive-services", {
+            api: { type: "aisdk", package: "@ai-sdk/openai-compatible" },
+          })
+          const openai = provider("openai")
+          catalog.provider.update(azure.id, (item) => {
+            item.api = azure.api
+          })
+          catalog.provider.update(openai.id, (item) => {
+            item.api = openai.api
+          })
+        })
+        const azure = yield* catalog.provider.get(ProviderV2.ID.make("azure-cognitive-services"))
+        const openai = yield* catalog.provider.get(ProviderV2.ID.openai)
+        expect(azure.request.body.baseURL).toBeUndefined()
+        expect(azure.api).toEqual({ type: "aisdk", package: "@ai-sdk/openai-compatible" })
+        expect(openai.request.body.baseURL).toBeUndefined()
+        expect(openai.api).toEqual({ type: "aisdk", package: "test-provider" })
+      }),
+    ),
+  )
+
+  it.effect("selects chat only for completion URLs", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AzureCognitiveServicesPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("azure-cognitive-services", "deployment"),
+          sdk: fakeSelectorSdk(calls),
+          options: { useCompletionUrls: true },
+        },
+        {},
+      )
+      expect(calls).toEqual(["chat:deployment"])
+    }),
+  )
+
+  it.effect("uses the legacy Azure selector order and provider guard", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AzureCognitiveServicesPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("azure-cognitive-services", "deployment"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      const ignored = yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("openai", "deployment"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      expect(calls).toEqual(["responses:deployment"])
+      expect(ignored.language).toBeUndefined()
+    }),
+  )
+
+  it.effect("falls back from responses to messages, chat, then languageModel", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      const sdk = fakeSelectorSdk(calls)
+      yield* plugin.add(AzureCognitiveServicesPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("azure-cognitive-services", "messages-deployment"),
+          sdk: { messages: sdk.messages, chat: sdk.chat, languageModel: sdk.languageModel },
+          options: {},
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("azure-cognitive-services", "chat-deployment"),
+          sdk: { chat: sdk.chat, languageModel: sdk.languageModel },
+          options: {},
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("azure-cognitive-services", "language-deployment"),
+          sdk: { languageModel: sdk.languageModel },
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual([
+        "messages:messages-deployment",
+        "chat:chat-deployment",
+        "languageModel:language-deployment",
+      ])
+    }),
+  )
+})

packages/core/test/plugin/provider-azure.test.ts

@@ -0,0 +1,280 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { Credential } from "@opencode-ai/core/credential"
+import { Connector } from "@opencode-ai/core/connector"
+import { Database } from "@opencode-ai/core/database/database"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { AzurePlugin } from "@opencode-ai/core/plugin/provider/azure"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+import { fakeSelectorSdk, it, model, npmLayer, provider, withEnv } from "./provider-helper"
+
+const itWithAccount = testEffect(
+  Catalog.locationLayer.pipe(
+    Layer.provideMerge(
+      Credential.layer.pipe(
+        Layer.provide(Database.layerFromPath(":memory:").pipe(Layer.fresh)),
+        Layer.provide(EventV2.defaultLayer),
+      ),
+    ),
+    Layer.provideMerge(EventV2.defaultLayer),
+    Layer.provideMerge(
+      Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("test") }))),
+    ),
+    Layer.provideMerge(npmLayer),
+  ),
+)
+
+describe("AzurePlugin", () => {
+  it.effect("resolves resourceName from env", () =>
+    withEnv({ AZURE_RESOURCE_NAME: "from-env" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(AzurePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          catalog.provider.update(ProviderV2.ID.azure, (item) => {
+            item.api = { type: "aisdk", package: "@ai-sdk/azure" }
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-env")
+      }),
+    ),
+  )
+
+  it.effect("keeps explicit resourceName over env and ignores other providers", () =>
+    withEnv({ AZURE_RESOURCE_NAME: "from-env" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(AzurePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const azure = provider("azure", {
+            api: { type: "aisdk", package: "@ai-sdk/azure" },
+            request: { headers: {}, body: { resourceName: "from-config" } },
+          })
+          catalog.provider.update(azure.id, (item) => {
+            item.api = azure.api
+            item.request = azure.request
+          })
+          catalog.provider.update(ProviderV2.ID.openai, () => {})
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-config")
+        expect((yield* catalog.provider.get(ProviderV2.ID.openai)).request.body.resourceName).toBeUndefined()
+      }),
+    ),
+  )
+
+  itWithAccount.effect("prefers account resourceName over env", () =>
+    withEnv(
+      {
+        AZURE_RESOURCE_NAME: "from-env",
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          const credentials = yield* Credential.Service
+          const catalog = yield* Catalog.Service
+          yield* credentials.create({
+            connectorID: Connector.ID.make("azure"),
+            methodID: Connector.MethodID.make("api-key"),
+            value: new Credential.Key({
+              type: "key",
+              key: "key",
+              metadata: { resourceName: "from-account" },
+            }),
+          })
+          yield* plugin.add(AzurePlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) => {
+            catalog.provider.update(ProviderV2.ID.azure, (item) => {
+              item.api = { type: "aisdk", package: "@ai-sdk/azure" }
+            })
+          })
+          expect((yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-account")
+        }),
+    ),
+  )
+
+  it.effect("falls back to env when configured resourceName is blank", () =>
+    withEnv({ AZURE_RESOURCE_NAME: "from-env" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(AzurePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const azure = provider("azure", {
+            api: { type: "aisdk", package: "@ai-sdk/azure" },
+            request: { headers: {}, body: { resourceName: "" } },
+          })
+          catalog.provider.update(azure.id, (item) => {
+            item.api = azure.api
+            item.request = azure.request
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-env")
+      }),
+    ),
+  )
+
+  it.effect("falls back to env when configured resourceName is whitespace", () =>
+    withEnv({ AZURE_RESOURCE_NAME: "from-env" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(AzurePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const azure = provider("azure", {
+            api: { type: "aisdk", package: "@ai-sdk/azure" },
+            request: { headers: {}, body: { resourceName: "   " } },
+          })
+          catalog.provider.update(azure.id, (item) => {
+            item.api = azure.api
+            item.request = azure.request
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.azure)).request.body.resourceName).toBe("from-env")
+      }),
+    ),
+  )
+
+  it.effect("allows configured baseURL without resourceName", () =>
+    withEnv({ AZURE_RESOURCE_NAME: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AzurePlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("azure", "deployment"),
+            package: "@ai-sdk/azure",
+            options: { name: "azure", baseURL: "https://proxy.example.com/openai" },
+          },
+          {},
+        )
+        expect(result.sdk).toBeDefined()
+      }),
+    ),
+  )
+
+  it.effect("rejects missing resourceName when baseURL is not configured", () =>
+    withEnv({ AZURE_RESOURCE_NAME: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(AzurePlugin)
+        const exit = yield* plugin
+          .trigger(
+            "aisdk.sdk",
+            { model: model("azure", "deployment"), package: "@ai-sdk/azure", options: { name: "azure" } },
+            {},
+          )
+          .pipe(Effect.exit)
+        expect(exit._tag).toBe("Failure")
+      }),
+    ),
+  )
+
+  it.effect("selects chat only for completion URLs", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AzurePlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("azure", "deployment"), sdk: fakeSelectorSdk(calls), options: { useCompletionUrls: true } },
+        {},
+      )
+      expect(calls).toEqual(["chat:deployment"])
+    }),
+  )
+
+  it.effect("selects chat from per-call useCompletionUrls", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AzurePlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("azure", "deployment"), sdk: fakeSelectorSdk(calls), options: { useCompletionUrls: true } },
+        {},
+      )
+      expect(calls).toEqual(["chat:deployment"])
+    }),
+  )
+
+  it.effect("ignores model useCompletionUrls when per-call option is unset", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AzurePlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("azure", "deployment", {
+            request: { headers: {}, body: { useCompletionUrls: true } },
+          }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual(["responses:deployment"])
+    }),
+  )
+
+  it.effect("uses the legacy Azure selector order and provider guard", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(AzurePlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("azure", "deployment"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      const ignored = yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("openai", "deployment"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      expect(calls).toEqual(["responses:deployment"])
+      expect(ignored.language).toBeUndefined()
+    }),
+  )
+
+  it.effect("falls back through the legacy Azure selector order", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      const make = (method: string) => (id: string) => {
+        calls.push(`${method}:${id}`)
+        return { modelId: id, provider: method, specificationVersion: "v3" }
+      }
+      yield* plugin.add(AzurePlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("azure", "messages-deployment"),
+          sdk: { messages: make("messages"), chat: make("chat"), languageModel: make("languageModel") },
+          options: {},
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("azure", "language-deployment"), sdk: { languageModel: make("languageModel") }, options: {} },
+        {},
+      )
+      expect(calls).toEqual(["messages:messages-deployment", "languageModel:language-deployment"])
+    }),
+  )
+})

packages/core/test/plugin/provider-cerebras.test.ts

@@ -0,0 +1,107 @@
+import { describe, expect, mock } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { CerebrasPlugin } from "@opencode-ai/core/plugin/provider/cerebras"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { it, model } from "./provider-helper"
+
+const cerebrasOptions: Record<string, unknown>[] = []
+
+void mock.module("@ai-sdk/cerebras", () => ({
+  createCerebras: (options: Record<string, unknown>) => {
+    const snapshot = { ...options }
+    cerebrasOptions.push(snapshot)
+    return {
+      languageModel: (modelID: string) => ({ modelID, provider: snapshot.name, specificationVersion: "v3" }),
+    }
+  },
+}))
+
+describe("CerebrasPlugin", () => {
+  it.effect("applies the legacy integration header", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(CerebrasPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        catalog.provider.update(ProviderV2.ID.make("cerebras"), (item) => {
+          item.api = { type: "aisdk", package: "@ai-sdk/cerebras" }
+          item.request.headers.Existing = "1"
+        })
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("cerebras"))).request.headers).toEqual({
+        Existing: "1",
+        "X-Cerebras-3rd-Party-Integration": "opencode",
+      })
+    }),
+  )
+
+  it.effect("ignores non-Cerebras providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(CerebrasPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => catalog.provider.update(ProviderV2.ID.make("groq"), () => {}))
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("groq"))).request.headers).toEqual({})
+    }),
+  )
+
+  it.effect("creates a bundled Cerebras SDK with the model provider ID as the SDK name", () =>
+    Effect.gen(function* () {
+      cerebrasOptions.length = 0
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(CerebrasPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-cerebras", "llama-4-scout-17b-16e-instruct"),
+          package: "@ai-sdk/cerebras",
+          options: { name: "custom-cerebras", apiKey: "test" },
+        },
+        {},
+      )
+      expect(cerebrasOptions).toEqual([{ name: "custom-cerebras", apiKey: "test" }])
+      expect(result.sdk.languageModel("llama-4-scout-17b-16e-instruct").provider).toBe("custom-cerebras")
+    }),
+  )
+
+  it.effect("preserves an explicit bundled Cerebras SDK name option", () =>
+    Effect.gen(function* () {
+      cerebrasOptions.length = 0
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(CerebrasPlugin)
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-cerebras", "llama-4-scout-17b-16e-instruct"),
+          package: "@ai-sdk/cerebras",
+          options: { name: "configured-cerebras", apiKey: "test" },
+        },
+        {},
+      )
+      expect(cerebrasOptions).toEqual([{ name: "configured-cerebras", apiKey: "test" }])
+    }),
+  )
+
+  it.effect("ignores non-Cerebras SDK packages", () =>
+    Effect.gen(function* () {
+      cerebrasOptions.length = 0
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(CerebrasPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-cerebras", "llama-4-scout-17b-16e-instruct"),
+          package: "@ai-sdk/groq",
+          options: { name: "custom-cerebras", apiKey: "test" },
+        },
+        {},
+      )
+      expect(cerebrasOptions).toEqual([])
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+})

packages/core/test/plugin/provider-cloudflare-ai-gateway.test.ts

@@ -0,0 +1,384 @@
+import { describe, expect, mock } from "bun:test"
+import { Effect } from "effect"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { CloudflareAIGatewayPlugin } from "@opencode-ai/core/plugin/provider/cloudflare-ai-gateway"
+import { it, model, withEnv } from "./provider-helper"
+
+const aiGatewayCalls: Record<string, unknown>[] = []
+const unifiedCalls: string[] = []
+const gatewayModelCalls: unknown[] = []
+
+function captureAiGatewayOptions(options: Record<string, unknown>) {
+  const nested =
+    options.options && typeof options.options === "object" ? (options.options as Record<string, unknown>) : undefined
+  return {
+    ...options,
+    ...(nested
+      ? {
+          options: {
+            ...nested,
+            headers:
+              nested.headers && typeof nested.headers === "object"
+                ? { ...(nested.headers as Record<string, unknown>) }
+                : nested.headers,
+          },
+        }
+      : {}),
+  }
+}
+
+function resetCalls() {
+  aiGatewayCalls.length = 0
+  unifiedCalls.length = 0
+  gatewayModelCalls.length = 0
+}
+
+function cloudflareEnv(overrides: Record<string, string | undefined> = {}) {
+  return {
+    CLOUDFLARE_ACCOUNT_ID: "env-account",
+    CLOUDFLARE_GATEWAY_ID: "env-gateway",
+    CLOUDFLARE_API_TOKEN: "env-token",
+    CF_AIG_TOKEN: undefined,
+    ...overrides,
+  }
+}
+
+mock.module("ai-gateway-provider", () => ({
+  createAiGateway(options: Record<string, unknown>) {
+    aiGatewayCalls.push(captureAiGatewayOptions(options))
+    return (input: unknown) => {
+      gatewayModelCalls.push(input)
+      return {
+        modelId: input,
+        provider: "cloudflare-ai-gateway",
+        specificationVersion: "v3",
+      }
+    }
+  },
+}))
+
+mock.module("ai-gateway-provider/providers/unified", () => ({
+  createUnified() {
+    return (modelID: string) => {
+      unifiedCalls.push(modelID)
+      return { unifiedModelID: modelID }
+    }
+  },
+}))
+
+describe("CloudflareAIGatewayPlugin", () => {
+  it.effect("requires account, gateway, and token before creating the unified SDK", () =>
+    withEnv(
+      {
+        CLOUDFLARE_ACCOUNT_ID: "acct",
+        CLOUDFLARE_GATEWAY_ID: "gateway",
+        CLOUDFLARE_API_TOKEN: "token",
+        CF_AIG_TOKEN: undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(CloudflareAIGatewayPlugin)
+          const result = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+              package: "ai-gateway-provider",
+              options: { name: "cloudflare-ai-gateway" },
+            },
+            {},
+          )
+          expect(result.sdk.languageModel("openai/gpt-5")).toBeDefined()
+        }),
+    ),
+  )
+
+  it.effect("passes legacy metadata, cache, log, and User-Agent values under the AI Gateway options key", () =>
+    withEnv(cloudflareEnv(), () =>
+      Effect.gen(function* () {
+        resetCalls()
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareAIGatewayPlugin)
+
+        yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+            package: "ai-gateway-provider",
+            options: {
+              name: "cloudflare-ai-gateway",
+              metadata: { invoked_by: "test", project: "opencode" },
+              cacheTtl: 300,
+              cacheKey: "cache-key",
+              skipCache: true,
+              collectLog: false,
+            },
+          },
+          {},
+        )
+
+        expect(aiGatewayCalls).toHaveLength(1)
+        expect(aiGatewayCalls[0]).toEqual({
+          accountId: "env-account",
+          gateway: "env-gateway",
+          apiKey: "env-token",
+          options: {
+            metadata: { invoked_by: "test", project: "opencode" },
+            cacheTtl: 300,
+            cacheKey: "cache-key",
+            skipCache: true,
+            collectLog: false,
+            headers: {
+              "User-Agent": expect.stringContaining("opencode/"),
+            },
+          },
+        })
+      }),
+    ),
+  )
+
+  it.effect("parses legacy cf-aig-metadata header when metadata option is absent", () =>
+    withEnv(cloudflareEnv(), () =>
+      Effect.gen(function* () {
+        resetCalls()
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareAIGatewayPlugin)
+
+        yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+            package: "ai-gateway-provider",
+            options: {
+              name: "cloudflare-ai-gateway",
+              headers: {
+                "cf-aig-metadata": JSON.stringify({ invoked_by: "header", project: "opencode" }),
+              },
+            },
+          },
+          {},
+        )
+
+        expect(aiGatewayCalls[0]?.options).toMatchObject({
+          metadata: { invoked_by: "header", project: "opencode" },
+        })
+      }),
+    ),
+  )
+
+  it.effect("prefers Cloudflare env values over auth/config-derived options", () =>
+    withEnv(cloudflareEnv(), () =>
+      Effect.gen(function* () {
+        resetCalls()
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareAIGatewayPlugin)
+
+        yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+            package: "ai-gateway-provider",
+            options: {
+              name: "cloudflare-ai-gateway",
+              accountId: "auth-account",
+              gateway: "auth-gateway",
+              apiKey: "auth-token",
+            },
+          },
+          {},
+        )
+
+        expect(aiGatewayCalls[0]).toMatchObject({
+          accountId: "env-account",
+          gateway: "env-gateway",
+          apiKey: "env-token",
+        })
+      }),
+    ),
+  )
+
+  it.effect("accepts gatewayId metadata copied from auth into provider options", () =>
+    withEnv(
+      cloudflareEnv({
+        CLOUDFLARE_ACCOUNT_ID: undefined,
+        CLOUDFLARE_GATEWAY_ID: undefined,
+        CLOUDFLARE_API_TOKEN: undefined,
+      }),
+      () =>
+        Effect.gen(function* () {
+          resetCalls()
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(CloudflareAIGatewayPlugin)
+
+          yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+              package: "ai-gateway-provider",
+              options: {
+                name: "cloudflare-ai-gateway",
+                accountId: "auth-account",
+                gatewayId: "auth-gateway",
+                apiKey: "auth-token",
+              },
+            },
+            {},
+          )
+
+          expect(aiGatewayCalls[0]).toMatchObject({
+            accountId: "auth-account",
+            gateway: "auth-gateway",
+            apiKey: "auth-token",
+          })
+        }),
+    ),
+  )
+
+  it.effect("falls back to CF_AIG_TOKEN when CLOUDFLARE_API_TOKEN is unset", () =>
+    withEnv(cloudflareEnv({ CLOUDFLARE_API_TOKEN: undefined, CF_AIG_TOKEN: "cf-aig-token" }), () =>
+      Effect.gen(function* () {
+        resetCalls()
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareAIGatewayPlugin)
+
+        yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+            package: "ai-gateway-provider",
+            options: { name: "cloudflare-ai-gateway" },
+          },
+          {},
+        )
+
+        expect(aiGatewayCalls[0]).toMatchObject({ apiKey: "cf-aig-token" })
+      }),
+    ),
+  )
+
+  it.effect("does not create an SDK when account and gateway IDs are missing", () =>
+    withEnv(cloudflareEnv({ CLOUDFLARE_ACCOUNT_ID: undefined, CLOUDFLARE_GATEWAY_ID: undefined }), () =>
+      Effect.gen(function* () {
+        resetCalls()
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareAIGatewayPlugin)
+
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+            package: "ai-gateway-provider",
+            options: { name: "cloudflare-ai-gateway" },
+          },
+          {},
+        )
+
+        expect(result.sdk).toBeUndefined()
+        expect(aiGatewayCalls).toHaveLength(0)
+      }),
+    ),
+  )
+
+  it.effect("does not create an SDK when the token is missing", () =>
+    withEnv(cloudflareEnv({ CLOUDFLARE_API_TOKEN: undefined, CF_AIG_TOKEN: undefined }), () =>
+      Effect.gen(function* () {
+        resetCalls()
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareAIGatewayPlugin)
+
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+            package: "ai-gateway-provider",
+            options: { name: "cloudflare-ai-gateway" },
+          },
+          {},
+        )
+
+        expect(result.sdk).toBeUndefined()
+        expect(aiGatewayCalls).toHaveLength(0)
+      }),
+    ),
+  )
+
+  it.effect("does not replace a configured baseURL with the Cloudflare AI Gateway SDK", () =>
+    withEnv(
+      cloudflareEnv({
+        CLOUDFLARE_ACCOUNT_ID: undefined,
+        CLOUDFLARE_GATEWAY_ID: undefined,
+        CLOUDFLARE_API_TOKEN: undefined,
+      }),
+      () =>
+        Effect.gen(function* () {
+          resetCalls()
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(CloudflareAIGatewayPlugin)
+
+          const result = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+              package: "ai-gateway-provider",
+              options: { name: "cloudflare-ai-gateway", baseURL: "https://proxy.example/v1" },
+            },
+            {},
+          )
+
+          expect(result.sdk).toBeUndefined()
+          expect(aiGatewayCalls).toHaveLength(0)
+        }),
+    ),
+  )
+
+  it.effect("maps provider/model IDs through the unified Cloudflare provider unchanged", () =>
+    withEnv(cloudflareEnv(), () =>
+      Effect.gen(function* () {
+        resetCalls()
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareAIGatewayPlugin)
+
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-ai-gateway", "anthropic/claude-sonnet-4-5"),
+            package: "ai-gateway-provider",
+            options: { name: "cloudflare-ai-gateway" },
+          },
+          {},
+        )
+
+        expect(result.sdk.languageModel("anthropic/claude-sonnet-4-5")).toEqual({
+          modelId: { unifiedModelID: "anthropic/claude-sonnet-4-5" },
+          provider: "cloudflare-ai-gateway",
+          specificationVersion: "v3",
+        })
+        expect(unifiedCalls).toEqual(["anthropic/claude-sonnet-4-5"])
+        expect(gatewayModelCalls).toEqual([{ unifiedModelID: "anthropic/claude-sonnet-4-5" }])
+      }),
+    ),
+  )
+
+  it.effect("ignores non Cloudflare AI Gateway packages", () =>
+    withEnv(cloudflareEnv(), () =>
+      Effect.gen(function* () {
+        resetCalls()
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareAIGatewayPlugin)
+
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-ai-gateway", "openai/gpt-5"),
+            package: "@ai-sdk/openai-compatible",
+            options: { name: "cloudflare-ai-gateway" },
+          },
+          {},
+        )
+
+        expect(result.sdk).toBeUndefined()
+        expect(aiGatewayCalls).toHaveLength(0)
+      }),
+    ),
+  )
+})

packages/core/test/plugin/provider-cloudflare-workers-ai.test.ts

@@ -0,0 +1,285 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { Credential } from "@opencode-ai/core/credential"
+import { Connector } from "@opencode-ai/core/connector"
+import { Database } from "@opencode-ai/core/database/database"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { Location } from "@opencode-ai/core/location"
+import { EventV2 } from "@opencode-ai/core/event"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { CloudflareWorkersAIPlugin } from "@opencode-ai/core/plugin/provider/cloudflare-workers-ai"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+import { fakeSelectorSdk, it, model, npmLayer, withEnv } from "./provider-helper"
+
+const itWithAccount = testEffect(
+  Catalog.locationLayer.pipe(
+    Layer.provideMerge(
+      Credential.layer.pipe(
+        Layer.provide(Database.layerFromPath(":memory:").pipe(Layer.fresh)),
+        Layer.provide(EventV2.defaultLayer),
+      ),
+    ),
+    Layer.provideMerge(EventV2.defaultLayer),
+    Layer.provideMerge(
+      Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("test") }))),
+    ),
+    Layer.provideMerge(npmLayer),
+  ),
+)
+
+function cloudflareLanguage(sdk: unknown, modelID = "@cf/model") {
+  return (sdk as { languageModel: (id: string) => { config: CloudflareConfig; provider: string } }).languageModel(
+    modelID,
+  )
+}
+
+type CloudflareConfig = {
+  url: (input: { path: string; modelId: string }) => string
+  headers: () => Record<string, string> | Promise<Record<string, string>>
+}
+
+function cloudflareURL(sdk: unknown, modelID = "@cf/model") {
+  return cloudflareLanguage(sdk, modelID).config.url({ path: "/chat/completions", modelId: modelID })
+}
+
+function cloudflareHeaders(sdk: unknown, modelID = "@cf/model") {
+  return cloudflareLanguage(sdk, modelID).config.headers()
+}
+
+describe("CloudflareWorkersAIPlugin", () => {
+  it.effect("maps account ID to endpoint URL and creates an OpenAI-compatible SDK", () =>
+    withEnv({ CLOUDFLARE_ACCOUNT_ID: "acct", CLOUDFLARE_API_KEY: "key" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(CloudflareWorkersAIPlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) =>
+          catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => {
+            provider.api = { type: "aisdk", package: "test-provider" }
+          }),
+        )
+        const provider = yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai"))
+        const sdk = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-workers-ai", "@cf/model", { api: provider.api }),
+            package: "@ai-sdk/openai-compatible",
+            options: { name: "cloudflare-workers-ai", headers: { custom: "header" } },
+          },
+          {},
+        )
+        expect(provider.api).toEqual({
+          type: "aisdk",
+          package: "test-provider",
+          url: "https://api.cloudflare.com/client/v4/accounts/acct/ai/v1",
+        })
+        expect(sdk.sdk).toBeDefined()
+      }),
+    ),
+  )
+
+  it.effect("preserves a configured endpoint URL instead of deriving one from account ID", () =>
+    withEnv({ CLOUDFLARE_ACCOUNT_ID: "acct" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(CloudflareWorkersAIPlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) =>
+          catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => {
+            provider.api = { type: "aisdk", package: "test-provider", url: "https://proxy.example/v1" }
+          }),
+        )
+        expect((yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai"))).api).toEqual({
+          type: "aisdk",
+          package: "test-provider",
+          url: "https://proxy.example/v1",
+        })
+      }),
+    ),
+  )
+
+  it.effect("allows a configured baseURL without account ID", () =>
+    withEnv({ CLOUDFLARE_ACCOUNT_ID: undefined, CLOUDFLARE_API_KEY: "key" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareWorkersAIPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-workers-ai", "@cf/model", {
+              api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://proxy.example/v1" },
+            }),
+            package: "@ai-sdk/openai-compatible",
+            options: { name: "cloudflare-workers-ai", baseURL: "https://proxy.example/v1" },
+          },
+          {},
+        )
+        expect(cloudflareURL(result.sdk)).toBe("https://proxy.example/v1/chat/completions")
+      }),
+    ),
+  )
+
+  itWithAccount.effect("falls back to account metadata when account env is absent", () =>
+    withEnv(
+      {
+        CLOUDFLARE_ACCOUNT_ID: undefined,
+        CLOUDFLARE_API_KEY: undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          const credentials = yield* Credential.Service
+          const catalog = yield* Catalog.Service
+          yield* credentials.create({
+            connectorID: Connector.ID.make("cloudflare-workers-ai"),
+            methodID: Connector.MethodID.make("api-key"),
+            value: new Credential.Key({
+              type: "key",
+              key: "account-key",
+              metadata: { accountId: "account-acct" },
+            }),
+          })
+          yield* plugin.add(CloudflareWorkersAIPlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) =>
+            catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => {
+              provider.api = { type: "aisdk", package: "test-provider" }
+            }),
+          )
+          expect((yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai"))).request.body).toMatchObject(
+            {
+              apiKey: "account-key",
+              accountId: "account-acct",
+            },
+          )
+        }),
+    ),
+  )
+
+  it.effect("uses env account ID over configured account ID", () =>
+    withEnv({ CLOUDFLARE_ACCOUNT_ID: "env-acct" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(CloudflareWorkersAIPlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) =>
+          catalog.provider.update(ProviderV2.ID.make("cloudflare-workers-ai"), (provider) => {
+            provider.api = { type: "aisdk", package: "test-provider" }
+            provider.request.body.accountId = "configured-acct"
+          }),
+        )
+        expect((yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai"))).api).toEqual({
+          type: "aisdk",
+          package: "test-provider",
+          url: "https://api.cloudflare.com/client/v4/accounts/env-acct/ai/v1",
+        })
+      }),
+    ),
+  )
+
+  it.effect("uses env API key over auth or configured API key and keeps the Cloudflare User-Agent", () =>
+    withEnv({ CLOUDFLARE_ACCOUNT_ID: "acct", CLOUDFLARE_API_KEY: "env-key" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareWorkersAIPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-workers-ai", "@cf/model", {
+              api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://proxy.example/v1" },
+            }),
+            package: "@ai-sdk/openai-compatible",
+            options: {
+              name: "cloudflare-workers-ai",
+              apiKey: "auth-key",
+              baseURL: "https://proxy.example/v1",
+              headers: { custom: "header" },
+            },
+          },
+          {},
+        )
+        const headers = yield* Effect.promise(() => Promise.resolve(cloudflareHeaders(result.sdk)))
+        expect(headers.authorization).toBe("Bearer env-key")
+        expect(headers.custom).toBe("header")
+        expect(headers["user-agent"]).toMatch(/^opencode\/.* cloudflare-workers-ai \(.+\) ai-sdk\/openai-compatible\//)
+      }),
+    ),
+  )
+
+  it.effect("expands account ID vars in endpoint URLs", () =>
+    withEnv({ CLOUDFLARE_ACCOUNT_ID: "acct", CLOUDFLARE_API_KEY: "key" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareWorkersAIPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-workers-ai", "@cf/model", {
+              api: {
+                type: "aisdk",
+                package: "@ai-sdk/openai-compatible",
+                url: "https://api.cloudflare.com/client/v4/accounts/${CLOUDFLARE_ACCOUNT_ID}/ai/v1",
+              },
+            }),
+            package: "@ai-sdk/openai-compatible",
+            options: {
+              name: "cloudflare-workers-ai",
+              baseURL: "https://api.cloudflare.com/client/v4/accounts/${CLOUDFLARE_ACCOUNT_ID}/ai/v1",
+            },
+          },
+          {},
+        )
+        expect(cloudflareURL(result.sdk)).toBe(
+          "https://api.cloudflare.com/client/v4/accounts/acct/ai/v1/chat/completions",
+        )
+      }),
+    ),
+  )
+
+  it.effect("selects languageModel with the API model ID", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(CloudflareWorkersAIPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("cloudflare-workers-ai", "alias", { api: { id: ModelV2.ID.make("@cf/api-model") } }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+      expect(result.language).toBeDefined()
+      expect(calls).toEqual(["languageModel:@cf/api-model"])
+    }),
+  )
+
+  it.effect("does not create an SDK for non OpenAI-compatible packages", () =>
+    withEnv({ CLOUDFLARE_ACCOUNT_ID: "acct", CLOUDFLARE_API_KEY: "key" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(CloudflareWorkersAIPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("cloudflare-workers-ai", "@cf/model", {
+              api: { type: "aisdk", package: "@ai-sdk/anthropic", url: "https://proxy.example/v1" },
+            }),
+            package: "@ai-sdk/anthropic",
+            options: { name: "cloudflare-workers-ai" },
+          },
+          {},
+        )
+        expect(result.sdk).toBeUndefined()
+      }),
+    ),
+  )
+})

packages/core/test/plugin/provider-cohere.test.ts

@@ -0,0 +1,86 @@
+import { describe, expect, mock } from "bun:test"
+import { Effect } from "effect"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { CoherePlugin } from "@opencode-ai/core/plugin/provider/cohere"
+import { fakeSelectorSdk, it, model } from "./provider-helper"
+
+const cohereOptions: Record<string, any>[] = []
+
+void mock.module("@ai-sdk/cohere", () => ({
+  createCohere: (options: Record<string, any>) => {
+    cohereOptions.push({ ...options })
+    return {
+      languageModel: (modelID: string) => ({
+        modelID,
+        provider: `${options.name ?? "cohere"}.chat`,
+        specificationVersion: "v3",
+      }),
+    }
+  },
+}))
+
+describe("CoherePlugin", () => {
+  it.effect("creates a Cohere SDK only for @ai-sdk/cohere", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(CoherePlugin)
+
+      const ignored = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("cohere", "command"), package: "@ai-sdk/openai-compatible", options: { name: "cohere" } },
+        {},
+      )
+      expect(ignored.sdk).toBeUndefined()
+
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("cohere", "command"), package: "@ai-sdk/cohere", options: { name: "cohere" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("uses the model provider ID as the bundled SDK name", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(CoherePlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-cohere", "command-r-plus"),
+          package: "@ai-sdk/cohere",
+          options: { name: "custom-cohere", apiKey: "test", baseURL: "https://cohere.example" },
+        },
+        {},
+      )
+
+      expect(cohereOptions.at(-1)).toEqual({
+        name: "custom-cohere",
+        apiKey: "test",
+        baseURL: "https://cohere.example",
+      })
+      expect(result.sdk?.languageModel("command-r-plus").provider).toBe("custom-cohere.chat")
+    }),
+  )
+
+  it.effect("leaves language selection to the default languageModel fallback", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      const sdk = fakeSelectorSdk(calls)
+      yield* plugin.add(CoherePlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("cohere", "alias", { api: { id: ModelV2.ID.make("command-r-plus") } }), sdk, options: {} },
+        {},
+      )
+
+      expect(result.language).toBeUndefined()
+      expect(calls).toEqual([])
+      expect(result.language ?? sdk.languageModel("command-r-plus")).toBeDefined()
+      expect(calls).toEqual(["languageModel:command-r-plus"])
+    }),
+  )
+})

packages/core/test/plugin/provider-deepinfra.test.ts

@@ -0,0 +1,132 @@
+import { describe, expect, mock } from "bun:test"
+import { Effect, Layer } from "effect"
+import { AISDK } from "@opencode-ai/core/aisdk"
+import { EventV2 } from "@opencode-ai/core/event"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { DeepInfraPlugin } from "@opencode-ai/core/plugin/provider/deepinfra"
+import { testEffect } from "../lib/effect"
+import { it, model } from "./provider-helper"
+
+const itAISDK = testEffect(
+  Layer.provideMerge(AISDK.layer, PluginV2.locationLayer.pipe(Layer.provide(EventV2.defaultLayer))),
+)
+const deepinfraOptions: Record<string, any>[] = []
+const deepinfraLanguageModels: string[] = []
+
+void mock.module("@ai-sdk/deepinfra", () => ({
+  createDeepInfra: (options: Record<string, any>) => {
+    const captured = { ...options }
+    deepinfraOptions.push(captured)
+    return {
+      languageModel: (modelID: string) => {
+        deepinfraLanguageModels.push(modelID)
+        return { modelID, provider: `${captured.name ?? "deepinfra"}.chat`, specificationVersion: "v3" }
+      },
+    }
+  },
+}))
+
+function resetDeepInfraMock() {
+  deepinfraOptions.length = 0
+  deepinfraLanguageModels.length = 0
+}
+
+describe("DeepInfraPlugin", () => {
+  it.effect("creates a DeepInfra SDK for @ai-sdk/deepinfra", () =>
+    Effect.gen(function* () {
+      resetDeepInfraMock()
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(DeepInfraPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("deepinfra", "model"), package: "@ai-sdk/deepinfra", options: { name: "deepinfra" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("passes the model provider ID as the bundled DeepInfra SDK name", () =>
+    Effect.gen(function* () {
+      resetDeepInfraMock()
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(DeepInfraPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-deepinfra", "model"),
+          package: "@ai-sdk/deepinfra",
+          options: { name: "custom-deepinfra", apiKey: "test" },
+        },
+        {},
+      )
+      expect(result.sdk.languageModel("model").provider).toBe("custom-deepinfra.chat")
+      expect(deepinfraOptions).toEqual([{ name: "custom-deepinfra", apiKey: "test" }])
+    }),
+  )
+
+  it.effect("uses the canonical provider ID as the bundled DeepInfra SDK name", () =>
+    Effect.gen(function* () {
+      resetDeepInfraMock()
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(DeepInfraPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("deepinfra", "model"),
+          package: "@ai-sdk/deepinfra",
+          options: { name: "deepinfra", apiKey: "test" },
+        },
+        {},
+      )
+      expect(result.sdk.languageModel("model").provider).toBe("deepinfra.chat")
+      expect(deepinfraOptions).toEqual([{ name: "deepinfra", apiKey: "test" }])
+    }),
+  )
+
+  it.effect("matches only the exact bundled DeepInfra package", () =>
+    Effect.gen(function* () {
+      resetDeepInfraMock()
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(DeepInfraPlugin)
+      const packages = [
+        "unmatched-package",
+        "@ai-sdk/deepinfra-compatible",
+        "file:///tmp/@ai-sdk/deepinfra-provider.js",
+      ]
+      yield* Effect.forEach(packages, (item) =>
+        Effect.gen(function* () {
+          const ignored = yield* plugin.trigger(
+            "aisdk.sdk",
+            { model: model("deepinfra", "model"), package: item, options: { name: "deepinfra" } },
+            {},
+          )
+          expect(ignored.sdk).toBeUndefined()
+        }),
+      )
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("deepinfra", "model"), package: "@ai-sdk/deepinfra", options: { name: "deepinfra" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+      expect(deepinfraOptions).toEqual([{ name: "deepinfra" }])
+    }),
+  )
+
+  itAISDK.effect("uses the default languageModel selection for DeepInfra models", () =>
+    Effect.gen(function* () {
+      resetDeepInfraMock()
+      const plugin = yield* PluginV2.Service
+      const aisdk = yield* AISDK.Service
+      yield* plugin.add(DeepInfraPlugin)
+      const language = yield* aisdk.language(
+        model("deepinfra", "meta-llama/Llama-3.3-70B-Instruct", {
+          api: { type: "aisdk", package: "@ai-sdk/deepinfra" },
+        }),
+      )
+      expect(language.provider).toBe("deepinfra.chat")
+      expect(deepinfraLanguageModels).toEqual(["meta-llama/Llama-3.3-70B-Instruct"])
+    }),
+  )
+})

packages/core/test/plugin/provider-dynamic.test.ts

@@ -0,0 +1,174 @@
+import { Npm } from "@opencode-ai/core/npm"
+import { describe, expect } from "bun:test"
+import { Cause, Effect, Layer, Option } from "effect"
+import fs from "fs/promises"
+import os from "os"
+import path from "path"
+import { fileURLToPath } from "url"
+import { AISDK } from "@opencode-ai/core/aisdk"
+import { EventV2 } from "@opencode-ai/core/event"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { DynamicProviderPlugin } from "@opencode-ai/core/plugin/provider/dynamic"
+import { testEffect } from "../lib/effect"
+import { fixtureProvider, it, model, npmLayer } from "./provider-helper"
+
+const fixtureProviderPath = fileURLToPath(fixtureProvider)
+const itWithAISDK = testEffect(
+  AISDK.layer.pipe(Layer.provideMerge(PluginV2.locationLayer.pipe(Layer.provide(EventV2.defaultLayer)))),
+)
+
+function npmEntrypointLayer(entrypoint: Option.Option<string>) {
+  return Layer.succeed(
+    Npm.Service,
+    Npm.Service.of({
+      add: () => Effect.succeed({ directory: "", entrypoint }),
+      install: () => Effect.void,
+      which: () => Effect.succeed(Option.none<string>()),
+    }),
+  )
+}
+
+function dynamicPlugin(layer = npmLayer) {
+  return { id: DynamicProviderPlugin.id, effect: DynamicProviderPlugin.effect.pipe(Effect.provide(layer)) }
+}
+
+function tempEntrypoint(source: string) {
+  return Effect.acquireRelease(
+    Effect.promise(async () => {
+      const directory = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-provider-dynamic-"))
+      const entrypoint = path.join(directory, "provider.mjs")
+      await Bun.write(entrypoint, source)
+      return { directory, entrypoint }
+    }),
+    (tmp) => Effect.promise(() => fs.rm(tmp.directory, { recursive: true, force: true })),
+  )
+}
+
+describe("DynamicProviderPlugin", () => {
+  it.effect("creates an SDK from a provider factory export", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(dynamicPlugin())
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom", "test-model"),
+          package: fixtureProvider,
+          options: { name: "custom", marker: "dynamic" },
+        },
+        {},
+      )
+      expect(result.sdk.options).toEqual({ marker: "dynamic", name: "custom" })
+      expect(result.sdk.languageModel("x")).toEqual({ modelID: "x", options: { marker: "dynamic", name: "custom" } })
+    }),
+  )
+
+  it.effect("does not override an SDK already supplied by an earlier plugin", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const sdk = { marker: "existing" }
+      yield* plugin.add(dynamicPlugin())
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom", "test-model"),
+          package: fixtureProvider,
+          options: { name: "custom", marker: "dynamic" },
+        },
+        { sdk },
+      )
+      expect(result.sdk).toBe(sdk)
+    }),
+  )
+
+  it.effect("injects the provider ID as the SDK factory name", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(dynamicPlugin())
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-provider", "test-model"),
+          package: fixtureProvider,
+          options: { name: "custom-provider", marker: "dynamic" },
+        },
+        {},
+      )
+      expect(result.sdk.options).toEqual({ marker: "dynamic", name: "custom-provider" })
+    }),
+  )
+
+  it.effect("loads npm packages through their resolved import entrypoint", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(dynamicPlugin(npmEntrypointLayer(Option.some(fixtureProviderPath))))
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("npm-provider", "test-model"),
+          package: "fixture-provider",
+          options: { name: "npm-provider", marker: "npm" },
+        },
+        {},
+      )
+      expect(result.sdk.languageModel("x")).toEqual({ modelID: "x", options: { marker: "npm", name: "npm-provider" } })
+    }),
+  )
+
+  itWithAISDK.effect("wraps missing npm entrypoint failures as AISDK init errors", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const aisdk = yield* AISDK.Service
+      yield* plugin.add(dynamicPlugin(npmEntrypointLayer(Option.none<string>())))
+      const exit = yield* aisdk
+        .language(model("missing-entrypoint", "alias", { api: { type: "aisdk", package: "fixture-provider" } }))
+        .pipe(Effect.exit)
+      expect(exit._tag).toBe("Failure")
+      if (exit._tag === "Failure") expect(Cause.prettyErrors(exit.cause).join("\n")).toContain("AISDK.InitError")
+    }),
+  )
+
+  itWithAISDK.effect("wraps dynamic import failures as AISDK init errors", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const aisdk = yield* AISDK.Service
+      yield* plugin.add(dynamicPlugin())
+      const exit = yield* aisdk
+        .language(
+          model("bad-import", "alias", { api: { type: "aisdk", package: "file:///missing/provider-factory.js" } }),
+        )
+        .pipe(Effect.exit)
+      expect(exit._tag).toBe("Failure")
+      if (exit._tag === "Failure") expect(Cause.prettyErrors(exit.cause).join("\n")).toContain("AISDK.InitError")
+    }),
+  )
+
+  itWithAISDK.live("wraps missing provider factory exports as AISDK init errors", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const aisdk = yield* AISDK.Service
+      const tmp = yield* tempEntrypoint("export const notAProviderFactory = true\n")
+      yield* plugin.add(dynamicPlugin(npmEntrypointLayer(Option.some(tmp.entrypoint))))
+      const exit = yield* aisdk
+        .language(model("missing-factory", "alias", { api: { type: "aisdk", package: "fixture-provider" } }))
+        .pipe(Effect.exit)
+      expect(exit._tag).toBe("Failure")
+      if (exit._tag === "Failure") expect(Cause.prettyErrors(exit.cause).join("\n")).toContain("AISDK.InitError")
+    }),
+  )
+
+  itWithAISDK.effect("uses the model api.id for the default language model", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const aisdk = yield* AISDK.Service
+      yield* plugin.add(dynamicPlugin())
+      const language = yield* aisdk.language(
+        model("custom", "alias", {
+          api: { id: ModelV2.ID.make("test-model-api"), type: "aisdk", package: fixtureProvider },
+        }),
+      )
+      expect(language).toMatchObject({ modelID: "test-model-api", options: { name: "custom" } })
+    }),
+  )
+})

packages/core/test/plugin/provider-gateway.test.ts

@@ -0,0 +1,87 @@
+import { describe, expect, mock } from "bun:test"
+import { Effect } from "effect"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { GatewayPlugin } from "@opencode-ai/core/plugin/provider/gateway"
+import { it, model } from "./provider-helper"
+
+const gatewayCalls: Record<string, unknown>[] = []
+const vercelGatewayModels = ["anthropic/claude-sonnet-4", "openai/gpt-5", "google/gemini-2.5-pro"]
+
+mock.module("@ai-sdk/gateway", () => ({
+  createGateway(options: Record<string, unknown>) {
+    gatewayCalls.push({ ...options })
+    return {
+      languageModel(modelID: string) {
+        return {
+          modelId: modelID,
+          provider: options.name,
+          specificationVersion: "v3",
+        }
+      },
+    }
+  },
+}))
+
+describe("GatewayPlugin", () => {
+  it.effect("creates a Gateway SDK for @ai-sdk/gateway", () =>
+    Effect.gen(function* () {
+      gatewayCalls.length = 0
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GatewayPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("gateway", "model"), package: "@ai-sdk/gateway", options: { name: "gateway" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+      expect(gatewayCalls).toHaveLength(1)
+    }),
+  )
+
+  it.effect("passes the model providerID as the Gateway SDK name", () =>
+    Effect.gen(function* () {
+      gatewayCalls.length = 0
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GatewayPlugin)
+
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("vercel", "anthropic/claude-sonnet-4"),
+          package: "@ai-sdk/gateway",
+          options: { name: "vercel", apiKey: "test-key" },
+        },
+        {},
+      )
+
+      expect(gatewayCalls).toEqual([{ name: "vercel", apiKey: "test-key" }])
+      expect(result.sdk.languageModel("anthropic/claude-sonnet-4").provider).toBe("vercel")
+    }),
+  )
+
+  it.effect("matches Vercel AI Gateway models by their @ai-sdk/gateway package", () =>
+    Effect.gen(function* () {
+      gatewayCalls.length = 0
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GatewayPlugin)
+
+      for (const modelID of vercelGatewayModels) {
+        const ignored = yield* plugin.trigger(
+          "aisdk.sdk",
+          { model: model("vercel", modelID), package: "@ai-sdk/vercel", options: { name: "vercel" } },
+          {},
+        )
+        expect(ignored.sdk).toBeUndefined()
+
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          { model: model("vercel", modelID), package: "@ai-sdk/gateway", options: { name: "vercel" } },
+          {},
+        )
+        expect(result.sdk).toBeDefined()
+      }
+
+      expect(gatewayCalls).toHaveLength(3)
+    }),
+  )
+})

packages/core/test/plugin/provider-github-copilot.test.ts

@@ -0,0 +1,196 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { GithubCopilotPlugin } from "@opencode-ai/core/plugin/provider/github-copilot"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { fakeSelectorSdk, it, model } from "./provider-helper"
+
+describe("GithubCopilotPlugin", () => {
+  it.effect("creates the bundled Copilot SDK for the GitHub Copilot package", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GithubCopilotPlugin)
+      const ignored = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("github-copilot", "gpt-5"),
+          package: "@ai-sdk/openai-compatible",
+          options: { name: "github-copilot" },
+        },
+        {},
+      )
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("github-copilot", "gpt-5"),
+          package: "@ai-sdk/github-copilot",
+          options: { name: "github-copilot" },
+        },
+        {},
+      )
+      expect(ignored.sdk).toBeUndefined()
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("selects languageModel when responses and chat are absent", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(GithubCopilotPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("github-copilot", "claude-sonnet-4"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual(["languageModel:claude-sonnet-4"])
+    }),
+  )
+
+  it.effect("selects languageModel with the API model ID when responses and chat are absent", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(GithubCopilotPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("github-copilot", "alias", { api: { id: ModelV2.ID.make("claude-sonnet-4") } }),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual(["languageModel:claude-sonnet-4"])
+    }),
+  )
+
+  it.effect("uses responses for gpt-5 models except gpt-5-mini", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(GithubCopilotPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("github-copilot", "gpt-5"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("github-copilot", "gpt-5.1-codex"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("github-copilot", "gpt-4o"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("github-copilot", "gpt-5-mini"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("github-copilot", "gpt-5-mini-2025-08-07"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      expect(calls).toEqual([
+        "responses:gpt-5",
+        "responses:gpt-5.1-codex",
+        "chat:gpt-4o",
+        "chat:gpt-5-mini",
+        "chat:gpt-5-mini-2025-08-07",
+      ])
+    }),
+  )
+
+  it.effect("uses the API model ID when selecting responses or chat", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(GithubCopilotPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("github-copilot", "default", { api: { id: ModelV2.ID.make("gpt-5") } }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("github-copilot", "small", { api: { id: ModelV2.ID.make("gpt-5-mini") } }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("github-copilot", "sonnet", { api: { id: ModelV2.ID.make("claude-sonnet-4") } }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual(["responses:gpt-5", "chat:gpt-5-mini", "chat:claude-sonnet-4"])
+    }),
+  )
+
+  it.effect("disables gpt-5-chat-latest before Copilot language selection", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(GithubCopilotPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        catalog.provider.update(ProviderV2.ID.make("github-copilot"), () => {})
+        catalog.model.update(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-chat-latest"), () => {})
+      })
+      expect(
+        (yield* catalog.model.get(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-chat-latest"))).enabled,
+      ).toBe(false)
+    }),
+  )
+
+  it.effect("does not disable gpt-5-chat-latest for non-Copilot providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(GithubCopilotPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        catalog.provider.update(ProviderV2.ID.make("custom-copilot"), () => {})
+        catalog.model.update(ProviderV2.ID.make("custom-copilot"), ModelV2.ID.make("gpt-5-chat-latest"), () => {})
+      })
+      expect(
+        (yield* catalog.model.get(ProviderV2.ID.make("custom-copilot"), ModelV2.ID.make("gpt-5-chat-latest"))).enabled,
+      ).toBe(true)
+    }),
+  )
+
+  it.effect("ignores non-Copilot providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(GithubCopilotPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("openai", "gpt-5"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      expect(calls).toEqual([])
+      expect(result.language).toBeUndefined()
+    }),
+  )
+})

packages/core/test/plugin/provider-gitlab.test.ts

@@ -0,0 +1,363 @@
+import { describe, expect, mock } from "bun:test"
+import { Effect, Layer } from "effect"
+import { Credential } from "@opencode-ai/core/credential"
+import { Connector } from "@opencode-ai/core/connector"
+import { Database } from "@opencode-ai/core/database/database"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { GitLabPlugin } from "@opencode-ai/core/plugin/provider/gitlab"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+import { it, model, npmLayer, withEnv } from "./provider-helper"
+
+const gitlabSDKOptions: Record<string, unknown>[] = []
+
+void mock.module("gitlab-ai-provider", () => ({
+  VERSION: "test-version",
+  createGitLab: (options: Record<string, unknown>) => {
+    gitlabSDKOptions.push(options)
+    return {
+      agenticChat: (id: string, options: unknown) => ({ id, options, type: "agentic" }),
+      workflowChat: (id: string, options: unknown) => ({ id, options, type: "workflow" }),
+    }
+  },
+  discoverWorkflowModels: async () => ({ models: [], project: undefined }),
+  isWorkflowModel: (id: string) => id === "duo-workflow" || id === "duo-workflow-exact",
+}))
+
+const itWithAccount = testEffect(
+  Catalog.locationLayer.pipe(
+    Layer.provideMerge(
+      Credential.layer.pipe(
+        Layer.provide(Database.layerFromPath(":memory:").pipe(Layer.fresh)),
+        Layer.provide(EventV2.defaultLayer),
+      ),
+    ),
+    Layer.provideMerge(EventV2.defaultLayer),
+    Layer.provideMerge(
+      Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("/") }))),
+    ),
+    Layer.provideMerge(npmLayer),
+  ),
+)
+
+describe("GitLabPlugin", () => {
+  it.effect("creates SDKs with legacy default instance URL, token env, headers, and feature flags", () =>
+    withEnv(
+      {
+        GITLAB_INSTANCE_URL: undefined,
+        GITLAB_TOKEN: "env-token",
+      },
+      () =>
+        Effect.gen(function* () {
+          gitlabSDKOptions.length = 0
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(GitLabPlugin)
+          yield* plugin.trigger(
+            "aisdk.sdk",
+            { model: model("gitlab", "claude"), package: "gitlab-ai-provider", options: { name: "gitlab" } },
+            {},
+          )
+          expect(gitlabSDKOptions).toHaveLength(1)
+          expect(gitlabSDKOptions[0].instanceUrl).toBe("https://gitlab.com")
+          expect(gitlabSDKOptions[0].apiKey).toBe("env-token")
+          expect(gitlabSDKOptions[0].aiGatewayHeaders).toMatchObject({
+            "anthropic-beta": "context-1m-2025-08-07",
+          })
+          expect(String((gitlabSDKOptions[0].aiGatewayHeaders as Record<string, string>)["User-Agent"])).toContain(
+            "gitlab-ai-provider/test-version",
+          )
+          expect(gitlabSDKOptions[0].featureFlags).toEqual({
+            duo_agent_platform_agentic_chat: true,
+            duo_agent_platform: true,
+          })
+        }),
+    ),
+  )
+
+  it.effect("uses GITLAB_INSTANCE_URL when instanceUrl is not configured", () =>
+    withEnv(
+      {
+        GITLAB_INSTANCE_URL: "https://env.gitlab.example",
+        GITLAB_TOKEN: undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          gitlabSDKOptions.length = 0
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(GitLabPlugin)
+          yield* plugin.trigger(
+            "aisdk.sdk",
+            { model: model("gitlab", "claude"), package: "gitlab-ai-provider", options: { name: "gitlab" } },
+            {},
+          )
+          expect(gitlabSDKOptions[0].instanceUrl).toBe("https://env.gitlab.example")
+        }),
+    ),
+  )
+
+  it.effect("keeps configured instance URL, apiKey, aiGatewayHeaders, and featureFlags over env/defaults", () =>
+    withEnv(
+      {
+        GITLAB_INSTANCE_URL: "https://env.gitlab.example",
+        GITLAB_TOKEN: "env-token",
+      },
+      () =>
+        Effect.gen(function* () {
+          gitlabSDKOptions.length = 0
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(GitLabPlugin)
+          yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("gitlab", "claude"),
+              package: "gitlab-ai-provider",
+              options: {
+                name: "gitlab",
+                instanceUrl: "https://configured.gitlab.example",
+                apiKey: "configured-token",
+                aiGatewayHeaders: {
+                  "anthropic-beta": "configured-beta",
+                  "x-gitlab-test": "1",
+                },
+                featureFlags: {
+                  duo_agent_platform: false,
+                  custom_flag: true,
+                },
+              },
+            },
+            {},
+          )
+          expect(gitlabSDKOptions[0].instanceUrl).toBe("https://configured.gitlab.example")
+          expect(gitlabSDKOptions[0].apiKey).toBe("configured-token")
+          expect(gitlabSDKOptions[0].aiGatewayHeaders).toMatchObject({
+            "anthropic-beta": "configured-beta",
+            "x-gitlab-test": "1",
+          })
+          expect(gitlabSDKOptions[0].featureFlags).toEqual({
+            duo_agent_platform_agentic_chat: true,
+            duo_agent_platform: false,
+            custom_flag: true,
+          })
+        }),
+    ),
+  )
+
+  it.effect("ignores non-GitLab SDK packages", () =>
+    Effect.gen(function* () {
+      gitlabSDKOptions.length = 0
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GitLabPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("gitlab", "claude"), package: "@ai-sdk/openai", options: { name: "gitlab" } },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+      expect(gitlabSDKOptions).toHaveLength(0)
+    }),
+  )
+
+  itWithAccount.effect("uses active account API token over GITLAB_TOKEN", () =>
+    withEnv(
+      {
+        GITLAB_TOKEN: "env-token",
+      },
+      () =>
+        Effect.gen(function* () {
+          gitlabSDKOptions.length = 0
+          const plugin = yield* PluginV2.Service
+          const credentials = yield* Credential.Service
+          const catalog = yield* Catalog.Service
+          yield* credentials.create({
+            connectorID: Connector.ID.make("gitlab"),
+            methodID: Connector.MethodID.make("api-key"),
+            value: new Credential.Key({ type: "key", key: "account-token" }),
+          })
+          yield* plugin.add(GitLabPlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) => catalog.provider.update(ProviderV2.ID.make("gitlab"), () => {}))
+          const provider = yield* catalog.provider.get(ProviderV2.ID.make("gitlab"))
+          yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("gitlab", "claude"),
+              package: "gitlab-ai-provider",
+              options: provider.request.body,
+            },
+            {},
+          )
+          expect(gitlabSDKOptions[0].apiKey).toBe("account-token")
+        }),
+    ),
+  )
+
+  itWithAccount.effect("uses active account OAuth access token when no API token exists", () =>
+    withEnv(
+      {
+        GITLAB_TOKEN: undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          gitlabSDKOptions.length = 0
+          const plugin = yield* PluginV2.Service
+          const credentials = yield* Credential.Service
+          const catalog = yield* Catalog.Service
+          yield* credentials.create({
+            connectorID: Connector.ID.make("gitlab"),
+            methodID: Connector.MethodID.make("oauth"),
+            value: new Credential.OAuth({
+              type: "oauth",
+              refresh: "refresh-token",
+              access: "account-oauth-token",
+              expires: 9999999999999,
+            }),
+          })
+          yield* plugin.add(GitLabPlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) => catalog.provider.update(ProviderV2.ID.make("gitlab"), () => {}))
+          const provider = yield* catalog.provider.get(ProviderV2.ID.make("gitlab"))
+          yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("gitlab", "claude"),
+              package: "gitlab-ai-provider",
+              options: provider.request.body,
+            },
+            {},
+          )
+          expect(gitlabSDKOptions[0].apiKey).toBe("account-oauth-token")
+        }),
+    ),
+  )
+
+  it.effect("uses workflowChat for duo workflow models and preserves selectedModelRef", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: [string, unknown][] = []
+      yield* plugin.add(GitLabPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("gitlab", "duo-workflow-custom", {
+            request: {
+              headers: {},
+              body: { workflowRef: "ref", workflowDefinition: "definition" },
+            },
+          }),
+          sdk: {
+            workflowChat: (id: string, options: unknown) => {
+              calls.push([id, options])
+              return { id, options }
+            },
+            agenticChat: () => undefined,
+          },
+          options: { featureFlags: { configured: true } },
+        },
+        {},
+      )
+      expect(calls).toEqual([
+        ["duo-workflow", { featureFlags: { configured: true }, workflowDefinition: "definition" }],
+      ])
+      expect(result.language as unknown).toEqual({
+        id: "duo-workflow",
+        options: calls[0]?.[1],
+        selectedModelRef: "ref",
+      })
+    }),
+  )
+
+  it.effect("uses exact static workflow model ids when the provider recognizes them", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: [string, unknown][] = []
+      yield* plugin.add(GitLabPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("gitlab", "duo-workflow-exact"),
+          sdk: {
+            workflowChat: (id: string, options: unknown) => {
+              calls.push([id, options])
+              return { id, options }
+            },
+            agenticChat: () => undefined,
+          },
+          options: { featureFlags: { configured: true } },
+        },
+        {},
+      )
+      expect(calls).toEqual([
+        ["duo-workflow-exact", { featureFlags: { configured: true }, workflowDefinition: undefined }],
+      ])
+      expect(result.language as unknown).toEqual({ id: "duo-workflow-exact", options: calls[0]?.[1] })
+    }),
+  )
+
+  it.effect("uses provider feature flags instead of request feature flags", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: [string, unknown][] = []
+      yield* plugin.add(GitLabPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("gitlab", "duo-workflow-custom", {
+            request: {
+              headers: {},
+              body: { featureFlags: { request_flag: true } },
+            },
+          }),
+          sdk: {
+            workflowChat: (id: string, options: unknown) => {
+              calls.push([id, options])
+              return { id, options }
+            },
+            agenticChat: () => undefined,
+          },
+          options: { featureFlags: { configured: true } },
+        },
+        {},
+      )
+      expect(calls).toEqual([["duo-workflow", { featureFlags: { configured: true }, workflowDefinition: undefined }]])
+    }),
+  )
+
+  it.effect("uses agenticChat with provider aiGatewayHeaders and feature flags for normal models", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: [string, unknown][] = []
+      yield* plugin.add(GitLabPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("gitlab", "claude", {
+            request: { headers: { h: "v" }, body: {} },
+          }),
+          sdk: {
+            workflowChat: () => undefined,
+            agenticChat: (id: string, options: unknown) => {
+              const selected = options as {
+                aiGatewayHeaders?: Record<string, string>
+                featureFlags?: Record<string, boolean>
+              }
+              calls.push([
+                id,
+                { aiGatewayHeaders: { ...selected.aiGatewayHeaders }, featureFlags: { ...selected.featureFlags } },
+              ])
+            },
+          },
+          options: { aiGatewayHeaders: { fallback: "header" }, featureFlags: { duo_agent_platform: true } },
+        },
+        {},
+      )
+      expect(calls).toEqual([
+        ["claude", { aiGatewayHeaders: { fallback: "header" }, featureFlags: { duo_agent_platform: true } }],
+      ])
+    }),
+  )
+})

packages/core/test/plugin/provider-google-vertex-anthropic.test.ts

@@ -0,0 +1,215 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { GoogleVertexAnthropicPlugin, GoogleVertexPlugin } from "@opencode-ai/core/plugin/provider/google-vertex"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { fakeSelectorSdk, it, model, withEnv } from "./provider-helper"
+
+describe("GoogleVertexAnthropicPlugin", () => {
+  it.effect("resolves legacy project and location env on provider update", () =>
+    withEnv(
+      {
+        GOOGLE_CLOUD_PROJECT: "cloud-project",
+        GCP_PROJECT: "gcp-project",
+        GCLOUD_PROJECT: "gcloud-project",
+        GOOGLE_CLOUD_LOCATION: "cloud-location",
+        VERTEX_LOCATION: "vertex-location",
+        GOOGLE_VERTEX_LOCATION: "google-vertex-location",
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          const catalog = yield* Catalog.Service
+          yield* plugin.add(GoogleVertexAnthropicPlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) =>
+            catalog.provider.update(ProviderV2.ID.make("google-vertex-anthropic"), (provider) => {
+              provider.api = { type: "aisdk", package: "@ai-sdk/google-vertex/anthropic" }
+            }),
+          )
+          const provider = yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic"))
+          expect(provider.request.body.project).toBe("cloud-project")
+          expect(provider.request.body.location).toBe("cloud-location")
+        }),
+    ),
+  )
+
+  it.effect("keeps configured project and location over env fallback", () =>
+    withEnv({ GOOGLE_CLOUD_PROJECT: "env-project", GOOGLE_CLOUD_LOCATION: "env-location" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(GoogleVertexAnthropicPlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) =>
+          catalog.provider.update(ProviderV2.ID.make("google-vertex-anthropic"), (provider) => {
+            provider.api = { type: "aisdk", package: "@ai-sdk/google-vertex/anthropic" }
+            provider.request.body.project = "configured-project"
+            provider.request.body.location = "configured-location"
+          }),
+        )
+        const provider = yield* catalog.provider.get(ProviderV2.ID.make("google-vertex-anthropic"))
+        expect(provider.request.body.project).toBe("configured-project")
+        expect(provider.request.body.location).toBe("configured-location")
+      }),
+    ),
+  )
+
+  it.effect("creates SDKs from legacy env fallback and default location", () =>
+    withEnv(
+      {
+        GOOGLE_CLOUD_PROJECT: undefined,
+        GCP_PROJECT: "gcp-project",
+        GCLOUD_PROJECT: "gcloud-project",
+        GOOGLE_CLOUD_LOCATION: undefined,
+        VERTEX_LOCATION: undefined,
+        GOOGLE_VERTEX_LOCATION: "ignored-location",
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(GoogleVertexAnthropicPlugin)
+          const result = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("google-vertex-anthropic", "claude-sonnet-4-5"),
+              package: "@ai-sdk/google-vertex/anthropic",
+              options: { name: "google-vertex-anthropic" },
+            },
+            {},
+          )
+          expect(result.sdk.languageModel("claude-sonnet-4-5").config.baseURL).toBe(
+            "https://aiplatform.googleapis.com/v1/projects/gcp-project/locations/global/publishers/anthropic/models",
+          )
+        }),
+    ),
+  )
+
+  it.effect("uses GOOGLE_CLOUD_LOCATION before VERTEX_LOCATION when creating SDKs", () =>
+    withEnv(
+      { GOOGLE_CLOUD_PROJECT: "project", GOOGLE_CLOUD_LOCATION: "cloud-location", VERTEX_LOCATION: "vertex-location" },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(GoogleVertexAnthropicPlugin)
+          const result = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("google-vertex-anthropic", "claude-sonnet-4-5"),
+              package: "@ai-sdk/google-vertex/anthropic",
+              options: { name: "google-vertex-anthropic" },
+            },
+            {},
+          )
+          expect(result.sdk.languageModel("claude-sonnet-4-5").config.baseURL).toBe(
+            "https://cloud-location-aiplatform.googleapis.com/v1/projects/project/locations/cloud-location/publishers/anthropic/models",
+          )
+        }),
+    ),
+  )
+
+  it.effect("creates SDKs for google-vertex Anthropic models with multi-region endpoints", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GoogleVertexAnthropicPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("google-vertex", "claude-sonnet-4-5"),
+          package: "@ai-sdk/google-vertex/anthropic",
+          options: { name: "google-vertex", project: "project", location: "eu" },
+        },
+        {},
+      )
+      expect(result.sdk.languageModel("claude-sonnet-4-5").config.baseURL).toBe(
+        "https://aiplatform.eu.rep.googleapis.com/v1/projects/project/locations/eu/publishers/anthropic/models",
+      )
+    }),
+  )
+
+  it.effect("keeps configured baseURL for google-vertex Anthropic models", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GoogleVertexAnthropicPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("google-vertex", "claude-sonnet-4-5"),
+          package: "@ai-sdk/google-vertex/anthropic",
+          options: { name: "google-vertex", project: "project", location: "eu", baseURL: "https://proxy.example/v1" },
+        },
+        {},
+      )
+      expect(result.sdk.languageModel("claude-sonnet-4-5").config.baseURL).toBe("https://proxy.example/v1")
+    }),
+  )
+
+  it.effect("selects google-vertex Anthropic language models through V2 plugins", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GoogleVertexPlugin)
+      yield* plugin.add(GoogleVertexAnthropicPlugin)
+      const sdkResult = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("google-vertex", " claude-sonnet-4-5 "),
+          package: "@ai-sdk/google-vertex/anthropic",
+          options: { name: "google-vertex", project: "project", location: "us" },
+        },
+        {},
+      )
+      const languageResult = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("google-vertex", " claude-sonnet-4-5 "),
+          sdk: sdkResult.sdk,
+          options: {},
+        },
+        {},
+      )
+      const language = languageResult.language as unknown as { config: { baseURL: string }; modelId: string }
+      expect(language.config.baseURL).toBe(
+        "https://aiplatform.us.rep.googleapis.com/v1/projects/project/locations/us/publishers/anthropic/models",
+      )
+      expect(language.modelId).toBe("claude-sonnet-4-5")
+    }),
+  )
+
+  it.effect("trims model IDs before selecting language models", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(GoogleVertexAnthropicPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("google-vertex-anthropic", " claude-sonnet-4-5 "),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual(["languageModel:claude-sonnet-4-5"])
+    }),
+  )
+
+  it.effect("ignores non Vertex Anthropic providers for language selection", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(GoogleVertexAnthropicPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("google-vertex", "claude-sonnet-4-5"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual([])
+      expect(result.language).toBeUndefined()
+    }),
+  )
+})

packages/core/test/plugin/provider-google-vertex.test.ts

@@ -0,0 +1,344 @@
+import { describe, expect, mock } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { GoogleVertexPlugin } from "@opencode-ai/core/plugin/provider/google-vertex"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { fakeSelectorSdk, it, model, withEnv } from "./provider-helper"
+
+const vertexOptions: Record<string, any>[] = []
+const googleAuthOptions: Record<string, any>[] = []
+
+void mock.module("@ai-sdk/google-vertex", () => ({
+  createVertex: (options: Record<string, any>) => {
+    vertexOptions.push(options)
+    return {
+      languageModel: (modelID: string) => ({ modelID, provider: "google-vertex", specificationVersion: "v3" }),
+    }
+  },
+}))
+
+void mock.module("google-auth-library", () => ({
+  GoogleAuth: class {
+    constructor(options: Record<string, any>) {
+      googleAuthOptions.push(options)
+    }
+
+    async getClient() {
+      return {
+        async getAccessToken() {
+          return { token: "vertex-token" }
+        },
+      }
+    }
+  },
+}))
+
+describe("GoogleVertexPlugin", () => {
+  it.effect("ignores OpenAI-compatible providers that are not Google Vertex", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(GoogleVertexPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) =>
+        catalog.provider.update(ProviderV2.ID.opencode, (provider) => {
+          provider.api = {
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://opencode.ai/zen/v1",
+          }
+        }),
+      )
+
+      const provider = yield* catalog.provider.get(ProviderV2.ID.opencode)
+      expect(provider.request.body).toEqual({})
+    }),
+  )
+
+  it.effect("resolves project and location from env using legacy precedence", () =>
+    withEnv(
+      {
+        GOOGLE_CLOUD_PROJECT: "google-cloud-project",
+        GCP_PROJECT: "gcp-project",
+        GCLOUD_PROJECT: "gcloud-project",
+        GOOGLE_VERTEX_LOCATION: "google-vertex-location",
+        GOOGLE_CLOUD_LOCATION: "google-cloud-location",
+        VERTEX_LOCATION: "vertex-location",
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          const catalog = yield* Catalog.Service
+          yield* plugin.add(GoogleVertexPlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) =>
+            catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => {
+              provider.api = {
+                type: "aisdk",
+                package: "@ai-sdk/openai-compatible",
+                url: "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}",
+              }
+            }),
+          )
+          const provider = yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))
+          expect(provider.request.body.project).toBe("google-cloud-project")
+          expect(provider.request.body.location).toBe("google-vertex-location")
+          expect(provider.api).toEqual({
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://google-vertex-location-aiplatform.googleapis.com/v1/projects/google-cloud-project/locations/google-vertex-location",
+          })
+        }),
+    ),
+  )
+
+  it.effect("resolves the advertised GOOGLE_VERTEX_PROJECT env for provider updates and SDKs", () =>
+    withEnv(
+      {
+        GOOGLE_VERTEX_PROJECT: "vertex-project",
+        GOOGLE_CLOUD_PROJECT: undefined,
+        GCP_PROJECT: undefined,
+        GCLOUD_PROJECT: undefined,
+        GOOGLE_VERTEX_LOCATION: "europe-west4",
+        GOOGLE_CLOUD_LOCATION: undefined,
+        VERTEX_LOCATION: undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          vertexOptions.length = 0
+          const plugin = yield* PluginV2.Service
+          const catalog = yield* Catalog.Service
+          yield* plugin.add(GoogleVertexPlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) =>
+            catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => {
+              provider.api = {
+                type: "aisdk",
+                package: "@ai-sdk/openai-compatible",
+                url: "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}",
+              }
+            }),
+          )
+          const provider = yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))
+          yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("google-vertex", "gemini", {
+                api: { type: "aisdk", package: "@ai-sdk/google-vertex" },
+              }),
+              package: "@ai-sdk/google-vertex",
+              options: { name: "google-vertex" },
+            },
+            {},
+          )
+
+          expect(provider.request.body.project).toBe("vertex-project")
+          expect(provider.api).toEqual({
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://europe-west4-aiplatform.googleapis.com/v1/projects/vertex-project/locations/europe-west4",
+          })
+          expect(vertexOptions[0].project).toBe("vertex-project")
+          expect(vertexOptions[0].location).toBe("europe-west4")
+        }),
+    ),
+  )
+
+  it.effect("keeps configured project and location over env and uses global endpoint", () =>
+    withEnv(
+      {
+        GOOGLE_CLOUD_PROJECT: "env-project",
+        GCP_PROJECT: "env-gcp-project",
+        GCLOUD_PROJECT: "env-gcloud-project",
+        GOOGLE_VERTEX_LOCATION: "env-location",
+        GOOGLE_CLOUD_LOCATION: "env-google-cloud-location",
+        VERTEX_LOCATION: "env-vertex-location",
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          const catalog = yield* Catalog.Service
+          yield* plugin.add(GoogleVertexPlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) =>
+            catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => {
+              provider.api = {
+                type: "aisdk",
+                package: "@ai-sdk/openai-compatible",
+                url: "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}",
+              }
+              provider.request.body.project = "config-project"
+              provider.request.body.location = "global"
+            }),
+          )
+          const provider = yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))
+          expect(provider.request.body.project).toBe("config-project")
+          expect(provider.request.body.location).toBe("global")
+          expect(provider.api).toEqual({
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://aiplatform.googleapis.com/v1/projects/config-project/locations/global",
+          })
+        }),
+    ),
+  )
+
+  it.effect("keeps OpenAI-compatible Vertex endpoint templates regional for eu", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(GoogleVertexPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) =>
+        catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => {
+          provider.api = {
+            type: "aisdk",
+            package: "@ai-sdk/openai-compatible",
+            url: "https://${GOOGLE_VERTEX_ENDPOINT}/v1/projects/${GOOGLE_VERTEX_PROJECT}/locations/${GOOGLE_VERTEX_LOCATION}",
+          }
+          provider.request.body.project = "config-project"
+          provider.request.body.location = "eu"
+        }),
+      )
+      const provider = yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))
+      expect(provider.api).toEqual({
+        type: "aisdk",
+        package: "@ai-sdk/openai-compatible",
+        url: "https://eu-aiplatform.googleapis.com/v1/projects/config-project/locations/eu",
+      })
+    }),
+  )
+
+  it.effect("defaults location to us-central1 when only project is configured", () =>
+    withEnv(
+      {
+        GOOGLE_CLOUD_PROJECT: undefined,
+        GCP_PROJECT: undefined,
+        GCLOUD_PROJECT: undefined,
+        GOOGLE_VERTEX_LOCATION: undefined,
+        GOOGLE_CLOUD_LOCATION: undefined,
+        VERTEX_LOCATION: undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          const catalog = yield* Catalog.Service
+          yield* plugin.add(GoogleVertexPlugin)
+          const transform = yield* catalog.transform()
+          yield* transform((catalog) =>
+            catalog.provider.update(ProviderV2.ID.make("google-vertex"), (provider) => {
+              provider.api = { type: "aisdk", package: "@ai-sdk/google-vertex" }
+              provider.request.body.project = "config-project"
+            }),
+          )
+          const provider = yield* catalog.provider.get(ProviderV2.ID.make("google-vertex"))
+          expect(provider.request.body.project).toBe("config-project")
+          expect(provider.request.body.location).toBe("us-central1")
+        }),
+    ),
+  )
+
+  it.effect("does not pass Google auth fetch to the native Vertex SDK", () =>
+    withEnv(
+      {
+        GOOGLE_CLOUD_PROJECT: "env-project",
+        GOOGLE_VERTEX_LOCATION: "env-location",
+      },
+      () =>
+        Effect.gen(function* () {
+          vertexOptions.length = 0
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(GoogleVertexPlugin)
+          yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("google-vertex", "gemini", {
+                api: { type: "aisdk", package: "@ai-sdk/google-vertex" },
+              }),
+              package: "@ai-sdk/google-vertex",
+              options: { name: "google-vertex" },
+            },
+            {},
+          )
+          expect(vertexOptions).toHaveLength(1)
+          expect(vertexOptions[0].project).toBe("env-project")
+          expect(vertexOptions[0].location).toBe("env-location")
+          expect(vertexOptions[0].fetch).toBeUndefined()
+        }),
+    ),
+  )
+
+  it.effect("keeps Google auth fetch for OpenAI-compatible Vertex endpoints", () =>
+    Effect.gen(function* () {
+      googleAuthOptions.length = 0
+      const fetchCalls: { input: Parameters<typeof fetch>[0]; init?: RequestInit }[] = []
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GoogleVertexPlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("capture-openai-compatible"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.promise(async () => {
+              if (evt.model.providerID !== "google-vertex") return
+              if (evt.package !== "@ai-sdk/openai-compatible") return
+              expect(typeof evt.options.fetch).toBe("function")
+              await evt.options.fetch("https://vertex.example", {
+                headers: { "x-test": "1" },
+              })
+            }),
+        }),
+      })
+      const originalFetch = fetch
+      ;(globalThis as typeof globalThis & { fetch: typeof fetch }).fetch = (async (
+        input: Parameters<typeof fetch>[0],
+        init?: RequestInit,
+      ) => {
+        fetchCalls.push({ input, init })
+        return new Response("ok")
+      }) as typeof fetch
+      yield* Effect.acquireUseRelease(
+        Effect.void,
+        () =>
+          plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("google-vertex", "gemini", {
+                api: { type: "aisdk", package: "@ai-sdk/openai-compatible" },
+              }),
+              package: "@ai-sdk/openai-compatible",
+              options: { name: "google-vertex" },
+            },
+            {},
+          ),
+        () =>
+          Effect.sync(() => {
+            ;(globalThis as typeof globalThis & { fetch: typeof fetch }).fetch = originalFetch
+          }),
+      )
+      expect(fetchCalls).toHaveLength(1)
+      expect(googleAuthOptions).toEqual([{ scopes: ["https://www.googleapis.com/auth/cloud-platform"] }])
+      expect(fetchCalls[0].input).toBe("https://vertex.example")
+      expect(new Headers(fetchCalls[0].init?.headers).get("authorization")).toBe("Bearer vertex-token")
+      expect(new Headers(fetchCalls[0].init?.headers).get("x-test")).toBe("1")
+    }),
+  )
+
+  it.effect("trims model IDs before selecting language models", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(GoogleVertexPlugin)
+      yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("google-vertex", " gemini-2.5-pro "),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual(["languageModel:gemini-2.5-pro"])
+    }),
+  )
+})

packages/core/test/plugin/provider-google.test.ts

@@ -0,0 +1,69 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { AISDK } from "@opencode-ai/core/aisdk"
+import { EventV2 } from "@opencode-ai/core/event"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { GooglePlugin } from "@opencode-ai/core/plugin/provider/google"
+import { testEffect } from "../lib/effect"
+import { it, model } from "./provider-helper"
+
+const itWithAISDK = testEffect(
+  AISDK.layer.pipe(Layer.provideMerge(PluginV2.locationLayer.pipe(Layer.provide(EventV2.defaultLayer)))),
+)
+
+describe("GooglePlugin", () => {
+  it.effect("creates a Google Generative AI SDK for @ai-sdk/google using the provider ID as SDK name", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GooglePlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-google", "gemini"),
+          package: "@ai-sdk/google",
+          options: { name: "custom-google", apiKey: "test" },
+        },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+      expect(result.sdk?.languageModel("gemini").provider).toBe("custom-google")
+    }),
+  )
+
+  it.effect("ignores non-Google SDK packages", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GooglePlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("google", "gemini"), package: "@ai-sdk/google-vertex", options: { name: "google" } },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  itWithAISDK.effect("uses default languageModel loading with provider ID parity", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const aisdk = yield* AISDK.Service
+      yield* plugin.add(GooglePlugin)
+      const language = yield* aisdk.language(
+        model("custom-google", "alias", {
+          api: {
+            id: ModelV2.ID.make("gemini-api"),
+            type: "aisdk",
+            package: "@ai-sdk/google",
+          },
+          request: {
+            headers: {},
+            body: { apiKey: "test" },
+          },
+        }),
+      )
+      expect(language.modelId).toBe("gemini-api")
+      expect(language.provider).toBe("custom-google")
+    }),
+  )
+})

packages/core/test/plugin/provider-groq.test.ts

@@ -0,0 +1,100 @@
+import { describe, expect } from "bun:test"
+import { createGroq } from "@ai-sdk/groq"
+import { Effect, Layer } from "effect"
+import { AISDK } from "@opencode-ai/core/aisdk"
+import { EventV2 } from "@opencode-ai/core/event"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { GroqPlugin } from "@opencode-ai/core/plugin/provider/groq"
+import { it, model } from "./provider-helper"
+import { testEffect } from "../lib/effect"
+
+const aisdkIt = testEffect(
+  AISDK.layer.pipe(Layer.provideMerge(PluginV2.locationLayer.pipe(Layer.provide(EventV2.defaultLayer)))),
+)
+
+describe("GroqPlugin", () => {
+  it.effect("creates a Groq SDK for @ai-sdk/groq", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GroqPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("groq", "llama"), package: "@ai-sdk/groq", options: { name: "groq" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("ignores non-Groq SDK packages", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GroqPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("groq", "llama"), package: "@ai-sdk/openai-compatible", options: { name: "groq" } },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("only matches the bundled @ai-sdk/groq package exactly", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GroqPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("groq", "llama"), package: "@ai-sdk/groq/compat", options: { name: "groq" } },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("matches the old bundled Groq SDK provider naming", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(GroqPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-groq", "llama"),
+          package: "@ai-sdk/groq",
+          options: { name: "custom-groq", apiKey: "test" },
+        },
+        {},
+      )
+      const expected = createGroq({ name: "custom-groq", apiKey: "test" } as Parameters<typeof createGroq>[0] & {
+        name: string
+      }).languageModel("llama")
+      const actual = result.sdk?.languageModel("llama")
+      expect(actual?.provider).toBe(expected.provider)
+      expect(actual?.modelId).toBe(expected.modelId)
+    }),
+  )
+
+  aisdkIt.effect("uses the default languageModel(api.id) behavior", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const aisdk = yield* AISDK.Service
+      yield* plugin.add(GroqPlugin)
+      const result = yield* aisdk.language(
+        model("groq", "alias", {
+          api: {
+            id: ModelV2.ID.make("llama-api"),
+            type: "aisdk",
+            package: "@ai-sdk/groq",
+          },
+          request: {
+            headers: {},
+            body: { apiKey: "test" },
+          },
+        }),
+      )
+      expect(result.modelId).toBe("llama-api")
+      expect(result.provider).toBe("groq.chat")
+    }),
+  )
+})

packages/core/test/plugin/provider-helper.ts

@@ -0,0 +1,149 @@
+import { Npm } from "@opencode-ai/core/npm"
+import type { LanguageModelV3 } from "@ai-sdk/provider"
+import { expect } from "bun:test"
+import { Effect, Layer, Option } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { Connector } from "@opencode-ai/core/connector"
+import { Credential } from "@opencode-ai/core/credential"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+
+export const fixtureProvider = new URL("./fixtures/provider-factory.ts", import.meta.url).href
+const locationLayer = Layer.succeed(
+  Location.Service,
+  Location.Service.of(location({ directory: AbsolutePath.make("test") })),
+)
+
+export const npmLayer = Layer.succeed(
+  Npm.Service,
+  Npm.Service.of({
+    add: () => Effect.succeed({ directory: "", entrypoint: Option.none<string>() }),
+    install: () => Effect.void,
+    which: () => Effect.succeed(Option.none<string>()),
+  }),
+)
+
+export const catalogLayer = Layer.succeed(
+  Catalog.Service,
+  Catalog.Service.of({
+    transform: () => Effect.die("unexpected catalog.transform"),
+    provider: {
+      get: () => Effect.die("unexpected provider.get"),
+      all: () => Effect.succeed([]),
+      available: () => Effect.succeed([]),
+    },
+    model: {
+      get: () => Effect.die("unexpected model.get"),
+      all: () => Effect.succeed([]),
+      available: () => Effect.succeed([]),
+      default: () => Effect.succeed(Option.none<ModelV2.Info>()),
+      small: () => Effect.succeed(Option.none<ModelV2.Info>()),
+    },
+  }),
+)
+
+const connectors = Connector.locationLayer.pipe(
+  Layer.provide(EventV2.defaultLayer),
+  Layer.provide(Layer.mock(Credential.Service)({ create: () => Effect.die("unexpected credential creation") })),
+)
+
+export const it = testEffect(
+  Catalog.locationLayer.pipe(
+    Layer.provideMerge(connectors),
+    Layer.provideMerge(Layer.mock(Credential.Service)({ activeAll: () => Effect.succeed(new Map()) })),
+    Layer.provideMerge(EventV2.defaultLayer),
+    Layer.provideMerge(locationLayer),
+    Layer.provideMerge(npmLayer),
+  ),
+)
+
+type ProviderInput = Partial<Omit<ProviderV2.Info, "api" | "request">> & {
+  api?: ProviderV2.Api
+  request?: ProviderV2.Request
+}
+
+type ModelInput = Partial<Omit<ModelV2.Info, "api" | "request">> & {
+  api?: (ProviderV2.Api & { id?: ModelV2.ID }) | { id: ModelV2.ID }
+  request?: ModelV2.Info["request"]
+}
+
+export function provider(providerID: string, options?: ProviderInput) {
+  return new ProviderV2.Info({
+    ...ProviderV2.Info.empty(ProviderV2.ID.make(providerID)),
+    api: options?.api ?? {
+      type: "aisdk",
+      package: "test-provider",
+    },
+    ...options,
+    request: {
+      headers: {},
+      body: {},
+      ...options?.request,
+    },
+  })
+}
+
+export function model(providerID: string, modelID: string, options?: ModelInput) {
+  return new ModelV2.Info({
+    ...ModelV2.Info.empty(ProviderV2.ID.make(providerID), ModelV2.ID.make(modelID)),
+    ...options,
+    api:
+      options?.api && "type" in options.api
+        ? { id: ModelV2.ID.make(modelID), ...options.api }
+        : {
+            id: ModelV2.ID.make(modelID),
+            ...options?.api,
+            type: "aisdk",
+            package: "test-provider",
+          },
+    request: {
+      headers: {},
+      body: {},
+      ...options?.request,
+    },
+  })
+}
+
+export function withEnv<A, E, R>(vars: Record<string, string | undefined>, fx: () => Effect.Effect<A, E, R>) {
+  return Effect.acquireUseRelease(
+    Effect.sync(() => {
+      const previous = Object.fromEntries(Object.keys(vars).map((key) => [key, process.env[key]]))
+      for (const [key, value] of Object.entries(vars)) {
+        if (value === undefined) delete process.env[key]
+        else process.env[key] = value
+      }
+      return previous
+    }),
+    () => fx(),
+    (previous) =>
+      Effect.sync(() => {
+        for (const [key, value] of Object.entries(previous)) {
+          if (value === undefined) delete process.env[key]
+          else process.env[key] = value
+        }
+      }),
+  )
+}
+
+export function fakeSelectorSdk(calls: string[]) {
+  const make = (method: string) => (id: string) => {
+    calls.push(`${method}:${id}`)
+    return { modelId: id, provider: method, specificationVersion: "v3" } as unknown as LanguageModelV3
+  }
+  return {
+    responses: make("responses"),
+    messages: make("messages"),
+    chat: make("chat"),
+    languageModel: make("languageModel"),
+  }
+}
+
+export function expectPluginRegistered(ids: string[], id: string) {
+  expect(ids).toContain(PluginV2.ID.make(id))
+}

packages/core/test/plugin/provider-kilo.test.ts

@@ -0,0 +1,100 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
+import { KiloPlugin } from "@opencode-ai/core/plugin/provider/kilo"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { expectPluginRegistered, it, provider } from "./provider-helper"
+
+describe("KiloPlugin", () => {
+  it.effect("is registered so legacy referer headers can be applied", () =>
+    Effect.sync(() =>
+      expectPluginRegistered(
+        ProviderPlugins.map((item) => item.id),
+        "kilo",
+      ),
+    ),
+  )
+
+  it.effect("applies legacy referer headers only to kilo", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(KiloPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const kilo = provider("kilo", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://api.kilo.ai/api/gateway" },
+          request: { headers: { Existing: "value" }, body: {} },
+        })
+        catalog.provider.update(kilo.id, (draft) => {
+          draft.api = kilo.api
+          draft.request = kilo.request
+        })
+        catalog.provider.update(provider("openrouter").id, () => {})
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo"))).request.headers).toEqual({
+        Existing: "value",
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.openrouter)).request.headers).toEqual({})
+    }),
+  )
+
+  it.effect("uses the exact legacy Kilo header casing and set", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(KiloPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("kilo", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://api.kilo.ai/api/gateway" },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+        })
+      })
+
+      const result = yield* catalog.provider.get(ProviderV2.ID.make("kilo"))
+      expect(result.request.headers).toEqual({
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+      })
+      expect(result.request.headers).not.toHaveProperty("http-referer")
+      expect(result.request.headers).not.toHaveProperty("x-title")
+      expect(result.request.headers).not.toHaveProperty("X-Source")
+    }),
+  )
+
+  it.effect("uses the legacy provider-id guard instead of endpoint package matching", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(KiloPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const kilo = provider("kilo", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://api.kilo.ai/api/gateway" },
+        })
+        catalog.provider.update(kilo.id, (draft) => {
+          draft.api = kilo.api
+        })
+        const custom = provider("custom-kilo", {
+          api: { type: "aisdk", package: "kilo" },
+        })
+        catalog.provider.update(custom.id, (draft) => {
+          draft.api = custom.api
+        })
+      })
+
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("kilo"))).request.headers).toEqual({
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("custom-kilo"))).request.headers).toEqual({})
+    }),
+  )
+})

packages/core/test/plugin/provider-llmgateway.test.ts

@@ -0,0 +1,73 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
+import { LLMGatewayPlugin } from "@opencode-ai/core/plugin/provider/llmgateway"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { expectPluginRegistered, it, provider } from "./provider-helper"
+
+describe("LLMGatewayPlugin", () => {
+  it.effect("is registered so legacy referer headers can be applied", () =>
+    Effect.sync(() =>
+      expectPluginRegistered(
+        ProviderPlugins.map((item) => item.id),
+        "llmgateway",
+      ),
+    ),
+  )
+
+  it.effect("applies legacy referer headers only to enabled llmgateway", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(LLMGatewayPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const llmgateway = provider("llmgateway", {
+          enabled: { via: "env", name: "LLMGATEWAY_API_KEY" },
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://api.llmgateway.io/v1" },
+          request: { headers: { Existing: "value" }, body: {} },
+        })
+        catalog.provider.update(llmgateway.id, (draft) => {
+          draft.enabled = llmgateway.enabled
+          draft.api = llmgateway.api
+          draft.request = llmgateway.request
+        })
+        const openrouter = provider("openrouter", {
+          enabled: { via: "env", name: "OPENROUTER_API_KEY" },
+        })
+        catalog.provider.update(openrouter.id, (draft) => {
+          draft.enabled = openrouter.enabled
+        })
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway"))).request.headers).toEqual({
+        Existing: "value",
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+        "X-Source": "opencode",
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.openrouter)).request.headers).toEqual({})
+    }),
+  )
+
+  it.effect("does not apply legacy headers to a disabled llmgateway provider", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(LLMGatewayPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("llmgateway", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://api.llmgateway.io/v1" },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+        })
+      })
+
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway"))).enabled).toBe(false)
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("llmgateway"))).request.headers).toEqual({})
+    }),
+  )
+})

packages/core/test/plugin/provider-mistral.test.ts

@@ -0,0 +1,106 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { MistralPlugin } from "@opencode-ai/core/plugin/provider/mistral"
+import { fakeSelectorSdk, it, model } from "./provider-helper"
+
+describe("MistralPlugin", () => {
+  it.effect("creates a Mistral SDK for @ai-sdk/mistral", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(MistralPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("mistral", "mistral-large"), package: "@ai-sdk/mistral", options: { name: "mistral" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("ignores non-Mistral SDK packages", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(MistralPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("mistral", "mistral-large"),
+          package: "@ai-sdk/openai-compatible",
+          options: { name: "mistral" },
+        },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("matches the old bundled Mistral SDK provider name for the bundled provider ID", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const providers: string[] = []
+      yield* plugin.add(MistralPlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("mistral-sdk-inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              providers.push(evt.sdk.languageModel("mistral-large").provider)
+            }),
+        }),
+      })
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("mistral", "mistral-large"), package: "@ai-sdk/mistral", options: { name: "mistral" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+      expect(providers).toEqual(["mistral.chat"])
+    }),
+  )
+
+  it.effect("matches the old bundled Mistral SDK provider name for custom provider IDs", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const providers: string[] = []
+      yield* plugin.add(MistralPlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("mistral-sdk-inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              providers.push(evt.sdk.languageModel("mistral-large").provider)
+            }),
+        }),
+      })
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-mistral", "mistral-large"),
+          package: "@ai-sdk/mistral",
+          options: { name: "custom-mistral" },
+        },
+        {},
+      )
+      expect(providers).toEqual(["mistral.chat"])
+    }),
+  )
+
+  it.effect("leaves Mistral language selection on the default sdk.languageModel(api.id) path", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      const sdk = fakeSelectorSdk(calls)
+      yield* plugin.add(MistralPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("mistral", "alias", { api: { id: ModelV2.ID.make("mistral-large") } }), sdk, options: {} },
+        {},
+      )
+      const language = result.language ?? sdk.languageModel(result.model.api.id)
+      expect(calls).toEqual(["languageModel:mistral-large"])
+      expect(language).toBeDefined()
+    }),
+  )
+})

packages/core/test/plugin/provider-nvidia.test.ts

@@ -0,0 +1,99 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
+import { NvidiaPlugin } from "@opencode-ai/core/plugin/provider/nvidia"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { expectPluginRegistered, it, provider } from "./provider-helper"
+
+describe("NvidiaPlugin", () => {
+  it.effect("is registered so legacy referer headers can be applied", () =>
+    Effect.sync(() =>
+      expectPluginRegistered(
+        ProviderPlugins.map((item) => item.id),
+        "nvidia",
+      ),
+    ),
+  )
+
+  it.effect("applies NVIDIA tracking headers only to nvidia", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(NvidiaPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const nvidia = provider("nvidia", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://integrate.api.nvidia.com/v1" },
+          request: { headers: { Existing: "value" }, body: {} },
+        })
+        catalog.provider.update(nvidia.id, (draft) => {
+          draft.api = nvidia.api
+          draft.request = nvidia.request
+        })
+        catalog.provider.update(provider("openrouter").id, () => {})
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia"))).request.headers).toEqual({
+        Existing: "value",
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+        "X-BILLING-INVOKE-ORIGIN": "OpenCode",
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.openrouter)).request.headers).toEqual({})
+    }),
+  )
+
+  it.effect("adds billing origin for custom NVIDIA endpoints", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(NvidiaPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("nvidia", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://integrate.api.nvidia.com/v1" },
+          request: { headers: {}, body: {} },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+          draft.request = item.request
+        })
+      })
+
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia"))).request.headers).toEqual({
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+        "X-BILLING-INVOKE-ORIGIN": "OpenCode",
+      })
+    }),
+  )
+
+  it.effect("preserves an explicit NVIDIA billing origin header", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(NvidiaPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("nvidia", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://integrate.api.nvidia.com/v1" },
+          request: {
+            headers: { "X-BILLING-INVOKE-ORIGIN": "CustomOrigin" },
+            body: { baseURL: "https://integrate.api.nvidia.com/v1" },
+          },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+          draft.request = item.request
+        })
+      })
+
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia"))).request.headers).toEqual({
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+        "X-BILLING-INVOKE-ORIGIN": "CustomOrigin",
+      })
+    }),
+  )
+})

packages/core/test/plugin/provider-openai-compatible.test.ts

@@ -0,0 +1,101 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { OpenAICompatiblePlugin } from "@opencode-ai/core/plugin/provider/openai-compatible"
+import { it, model } from "./provider-helper"
+
+describe("OpenAICompatiblePlugin", () => {
+  it.effect("preserves explicit includeUsage false and defaults it to true", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(OpenAICompatiblePlugin)
+      const defaulted = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("custom", "model"), package: "@ai-sdk/openai-compatible", options: { name: "custom" } },
+        {},
+      )
+      const disabled = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom", "model"),
+          package: "@ai-sdk/openai-compatible",
+          options: { name: "custom", includeUsage: false },
+        },
+        {},
+      )
+      expect(defaulted.options.includeUsage).toBe(true)
+      expect(disabled.options.includeUsage).toBe(false)
+    }),
+  )
+
+  it.effect("defaults includeUsage for OpenAI-compatible package matches", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(OpenAICompatiblePlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom", "model"),
+          package: "file:///tmp/@ai-sdk/openai-compatible-provider.js",
+          options: { name: "custom" },
+        },
+        {},
+      )
+      expect(result.options.includeUsage).toBe(true)
+    }),
+  )
+
+  it.effect("uses the provider ID as the OpenAI-compatible provider name", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const observed: string[] = []
+      yield* plugin.add(OpenAICompatiblePlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              observed.push(evt.sdk.languageModel("model").provider)
+            }),
+        }),
+      })
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-provider", "model"),
+          package: "@ai-sdk/openai-compatible",
+          options: { name: "custom-provider", baseURL: "https://example.com/v1" },
+        },
+        {},
+      )
+      expect(observed).toEqual(["custom-provider.chat"])
+    }),
+  )
+
+  it.effect("does not overwrite an SDK created by an earlier provider-specific plugin", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const sentinel = { languageModel: (modelID: string) => ({ modelID }) }
+      yield* plugin.add({
+        id: PluginV2.ID.make("sentinel"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              evt.sdk = sentinel
+            }),
+        }),
+      })
+      yield* plugin.add(OpenAICompatiblePlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("cloudflare-workers-ai", "model"),
+          package: "@ai-sdk/openai-compatible",
+          options: { name: "cloudflare-workers-ai" },
+        },
+        {},
+      )
+      expect(result.sdk).toBe(sentinel)
+    }),
+  )
+})

packages/core/test/plugin/provider-openai.test.ts

@@ -0,0 +1,139 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { Connector } from "@opencode-ai/core/connector"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { OpenAIPlugin } from "@opencode-ai/core/plugin/provider/openai"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { fakeSelectorSdk, it, model, provider } from "./provider-helper"
+
+function add(plugin: PluginV2.Interface, connectors: Connector.Interface) {
+  return plugin.add({
+    ...OpenAIPlugin,
+    effect: OpenAIPlugin.effect.pipe(Effect.provideService(Connector.Service, connectors)),
+  })
+}
+
+describe("OpenAIPlugin", () => {
+  it.effect("registers browser and headless ChatGPT OAuth methods", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* add(plugin, yield* Connector.Service)
+      expect((yield* (yield* Connector.Service).get(Connector.ID.make("openai")))?.methods).toEqual([
+        new Connector.OAuthMethod({
+          id: Connector.MethodID.make("chatgpt-browser"),
+          type: "oauth",
+          label: "ChatGPT Pro/Plus (browser)",
+        }),
+        new Connector.OAuthMethod({
+          id: Connector.MethodID.make("chatgpt-headless"),
+          type: "oauth",
+          label: "ChatGPT Pro/Plus (headless)",
+        }),
+      ])
+    }),
+  )
+
+  it.effect("creates an OpenAI SDK for @ai-sdk/openai using the provider ID as SDK name", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* add(plugin, yield* Connector.Service)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-openai", "gpt-5"),
+          package: "@ai-sdk/openai",
+          options: { name: "custom-openai", apiKey: "test" },
+        },
+        {},
+      )
+      expect(result.sdk?.responses("gpt-5").provider).toBe("custom-openai.responses")
+    }),
+  )
+
+  it.effect("ignores non-OpenAI SDK packages", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* add(plugin, yield* Connector.Service)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("openai", "gpt-5"), package: "@ai-sdk/openai-compatible", options: { name: "openai" } },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("uses the Responses API for language models", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* add(plugin, yield* Connector.Service)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("openai", "alias", {
+            api: { id: ModelV2.ID.make("gpt-5"), type: "aisdk", package: "test-provider" },
+          }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual(["responses:gpt-5"])
+      expect(result.language).toBeDefined()
+    }),
+  )
+
+  it.effect("ignores non-OpenAI providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* add(plugin, yield* Connector.Service)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("anthropic", "gpt-5"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      expect(calls).toEqual([])
+      expect(result.language).toBeUndefined()
+    }),
+  )
+
+  it.effect("disables gpt-5-chat-latest during catalog transforms", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* add(plugin, yield* Connector.Service)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("openai", { api: { type: "aisdk", package: "@ai-sdk/openai" } })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+        })
+        catalog.model.update(item.id, ModelV2.ID.make("gpt-5"), () => {})
+        catalog.model.update(item.id, ModelV2.ID.make("gpt-5-chat-latest"), () => {})
+      })
+      expect((yield* catalog.model.get(ProviderV2.ID.openai, ModelV2.ID.make("gpt-5"))).enabled).toBe(true)
+      expect((yield* catalog.model.get(ProviderV2.ID.openai, ModelV2.ID.make("gpt-5-chat-latest"))).enabled).toBe(false)
+    }),
+  )
+
+  it.effect("does not disable gpt-5-chat-latest for non-OpenAI providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* add(plugin, yield* Connector.Service)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("custom-openai")
+        catalog.provider.update(item.id, () => {})
+        catalog.model.update(item.id, ModelV2.ID.make("gpt-5-chat-latest"), () => {})
+      })
+      expect(
+        (yield* catalog.model.get(ProviderV2.ID.make("custom-openai"), ModelV2.ID.make("gpt-5-chat-latest"))).enabled,
+      ).toBe(true)
+    }),
+  )
+})

packages/core/test/plugin/provider-opencode.test.ts

@@ -0,0 +1,232 @@
+import { describe, expect } from "bun:test"
+import { DateTime, Effect, Layer, Option } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { Credential } from "@opencode-ai/core/credential"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { OpencodePlugin } from "@opencode-ai/core/plugin/provider/opencode"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { it, model, provider, withEnv } from "./provider-helper"
+
+const cost = (input: number, output = 0) => [{ input, output, cache: { read: 0, write: 0 } }]
+const locationLayer = Layer.succeed(
+  Location.Service,
+  Location.Service.of(location({ directory: AbsolutePath.make("test") })),
+)
+
+describe("OpencodePlugin", () => {
+  it.effect("uses a public key and disables paid models without credentials", () =>
+    withEnv({ OPENCODE_API_KEY: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(OpencodePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const item = provider("opencode")
+          catalog.provider.update(item.id, () => {})
+          const paid = model("opencode", "paid", { cost: cost(1) })
+          catalog.model.update(item.id, paid.id, (draft) => {
+            draft.cost = [...paid.cost]
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBe("public")
+        expect((yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(false)
+      }),
+    ),
+  )
+
+  it.effect("keeps free models without credentials", () =>
+    withEnv({ OPENCODE_API_KEY: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(OpencodePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const item = provider("opencode")
+          catalog.provider.update(item.id, () => {})
+          const free = model("opencode", "free", { cost: cost(0) })
+          catalog.model.update(item.id, free.id, (draft) => {
+            draft.cost = [...free.cost]
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBe("public")
+        expect((yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("free"))).enabled).toBe(true)
+      }),
+    ),
+  )
+
+  it.effect("treats output-only cost as free without credentials", () =>
+    withEnv({ OPENCODE_API_KEY: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(OpencodePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const item = provider("opencode")
+          catalog.provider.update(item.id, () => {})
+          const outputOnly = model("opencode", "output-only", { cost: cost(0, 1) })
+          catalog.model.update(item.id, outputOnly.id, (draft) => {
+            draft.cost = [...outputOnly.cost]
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBe("public")
+        expect((yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("output-only"))).enabled).toBe(true)
+      }),
+    ),
+  )
+
+  it.effect("uses OPENCODE_API_KEY as credentials", () =>
+    withEnv({ OPENCODE_API_KEY: "secret" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(OpencodePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const item = provider("opencode")
+          catalog.provider.update(item.id, () => {})
+          const paid = model("opencode", "paid", { cost: cost(1) })
+          catalog.model.update(item.id, paid.id, (draft) => {
+            draft.cost = [...paid.cost]
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBeUndefined()
+        expect((yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(true)
+      }),
+    ),
+  )
+
+  it.effect("uses configured provider env vars as credentials", () =>
+    withEnv({ OPENCODE_API_KEY: undefined, CUSTOM_OPENCODE_API_KEY: "secret" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(OpencodePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const item = provider("opencode", { env: ["CUSTOM_OPENCODE_API_KEY"] })
+          catalog.provider.update(item.id, (draft) => {
+            draft.env = [...item.env]
+          })
+          const paid = model("opencode", "paid", { cost: cost(1) })
+          catalog.model.update(item.id, paid.id, (draft) => {
+            draft.cost = [...paid.cost]
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBeUndefined()
+        expect((yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(true)
+      }),
+    ),
+  )
+
+  it.effect("uses configured apiKey as credentials", () =>
+    withEnv({ OPENCODE_API_KEY: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(OpencodePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const item = provider("opencode", {
+            request: {
+              headers: {},
+              body: { apiKey: "configured" },
+            },
+          })
+          catalog.provider.update(item.id, (draft) => {
+            draft.request = item.request
+          })
+          const paid = model("opencode", "paid", { cost: cost(1) })
+          catalog.model.update(item.id, paid.id, (draft) => {
+            draft.cost = [...paid.cost]
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBe("configured")
+        expect((yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(true)
+      }),
+    ),
+  )
+
+  it.effect("uses auth-enabled providers as credentials", () =>
+    withEnv({ OPENCODE_API_KEY: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(OpencodePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const item = provider("opencode", {
+            enabled: { via: "credential", credentialID: Credential.ID.make("credential") },
+          })
+          catalog.provider.update(item.id, (draft) => {
+            draft.enabled = item.enabled
+          })
+          const paid = model("opencode", "paid", { cost: cost(1) })
+          catalog.model.update(item.id, paid.id, (draft) => {
+            draft.cost = [...paid.cost]
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.opencode)).request.body.apiKey).toBeUndefined()
+        expect((yield* catalog.model.get(ProviderV2.ID.opencode, ModelV2.ID.make("paid"))).enabled).toBe(true)
+      }),
+    ),
+  )
+
+  it.effect("ignores non-opencode providers and models", () =>
+    withEnv({ OPENCODE_API_KEY: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const catalog = yield* Catalog.Service
+        yield* plugin.add(OpencodePlugin)
+        const transform = yield* catalog.transform()
+        yield* transform((catalog) => {
+          const item = provider("openai")
+          catalog.provider.update(item.id, () => {})
+          const paid = model("openai", "paid", { cost: cost(1) })
+          catalog.model.update(item.id, paid.id, (draft) => {
+            draft.cost = [...paid.cost]
+          })
+        })
+        expect((yield* catalog.provider.get(ProviderV2.ID.openai)).request.body.apiKey).toBeUndefined()
+        expect((yield* catalog.model.get(ProviderV2.ID.openai, ModelV2.ID.make("paid"))).enabled).toBe(true)
+      }),
+    ),
+  )
+
+  it.effect("prefers gpt-5-nano as the opencode small model", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.opencode
+
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        catalog.provider.update(providerID, () => {})
+        catalog.model.update(providerID, ModelV2.ID.make("cheap-mini"), (model) => {
+          model.capabilities.input = ["text"]
+          model.capabilities.output = ["text"]
+          model.cost = [...cost(1, 1)]
+          model.time.released = DateTime.makeUnsafe(Date.now())
+        })
+        catalog.model.update(providerID, ModelV2.ID.make("gpt-5-nano"), (model) => {
+          model.capabilities.input = ["text"]
+          model.capabilities.output = ["text"]
+          model.cost = [...cost(10, 10)]
+          model.time.released = DateTime.makeUnsafe(Date.now())
+        })
+      })
+
+      const selected = yield* catalog.model.small(providerID)
+
+      expect(Option.getOrUndefined(selected)?.id).toBe(ModelV2.ID.make("gpt-5-nano"))
+    }).pipe(
+      Effect.provide(Catalog.locationLayer.pipe(Layer.provide(EventV2.defaultLayer), Layer.provide(locationLayer))),
+    ),
+  )
+})

packages/core/test/plugin/provider-openrouter.test.ts

@@ -0,0 +1,122 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
+import { OpenRouterPlugin } from "@opencode-ai/core/plugin/provider/openrouter"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { expectPluginRegistered, it, model, provider } from "./provider-helper"
+
+describe("OpenRouterPlugin", () => {
+  it.effect("is registered so legacy OpenRouter behavior can be applied", () =>
+    Effect.sync(() =>
+      expectPluginRegistered(
+        ProviderPlugins.map((item) => item.id),
+        "openrouter",
+      ),
+    ),
+  )
+
+  it.effect("applies legacy referer headers only to openrouter", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(OpenRouterPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const openrouter = provider("openrouter", {
+          api: { type: "aisdk", package: "@openrouter/ai-sdk-provider" },
+          request: { headers: { Existing: "value" }, body: {} },
+        })
+        catalog.provider.update(openrouter.id, (item) => {
+          item.api = openrouter.api
+          item.request = openrouter.request
+        })
+        catalog.provider.update(ProviderV2.ID.make("nvidia"), () => {})
+      })
+
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("openrouter"))).request.headers).toEqual({
+        Existing: "value",
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("nvidia"))).request.headers).toEqual({})
+    }),
+  )
+
+  it.effect("creates an SDK only for the OpenRouter package", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(OpenRouterPlugin)
+
+      const ignored = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("openrouter", "openai/gpt-5"),
+          package: "@ai-sdk/openai-compatible",
+          options: { name: "openrouter" },
+        },
+        {},
+      )
+      expect(ignored.sdk).toBeUndefined()
+
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("custom", "openai/gpt-5"), package: "@openrouter/ai-sdk-provider", options: { name: "custom" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("filters OpenRouter's gpt-5 chat alias", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(OpenRouterPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const openrouter = provider("openrouter", {
+          api: { type: "aisdk", package: "@openrouter/ai-sdk-provider" },
+        })
+        catalog.provider.update(openrouter.id, (item) => {
+          item.api = openrouter.api
+        })
+        catalog.provider.update(ProviderV2.ID.openai, () => {})
+        for (const item of [
+          model("openrouter", "openai/gpt-5-chat"),
+          model("openrouter", "openai/gpt-5"),
+          model("openai", "openai/gpt-5-chat"),
+        ]) {
+          catalog.model.update(item.providerID, item.id, () => {})
+        }
+      })
+
+      expect(
+        (yield* catalog.model.get(ProviderV2.ID.make("openrouter"), ModelV2.ID.make("openai/gpt-5-chat"))).enabled,
+      ).toBe(false)
+      expect(
+        (yield* catalog.model.get(ProviderV2.ID.make("openrouter"), ModelV2.ID.make("openai/gpt-5"))).enabled,
+      ).toBe(true)
+      expect((yield* catalog.model.get(ProviderV2.ID.openai, ModelV2.ID.make("openai/gpt-5-chat"))).enabled).toBe(true)
+    }),
+  )
+
+  it.effect("does not disable gpt-5-chat-latest for non-OpenRouter providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(OpenRouterPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        catalog.provider.update(ProviderV2.ID.make("custom-openrouter"), () => {})
+        catalog.model.update(ProviderV2.ID.make("custom-openrouter"), ModelV2.ID.make("gpt-5-chat-latest"), () => {})
+      })
+      expect(
+        (yield* catalog.model.get(ProviderV2.ID.make("custom-openrouter"), ModelV2.ID.make("gpt-5-chat-latest")))
+          .enabled,
+      ).toBe(true)
+    }),
+  )
+})

packages/core/test/plugin/provider-perplexity.test.ts

@@ -0,0 +1,107 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { PerplexityPlugin } from "@opencode-ai/core/plugin/provider/perplexity"
+import { fakeSelectorSdk, it, model } from "./provider-helper"
+
+describe("PerplexityPlugin", () => {
+  it.effect("creates a Perplexity SDK for the exact @ai-sdk/perplexity package", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(PerplexityPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("perplexity", "sonar"), package: "@ai-sdk/perplexity", options: { name: "perplexity" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("ignores packages that are not the bundled Perplexity package", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(PerplexityPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("perplexity", "sonar"),
+          package: "@ai-sdk/perplexity-compatible",
+          options: { name: "perplexity" },
+        },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("uses the Perplexity provider ID as the SDK name for the bundled provider", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const providers: string[] = []
+      yield* plugin.add(PerplexityPlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("perplexity-sdk-inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              providers.push(evt.sdk.languageModel("sonar").provider)
+            }),
+        }),
+      })
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("perplexity", "sonar"), package: "@ai-sdk/perplexity", options: { name: "perplexity" } },
+        {},
+      )
+      expect(providers).toEqual(["perplexity"])
+    }),
+  )
+
+  it.effect("creates bundled Perplexity SDKs for custom provider IDs", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const providers: string[] = []
+      yield* plugin.add(PerplexityPlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("custom-perplexity-sdk-inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              providers.push(evt.sdk.languageModel("sonar").provider)
+            }),
+        }),
+      })
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-perplexity", "sonar"),
+          package: "@ai-sdk/perplexity",
+          options: { name: "custom-perplexity" },
+        },
+        {},
+      )
+      expect(providers).toEqual(["perplexity"])
+    }),
+  )
+
+  it.effect("leaves Perplexity language selection to the default languageModel fallback", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(PerplexityPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("perplexity", "alias", { api: { id: ModelV2.ID.make("sonar") } }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+      expect(calls).toEqual([])
+      expect(result.language).toBeUndefined()
+    }),
+  )
+})

packages/core/test/plugin/provider-sap-ai-core.test.ts

@@ -0,0 +1,127 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { SapAICorePlugin } from "@opencode-ai/core/plugin/provider/sap-ai-core"
+import { fixtureProvider, it, model, npmLayer, withEnv } from "./provider-helper"
+
+const pluginWithNpm = { id: SapAICorePlugin.id, effect: SapAICorePlugin.effect.pipe(Effect.provide(npmLayer)) }
+
+describe("SapAICorePlugin", () => {
+  it.effect("copies serviceKey option into AICORE_SERVICE_KEY but keeps SDK options to deployment metadata", () =>
+    withEnv(
+      { AICORE_SERVICE_KEY: undefined, AICORE_DEPLOYMENT_ID: "deployment", AICORE_RESOURCE_GROUP: "resource-group" },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(pluginWithNpm)
+          const sdk = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("sap-ai-core", "sap-model"),
+              package: fixtureProvider,
+              options: { name: "sap-ai-core", serviceKey: "service-key" },
+            },
+            {},
+          )
+          expect(process.env.AICORE_SERVICE_KEY).toBe("service-key")
+          expect(sdk.sdk.options).toEqual({ deploymentId: "deployment", resourceGroup: "resource-group" })
+        }),
+    ),
+  )
+
+  it.effect("preserves existing AICORE_SERVICE_KEY over serviceKey option", () =>
+    withEnv(
+      {
+        AICORE_SERVICE_KEY: "env-service-key",
+        AICORE_DEPLOYMENT_ID: "deployment",
+        AICORE_RESOURCE_GROUP: "resource-group",
+      },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(pluginWithNpm)
+          const sdk = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("sap-ai-core", "sap-model"),
+              package: fixtureProvider,
+              options: { name: "sap-ai-core", serviceKey: "option-service-key" },
+            },
+            {},
+          )
+          expect(process.env.AICORE_SERVICE_KEY).toBe("env-service-key")
+          expect(sdk.sdk.options).toEqual({ deploymentId: "deployment", resourceGroup: "resource-group" })
+        }),
+    ),
+  )
+
+  it.effect("omits deployment and resourceGroup SDK options when no service key is available", () =>
+    withEnv(
+      { AICORE_SERVICE_KEY: undefined, AICORE_DEPLOYMENT_ID: "deployment", AICORE_RESOURCE_GROUP: "resource-group" },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(pluginWithNpm)
+          const sdk = yield* plugin.trigger(
+            "aisdk.sdk",
+            { model: model("sap-ai-core", "sap-model"), package: fixtureProvider, options: { name: "sap-ai-core" } },
+            {},
+          )
+          expect(process.env.AICORE_SERVICE_KEY).toBeUndefined()
+          expect(sdk.sdk.options).toEqual({})
+        }),
+    ),
+  )
+
+  it.effect("uses the callable SDK for language selection", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(pluginWithNpm)
+      const sdk = Object.assign((modelID: string) => ({ modelID, provider: "callable" }), {
+        languageModel() {
+          throw new Error("SAP AI Core should call the SDK directly")
+        },
+      })
+      const language = yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("sap-ai-core", "sap-model"), sdk, options: {} },
+        {},
+      )
+      expect(language.language as unknown).toEqual({ modelID: "sap-model", provider: "callable" })
+    }),
+  )
+
+  it.effect("ignores non-SAP AI Core providers", () =>
+    withEnv(
+      { AICORE_SERVICE_KEY: undefined, AICORE_DEPLOYMENT_ID: "deployment", AICORE_RESOURCE_GROUP: "resource-group" },
+      () =>
+        Effect.gen(function* () {
+          const plugin = yield* PluginV2.Service
+          yield* plugin.add(pluginWithNpm)
+          const sdk = yield* plugin.trigger(
+            "aisdk.sdk",
+            {
+              model: model("openai", "sap-model"),
+              package: fixtureProvider,
+              options: { name: "openai", serviceKey: "service-key" },
+            },
+            {},
+          )
+          const language = yield* plugin.trigger(
+            "aisdk.language",
+            {
+              model: model("openai", "sap-model"),
+              sdk: () => {
+                throw new Error("SAP AI Core should ignore other providers")
+              },
+              options: {},
+            },
+            {},
+          )
+          expect(process.env.AICORE_SERVICE_KEY).toBeUndefined()
+          expect(sdk.sdk).toBeUndefined()
+          expect(language.language).toBeUndefined()
+        }),
+    ),
+  )
+})

packages/core/test/plugin/provider-snowflake-cortex.test.ts

@@ -0,0 +1,193 @@
+import { describe, expect, it as bun_it } from "bun:test"
+import { Effect } from "effect"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { SnowflakeCortexPlugin, cortexFetch } from "@opencode-ai/core/plugin/provider/snowflake-cortex"
+import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
+import { expectPluginRegistered, it, model, withEnv } from "./provider-helper"
+
+describe("SnowflakeCortexPlugin", () => {
+  it.effect("is registered in ProviderPlugins before OpenAICompatiblePlugin", () =>
+    Effect.sync(() => {
+      expectPluginRegistered(
+        ProviderPlugins.map((item) => item.id),
+        "snowflake-cortex",
+      )
+      const ids = ProviderPlugins.map((p) => p.id as string)
+      expect(ids.indexOf("snowflake-cortex")).toBeLessThan(ids.indexOf("openai-compatible"))
+    }),
+  )
+
+  it.effect("ignores non-snowflake-cortex providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(SnowflakeCortexPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("openai", "gpt-4"), package: "@ai-sdk/openai", options: { name: "openai" } },
+        {},
+      )
+      expect(result.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("creates SDK for snowflake-cortex using SNOWFLAKE_CORTEX_PAT env var", () =>
+    withEnv({ SNOWFLAKE_CORTEX_PAT: "test-pat" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(SnowflakeCortexPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("snowflake-cortex", "claude-sonnet-4-6"),
+            package: "@ai-sdk/openai-compatible",
+            options: { name: "snowflake-cortex", baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1" },
+          },
+          {},
+        )
+        expect(result.sdk).toBeDefined()
+      }),
+    ),
+  )
+
+  it.effect("falls back to options.apiKey when SNOWFLAKE_CORTEX_PAT env var is absent", () =>
+    withEnv({ SNOWFLAKE_CORTEX_PAT: undefined }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        yield* plugin.add(SnowflakeCortexPlugin)
+        const result = yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("snowflake-cortex", "claude-sonnet-4-6"),
+            package: "@ai-sdk/openai-compatible",
+            options: {
+              name: "snowflake-cortex",
+              baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1",
+              apiKey: "options-pat",
+            },
+          },
+          {},
+        )
+        expect(result.sdk).toBeDefined()
+      }),
+    ),
+  )
+
+  it.effect("sets includeUsage on the SDK options", () =>
+    withEnv({ SNOWFLAKE_CORTEX_PAT: "test-pat" }, () =>
+      Effect.gen(function* () {
+        const plugin = yield* PluginV2.Service
+        const captured: Record<string, unknown>[] = []
+        yield* plugin.add(SnowflakeCortexPlugin)
+        yield* plugin.add({
+          id: PluginV2.ID.make("inspector"),
+          effect: Effect.succeed({
+            "aisdk.sdk": (evt) =>
+              Effect.sync(() => {
+                captured.push({ ...evt.options })
+              }),
+          }),
+        })
+        yield* plugin.trigger(
+          "aisdk.sdk",
+          {
+            model: model("snowflake-cortex", "claude-sonnet-4-6"),
+            package: "@ai-sdk/openai-compatible",
+            options: { name: "snowflake-cortex", baseURL: "https://test.snowflakecomputing.com/api/v2/cortex/v1" },
+          },
+          {},
+        )
+        expect(captured[0]?.includeUsage).toBe(true)
+      }),
+    ),
+  )
+})
+
+type FetchLike = (url: string | URL | Request, init?: RequestInit) => Promise<Response>
+
+describe("cortexFetch", () => {
+  bun_it("rewrites max_tokens to max_completion_tokens", async () => {
+    const captured: RequestInit[] = []
+    const upstream: FetchLike = async (_url, init) => {
+      captured.push(init ?? {})
+      return new Response("{}", { status: 200 })
+    }
+    await cortexFetch(upstream)("https://test", {
+      method: "POST",
+      body: JSON.stringify({ model: "claude-sonnet-4-6", max_tokens: 1024 }),
+    })
+    const body = JSON.parse(captured[0].body as string)
+    expect(body.max_completion_tokens).toBe(1024)
+    expect(body.max_tokens).toBeUndefined()
+  })
+
+  bun_it("preserves body when max_tokens is absent", async () => {
+    const captured: RequestInit[] = []
+    const upstream: FetchLike = async (_url, init) => {
+      captured.push(init ?? {})
+      return new Response("{}", { status: 200 })
+    }
+    const original = JSON.stringify({ model: "claude-sonnet-4-6", temperature: 0.7 })
+    await cortexFetch(upstream)("https://test", { method: "POST", body: original })
+    expect(captured[0].body).toBe(original)
+  })
+
+  bun_it("treats 400 'conversation complete' as a stop response", async () => {
+    const upstream: FetchLike = async () =>
+      new Response(JSON.stringify({ message: "Conversation complete" }), {
+        status: 400,
+        headers: { "content-type": "application/json" },
+      })
+    const response = await cortexFetch(upstream)("https://test", {})
+    expect(response.status).toBe(200)
+    const data = (await response.json()) as { choices: { finish_reason: string }[] }
+    expect(data.choices[0].finish_reason).toBe("stop")
+  })
+
+  bun_it("passes through other 400 errors unchanged", async () => {
+    const upstream: FetchLike = async () =>
+      new Response(JSON.stringify({ message: "Invalid model" }), {
+        status: 400,
+        headers: { "content-type": "application/json" },
+      })
+    const response = await cortexFetch(upstream)("https://test", {})
+    expect(response.status).toBe(400)
+  })
+
+  bun_it("passes through non-400 errors unchanged", async () => {
+    const upstream: FetchLike = async () => new Response("Unauthorized", { status: 401 })
+    const response = await cortexFetch(upstream)("https://test", {})
+    expect(response.status).toBe(401)
+  })
+
+  bun_it("handles invalid JSON body gracefully without throwing", async () => {
+    const captured: RequestInit[] = []
+    const upstream: FetchLike = async (_url, init) => {
+      captured.push(init ?? {})
+      return new Response("{}", { status: 200 })
+    }
+    const invalidBody = "{ not json }"
+    await cortexFetch(upstream)("https://test", { method: "POST", body: invalidBody })
+    expect(captured[0].body).toBe(invalidBody)
+  })
+
+  bun_it("rewrites role:'' to role:'assistant' in streaming SSE chunks", async () => {
+    const chunk = `data: {"choices":[{"delta":{"role":"","content":"Hi"},"index":0}]}\n\n`
+    const upstream: FetchLike = async () =>
+      new Response(
+        new ReadableStream({
+          start: (ctrl) => {
+            ctrl.enqueue(new TextEncoder().encode(chunk))
+            ctrl.close()
+          },
+        }),
+        {
+          status: 200,
+          headers: { "content-type": "text/event-stream" },
+        },
+      )
+    const response = await cortexFetch(upstream)("https://test", {})
+    const text = await response.text()
+    expect(text).toContain('"role":"assistant"')
+    expect(text).not.toContain('"role":""')
+  })
+})

packages/core/test/plugin/provider-togetherai.test.ts

@@ -0,0 +1,97 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { TogetherAIPlugin } from "@opencode-ai/core/plugin/provider/togetherai"
+import { fakeSelectorSdk, it, model } from "./provider-helper"
+
+describe("TogetherAIPlugin", () => {
+  it.effect("creates a TogetherAI SDK for @ai-sdk/togetherai", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(TogetherAIPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("togetherai", "model"), package: "@ai-sdk/togetherai", options: { name: "togetherai" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("matches the old bundled provider package exactly", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(TogetherAIPlugin)
+
+      const ignored = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("togetherai", "model"),
+          package: "file:///tmp/@ai-sdk/togetherai-provider.js",
+          options: { name: "togetherai" },
+        },
+        {},
+      )
+      expect(ignored.sdk).toBeUndefined()
+
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("togetherai", "model"), package: "@ai-sdk/togetherai", options: { name: "togetherai" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("creates bundled TogetherAI SDKs for custom provider IDs", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const observed: string[] = []
+      yield* plugin.add(TogetherAIPlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              observed.push(evt.sdk.languageModel("model").provider)
+            }),
+        }),
+      })
+
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-togetherai", "model"),
+          package: "@ai-sdk/togetherai",
+          options: { name: "custom-togetherai" },
+        },
+        {},
+      )
+
+      expect(observed).toEqual(["togetherai.chat"])
+    }),
+  )
+
+  it.effect("defaults language selection to sdk.languageModel with the model API ID", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(TogetherAIPlugin)
+
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: model("togetherai", "meta-llama/Llama-3.3-70B-Instruct-Turbo"),
+          sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
+          options: {},
+        },
+        {},
+      )
+
+      expect(result.language).toBeUndefined()
+      expect(calls).toEqual([])
+      expect(result.language ?? fakeSelectorSdk(calls).languageModel(result.model.api.id)).toBeDefined()
+      expect(calls).toEqual(["languageModel:meta-llama/Llama-3.3-70B-Instruct-Turbo"])
+    }),
+  )
+})

packages/core/test/plugin/provider-venice.test.ts

@@ -0,0 +1,86 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { VenicePlugin } from "@opencode-ai/core/plugin/provider/venice"
+import { fakeSelectorSdk, it, model } from "./provider-helper"
+
+describe("VenicePlugin", () => {
+  it.effect("creates a Venice SDK for venice-ai-sdk-provider", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(VenicePlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("venice", "model"), package: "venice-ai-sdk-provider", options: { name: "venice" } },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+    }),
+  )
+
+  it.effect("uses the model provider ID as the bundled Venice SDK name", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const observed: string[] = []
+      yield* plugin.add(VenicePlugin)
+      yield* plugin.add({
+        id: PluginV2.ID.make("inspector"),
+        effect: Effect.succeed({
+          "aisdk.sdk": (evt) =>
+            Effect.sync(() => {
+              observed.push(evt.sdk.languageModel("model").provider)
+            }),
+        }),
+      })
+      const result = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("custom-venice", "model"),
+          package: "venice-ai-sdk-provider",
+          options: { name: "custom-venice", apiKey: "test" },
+        },
+        {},
+      )
+      expect(result.sdk).toBeDefined()
+      expect(observed).toEqual(["custom-venice.chat"])
+    }),
+  )
+
+  it.effect("only handles the bundled venice-ai-sdk-provider package", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(VenicePlugin)
+      const similar = yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: model("venice", "model"),
+          package: "file:///tmp/venice-ai-sdk-provider.js",
+          options: { name: "venice" },
+        },
+        {},
+      )
+      const other = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("venice", "model"), package: "@ai-sdk/openai-compatible", options: { name: "venice" } },
+        {},
+      )
+      expect(similar.sdk).toBeUndefined()
+      expect(other.sdk).toBeUndefined()
+    }),
+  )
+
+  it.effect("leaves Venice language selection to the default languageModel fallback", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+      yield* plugin.add(VenicePlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        { model: model("venice", "alias"), sdk: fakeSelectorSdk(calls), options: {} },
+        {},
+      )
+      expect(calls).toEqual([])
+      expect(result.language).toBeUndefined()
+    }),
+  )
+})

packages/core/test/plugin/provider-vercel.test.ts

@@ -0,0 +1,77 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { VercelPlugin } from "@opencode-ai/core/plugin/provider/vercel"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { it, model, provider } from "./provider-helper"
+
+describe("VercelPlugin", () => {
+  it.effect("applies legacy lower-case referer headers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(VercelPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("vercel", {
+          api: { type: "aisdk", package: "@ai-sdk/vercel" },
+          request: { headers: { Existing: "1" }, body: {} },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+          draft.request = item.request
+        })
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel"))).request.headers).toEqual({
+        Existing: "1",
+        "http-referer": "https://opencode.ai/",
+        "x-title": "opencode",
+      })
+    }),
+  )
+
+  it.effect("does not add legacy upper-case referer headers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(VercelPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("vercel", { api: { type: "aisdk", package: "@ai-sdk/vercel" } })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+        })
+      })
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel"))).request.headers).not.toHaveProperty(
+        "HTTP-Referer",
+      )
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("vercel"))).request.headers).not.toHaveProperty("X-Title")
+    }),
+  )
+
+  it.effect("creates @ai-sdk/vercel SDKs for custom provider IDs", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(VercelPlugin)
+      const event = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model: model("custom-vercel", "v0-1.0-md"), package: "@ai-sdk/vercel", options: { name: "custom-vercel" } },
+        {},
+      )
+      expect(event.sdk).toBeDefined()
+      expect(event.sdk.languageModel("v0-1.0-md").provider).toBe("vercel.chat")
+    }),
+  )
+
+  it.effect("ignores non-Vercel providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(VercelPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => catalog.provider.update(provider("gateway").id, () => {}))
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("gateway"))).request.headers).toEqual({})
+    }),
+  )
+})

packages/core/test/plugin/provider-xai.test.ts

@@ -0,0 +1,116 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { EventV2 } from "@opencode-ai/core/event"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { XAIPlugin } from "@opencode-ai/core/plugin/provider/xai"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { testEffect } from "../lib/effect"
+import { fakeSelectorSdk } from "./provider-helper"
+
+const it = testEffect(PluginV2.locationLayer.pipe(Layer.provide(EventV2.defaultLayer)))
+
+const model = new ModelV2.Info({
+  ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")),
+  api: {
+    id: ModelV2.ID.make("grok-4"),
+    type: "aisdk",
+    package: "@ai-sdk/xai",
+  },
+})
+
+describe("XAIPlugin", () => {
+  it.effect("creates an xAI SDK only for @ai-sdk/xai", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      yield* plugin.add(XAIPlugin)
+
+      const ignored = yield* plugin.trigger(
+        "aisdk.sdk",
+        { model, package: "@ai-sdk/openai-compatible", options: {} },
+        {},
+      )
+
+      const result = yield* plugin.trigger("aisdk.sdk", { model, package: "@ai-sdk/xai", options: {} }, {})
+
+      expect(ignored.sdk).toBeUndefined()
+      expect(typeof result.sdk?.responses).toBe("function")
+    }),
+  )
+
+  it.effect("creates xAI SDKs for custom provider IDs", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const providers: string[] = []
+
+      yield* plugin.add(XAIPlugin)
+      yield* plugin.add(
+        PluginV2.define({
+          id: PluginV2.ID.make("xai-sdk-name-observer"),
+          effect: Effect.gen(function* () {
+            return {
+              "aisdk.sdk": Effect.fn(function* (evt) {
+                if (!evt.sdk) return
+                providers.push(evt.sdk.responses("grok-4").provider)
+              }),
+            }
+          }),
+        }),
+      )
+
+      yield* plugin.trigger(
+        "aisdk.sdk",
+        {
+          model: new ModelV2.Info({ ...model, providerID: ProviderV2.ID.make("custom-xai") }),
+          package: "@ai-sdk/xai",
+          options: {},
+        },
+        {},
+      )
+
+      expect(providers).toEqual(["xai.responses"])
+    }),
+  )
+
+  it.effect("uses responses with the model api.id for xAI language models", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+
+      yield* plugin.add(XAIPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: new ModelV2.Info({ ...model, id: ModelV2.ID.make("alias") }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+
+      expect(calls).toEqual(["responses:grok-4"])
+      expect(result.language).toBeDefined()
+    }),
+  )
+
+  it.effect("ignores non-xAI providers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const calls: string[] = []
+
+      yield* plugin.add(XAIPlugin)
+      const result = yield* plugin.trigger(
+        "aisdk.language",
+        {
+          model: new ModelV2.Info({ ...model, providerID: ProviderV2.ID.openai }),
+          sdk: fakeSelectorSdk(calls),
+          options: {},
+        },
+        {},
+      )
+
+      expect(calls).toEqual([])
+      expect(result.language).toBeUndefined()
+    }),
+  )
+})

packages/core/test/plugin/provider-zenmux.test.ts

@@ -0,0 +1,116 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { Catalog } from "@opencode-ai/core/catalog"
+import { PluginV2 } from "@opencode-ai/core/plugin"
+import { ProviderPlugins } from "@opencode-ai/core/plugin/provider"
+import { ZenmuxPlugin } from "@opencode-ai/core/plugin/provider/zenmux"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { expectPluginRegistered, it, provider } from "./provider-helper"
+
+describe("ZenmuxPlugin", () => {
+  it.effect("is registered so legacy referer headers can be applied", () =>
+    Effect.sync(() =>
+      expectPluginRegistered(
+        ProviderPlugins.map((item) => item.id),
+        "zenmux",
+      ),
+    ),
+  )
+
+  it.effect("applies the exact legacy Zenmux headers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(ZenmuxPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("zenmux", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://zenmux.ai/api/v1" },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+        })
+      })
+      const result = yield* catalog.provider.get(ProviderV2.ID.make("zenmux"))
+      expect(result.request.headers).toEqual({ "HTTP-Referer": "https://opencode.ai/", "X-Title": "opencode" })
+      expect(Object.keys(result.request.headers).sort()).toEqual(["HTTP-Referer", "X-Title"])
+    }),
+  )
+
+  it.effect("merges legacy Zenmux headers with existing headers", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(ZenmuxPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("zenmux", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://zenmux.ai/api/v1" },
+          request: { headers: { Existing: "value" }, body: {} },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+          draft.request = item.request
+        })
+      })
+
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("zenmux"))).request.headers).toEqual({
+        Existing: "value",
+        "HTTP-Referer": "https://opencode.ai/",
+        "X-Title": "opencode",
+      })
+    }),
+  )
+
+  it.effect("lets configured Zenmux legacy headers override defaults", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(ZenmuxPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("zenmux", {
+          api: { type: "aisdk", package: "@ai-sdk/openai-compatible", url: "https://zenmux.ai/api/v1" },
+          request: {
+            headers: { "HTTP-Referer": "https://example.com/", "X-Title": "custom-title" },
+            body: {},
+          },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.api = item.api
+          draft.request = item.request
+        })
+      })
+
+      expect((yield* catalog.provider.get(ProviderV2.ID.make("zenmux"))).request.headers).toEqual({
+        "HTTP-Referer": "https://example.com/",
+        "X-Title": "custom-title",
+      })
+    }),
+  )
+
+  it.effect("guards legacy Zenmux headers to the exact zenmux provider id", () =>
+    Effect.gen(function* () {
+      const plugin = yield* PluginV2.Service
+      const catalog = yield* Catalog.Service
+      yield* plugin.add(ZenmuxPlugin)
+      const transform = yield* catalog.transform()
+      yield* transform((catalog) => {
+        const item = provider("openrouter", {
+          request: {
+            headers: { "HTTP-Referer": "https://example.com/", "X-Title": "custom-title" },
+            body: {},
+          },
+        })
+        catalog.provider.update(item.id, (draft) => {
+          draft.request = item.request
+        })
+      })
+
+      expect((yield* catalog.provider.get(ProviderV2.ID.openrouter)).request.headers).toEqual({
+        "HTTP-Referer": "https://example.com/",
+        "X-Title": "custom-title",
+      })
+    }),
+  )
+})

packages/core/test/plugin/skill.test.ts

@@ -0,0 +1,32 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { AgentV2 } from "@opencode-ai/core/agent"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { SkillPlugin } from "@opencode-ai/core/plugin/skill"
+import { SkillV2 } from "@opencode-ai/core/skill"
+import { SkillDiscovery } from "@opencode-ai/core/skill/discovery"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(
+  SkillV2.layer.pipe(
+    Layer.provide(FSUtil.defaultLayer),
+    Layer.provide(SkillDiscovery.defaultLayer),
+    Layer.provideMerge(AgentV2.locationLayer),
+  ),
+)
+
+describe("SkillPlugin.Plugin", () => {
+  it.effect("registers the built-in customize-opencode skill", () =>
+    Effect.gen(function* () {
+      const skill = yield* SkillV2.Service
+      yield* SkillPlugin.Plugin.effect.pipe(Effect.provideService(SkillV2.Service, skill))
+
+      expect(yield* skill.list()).toContainEqual(
+        expect.objectContaining({
+          name: "customize-opencode",
+          description: expect.stringContaining("opencode's own configuration"),
+        }),
+      )
+    }),
+  )
+})

packages/core/test/policy.test.ts

@@ -0,0 +1,83 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { Location } from "@opencode-ai/core/location"
+import { Policy } from "@opencode-ai/core/policy"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "./fixture/location"
+import { testEffect } from "./lib/effect"
+
+const it = testEffect(
+  Policy.locationLayer.pipe(
+    Layer.provide(
+      Layer.succeed(Location.Service, Location.Service.of(location({ directory: AbsolutePath.make("test") }))),
+    ),
+  ),
+)
+
+describe("Policy", () => {
+  it.effect("returns the caller's fallback when no statement matches", () =>
+    Effect.gen(function* () {
+      const policy = yield* Policy.Service
+
+      expect(yield* policy.evaluate("provider.use", "anthropic", "allow")).toBe("allow")
+      expect(yield* policy.evaluate("provider.use", "anthropic", "deny")).toBe("deny")
+    }),
+  )
+
+  it.effect("evaluates wildcard provider rules in written order", () =>
+    Effect.gen(function* () {
+      const policy = yield* Policy.Service
+      yield* policy.load([
+        new Policy.Info({
+          effect: "deny",
+          action: "provider.*",
+          resource: "*",
+        }),
+        new Policy.Info({
+          effect: "allow",
+          action: "provider.use",
+          resource: "anthropic",
+        }),
+      ])
+
+      expect(yield* policy.evaluate("provider.use", "anthropic", "allow")).toBe("allow")
+      expect(yield* policy.evaluate("provider.use", "openai", "allow")).toBe("deny")
+    }),
+  )
+
+  it.effect("matches action and resource independently", () =>
+    Effect.gen(function* () {
+      const policy = yield* Policy.Service
+      yield* policy.load([
+        new Policy.Info({
+          effect: "deny",
+          action: "provider.*",
+          resource: "company-*",
+        }),
+      ])
+
+      expect(yield* policy.evaluate("provider.use", "company-stable", "allow")).toBe("deny")
+      expect(yield* policy.evaluate("plugin.load", "company-stable", "allow")).toBe("allow")
+    }),
+  )
+
+  it.effect("uses the last matching loaded statement", () =>
+    Effect.gen(function* () {
+      const policy = yield* Policy.Service
+      yield* policy.load([
+        new Policy.Info({
+          effect: "allow",
+          action: "provider.use",
+          resource: "openai",
+        }),
+        new Policy.Info({
+          effect: "deny",
+          action: "provider.use",
+          resource: "openai",
+        }),
+      ])
+
+      expect(yield* policy.evaluate("provider.use", "openai", "allow")).toBe("deny")
+    }),
+  )
+})

packages/core/test/process/process.test.ts

@@ -0,0 +1,350 @@
+import { describe, expect } from "bun:test"
+import fs from "fs/promises"
+import { realpathSync } from "node:fs"
+import { tmpdir } from "node:os"
+import path from "node:path"
+import { Effect, Exit, Fiber, Stream } from "effect"
+import { ChildProcess } from "effect/unstable/process"
+import { AppProcess } from "@opencode-ai/core/process"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(AppProcess.defaultLayer)
+
+const NODE = process.execPath
+const cmd = (...args: string[]) => ChildProcess.make(NODE, args)
+
+const waitForFile = (file: string) =>
+  Effect.promise(async () => {
+    while (true) {
+      try {
+        return await fs.readFile(file, "utf8")
+      } catch (error) {
+        if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error
+        await new Promise<void>((resolve) => setTimeout(resolve, 10))
+      }
+    }
+  })
+
+describe("AppProcess", () => {
+  describe("run", () => {
+    it.effect(
+      "captures stdout and exit code zero",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.run(cmd("-e", "process.stdout.write('hi\\n')"))
+        expect(result.exitCode).toBe(0)
+        expect(result.stdout.toString("utf8")).toBe("hi\n")
+        expect(result.stdoutTruncated).toBe(false)
+        expect(result.stderrTruncated).toBe(false)
+      }),
+    )
+
+    it.effect(
+      "non-zero exit returns RunResult; caller can require success",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.run(cmd("-e", "process.exit(1)"))
+        expect(result.exitCode).toBe(1)
+      }),
+    )
+
+    it.effect(
+      "requireSuccess fails on non-zero exit",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const exit = yield* Effect.exit(
+          svc.run(cmd("-e", "process.exit(1)")).pipe(Effect.flatMap(AppProcess.requireSuccess)),
+        )
+        expect(Exit.isFailure(exit)).toBe(true)
+        if (Exit.isFailure(exit)) {
+          const reason = exit.cause.reasons[0]
+          if (reason && reason._tag === "Fail") {
+            expect(reason.error).toBeInstanceOf(AppProcess.AppProcessError)
+            expect((reason.error as AppProcess.AppProcessError).exitCode).toBe(1)
+          } else {
+            throw new Error("expected fail reason")
+          }
+        }
+      }),
+    )
+
+    it.effect(
+      "requireSuccess succeeds on exit 0",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.run(cmd("-e", "process.exit(0)")).pipe(Effect.flatMap(AppProcess.requireSuccess))
+        expect(result.exitCode).toBe(0)
+      }),
+    )
+
+    it.effect(
+      "requireExitIn allowlists multiple exit codes",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const requireZeroOrOne = AppProcess.requireExitIn([0, 1])
+        const okZero = yield* svc.run(cmd("-e", "process.exit(0)")).pipe(Effect.flatMap(requireZeroOrOne))
+        expect(okZero.exitCode).toBe(0)
+        const okOne = yield* svc.run(cmd("-e", "process.exit(1)")).pipe(Effect.flatMap(requireZeroOrOne))
+        expect(okOne.exitCode).toBe(1)
+        const exit = yield* Effect.exit(svc.run(cmd("-e", "process.exit(2)")).pipe(Effect.flatMap(requireZeroOrOne)))
+        expect(Exit.isFailure(exit)).toBe(true)
+        if (Exit.isFailure(exit)) {
+          const reason = exit.cause.reasons[0]
+          if (reason && reason._tag === "Fail") {
+            expect(reason.error).toBeInstanceOf(AppProcess.AppProcessError)
+            expect((reason.error as AppProcess.AppProcessError).exitCode).toBe(2)
+          }
+        }
+      }),
+    )
+
+    it.effect(
+      "truncates stdout when maxOutputBytes is set",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.run(cmd("-e", "process.stdout.write('0123456789')"), { maxOutputBytes: 5 })
+        expect(result.exitCode).toBe(0)
+        expect(result.stdoutTruncated).toBe(true)
+        expect(result.stderrTruncated).toBe(false)
+        expect(result.stdout.length).toBe(5)
+        expect(result.stdout.toString("utf8")).toBe("01234")
+      }),
+    )
+
+    it.effect(
+      "truncates stderr when maxErrorBytes is set",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.run(cmd("-e", "process.stderr.write('0123456789')"), { maxErrorBytes: 5 })
+        expect(result.exitCode).toBe(0)
+        expect(result.stdoutTruncated).toBe(false)
+        expect(result.stderrTruncated).toBe(true)
+        expect(result.stderr.length).toBe(5)
+        expect(result.stderr.toString("utf8")).toBe("01234")
+      }),
+    )
+
+    it.effect(
+      "result includes command description",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.run(cmd("-e", "process.stdout.write('hi')"))
+        expect(result.command).toBe(`${NODE} -e process.stdout.write('hi')`)
+      }),
+    )
+
+    if (process.platform !== "win32") {
+      it.live(
+        "timeout cleans up the scoped child process",
+        Effect.acquireUseRelease(
+          Effect.promise(() => fs.mkdtemp(path.join(tmpdir(), "opencode-process-timeout-"))),
+          (directory) => {
+            const ready = path.join(directory, "ready")
+            const settled = path.join(directory, "settled")
+            const script = `const fs=require('fs');fs.writeFileSync(${JSON.stringify(ready)},String(process.pid));process.on('SIGTERM',()=>{fs.writeFileSync(${JSON.stringify(settled)},'settled');process.exit(0)});setInterval(()=>{},60000)`
+            return Effect.gen(function* () {
+              const svc = yield* AppProcess.Service
+              const exit = yield* Effect.exit(svc.run(cmd("-e", script), { timeout: "1 second" }))
+              expect(Exit.isFailure(exit)).toBe(true)
+              expect(yield* waitForFile(ready)).toMatch(/^\d+$/)
+              expect(yield* waitForFile(settled)).toBe("settled")
+            })
+          },
+          (directory) => Effect.promise(() => fs.rm(directory, { recursive: true, force: true })),
+        ),
+        5_000,
+      )
+
+      it.live(
+        "fiber interruption cleans up the scoped child process after readiness",
+        Effect.acquireUseRelease(
+          Effect.promise(() => fs.mkdtemp(path.join(tmpdir(), "opencode-process-interrupt-"))),
+          (directory) => {
+            const ready = path.join(directory, "ready")
+            const settled = path.join(directory, "settled")
+            const script = `const fs=require('fs');fs.writeFileSync(${JSON.stringify(ready)},String(process.pid));process.on('SIGTERM',()=>{fs.writeFileSync(${JSON.stringify(settled)},'settled');process.exit(0)});setInterval(()=>{},60000)`
+            return Effect.gen(function* () {
+              const svc = yield* AppProcess.Service
+              const fiber = yield* svc.run(cmd("-e", script)).pipe(Effect.forkChild)
+              expect(yield* waitForFile(ready)).toMatch(/^\d+$/)
+              yield* Fiber.interrupt(fiber)
+              expect(yield* waitForFile(settled)).toBe("settled")
+            })
+          },
+          (directory) => Effect.promise(() => fs.rm(directory, { recursive: true, force: true })),
+        ),
+        5_000,
+      )
+    }
+  })
+
+  describe("inherited platform methods", () => {
+    it.effect(
+      "string returns stdout as string",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const out = yield* svc.string(cmd("-e", "process.stdout.write('hi\\n')"))
+        expect(out).toBe("hi\n")
+      }),
+    )
+
+    it.effect(
+      "lines returns the platform's array of lines",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const out = yield* svc.lines(cmd("-e", "process.stdout.write('a\\nb\\n')"))
+        expect(Array.from(out)).toEqual(["a", "b"])
+      }),
+    )
+  })
+
+  describe("run with stdin option", () => {
+    const echoStdin = "process.stdin.on('data', c => process.stdout.write(c))"
+
+    it.effect(
+      "feeds a string to stdin and returns it on stdout",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.run(cmd("-e", echoStdin), { stdin: "hello" })
+        expect(result.exitCode).toBe(0)
+        expect(result.stdout.toString("utf8")).toBe("hello")
+      }),
+    )
+
+    it.effect(
+      "feeds a Uint8Array to stdin",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const bytes = new TextEncoder().encode("bytes")
+        const result = yield* svc.run(cmd("-e", echoStdin), { stdin: bytes })
+        expect(result.exitCode).toBe(0)
+        expect(result.stdout.toString("utf8")).toBe("bytes")
+      }),
+    )
+
+    it.effect(
+      "feeds a Stream of Uint8Array chunks to stdin",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const enc = new TextEncoder()
+        const stream = Stream.fromIterable([enc.encode("one"), enc.encode("-two"), enc.encode("-three")])
+        const result = yield* svc.run(cmd("-e", echoStdin), { stdin: stream })
+        expect(result.exitCode).toBe(0)
+        expect(result.stdout.toString("utf8")).toBe("one-two-three")
+      }),
+    )
+
+    it.effect(
+      "completes correctly with empty input",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.run(cmd("-e", echoStdin), { stdin: "" })
+        expect(result.exitCode).toBe(0)
+        expect(result.stdout.toString("utf8")).toBe("")
+      }),
+    )
+
+    it.effect(
+      "carries existing Command options like env",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const script =
+          "process.stdout.write(process.env.FEED + ':'); process.stdin.on('data', c => process.stdout.write(c))"
+        const command = ChildProcess.make(NODE, ["-e", script], { env: { FEED: "envset" }, extendEnv: true })
+        const result = yield* svc.run(command, { stdin: "payload" })
+        expect(result.exitCode).toBe(0)
+        expect(result.stdout.toString("utf8")).toBe("envset:payload")
+      }),
+    )
+
+    it.effect(
+      "carries existing Command options like cwd",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const dir = realpathSync(tmpdir())
+        const script =
+          "process.stdout.write(process.cwd() + '|'); process.stdin.on('data', c => process.stdout.write(c))"
+        const command = ChildProcess.make(NODE, ["-e", script], { cwd: dir })
+        const result = yield* svc.run(command, { stdin: "ok" })
+        expect(result.exitCode).toBe(0)
+        const [cwd, stdin] = result.stdout.toString("utf8").split("|")
+        expect(realpathSync(cwd)).toBe(dir)
+        expect(stdin).toBe("ok")
+      }),
+    )
+  })
+
+  describe("runStream", () => {
+    it.live(
+      "emits lines incrementally and ends cleanly on exit 0",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc
+          .runStream(cmd("-e", "console.log('one'); console.log('two'); console.log('three')"))
+          .pipe(Stream.runCollect)
+        expect(Array.from(result)).toEqual(["one", "two", "three"])
+      }),
+    )
+
+    it.live(
+      "okExitCodes determines whether a non-zero exit fails the stream",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const allowed = yield* svc
+          .runStream(cmd("-e", "console.log('only'); process.exit(1)"), { okExitCodes: [0, 1] })
+          .pipe(Stream.runCollect)
+        expect(Array.from(allowed)).toEqual(["only"])
+        const exit = yield* Effect.exit(
+          svc
+            .runStream(cmd("-e", "console.log('a'); process.exit(2)"), { okExitCodes: [0, 1] })
+            .pipe(Stream.runCollect),
+        )
+        expect(Exit.isFailure(exit)).toBe(true)
+        if (Exit.isFailure(exit)) {
+          const reason = exit.cause.reasons[0]
+          if (reason && reason._tag === "Fail") {
+            expect(reason.error).toBeInstanceOf(AppProcess.AppProcessError)
+          }
+        }
+      }),
+    )
+
+    it.live(
+      "without okExitCodes, never fails on exit code",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const result = yield* svc.runStream(cmd("-e", "console.log('only'); process.exit(7)")).pipe(Stream.runCollect)
+        expect(Array.from(result)).toEqual(["only"])
+      }),
+    )
+
+    it.live(
+      "AbortSignal interrupts the stream",
+      Effect.gen(function* () {
+        const svc = yield* AppProcess.Service
+        const controller = new AbortController()
+        controller.abort()
+        const exit = yield* Effect.exit(
+          svc
+            .runStream(cmd("-e", "setInterval(() => {}, 60_000)"), { signal: controller.signal })
+            .pipe(Stream.runCollect),
+        )
+        expect(Exit.isFailure(exit)).toBe(true)
+      }),
+    )
+  })
+
+  describe("spawn (inherited)", () => {
+    it.live(
+      "returns the platform ChildProcessHandle for advanced use",
+      Effect.scoped(
+        Effect.gen(function* () {
+          const svc = yield* AppProcess.Service
+          const handle = yield* svc.spawn(cmd("-e", "setInterval(() => {}, 1_000)"))
+          expect(yield* handle.isRunning).toBe(true)
+          yield* handle.kill()
+        }),
+      ),
+    )
+  })
+})

packages/core/test/project-copy.test.ts

@@ -0,0 +1,320 @@
+import { describe, expect } from "bun:test"
+import { $ } from "bun"
+import fs from "fs/promises"
+import path from "path"
+import { eq } from "drizzle-orm"
+import { Effect, Fiber, Layer, Stream } from "effect"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Git } from "@opencode-ai/core/git"
+import { Database } from "@opencode-ai/core/database/database"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Project } from "@opencode-ai/core/project"
+import { ProjectDirectoryTable, ProjectTable } from "@opencode-ai/core/project/sql"
+import { ProjectCopy } from "@opencode-ai/core/project/copy"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+
+const databaseLayer = Database.layerFromPath(":memory:")
+const eventLayer = EventV2.layer.pipe(Layer.provide(databaseLayer))
+const copyLayer = ProjectCopy.layer.pipe(
+  Layer.provide(databaseLayer),
+  Layer.provide(eventLayer),
+  Layer.provide(FSUtil.defaultLayer),
+  Layer.provide(Git.defaultLayer),
+)
+const it = testEffect(Layer.mergeAll(copyLayer, databaseLayer, eventLayer))
+
+function abs(input: string) {
+  return AbsolutePath.make(input)
+}
+
+async function initRepo(directory: string) {
+  await $`git init`.cwd(directory).quiet()
+  await $`git config core.fsmonitor false`.cwd(directory).quiet()
+  await $`git config commit.gpgsign false`.cwd(directory).quiet()
+  await $`git config user.email test@opencode.test`.cwd(directory).quiet()
+  await $`git config user.name Test`.cwd(directory).quiet()
+  await $`git commit --allow-empty -m root`.cwd(directory).quiet()
+}
+
+function setup() {
+  return Effect.gen(function* () {
+    const root = yield* Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
+    )
+    yield* Effect.promise(() => initRepo(root.path))
+    const sourceDirectory = abs(yield* Effect.promise(() => fs.realpath(root.path)))
+    const projectID = Project.ID.make("copy-project")
+    const { db } = yield* Database.Service
+    yield* db
+      .insert(ProjectTable)
+      .values({ id: projectID, worktree: sourceDirectory, sandboxes: [], time_created: 1, time_updated: 1 })
+      .run()
+      .pipe(Effect.orDie)
+    yield* db
+      .insert(ProjectDirectoryTable)
+      .values({ project_id: projectID, directory: sourceDirectory, type: "main" })
+      .run()
+      .pipe(Effect.orDie)
+    return { root, sourceDirectory, projectID, db }
+  })
+}
+
+function stored(projectID: Project.ID) {
+  return Database.Service.use(({ db }) =>
+    db
+      .select({ directory: ProjectDirectoryTable.directory, type: ProjectDirectoryTable.type })
+      .from(ProjectDirectoryTable)
+      .where(eq(ProjectDirectoryTable.project_id, projectID))
+      .all()
+      .pipe(
+        Effect.orDie,
+        Effect.map((rows) => rows.toSorted((a, b) => a.directory.localeCompare(b.directory))),
+      ),
+  )
+}
+
+describe("ProjectCopy", () => {
+  it.live("detects linked git worktrees but not root checkouts", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const copy = yield* ProjectCopy.Service
+      const target = abs(`${input.root.path}-copy-detected`)
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(target, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      yield* Effect.promise(() => $`git worktree add --detach ${target} HEAD`.cwd(input.root.path).quiet())
+
+      expect(yield* copy.detect({ directory: input.sourceDirectory })).toBeUndefined()
+      expect(yield* copy.detect({ directory: target })).toBe("git_worktree")
+    }),
+  )
+
+  it.live("creates and removes a git worktree directory", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const copy = yield* ProjectCopy.Service
+      const events = yield* EventV2.Service
+      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
+      const parent = abs(path.join(temp, path.basename(input.root.path) + "-copy-created"))
+      const target = abs(path.join(parent, "copy"))
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      const fiber = yield* events
+        .subscribe(ProjectCopy.Event.Updated)
+        .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
+      yield* Effect.yieldNow
+
+      const created = yield* copy.create({
+        projectID: input.projectID,
+        strategy: "git_worktree",
+        sourceDirectory: input.sourceDirectory,
+        directory: parent,
+        name: "copy",
+      })
+      expect(created.directory).toBe(target)
+      expect(yield* stored(input.projectID)).toEqual(
+        [
+          { directory: input.sourceDirectory, type: "main" as const },
+          { directory: created.directory, type: "git_worktree" as const },
+        ].toSorted((a, b) => a.directory.localeCompare(b.directory)),
+      )
+      expect(Array.from(yield* Fiber.join(fiber))[0]?.data).toEqual({ projectID: input.projectID })
+
+      yield* copy.remove({ projectID: input.projectID, directory: created.directory, force: false })
+
+      expect(yield* stored(input.projectID)).toEqual([{ directory: input.sourceDirectory, type: "main" as const }])
+      expect(yield* Effect.promise(() => Bun.file(target).exists())).toBe(false)
+    }),
+  )
+
+  it.live("requires force to remove a dirty git worktree", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const copy = yield* ProjectCopy.Service
+      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
+      const parent = abs(path.join(temp, path.basename(input.root.path) + "-copy-dirty"))
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      const created = yield* copy.create({
+        projectID: input.projectID,
+        strategy: "git_worktree",
+        sourceDirectory: input.sourceDirectory,
+        directory: parent,
+        name: "copy",
+      })
+      yield* Effect.promise(() => Bun.write(path.join(created.directory, "dirty.txt"), "dirty"))
+
+      const error = yield* copy
+        .remove({ projectID: input.projectID, directory: created.directory, force: false })
+        .pipe(Effect.flip)
+
+      expect(error).toBeInstanceOf(Git.WorktreeError)
+      if (error instanceof Git.WorktreeError) {
+        expect(error.operation).toBe("remove")
+        expect(error.forceRequired).toBe(true)
+      }
+      expect(yield* stored(input.projectID)).toContainEqual({ directory: created.directory, type: "git_worktree" })
+      expect(yield* Effect.promise(() => Bun.file(path.join(created.directory, "dirty.txt")).exists())).toBe(true)
+
+      yield* copy.remove({ projectID: input.projectID, directory: created.directory, force: true })
+      expect(yield* Effect.promise(() => Bun.file(created.directory).exists())).toBe(false)
+    }),
+  )
+
+  it.live("adds a numeric suffix when a copy directory already exists", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const copy = yield* ProjectCopy.Service
+      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
+      const parent = abs(path.join(temp, path.basename(input.root.path) + "-copy-suffix"))
+      const target = abs(path.join(parent, "copy-3"))
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      yield* Effect.promise(() => fs.mkdir(path.join(parent, "copy"), { recursive: true }))
+      yield* Effect.promise(() => fs.mkdir(path.join(parent, "copy-2")))
+
+      const created = yield* copy.create({
+        projectID: input.projectID,
+        strategy: "git_worktree",
+        sourceDirectory: input.sourceDirectory,
+        directory: parent,
+        name: "copy",
+      })
+
+      expect(created.directory).toBe(target)
+      expect(yield* Effect.promise(() => fs.stat(path.join(parent, "copy")).then((item) => item.isDirectory()))).toBe(
+        true,
+      )
+      expect(yield* Effect.promise(() => fs.stat(path.join(parent, "copy-2")).then((item) => item.isDirectory()))).toBe(
+        true,
+      )
+
+      yield* copy.remove({ projectID: input.projectID, directory: created.directory, force: false })
+    }),
+  )
+
+  it.live("fails after ten copy directory conflicts", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const copy = yield* ProjectCopy.Service
+      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
+      const parent = abs(path.join(temp, path.basename(input.root.path) + "-copy-conflicts"))
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(parent, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      yield* Effect.promise(() =>
+        Promise.all(
+          Array.from({ length: 10 }, (_, index) =>
+            fs.mkdir(path.join(parent, index === 0 ? "copy" : `copy-${index + 1}`), { recursive: true }),
+          ),
+        ),
+      )
+
+      const error = yield* copy
+        .create({
+          projectID: input.projectID,
+          strategy: "git_worktree",
+          sourceDirectory: input.sourceDirectory,
+          directory: parent,
+          name: "copy",
+        })
+        .pipe(Effect.flip)
+
+      expect(error).toBeInstanceOf(ProjectCopy.DestinationExistsError)
+      expect(error.directory).toBe(abs(path.join(parent, "copy-10")))
+    }),
+  )
+
+  it.live("does not publish an event when refresh finds no directory changes", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const copy = yield* ProjectCopy.Service
+      const events = yield* EventV2.Service
+      const event = yield* events.subscribe(ProjectCopy.Event.Updated).pipe(
+        Stream.take(1),
+        Stream.runCollect,
+        Effect.forkScoped,
+        Effect.flatMap((fiber) =>
+          Effect.gen(function* () {
+            yield* Effect.yieldNow
+            yield* copy.refresh({ projectID: input.projectID })
+            return yield* Fiber.join(fiber).pipe(Effect.timeoutOption("50 millis"))
+          }),
+        ),
+      )
+
+      expect(event._tag).toBe("None")
+    }),
+  )
+
+  it.live("refresh discovers and prunes an externally managed git worktree", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const copy = yield* ProjectCopy.Service
+      const events = yield* EventV2.Service
+      const target = abs(`${input.root.path}-copy-external`)
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(target, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      yield* Effect.promise(() => $`git worktree add --detach ${target} HEAD`.cwd(input.root.path).quiet())
+      const fiber = yield* events
+        .subscribe(ProjectCopy.Event.Updated)
+        .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
+      yield* Effect.yieldNow
+
+      yield* copy.refresh({ projectID: input.projectID })
+
+      const discovered = abs(yield* Effect.promise(() => fs.realpath(target)))
+      expect(yield* stored(input.projectID)).toEqual(
+        [
+          { directory: input.sourceDirectory, type: "main" as const },
+          { directory: discovered, type: "git_worktree" as const },
+        ].toSorted((a, b) => a.directory.localeCompare(b.directory)),
+      )
+      expect(Array.from(yield* Fiber.join(fiber))[0]?.data).toEqual({ projectID: input.projectID })
+
+      yield* Effect.promise(() => $`git worktree remove --force ${target}`.cwd(input.root.path).quiet())
+      yield* copy.refresh({ projectID: input.projectID })
+      expect(yield* stored(input.projectID)).toEqual([{ directory: input.sourceDirectory, type: "main" as const }])
+    }),
+  )
+
+  it.live("refresh ignores stale git worktree registrations", () =>
+    Effect.gen(function* () {
+      const input = yield* setup()
+      const copy = yield* ProjectCopy.Service
+      const stale = abs(`${input.root.path}-copy-stale`)
+      const target = abs(`${input.root.path}-copy-after-stale`)
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => fs.rm(target, { recursive: true, force: true })).pipe(Effect.ignore),
+      )
+      yield* Effect.promise(() => $`git worktree add --detach ${stale} HEAD`.cwd(input.root.path).quiet())
+      yield* Effect.promise(() => fs.rm(stale, { recursive: true, force: true }))
+      yield* Effect.promise(() => $`git worktree add --detach ${target} HEAD`.cwd(input.root.path).quiet())
+
+      yield* copy.refresh({ projectID: input.projectID })
+
+      const discovered = abs(yield* Effect.promise(() => fs.realpath(target)))
+      expect(yield* stored(input.projectID)).toEqual(
+        [
+          { directory: input.sourceDirectory, type: "main" as const },
+          { directory: discovered, type: "git_worktree" as const },
+        ].toSorted((a, b) => a.directory.localeCompare(b.directory)),
+      )
+    }),
+  )
+
+  it.live("refresh with no roots is a no-op", () =>
+    Effect.gen(function* () {
+      const copy = yield* ProjectCopy.Service
+
+      yield* copy.refresh({ projectID: Project.ID.make("missing-project") })
+    }),
+  )
+})

packages/core/test/project.test.ts

@@ -0,0 +1,282 @@
+import { describe, expect } from "bun:test"
+import { $ } from "bun"
+import fs from "fs/promises"
+import path from "path"
+import { Effect, Layer, Schema } from "effect"
+import { ProjectV2 } from "@opencode-ai/core/project"
+import { ProjectDirectoryTable, ProjectTable } from "@opencode-ai/core/project/sql"
+import { Database } from "@opencode-ai/core/database/database"
+import { FSUtil } from "@opencode-ai/core/fs-util"
+import { Git } from "@opencode-ai/core/git"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { Hash } from "@opencode-ai/core/util/hash"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+
+const databaseLayer = Database.layerFromPath(":memory:")
+const it = testEffect(
+  Layer.mergeAll(
+    ProjectV2.layer.pipe(
+      Layer.provide(databaseLayer),
+      Layer.provide(FSUtil.defaultLayer),
+      Layer.provide(Git.defaultLayer),
+    ),
+    databaseLayer,
+  ),
+)
+
+function remoteID(remote: string) {
+  return ProjectV2.ID.make(Hash.fast(`git-remote:${remote}`))
+}
+
+function abs(value: string) {
+  return AbsolutePath.make(value)
+}
+
+function real(value: string) {
+  return Effect.promise(() => fs.realpath(value)).pipe(Effect.map((value) => AbsolutePath.make(value)))
+}
+
+async function initRepo(dir: string, opts?: { commit?: boolean; remote?: string }) {
+  await $`git init`.cwd(dir).quiet()
+  await $`git config core.fsmonitor false`.cwd(dir).quiet()
+  await $`git config commit.gpgsign false`.cwd(dir).quiet()
+  await $`git config user.email test@opencode.test`.cwd(dir).quiet()
+  await $`git config user.name Test`.cwd(dir).quiet()
+  if (opts?.commit) await $`git commit --allow-empty -m root`.cwd(dir).quiet()
+  if (opts?.remote) await $`git remote add origin ${opts.remote}`.cwd(dir).quiet()
+}
+
+async function rootCommit(dir: string) {
+  return (await $`git rev-list --max-parents=0 HEAD`.cwd(dir).text()).trim()
+}
+
+describe("Project directories schemas", () => {
+  it.effect("decodes project directory input and inline directory results", () =>
+    Effect.sync(() => {
+      expect(Schema.decodeUnknownSync(ProjectV2.DirectoriesInput)({ projectID: ProjectV2.ID.make("project") })).toEqual(
+        {
+          projectID: ProjectV2.ID.make("project"),
+        },
+      )
+      expect(
+        Schema.decodeUnknownSync(ProjectV2.Directories)([
+          { directory: AbsolutePath.make("/tmp/project"), type: "main" },
+        ]),
+      ).toEqual([{ directory: AbsolutePath.make("/tmp/project"), type: "main" }])
+    }),
+  )
+
+  it.effect("lists stored project directories newest first for the requested project", () =>
+    Effect.gen(function* () {
+      const project = yield* ProjectV2.Service
+      const { db } = yield* Database.Service
+      const projectID = ProjectV2.ID.make("directories-project")
+      const otherID = ProjectV2.ID.make("directories-other")
+      yield* db
+        .insert(ProjectTable)
+        .values([
+          { id: projectID, worktree: AbsolutePath.make("/repo"), sandboxes: [], time_created: 1, time_updated: 1 },
+          { id: otherID, worktree: AbsolutePath.make("/other"), sandboxes: [], time_created: 1, time_updated: 1 },
+        ])
+        .run()
+        .pipe(Effect.orDie)
+      yield* db
+        .insert(ProjectDirectoryTable)
+        .values([
+          { project_id: projectID, directory: AbsolutePath.make("/repo/z"), type: "root", time_created: 2 },
+          { project_id: projectID, directory: AbsolutePath.make("/repo/a"), type: "main", time_created: 1 },
+          { project_id: otherID, directory: AbsolutePath.make("/other"), type: "main", time_created: 3 },
+        ])
+        .run()
+        .pipe(Effect.orDie)
+
+      expect(yield* project.directories({ projectID })).toEqual([
+        { directory: AbsolutePath.make("/repo/z"), type: "root" },
+        { directory: AbsolutePath.make("/repo/a"), type: "main" },
+      ])
+    }),
+  )
+})
+
+describe("ProjectV2.resolve", () => {
+  it.live("returns global for non-git directory", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      const project = yield* ProjectV2.Service
+
+      const result = yield* project.resolve(abs(tmp.path))
+
+      expect(result.id).toBe(ProjectV2.ID.make("global"))
+      expect(path.resolve(result.directory)).toBe(path.parse(tmp.path).root)
+      expect(result.previous).toBeUndefined()
+      expect(result.vcs).toBeUndefined()
+    }),
+  )
+
+  it.live("returns git global for repo with no commits and no remote", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(tmp.path))
+      const project = yield* ProjectV2.Service
+
+      const result = yield* project.resolve(abs(tmp.path))
+
+      expect(result.id).toBe(ProjectV2.ID.make("global"))
+      expect(result.directory).toBe(yield* real(tmp.path))
+      expect(result.previous).toBeUndefined()
+      expect(result.vcs?.type).toBe("git")
+    }),
+  )
+
+  it.live("falls back to root commit when origin is missing", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(tmp.path, { commit: true }))
+      const project = yield* ProjectV2.Service
+
+      const result = yield* project.resolve(abs(tmp.path))
+
+      expect(result.id).toBe(ProjectV2.ID.make(yield* Effect.promise(() => rootCommit(tmp.path))))
+      expect(result.directory).toBe(yield* real(tmp.path))
+      expect(result.previous).toBeUndefined()
+      expect(result.vcs?.type).toBe("git")
+    }),
+  )
+
+  it.live("prefers normalized origin over root commit", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(tmp.path, { commit: true, remote: "git@github.com:Acme/App.git" }))
+      const project = yield* ProjectV2.Service
+
+      const result = yield* project.resolve(abs(tmp.path))
+
+      expect(result.id).toBe(remoteID("github.com/Acme/App"))
+      expect(result.id).not.toBe(ProjectV2.ID.make(yield* Effect.promise(() => rootCommit(tmp.path))))
+      expect(result.directory).toBe(yield* real(tmp.path))
+      expect(result.vcs?.type).toBe("git")
+    }),
+  )
+
+  it.live("normalizes ssh and https remotes to the same id", () =>
+    Effect.gen(function* () {
+      const ssh = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      const https = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(ssh.path, { commit: true, remote: "git@github.com:owner/repo.git" }))
+      yield* Effect.promise(() => initRepo(https.path, { commit: true, remote: "https://github.com/owner/repo.git" }))
+      const project = yield* ProjectV2.Service
+
+      const a = yield* project.resolve(abs(ssh.path))
+      const b = yield* project.resolve(abs(https.path))
+
+      expect(a.id).toBe(remoteID("github.com/owner/repo"))
+      expect(b.id).toBe(a.id)
+    }),
+  )
+
+  it.live("ignores file remotes and falls back to root commit", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(tmp.path, { commit: true, remote: `file://${tmp.path}` }))
+      const project = yield* ProjectV2.Service
+
+      const result = yield* project.resolve(abs(tmp.path))
+
+      expect(result.id).toBe(ProjectV2.ID.make(yield* Effect.promise(() => rootCommit(tmp.path))))
+    }),
+  )
+
+  it.live("returns previous cached id from common dir", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(tmp.path, { commit: true, remote: "git@github.com:owner/repo.git" }))
+      yield* Effect.promise(() => Bun.write(path.join(tmp.path, ".git", "opencode"), "old-id"))
+      const project = yield* ProjectV2.Service
+
+      const result = yield* project.resolve(abs(tmp.path))
+
+      expect(result.previous).toBe(ProjectV2.ID.make("old-id"))
+      expect(result.id).toBe(remoteID("github.com/owner/repo"))
+    }),
+  )
+
+  it.live("does not write the cache while resolving", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(tmp.path, { commit: true, remote: "git@github.com:owner/repo.git" }))
+      const project = yield* ProjectV2.Service
+
+      yield* project.resolve(abs(tmp.path))
+
+      expect(yield* Effect.promise(() => Bun.file(path.join(tmp.path, ".git", "opencode")).exists())).toBe(false)
+    }),
+  )
+
+  it.live("resolves from nested directories to repo root", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      yield* Effect.promise(() => initRepo(tmp.path, { commit: true }))
+      yield* Effect.promise(() => fs.mkdir(path.join(tmp.path, "a", "b"), { recursive: true }))
+      const project = yield* ProjectV2.Service
+
+      const result = yield* project.resolve(abs(path.join(tmp.path, "a", "b")))
+
+      expect(result.directory).toBe(yield* real(tmp.path))
+    }),
+  )
+
+  it.live("linked worktree returns opened worktree directory and previous from common dir", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      const worktree = `${tmp.path}-worktree`
+      yield* Effect.addFinalizer(() =>
+        Effect.promise(() => $`rm -rf ${worktree}`.quiet().nothrow()).pipe(Effect.ignore),
+      )
+      yield* Effect.promise(() => initRepo(tmp.path, { commit: true, remote: "git@github.com:owner/repo.git" }))
+      yield* Effect.promise(() => Bun.write(path.join(tmp.path, ".git", "opencode"), "old-id"))
+      yield* Effect.promise(() => $`git worktree add ${worktree} -b test-${Date.now()}`.cwd(tmp.path).quiet())
+      const project = yield* ProjectV2.Service
+
+      const result = yield* project.resolve(abs(worktree))
+
+      expect(result.directory).toBe(yield* real(worktree))
+      expect(result.previous).toBe(ProjectV2.ID.make("old-id"))
+      expect(result.id).toBe(remoteID("github.com/owner/repo"))
+      expect(result.vcs?.type).toBe("git")
+    }),
+  )
+})

packages/core/test/pty/info-schema.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, test } from "bun:test"
+import { Schema } from "effect"
+import { Pty } from "@opencode-ai/core/pty"
+
+const sample = (pid: number) => ({
+  id: "pty_01J5Y5H0AH4Q4NXJ6P4C3P5V2K",
+  title: "demo",
+  command: "cmd.exe",
+  args: [],
+  cwd: "C:\\",
+  status: "running",
+  pid,
+})
+
+describe("Pty.Info", () => {
+  test("accepts pid 0 (Windows ConPTY assigns the pid asynchronously)", () => {
+    expect(Schema.decodeUnknownSync(Pty.Info)(sample(0)).pid).toBe(0)
+  })
+
+  test("accepts a positive pid", () => {
+    expect(Schema.decodeUnknownSync(Pty.Info)(sample(48012)).pid).toBe(48012)
+  })
+
+  test("rejects a negative pid", () => {
+    expect(() => Schema.decodeUnknownSync(Pty.Info)(sample(-1))).toThrow()
+  })
+})

packages/core/test/pty/input.test.ts

@@ -0,0 +1,19 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { handlePtyInput } from "@opencode-ai/core/pty/input"
+import { it } from "../lib/effect"
+
+describe("pty websocket input", () => {
+  it.effect("does not forward invalid binary frames to the PTY handler", () =>
+    Effect.gen(function* () {
+      const messages: Array<string | ArrayBuffer> = []
+      const handler = { onMessage: (message: string | ArrayBuffer) => messages.push(message) }
+
+      yield* handlePtyInput(handler, "ready")
+      yield* handlePtyInput(handler, new Uint8Array([0xff, 0xfe, 0xfd]))
+      yield* handlePtyInput(handler, new TextEncoder().encode("hello"))
+
+      expect(messages).toEqual(["ready", "hello"])
+    }),
+  )
+})

packages/core/test/pty/pty-output-isolation.test.ts

@@ -0,0 +1,110 @@
+import { describe, expect } from "bun:test"
+import { Duration, Effect, Layer, Queue } from "effect"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { Pty } from "@opencode-ai/core/pty"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+
+type Socket = Parameters<Pty.Interface["connect"]>[1]
+
+const locationLayer = Layer.succeed(
+  Location.Service,
+  Location.Service.of(location({ directory: AbsolutePath.make("/tmp") })),
+)
+const it = testEffect(Pty.layer.pipe(Layer.provideMerge(EventV2.defaultLayer), Layer.provideMerge(locationLayer)))
+const ptyTest = process.platform === "win32" ? it.live.skip : it.live
+
+const createPty = Effect.fn("PtyOutputIsolationTest.createPty")(function* (command: string) {
+  const pty = yield* Pty.Service
+  return yield* Effect.acquireRelease(
+    pty.create({ command, args: [], cwd: "/tmp", env: { TERM: "xterm-256color", OPENCODE_TERMINAL: "1" } }),
+    (info) => pty.remove(info.id).pipe(Effect.ignore),
+  )
+})
+
+const decodeOutput = (data: string | Uint8Array | ArrayBuffer) =>
+  typeof data === "string"
+    ? data
+    : Buffer.from(data instanceof Uint8Array ? data : new Uint8Array(data)).toString("utf8")
+
+const makeSocket = Effect.fn("PtyOutputIsolationTest.makeSocket")(function* (data: unknown) {
+  const output = yield* Queue.unbounded<string>()
+  const socket: Socket = {
+    readyState: 1,
+    data,
+    send: (data) => Queue.offerUnsafe(output, decodeOutput(data)),
+    close: () => {},
+  }
+  return { socket, output }
+})
+
+const waitForOutput = (output: Queue.Queue<string>, text: string, duration: Duration.Input = "5 seconds") =>
+  Effect.gen(function* () {
+    let received = ""
+    while (!received.includes(text)) received += yield* Queue.take(output)
+    return received
+  }).pipe(
+    Effect.timeoutOrElse({
+      duration,
+      orElse: () => Effect.fail(new Error(`timeout waiting for output containing ${JSON.stringify(text)}`)),
+    }),
+  )
+
+describe("pty output isolation", () => {
+  ptyTest("does not leak output when websocket objects are reused", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const a = yield* createPty("cat")
+      const b = yield* createPty("cat")
+      const shared = yield* makeSocket({ events: { connection: "a" } })
+      const outB = yield* Queue.unbounded<string>()
+
+      yield* pty.connect(a.id, shared.socket)
+      shared.socket.data = { events: { connection: "b" } }
+      shared.socket.send = (data) => Queue.offerUnsafe(outB, decodeOutput(data))
+      yield* pty.connect(b.id, shared.socket)
+      yield* pty.write(a.id, "AAA\n")
+
+      const verify = yield* makeSocket({ events: { connection: "verify-a" } })
+      yield* pty.connect(a.id, verify.socket)
+      expect(yield* waitForOutput(verify.output, "AAA")).toContain("AAA")
+      expect(yield* waitForOutput(outB, "AAA", "100 millis").pipe(Effect.option)).toMatchObject({ _tag: "None" })
+    }),
+  )
+
+  ptyTest("does not leak output when Bun recycles websocket objects before re-connect", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const info = yield* createPty("cat")
+      const first = yield* makeSocket({ events: { connection: "a" } })
+      const recycled = yield* Queue.unbounded<string>()
+
+      yield* pty.connect(info.id, first.socket)
+      first.socket.data = { events: { connection: "b" } }
+      first.socket.send = (data) => Queue.offerUnsafe(recycled, decodeOutput(data))
+      yield* pty.write(info.id, "AAA\n")
+
+      const verify = yield* makeSocket({ events: { connection: "verify" } })
+      yield* pty.connect(info.id, verify.socket)
+      expect(yield* waitForOutput(verify.output, "AAA")).toContain("AAA")
+      expect(yield* waitForOutput(recycled, "AAA", "100 millis").pipe(Effect.option)).toMatchObject({ _tag: "None" })
+    }),
+  )
+
+  ptyTest("treats in-place socket data mutation as the same connection", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const info = yield* createPty("cat")
+      const data = { connId: 1 }
+      const socket = yield* makeSocket(data)
+
+      yield* pty.connect(info.id, socket.socket)
+      data.connId = 2
+      yield* pty.write(info.id, "AAA\n")
+
+      expect(yield* waitForOutput(socket.output, "AAA")).toContain("AAA")
+    }),
+  )
+})

packages/core/test/pty/pty-session.test.ts

@@ -0,0 +1,91 @@
+import { describe, expect } from "bun:test"
+import { Cause, Effect, Exit, Layer, Queue } from "effect"
+import { EventV2 } from "@opencode-ai/core/event"
+import { Location } from "@opencode-ai/core/location"
+import { Pty } from "@opencode-ai/core/pty"
+import type { PtyID } from "@opencode-ai/core/pty/schema"
+import { AbsolutePath } from "@opencode-ai/core/schema"
+import { location } from "../fixture/location"
+import { testEffect } from "../lib/effect"
+
+type PtyEvent = { type: "created" | "exited" | "deleted"; id: PtyID }
+
+const locationLayer = Layer.succeed(
+  Location.Service,
+  Location.Service.of(location({ directory: AbsolutePath.make("/tmp") })),
+)
+const it = testEffect(Pty.layer.pipe(Layer.provideMerge(EventV2.defaultLayer), Layer.provideMerge(locationLayer)))
+const ptyTest = process.platform === "win32" ? it.live.skip : it.live
+
+const subscribePtyEvents = Effect.fn("PtySessionTest.subscribePtyEvents")(function* () {
+  const source = yield* EventV2.Service
+  const events = yield* Queue.unbounded<PtyEvent>()
+  const unsubscribe = yield* source.listen((event) => {
+    if (event.type === Pty.Event.Created.type)
+      Queue.offerUnsafe(events, { type: "created", id: (event.data as typeof Pty.Event.Created.data.Type).info.id })
+    if (event.type === Pty.Event.Exited.type)
+      Queue.offerUnsafe(events, { type: "exited", id: (event.data as typeof Pty.Event.Exited.data.Type).id })
+    if (event.type === Pty.Event.Deleted.type)
+      Queue.offerUnsafe(events, { type: "deleted", id: (event.data as typeof Pty.Event.Deleted.data.Type).id })
+    return Effect.void
+  })
+  yield* Effect.addFinalizer(() => unsubscribe)
+  return events
+})
+
+const createPty = Effect.fn("PtySessionTest.createPty")(function* (command: string, args: string[] = []) {
+  const pty = yield* Pty.Service
+  return yield* Effect.acquireRelease(
+    pty.create({ command, args, cwd: "/tmp", env: { TERM: "xterm-256color", OPENCODE_TERMINAL: "1" } }),
+    (info) => pty.remove(info.id).pipe(Effect.ignore),
+  )
+})
+
+const waitForEvents = (events: Queue.Queue<PtyEvent>, id: PtyID, count: number) =>
+  Effect.gen(function* () {
+    const picked: Array<PtyEvent["type"]> = []
+    while (picked.length < count) {
+      const evt = yield* Queue.take(events)
+      if (evt.id === id) picked.push(evt.type)
+    }
+    return picked
+  }).pipe(
+    Effect.timeoutOrElse({
+      duration: "5 seconds",
+      orElse: () => Effect.fail(new Error("timeout waiting for pty events")),
+    }),
+  )
+
+describe("pty", () => {
+  it.live("returns typed not found errors for missing sessions", () =>
+    Effect.gen(function* () {
+      const pty = yield* Pty.Service
+      const id = "pty_missing" as PtyID
+      let closed = false
+      const socket = { readyState: 1, send: () => {}, close: () => void (closed = true) }
+
+      for (const result of [
+        yield* pty.get(id).pipe(Effect.asVoid, Effect.exit),
+        yield* pty.update(id, { title: "missing" }).pipe(Effect.asVoid, Effect.exit),
+        yield* pty.remove(id).pipe(Effect.exit),
+        yield* pty.resize(id, 80, 24).pipe(Effect.exit),
+        yield* pty.write(id, "input").pipe(Effect.exit),
+        yield* pty.connect(id, socket).pipe(Effect.asVoid, Effect.exit),
+      ]) {
+        expect(Exit.isFailure(result)).toBe(true)
+        if (Exit.isFailure(result))
+          expect(Cause.squash(result.cause)).toMatchObject({ _tag: "Pty.NotFoundError", ptyID: id })
+      }
+      expect(closed).toBe(true)
+    }),
+  )
+
+  ptyTest("publishes created, exited, deleted in order for a short-lived process", () =>
+    Effect.gen(function* () {
+      const events = yield* subscribePtyEvents()
+      const info = yield* createPty("/usr/bin/env", ["sh", "-c", "sleep 0.1"])
+
+      expect(yield* waitForEvents(events, info.id, 3)).toEqual(["created", "exited", "deleted"])
+    }),
+  )
+})

packages/core/test/pty/ticket.test.ts

@@ -0,0 +1,59 @@
+import { describe, expect } from "bun:test"
+import { Effect, Layer } from "effect"
+import { PtyID } from "@opencode-ai/core/pty/schema"
+import { PtyTicket } from "@opencode-ai/core/pty/ticket"
+import { WorkspaceV2 } from "@opencode-ai/core/workspace"
+import { testEffect } from "../lib/effect"
+
+const it = testEffect(PtyTicket.layer)
+const itExpiring = testEffect(Layer.effect(PtyTicket.Service, PtyTicket.make(5)))
+
+describe("PTY websocket tickets", () => {
+  it.live("consumes tickets once", () =>
+    Effect.gen(function* () {
+      const tickets = yield* PtyTicket.Service
+      const scope = { ptyID: PtyID.ascending(), directory: "/tmp/a" }
+      const issued = yield* tickets.issue(scope)
+
+      expect(yield* tickets.consume({ ...scope, ticket: issued.ticket })).toBe(true)
+      expect(yield* tickets.consume({ ...scope, ticket: issued.ticket })).toBe(false)
+    }),
+  )
+
+  it.live("rejects tickets scoped to a different request", () =>
+    Effect.gen(function* () {
+      const tickets = yield* PtyTicket.Service
+      const ptyID = PtyID.ascending()
+      const issued = yield* tickets.issue({ ptyID, directory: "/tmp/a" })
+
+      expect(yield* tickets.consume({ ptyID, directory: "/tmp/b", ticket: issued.ticket })).toBe(false)
+      expect(yield* tickets.consume({ ptyID, directory: "/tmp/a", ticket: issued.ticket })).toBe(true)
+    }),
+  )
+
+  itExpiring.live("rejects tickets after the TTL elapses", () =>
+    Effect.gen(function* () {
+      const tickets = yield* PtyTicket.Service
+      const ptyID = PtyID.ascending()
+      const issued = yield* tickets.issue({ ptyID })
+
+      yield* Effect.promise(() => new Promise((resolve) => setTimeout(resolve, 25)))
+
+      expect(yield* tickets.consume({ ptyID, ticket: issued.ticket })).toBe(false)
+    }),
+  )
+
+  it.live("rejects tickets scoped to a different workspace", () =>
+    Effect.gen(function* () {
+      const tickets = yield* PtyTicket.Service
+      const ptyID = PtyID.ascending()
+      const workspaceID = WorkspaceV2.ID.ascending()
+      const issued = yield* tickets.issue({ ptyID, workspaceID })
+
+      expect(yield* tickets.consume({ ptyID, workspaceID: WorkspaceV2.ID.ascending(), ticket: issued.ticket })).toBe(
+        false,
+      )
+      expect(yield* tickets.consume({ ptyID, workspaceID, ticket: issued.ticket })).toBe(true)
+    }),
+  )
+})

packages/core/test/public-opencode.test.ts

@@ -0,0 +1,177 @@
+import fs from "fs/promises"
+import path from "path"
+import { describe, expect } from "bun:test"
+import { Effect, Schema } from "effect"
+import { AbsolutePath, Location, Model, OpenCode, Session, Tool } from "@opencode-ai/core/public"
+import { tmpdir } from "./fixture/tmpdir"
+import { testEffect } from "./lib/effect"
+
+const it = testEffect(OpenCode.layer)
+
+describe("public native OpenCode API", () => {
+  it.effect("exposes only the intentional Session capabilities", () =>
+    Effect.gen(function* () {
+      const opencode = yield* OpenCode.Service
+
+      expect(Object.keys(opencode).sort()).toEqual(["sessions", "tools"])
+
+      expect(Object.keys(opencode.sessions).sort()).toEqual([
+        "context",
+        "create",
+        "events",
+        "get",
+        "interrupt",
+        "list",
+        "message",
+        "messages",
+        "prompt",
+        "switchModel",
+      ])
+      expect(Session.ID.create()).toStartWith("ses_")
+      expect(Session.MessageID.create()).toStartWith("msg_")
+      expect(yield* opencode.sessions.list()).toBeArray()
+      yield* opencode.tools.register({
+        public_tool: Tool.make({
+          description: "Public tool",
+          input: Schema.Struct({}),
+          output: Schema.Struct({ ok: Schema.Boolean }),
+          execute: () => Effect.succeed({ ok: true }),
+        }),
+      })
+    }),
+  )
+
+  it.effect("switches to an available model and variant", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* writeProvider(tmp.path)
+          const opencode = yield* OpenCode.Service
+          const sessionID = Session.ID.make("ses_public_switch_available")
+          const model = ref({ variant: "fast" })
+          yield* opencode.sessions.create({
+            id: sessionID,
+            location: Location.Ref.make({ directory: AbsolutePath.make(tmp.path) }),
+          })
+
+          yield* opencode.sessions.switchModel({ sessionID, model })
+
+          expect((yield* opencode.sessions.get(sessionID)).model).toEqual(model)
+        }),
+      ),
+    ),
+  )
+
+  it.effect("rejects missing and Location-disabled models without changing the Session", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => Promise.all([tmpdir(), tmpdir()])),
+      (dirs) => Effect.promise(() => Promise.all(dirs.map((dir) => dir[Symbol.asyncDispose]())).then(() => undefined)),
+    ).pipe(
+      Effect.flatMap(([available, disabled]) =>
+        Effect.gen(function* () {
+          yield* writeProvider(available.path)
+          yield* writeProvider(disabled.path, true)
+          const opencode = yield* OpenCode.Service
+          const availableID = Session.ID.make("ses_public_switch_exact_available")
+          const disabledID = Session.ID.make("ses_public_switch_exact_disabled")
+          yield* opencode.sessions.create({
+            id: availableID,
+            location: Location.Ref.make({ directory: AbsolutePath.make(available.path) }),
+          })
+          yield* opencode.sessions.create({
+            id: disabledID,
+            location: Location.Ref.make({ directory: AbsolutePath.make(disabled.path) }),
+          })
+
+          yield* opencode.sessions.switchModel({ sessionID: availableID, model: ref({ variant: "default" }) })
+          const disabledError = yield* opencode.sessions
+            .switchModel({ sessionID: disabledID, model: ref() })
+            .pipe(Effect.flip)
+          const missingError = yield* opencode.sessions
+            .switchModel({ sessionID: disabledID, model: ref({ id: "missing" }) })
+            .pipe(Effect.flip)
+
+          expect(disabledError).toBeInstanceOf(Session.ModelUnavailableError)
+          expect(missingError).toBeInstanceOf(Session.ModelUnavailableError)
+          expect((yield* opencode.sessions.get(availableID)).model).toEqual(ref({ variant: "default" }))
+          expect((yield* opencode.sessions.get(disabledID)).model).toBeUndefined()
+        }),
+      ),
+    ),
+  )
+
+  it.effect("rejects an unavailable variant without changing the Session", () =>
+    Effect.acquireRelease(
+      Effect.promise(() => tmpdir()),
+      (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+    ).pipe(
+      Effect.flatMap((tmp) =>
+        Effect.gen(function* () {
+          yield* writeProvider(tmp.path)
+          const opencode = yield* OpenCode.Service
+          const sessionID = Session.ID.make("ses_public_switch_variant")
+          const selected = ref({ variant: "fast" })
+          yield* opencode.sessions.create({
+            id: sessionID,
+            location: Location.Ref.make({ directory: AbsolutePath.make(tmp.path) }),
+          })
+          yield* opencode.sessions.switchModel({ sessionID, model: selected })
+
+          const error = yield* opencode.sessions
+            .switchModel({ sessionID, model: ref({ variant: "unknown" }) })
+            .pipe(Effect.flip)
+
+          expect(error).toBeInstanceOf(Session.VariantUnavailableError)
+          expect((yield* opencode.sessions.get(sessionID)).model).toEqual(selected)
+        }),
+      ),
+    ),
+  )
+
+  it.effect("preserves the typed not-found error for a missing Session", () =>
+    Effect.gen(function* () {
+      const opencode = yield* OpenCode.Service
+      const sessionID = Session.ID.make("ses_public_switch_missing")
+      const error = yield* opencode.sessions
+        .switchModel({
+          sessionID,
+          model: Schema.decodeUnknownSync(Model.Ref)({ id: "claude-sonnet-4-5", providerID: "anthropic" }),
+        })
+        .pipe(Effect.flip)
+
+      expect(error).toBeInstanceOf(Session.NotFoundError)
+      if (error instanceof Session.NotFoundError) expect(error.sessionID).toBe(sessionID)
+    }),
+  )
+})
+
+const ref = (input: { id?: string; variant?: string } = {}) =>
+  Schema.decodeUnknownSync(Model.Ref)({
+    id: input.id ?? "chat",
+    providerID: "public-test",
+    variant: input.variant,
+  })
+
+const writeProvider = (directory: string, disabled = false) =>
+  Effect.promise(() =>
+    fs.writeFile(
+      path.join(directory, "opencode.json"),
+      JSON.stringify({
+        providers: {
+          "public-test": {
+            name: "Public test",
+            api: { type: "native", settings: {} },
+            models: {
+              chat: {
+                disabled,
+                variants: [{ id: "fast" }],
+              },
+            },
+          },
+        },
+      }),
+    ),
+  )

packages/core/test/public-tool.test.ts

@@ -0,0 +1,13 @@
+import { describe, expect, it } from "bun:test"
+import { Tool } from "@opencode-ai/core/public"
+import { Effect } from "effect"
+
+describe("public Tool API", () => {
+  it("keeps the public registration capability narrow", () => {
+    const tools = {
+      register: () => Effect.void,
+    } satisfies Tool.Interface
+
+    expect(Object.keys(tools)).toEqual(["register"])
+  })
+})