feat(mcp): add managed MCP server profiles

README.md

@@ -148,6 +148,10 @@ The right sidebar can show:
 
 - MCP server status
 - MCP tool lists
+- Add and manage workspace-scoped MCP server profiles
+- Register local stdio servers with commands, arguments, working directories, environment variables, and timeouts
+- Register remote Streamable HTTP servers with URLs, headers, and timeouts
+- Connect, disconnect, and remove extension-managed MCP profiles
 - LSP server status
 - Slash-command skills
 - Available OpenCode agents
@@ -160,6 +164,19 @@ OpenCode UI works with OpenCode plugin-driven workflows, including community plu
 
 Plugin-provided agents, skills, and capabilities can be surfaced directly inside the extension UI.
 
+### Managing MCP Servers
+
+Open the **MCP Servers** section in the Integrations panel and select **Add server**. Profiles are scoped to the current file-based workspace and are re-registered with OpenCode when the managed OpenCode server reconnects.
+
+Supported connection types:
+
+- **STDIO**: OpenCode starts a local command using a structured executable and argument list.
+- **Streamable HTTP**: OpenCode connects to an HTTPS MCP endpoint with optional headers.
+
+Managed profiles can be connected, disconnected, and removed from the panel. Removing a profile deletes this extension's saved profile and secrets and disconnects the current runtime entry. The pinned SDK does not provide dynamic MCP deletion, so the current OpenCode process may continue to list the entry until it restarts.
+
+The extension stores non-sensitive profile metadata in workspace state. Environment values, HTTP header values, and OAuth client secrets are stored in VS Code `SecretStorage`; they are not included in webview state, status messages, logs, or project files. OAuth authentication controls remain gated until the pinned SDK's authentication callback contract is verified.
+
 ---
 
 ## Screenshots

package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencode-vscode-chryzxc",
   "displayName": "OpenCode — VS Code Client",
-  "description": "OpenCode client for VS Code with streaming chat, implementation plans, subagents, diff review, sessions, and quota monitoring.",
+  "description": "OpenCode client for VS Code with streaming chat, implementation plans, subagents, diff review, sessions, quota monitoring, and managed MCP servers.",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -11,9 +11,9 @@
   "bugs": {
     "url": "https://github.com/chryzxc/vscode-opencode/issues"
   },
-  "version": "0.3.6",
+  "version": "0.3.7",
   "opencodeCompatibility": {
-    "extensionVersion": "0.3.6",
+    "extensionVersion": "0.3.7",
     "sdk": {
       "package": "@opencode-ai/sdk",
       "supportedRange": ">=1.18.0 <1.19.0",
@@ -66,6 +66,9 @@
     "subagents",
     "multi agent",
     "mcp",
+    "mcp server management",
+    "streamable http",
+    "stdio",
     "model context protocol",
     "session management",
     "quota monitoring",

src/providers/ChatViewProvider.ts

@@ -100,7 +100,7 @@
 import * as path from "path";
 import * as vscode from "vscode";
 import { ErrorBuilder } from "./chat/ErrorBuilder";
 import type { DisplayError } from "./chat/types";
 import {
   CssGenerator,
   FileThemeProcessor,
@@ -110,6 +110,7 @@
 import type { TokenUsage } from "../services/GeminiTokenUsageTracker";
 import { GeminiTokenUsageTracker } from "../services/GeminiTokenUsageTracker";
 import { MessageStreamService } from "../services/MessageStreamService";
+import { McpServerService, type ManagedMcpDraft, type McpClient } from "../services/McpServerService";
 import { ModelCapabilitiesService } from "../services/ModelCapabilitiesService";
 import { OpencodeServerManager } from "../services/OpencodeServerManager";
 import { QuotaService } from "../services/QuotaService";
@@ -712,7 +713,7 @@
       let permissions: unknown[] = [];
 
       try {
         const questionResponse = await (client as any).question.list();
         questions = extractList(questionResponse, "questions").filter(belongsToSession);
       } catch (questionError) {
         this.logger.warn("Failed to list pending SDK questions", {
@@ -722,7 +723,7 @@
       }
 
       try {
         const permissionResponse = await (client as any).permission.list();
         permissions = extractList(permissionResponse, "permissions").filter(belongsToSession);
       } catch (permissionError) {
         this.logger.warn("Failed to list pending SDK permissions", {
@@ -856,8 +857,8 @@
   private lastSendMessageArgs?: {
     text: string;
     files?: string[];
     contexts?: any[];
     images?: any[];
     agent?: string;
   };
   /** OpenCode v2 accepts structured output only through the typed `format` field. */
@@ -885,6 +886,7 @@
   private readonly recentUiErrorToastTimestamps = new Map<string, number>();
   private readonly UI_ERROR_TOAST_DEDUPE_WINDOW_MS = 15_000;
   private readonly installedSdkVersion = detectInstalledOpencodeSdkVersion();
+  private readonly mcpServerService: McpServerService;
 
   /** ===== NEW: Module instances ===== */
   private diagnosticsLogger!: DiagnosticsLogger;
@@ -926,6 +928,12 @@
     this.streamService = new MessageStreamService(serverManager);
     this.quotaService = new QuotaService();
     this.sessionSnapshotLoader = new SessionSnapshotLoader(serverManager);
+    this.mcpServerService = new McpServerService(
+      context,
+      () => this.getWorkspaceDirectory(),
+      () => this.serverManager.ensureRunning() as Promise<McpClient>,
+      { info: (message, data) => this.logger.info(message, data), warn: (message, data) => this.logger.warn(message, data) },
+    );
     this.subagentTracker = new SubagentTracker(() => this.selectedModel);
     this.configFilesProvider = new ConfigFilesProvider();
     this.skillManager = new SkillManagerService(context);
@@ -943,7 +951,7 @@
     this.fileThemeProcessor.subscribe(this);
 
     // Load persisted model selection
     const savedModel = this.context.globalState.get<any>("selectedModel");
     if (
       savedModel &&
       typeof savedModel.providerID === "string" &&
@@ -1081,7 +1089,7 @@
    * Wire callbacks between modules and the shell
    */
   private wireModuleCallbacks(): void {
     const postMessage = (msg: any) => {
       this.view?.webview.postMessage(msg);
     };
 
@@ -1130,7 +1138,7 @@
       clientRequestId?: string;
       text?: string;
       files?: string[];
       contexts?: any[];
       images?: any[];
       agent?: string;
       userFacingText?: string;
@@ -4387,6 +4395,54 @@
           );
           break;
         }
+        case "addMcpServer":
+        case "connectMcpServer":
+        case "disconnectMcpServer":
+        case "removeMcpServer": {
+          const requestID = typeof message.requestID === "string" ? message.requestID : undefined;
+          const operation = message.type === "addMcpServer"
+            ? "adding"
+            : message.type === "connectMcpServer"
+              ? "connecting"
+              : message.type === "disconnectMcpServer"
+                ? "disconnecting"
+                : "removing";
+          const serverName = typeof message.name === "string" ? message.name.trim() : "";
+          const profileID = typeof message.profileId === "string" ? message.profileId : undefined;
+          if (message.type === "removeMcpServer") {
+            const confirmation = await vscode.window.showWarningMessage(
+              "This disconnects the current server and removes this extension's saved profile. The current OpenCode process may still list it until it restarts.",
+              { modal: true },
+              "Remove",
+            );
+            if (confirmation !== "Remove") break;
+          }
+          this.view?.webview.postMessage({ type: "mcpOperationStarted", requestID, operation, serverName, profileID });
+          try {
+            if (message.type === "addMcpServer") {
+              await this.mcpServerService.add(message.draft as ManagedMcpDraft);
+            } else if (message.type === "connectMcpServer") {
+              await this.mcpServerService.connect(serverName);
+            } else if (message.type === "disconnectMcpServer") {
+              await this.mcpServerService.disconnect(serverName);
+            } else {
+              await this.mcpServerService.remove(serverName, profileID);
+              void vscode.window.showInformationMessage("MCP profile removed. The current OpenCode process may list it until it restarts.");
+            }
+            this.view?.webview.postMessage({ type: "mcpOperationResult", requestID, operation, success: true });
+          } catch (error) {
+            void vscode.window.showErrorMessage("OpenCode could not complete the MCP operation. Check the MCP status for details.");
+            this.view?.webview.postMessage({
+              type: "mcpOperationResult",
+              requestID,
+              operation,
+              success: false,
+              error: "MCP operation failed. Refresh the MCP status and check the server details.",
+            });
+          }
+          await this.handleGetMcpStatus();
+          break;
+        }
         case "getLspStatus": {
           this.handleGetLspStatus().catch((err) =>
             log.error("Failed to handle LSP status request", {
@@ -5060,6 +5116,7 @@
         this.postErrorToast(serverError);
       }
       this.broadcastCompatibilityWarnings();
+      if (status === "running") void this.handleGetMcpStatus();
     });
     const serverErrorOutputSubscription = this.serverManager.onServerErrorOutput(
       (snippet) => {
@@ -10026,12 +10083,10 @@
       const client = await this.serverManager.ensureRunning();
 
       log.featureStep(flow, 'fetching_mcp_and_tool_data');
-      const [mcpRes, toolIdsRes] = await Promise.all([
-        client.mcp.status(),
+      const [servers, toolIdsRes] = await Promise.all([
+        this.mcpServerService.status(client as McpClient),
         client.tool.ids().catch(() => ({ data: [] })),
       ]);
-
-      const servers = mcpRes.data ?? {};
       const toolIds: string[] = Array.isArray(toolIdsRes?.data)
         ? toolIdsRes.data
         : [];
@@ -10041,9 +10096,26 @@
         toolCount: toolIds.length,
       });
 
+      const managedProfiles = new Map(this.mcpServerService.profiles().map((profile) => [profile.name, profile]));
+      const enrichedServers = Object.fromEntries(Object.entries(servers).filter(([name]) => !this.mcpServerService.wasRemoved(name)).map(([name, value]) => {
+        const profile = managedProfiles.get(name);
+        return [name, profile ? { ...(value as Record<string, unknown>), managed: true, profileId: profile.id, kind: profile.kind } : value];
+      }));
+      for (const profile of managedProfiles.values()) {
+        if (!Object.prototype.hasOwnProperty.call(enrichedServers, profile.name)) {
+          enrichedServers[profile.name] = {
+            status: "disconnected",
+            error: "The managed profile is saved but is not currently registered with OpenCode.",
+            managed: true,
+            profileId: profile.id,
+            kind: profile.kind,
+          };
+        }
+      }
+
       this.view?.webview.postMessage({
         type: "mcpStatus",
-        servers,
+        servers: enrichedServers,
         toolIds,
       });