chore: replace dedicated chatgpt endpoint with query param

hugodutka · hugodutka · commit 2faad08a805a · 2025-08-04T11:51:54.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -998,10 +998,7 @@ func New(options *Options) *API {
 			)
 
 			// MCP HTTP transport endpoint with mandatory authentication
-			r.Mount("/http", api.standardMCPHTTPHandler())
-			// ChatGPT gets a dedicated endpoint with a limited set of tools.
-			// See the docstring of the chatgptMCPHTTPHandler for more details.
-			r.Mount("/chatgpt", api.chatgptMCPHTTPHandler())
+			r.Mount("/http", api.mcpHTTPHandler())
 		})
 	})
 
diff --git a/coderd/mcp/mcp_e2e_test.go b/coderd/mcp/mcp_e2e_test.go
@@ -1232,7 +1232,7 @@ func TestMCPHTTP_E2E_ChatGPTEndpoint(t *testing.T) {
 	template := coderdtest.CreateTemplate(t, coderClient, user.OrganizationID, version.ID)
 
 	// Create MCP client pointing to the ChatGPT endpoint
-	mcpURL := api.AccessURL.String() + "/api/experimental/mcp/chatgpt"
+	mcpURL := api.AccessURL.String() + "/api/experimental/mcp/http?toolset=chatgpt"
 
 	// Configure client with authentication headers using RFC 6750 Bearer token
 	mcpClient, err := mcpclient.NewStreamableHttpClient(mcpURL,
diff --git a/coderd/mcp_http.go b/coderd/mcp_http.go
@@ -12,9 +12,53 @@ import (
 	"github.com/coder/coder/v2/codersdk/toolsdk"
 )
 
+type MCPToolset string
+
+const (
+	MCPToolsetStandard MCPToolset = "standard"
+	MCPToolsetChatGPT  MCPToolset = "chatgpt"
+)
+
 // mcpHTTPHandler creates the MCP HTTP transport handler
-func (api *API) mcpHTTPHandler(tools []toolsdk.GenericTool) http.Handler {
+// It supports a "toolset" query parameter to select the set of tools to register.
+func (api *API) mcpHTTPHandler() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		toolset := MCPToolset(r.URL.Query().Get("toolset"))
+		// Default to standard toolset if no toolset is specified.
+		if toolset == "" {
+			toolset = MCPToolsetStandard
+		}
+
+		mcpTools := []toolsdk.GenericTool{}
+		switch toolset {
+		case MCPToolsetStandard:
+			// Register all available tools, but exclude:
+			// - ReportTask - which requires dependencies not available in the remote MCP context
+			// - ChatGPT search and fetch tools, which are redundant with the standard tools.
+			for _, tool := range toolsdk.All {
+				if tool.Name == toolsdk.ToolNameReportTask ||
+					tool.Name == toolsdk.ToolNameChatGPTSearch || tool.Name == toolsdk.ToolNameChatGPTFetch {
+					continue
+				}
+				mcpTools = append(mcpTools, tool)
+			}
+		case MCPToolsetChatGPT:
+			// ChatGPT tools are the search and fetch tools as defined in https://platform.openai.com/docs/mcp.
+			// We do not expose any extra ones because ChatGPT has an undocumented "Safety Scan" feature.
+			// In my experiments, if I included extra tools in the MCP server, ChatGPT would often - but not always -
+			// refuse to add Coder as a connector.
+			for _, tool := range toolsdk.All {
+				if tool.Name == toolsdk.ToolNameChatGPTSearch || tool.Name == toolsdk.ToolNameChatGPTFetch {
+					mcpTools = append(mcpTools, tool)
+				}
+			}
+		default:
+			httpapi.Write(r.Context(), w, http.StatusBadRequest, codersdk.Response{
+				Message: "Invalid toolset",
+			})
+			return
+		}
+
 		// Create MCP server instance for each request
 		mcpServer, err := mcp.NewServer(api.Logger.Named("mcp"))
 		if err != nil {
@@ -30,45 +74,11 @@ func (api *API) mcpHTTPHandler(tools []toolsdk.GenericTool) http.Handler {
 		authenticatedClient.SetSessionToken(httpmw.APITokenFromRequest(r))
 
 		// Register tools with authenticated client
-		if err := mcpServer.RegisterTools(authenticatedClient, tools); err != nil {
+		if err := mcpServer.RegisterTools(authenticatedClient, mcpTools); err != nil {
 			api.Logger.Warn(r.Context(), "failed to register MCP tools", slog.Error(err))
 		}
 
 		// Handle the MCP request
 		mcpServer.ServeHTTP(w, r)
 	})
 }
-
-// standardMCPHTTPHandler sets up the MCP HTTP transport handler for the standard tools.
-// Standard tools are all tools except for the report task, ChatGPT search, and ChatGPT fetch tools.
-func (api *API) standardMCPHTTPHandler() http.Handler {
-	mcpTools := []toolsdk.GenericTool{}
-	// Register all available tools, but exclude:
-	// - ReportTask - which requires dependencies not available in the remote MCP context
-	// - ChatGPT search and fetch tools, which are redundant with the standard tools.
-	for _, tool := range toolsdk.All {
-		if tool.Name == toolsdk.ToolNameReportTask ||
-			tool.Name == toolsdk.ToolNameChatGPTSearch || tool.Name == toolsdk.ToolNameChatGPTFetch {
-			continue
-		}
-		mcpTools = append(mcpTools, tool)
-	}
-	return api.mcpHTTPHandler(mcpTools)
-}
-
-// chatgptMCPHTTPHandler sets up the MCP HTTP transport handler for the ChatGPT tools.
-// ChatGPT tools are the search and fetch tools as defined in https://platform.openai.com/docs/mcp.
-// We do not expose any extra ones because ChatGPT has an undocumented "Safety Scan" feature.
-// In my experiments, if I included extra tools in the MCP server, ChatGPT would refuse
-// to add Coder as a connector.
-func (api *API) chatgptMCPHTTPHandler() http.Handler {
-	mcpTools := []toolsdk.GenericTool{}
-	// Register only the ChatGPT search and fetch tools.
-	for _, tool := range toolsdk.All {
-		if !(tool.Name == toolsdk.ToolNameChatGPTSearch || tool.Name == toolsdk.ToolNameChatGPTFetch) {
-			continue
-		}
-		mcpTools = append(mcpTools, tool)
-	}
-	return api.mcpHTTPHandler(mcpTools)
-}
