fix: persist enabled/disabled flag to config on MCP connect/disconnect

Author: saravmajestic

packages/opencode/src/mcp/index.ts

@@ -15,6 +15,10 @@ import { NamedError } from "@opencode-ai/util/error"
 import z from "zod/v4"
 import { Instance } from "../project/instance"
 import { Installation } from "../installation"
+// altimate_change start — persist enabled flag
+import { findAllConfigPaths, listMcpInConfig, addMcpToConfig } from "./config"
+import { Global } from "../global"
+// altimate_change end
 import { withTimeout } from "@/util/timeout"
 import { McpOAuthProvider } from "./oauth-provider"
 import { McpOAuthCallback } from "./oauth-callback"
@@ -694,6 +698,31 @@ export namespace MCP {
     return state().then((state) => state.clients)
   }
 
+  // altimate_change start — persist enabled/disabled to disk so it survives session restarts
+  async function persistMcpEnabled(name: string, enabled: boolean): Promise<void> {
+    try {
+      const paths = await findAllConfigPaths(Instance.directory, Global.Path.config)
+      for (const p of paths) {
+        const names = await listMcpInConfig(p)
+        if (names.includes(name)) {
+          const cfg = await Config.get()
+          const entry = cfg.mcp?.[name]
+          if (entry)
+            await addMcpToConfig(
+              name,
+              { ...entry, enabled } as Parameters<typeof addMcpToConfig>[1],
+              p,
+            )
+          log.info("persistMcpEnabled", { name, enabled, path: p })
+          break
+        }
+      }
+    } catch (err) {
+      log.error("Failed to persist MCP enabled flag", { name, enabled, error: err })
+    }
+  }
+  // altimate_change end
+
   export async function connect(name: string) {
     const cfg = await Config.get()
     const config = cfg.mcp ?? {}
@@ -732,6 +761,9 @@ export namespace MCP {
       s.clients[name] = result.mcpClient
       if (result.transport) s.transports[name] = result.transport
     }
+    // altimate_change start — persist enabled:true so it survives session restarts
+    await persistMcpEnabled(name, true)
+    // altimate_change end
   }
 
   export async function disconnect(name: string) {
@@ -754,6 +786,9 @@ export namespace MCP {
     })
     delete s.transports[name]
     s.status[name] = { status: "disabled" }
+    // altimate_change start — persist enabled:false so disable survives session restarts
+    await persistMcpEnabled(name, false)
+    // altimate_change end
   }
 
   /** Fully remove a dynamically-added MCP server — disconnects, and purges from runtime state. */