diff --git a/packages/core/src/plugin/internal.ts b/packages/core/src/plugin/internal.ts index b2eefa8a9fa..17607027a9b 100644 --- a/packages/core/src/plugin/internal.ts +++ b/packages/core/src/plugin/internal.ts @@ -65,6 +65,7 @@ import { AgentPlugin } from "./agent.js" import { CommandPlugin } from "./command.js" import { PlanPlugin } from "./plan.js" import { ModelsDevPlugin } from "./models-dev.js" +import { MCPCodeModeExclusionPlugin } from "./mcp-codemode-exclusion.js" import { ProviderPlugins } from "./provider.js" import { WebSearchPlugins } from "./websearch/index.js" import { PluginRuntime } from "./runtime.js" @@ -201,6 +202,7 @@ export type InternalPlugin = Plugin const pre = [ ConfigMCPPlugin.Plugin, + MCPCodeModeExclusionPlugin.Plugin, WellKnownPlugin.Plugin, AgentPlugin.Plugin, PlanPlugin.Plugin, diff --git a/packages/core/src/plugin/mcp-codemode-exclusion.ts b/packages/core/src/plugin/mcp-codemode-exclusion.ts new file mode 100644 index 00000000000..b1b666b9c2e --- /dev/null +++ b/packages/core/src/plugin/mcp-codemode-exclusion.ts @@ -0,0 +1,26 @@ +export * as MCPCodeModeExclusionPlugin from "./mcp-codemode-exclusion.js" + +import { define } from "@opencode-ai/plugin/effect/plugin" +import { Effect } from "effect" + +// These servers provide Code Mode, so expose them directly instead of nesting them inside OpenCode Code Mode. +const urls = [/^https:\/\/mcp\.cloudflare\.com\/mcp$/, /^https:\/\/executor\.sh\/[^/]+\/mcp$/] + +export const Plugin = define({ + id: "opencode.mcp.codemode-exclusion", + effect: Effect.fn(function* (ctx) { + yield* ctx.mcp.transform((draft) => { + for (const [, server] of draft.list()) { + if (server.codemode !== undefined) continue + if (server.type === "local") { + if (server.command[0] === "executor" && server.command[1] === "mcp") server.codemode = false + continue + } + if (!URL.canParse(server.url)) continue + const url = new URL(server.url) + const endpoint = `${url.origin}${url.pathname.replace(/\/+$/, "")}` + if (urls.some((pattern) => pattern.test(endpoint))) server.codemode = false + } + }) + }), +}) diff --git a/packages/core/test/plugin/mcp-codemode-exclusion.test.ts b/packages/core/test/plugin/mcp-codemode-exclusion.test.ts new file mode 100644 index 00000000000..54249399edf --- /dev/null +++ b/packages/core/test/plugin/mcp-codemode-exclusion.test.ts @@ -0,0 +1,77 @@ +import { expect } from "bun:test" +import { MCPCodeModeExclusionPlugin } from "@opencode-ai/core/plugin/mcp-codemode-exclusion" +import type { Mcp } from "@opencode-ai/schema/mcp" +import { Effect, type Types } from "effect" +import { it } from "../lib/effect" +import { host } from "./host" + +it.effect("defaults only known Code Mode MCP servers to direct tools", () => + Effect.gen(function* () { + const cases: Array<{ + name: string + server: Types.DeepMutable + codemode: boolean | undefined + }> = [ + { + name: "executor remote", + server: { type: "remote", url: "https://executor.sh/example/mcp?source=opencode" }, + codemode: false, + }, + { name: "executor local", server: { type: "local", command: ["executor", "mcp"] }, codemode: false }, + { + name: "cloudflare code mode", + server: { type: "remote", url: "https://mcp.cloudflare.com/mcp/" }, + codemode: false, + }, + { + name: "cloudflare docs", + server: { type: "remote", url: "https://docs.mcp.cloudflare.com/mcp" }, + codemode: undefined, + }, + { + name: "explicit true", + server: { type: "remote", url: "https://mcp.cloudflare.com/mcp", codemode: true }, + codemode: true, + }, + { + name: "explicit false", + server: { type: "remote", url: "https://executor.sh/example/mcp", codemode: false }, + codemode: false, + }, + { name: "exa", server: { type: "remote", url: "https://mcp.exa.ai/mcp" }, codemode: undefined }, + { name: "unrelated", server: { type: "remote", url: "https://example.com/mcp" }, codemode: undefined }, + ] + const servers: Record> = Object.fromEntries( + cases.map((test) => [test.name, test.server]), + ) + const base = host() + + yield* MCPCodeModeExclusionPlugin.Plugin.effect( + host({ + mcp: { + ...base.mcp, + transform: (transform) => + Effect.sync(() => { + transform({ + list: () => Object.entries(servers), + get: (name) => servers[name], + set: () => { + throw new Error("unused") + }, + update: (name, update) => { + const server = servers[name] + if (server) update(server) + }, + remove: (name) => { + delete servers[name] + }, + }) + return { dispose: Effect.void } + }), + }, + }), + ) + + cases.forEach((test) => expect(servers[test.name]?.codemode).toBe(test.codemode)) + }), +)