wip: drop prompt and parameter overrides and implement prompt proxying

Signed-off-by: Nick Hale <[email protected]>

Author: njhale

apiclient/types/mcpserver.go

@@ -62,11 +62,10 @@ type CompositeCatalogConfig struct {
 
 // CatalogComponentServer represents a component server in a composite server catalog entry.
 type CatalogComponentServer struct {
-	CatalogEntryID  string                        `json:"catalogEntryID"`
-	MCPServerID     string                        `json:"mcpServerID,omitempty"`
-	Manifest        MCPServerCatalogEntryManifest `json:"manifest"`
-	ToolOverrides   []ToolOverride                `json:"toolOverrides,omitempty"`
-	PromptOverrides []PromptOverride              `json:"promptOverrides,omitempty"`
+	CatalogEntryID string                        `json:"catalogEntryID"`
+	MCPServerID    string                        `json:"mcpServerID,omitempty"`
+	Manifest       MCPServerCatalogEntryManifest `json:"manifest"`
+	ToolOverrides  []ToolOverride                `json:"toolOverrides,omitempty"`
 }
 
 type CompositeRuntimeConfig struct {
@@ -77,10 +76,9 @@ type ComponentServer struct {
 	// CatalogEntryID is used when the component server is a single-user or remote server.
 	CatalogEntryID string `json:"catalogEntryID"`
 	// MCPServerID is used when the component server is a multi-user server.
-	MCPServerID     string            `json:"mcpServerID,omitempty"`
-	Manifest        MCPServerManifest `json:"manifest"`
-	ToolOverrides   []ToolOverride    `json:"toolOverrides,omitempty"`
-	PromptOverrides []PromptOverride  `json:"promptOverrides,omitempty"`
+	MCPServerID   string            `json:"mcpServerID,omitempty"`
+	Manifest      MCPServerManifest `json:"manifest"`
+	ToolOverrides []ToolOverride    `json:"toolOverrides,omitempty"`
 }
 
 type MCPServerCatalogEntry struct {
@@ -117,19 +115,6 @@ type MCPServerCatalogEntryManifest struct {
 	Env []MCPEnv `json:"env,omitempty"`
 }
 
-// TODO(njhale): Prompt and tool overrides are effectively the same types with slightly different field names.
-// Consolidate them into a single set of types.
-
-// ParameterOverride is used to override the name and description of a parameter.
-type ParameterOverride struct {
-	// Name is the original parameter name as defined by the component server
-	Name string `json:"name"`
-	// OverrideName is the parameter name exposed by the composite server
-	OverrideName string `json:"overrideName"`
-	// Optional override for parameter description
-	OverrideDescription string `json:"overrideDescription,omitempty"`
-}
-
 // ToolOverride defines how a single component tool is exposed by the composite server
 type ToolOverride struct {
 	// Name is the original tool name as returned by the component server
@@ -140,25 +125,6 @@ type ToolOverride struct {
 	OverrideDescription string `json:"overrideDescription,omitempty"`
 	// Whether to include this tool (default true)
 	Enabled bool `json:"enabled,omitempty"`
-	// Optional parameter name/description overrides
-	ParameterOverrides []ParameterOverride `json:"parameterOverrides,omitempty"`
-}
-
-// PromptArgumentOverride is used to override the name and description of a prompt argument.
-type PromptArgumentOverride ParameterOverride
-
-// PromptOverride is used to override the name and description of a prompt.
-type PromptOverride struct {
-	// Name is the original prompt name as returned by the component server
-	Name string `json:"name"`
-	// OverrideName is the prompt name exposed by the composite server
-	OverrideName string `json:"overrideName"`
-	// Optional overrides for display
-	OverrideDescription string `json:"overrideDescription,omitempty"`
-	// Whether to include this prompt (default true)
-	Enabled bool `json:"enabled,omitempty"`
-	// Optional argument name/description overrides
-	ArgumentOverrides []PromptArgumentOverride `json:"argumentOverrides,omitempty"`
 }
 
 type MCPHeader struct {
@@ -442,8 +408,7 @@ func MapCatalogEntryToServer(catalogEntry MCPServerCatalogEntryManifest, userURL
 				CatalogEntryID:  catalogComponent.CatalogEntryID,
 				Manifest:        componentServerManifest,
 				ToolOverrides:   catalogComponent.ToolOverrides,
-				PromptOverrides: catalogComponent.PromptOverrides,
-			}
+				}
 		}
 
 		serverManifest.CompositeConfig = &CompositeRuntimeConfig{

apiclient/types/zz_generated.deepcopy.go

@@ -1112,8 +1112,7 @@ func serverManifestFromCatalogEntryManifest(isAdmin bool, entry types.MCPServerC
 				CatalogEntryID:  c.CatalogEntryID,
 				Manifest:        mapped,
 				ToolOverrides:   c.ToolOverrides,
-				PromptOverrides: c.PromptOverrides,
-			})
+				})
 		}
 
 		if isAdmin {