diff --git a/src/config/schema.ts b/src/config/schema.ts
index e4237a0..c567302 100644
--- a/src/config/schema.ts
+++ b/src/config/schema.ts
@@ -1,4 +1,5 @@
 import { z } from "zod"
+import { McpNameSchema } from "../mcp/types"
 
 const PermissionValue = z.enum(["ask", "allow", "deny"])
 
@@ -23,8 +24,6 @@ export const AgentNameSchema = z.enum([
   "document-writer",
 ])
 
-export const McpNameSchema = z.enum(["websearch_exa", "context7"])
-
 export const AgentOverrideConfigSchema = z.object({
   model: z.string().optional(),
   temperature: z.number().min(0).max(2).optional(),
@@ -53,5 +52,6 @@ export const OhMyOpenCodeConfigSchema = z.object({
 export type OhMyOpenCodeConfig = z.infer<typeof OhMyOpenCodeConfigSchema>
 export type AgentOverrideConfig = z.infer<typeof AgentOverrideConfigSchema>
 export type AgentOverrides = z.infer<typeof AgentOverridesSchema>
-export type McpName = z.infer<typeof McpNameSchema>
 export type AgentName = z.infer<typeof AgentNameSchema>
+
+export { McpNameSchema, type McpName } from "../mcp/types"
diff --git a/src/mcp/index.ts b/src/mcp/index.ts
index 49be11b..18c20ae 100644
--- a/src/mcp/index.ts
+++ b/src/mcp/index.ts
@@ -1,8 +1,8 @@
-import type { McpName } from "../config"
 import { websearch_exa } from "./websearch-exa"
 import { context7 } from "./context7"
+import type { McpName } from "./types"
 
-export type { McpName }
+export { McpNameSchema, type McpName } from "./types"
 
 const allBuiltinMcps: Record<McpName, { type: "remote"; url: string; enabled: boolean }> = {
   websearch_exa,
diff --git a/src/mcp/types.ts b/src/mcp/types.ts
new file mode 100644
index 0000000..ea7dfb9
--- /dev/null
+++ b/src/mcp/types.ts
@@ -0,0 +1,5 @@
+import { z } from "zod"
+
+export const McpNameSchema = z.enum(["websearch_exa", "context7"])
+
+export type McpName = z.infer<typeof McpNameSchema>