diff --git a/.opencode/opencode.jsonc b/.opencode/opencode.jsonc
index e16af2f78a..f9a81f1169 100644
--- a/.opencode/opencode.jsonc
+++ b/.opencode/opencode.jsonc
@@ -15,9 +15,4 @@
     "github-triage": false,
     "github-pr-search": false,
   },
-  // altimate_change start — disable auto MCP discovery for altimate-code
-  "experimental": {
-    "auto_mcp_discovery": false,
-  },
-  // altimate_change end
 }
diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 9d9ef57d8b..12e3730e43 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -1294,8 +1294,8 @@ export namespace Config {
           // altimate_change start - auto MCP discovery toggle
           auto_mcp_discovery: z
             .boolean()
-            .optional()
-            .describe("Auto-discover MCP servers from VS Code, Claude Code, Copilot, and Gemini configs at startup (default: true). Set to false to disable."),
+            .default(true)
+            .describe("Auto-discover MCP servers from VS Code, Claude Code, Copilot, and Gemini configs at startup. Set to false to disable."),
           // altimate_change end
         })
         .optional(),
diff --git a/packages/opencode/test/tool/skill.test.ts b/packages/opencode/test/tool/skill.test.ts
index 30fb9c2460..b80610c635 100644
--- a/packages/opencode/test/tool/skill.test.ts
+++ b/packages/opencode/test/tool/skill.test.ts
@@ -189,6 +189,7 @@ Use this skill.
       config: {
         experimental: {
           env_fingerprint_skill_selection: false,
+          auto_mcp_discovery: true,
         },
       },
       init: async (dir) => {
@@ -225,6 +226,7 @@ Use this skill.
       config: {
         experimental: {
           env_fingerprint_skill_selection: true,
+          auto_mcp_discovery: true,
         },
       },
       init: async (dir) => {