diff --git a/packages/core/src/plugin/provider.ts b/packages/core/src/plugin/provider.ts
index a6367b7df7b0..4bb84b0eb502 100644
--- a/packages/core/src/plugin/provider.ts
+++ b/packages/core/src/plugin/provider.ts
@@ -9,7 +9,6 @@ import { CloudflareAIGatewayPlugin } from "./provider/cloudflare-ai-gateway.js"
 import { CloudflareWorkersAIPlugin } from "./provider/cloudflare-workers-ai.js"
 import { DatabricksPlugin } from "./provider/databricks.js"
 import { DigitalOceanPlugin } from "./provider/digitalocean.js"
-import { DynamicProviderPlugin } from "./provider/dynamic.js"
 import { GithubCopilotPlugin } from "./provider/github-copilot.js"
 import { GitLabPlugin } from "./provider/gitlab.js"
 import { GoogleVertexPlugin } from "./provider/google-vertex.js"
@@ -69,7 +68,6 @@ export const ProviderPlugins: PluginInternal.InternalPlugin[] = [
   VLLMPlugin,
   XAIPlugin,
   ZenmuxPlugin,
-  DynamicProviderPlugin,
   // Reads the active subscription connections registered above; order it last.
   QuotaPlugin,
 ].filter((plugin) => plugin.id !== "opencode.provider.claude-agent")
diff --git a/packages/core/test/tool-registry.test.ts b/packages/core/test/tool-registry.test.ts
index a3d579d50ffb..d47f8cf9b626 100644
--- a/packages/core/test/tool-registry.test.ts
+++ b/packages/core/test/tool-registry.test.ts
@@ -709,7 +709,7 @@ describe("Tool", () => {
     }),
   )
 
-  it.effect("does not call a disabled direct tool through a cached code-mode runtime", () =>
+  it.effect("does not call a disabled tool through a cached code-mode runtime", () =>
     Effect.gen(function* () {
       const service = yield* Tool.Service
       const calls: string[] = []
@@ -724,7 +724,6 @@ describe("Tool", () => {
             },
           },
         },
-        { codemode: false },
       )
       const enabled = yield* service.snapshot()
       const run = (snapshot: Tool.Snapshot, id: string) =>