Fix serena MCP context to use engine-specific values instead of hardcoded "codex"

pkg/workflow/claude_mcp.go

@@ -20,6 +20,7 @@ func (e *ClaudeEngine) RenderMCPConfig(yaml *strings.Builder, tools map[string]a
 			InlineArgs:           false, // Claude uses multi-line args format
 			Format:               "json",
 			IsLast:               isLast,
+			EngineID:             e.id, // Pass engine ID for engine-specific configuration
 		})
 	}
 

pkg/workflow/codex_mcp.go

@@ -23,6 +23,7 @@ func (e *CodexEngine) RenderMCPConfig(yaml *strings.Builder, tools map[string]an
 			InlineArgs:           false, // Codex uses multi-line args format
 			Format:               "toml",
 			IsLast:               isLast,
+			EngineID:             e.id, // Pass engine ID for engine-specific configuration
 		})
 	}
 
@@ -109,6 +110,7 @@ func (e *CodexEngine) RenderMCPConfig(yaml *strings.Builder, tools map[string]an
 			InlineArgs:           false, // Use standard multi-line format
 			Format:               "json",
 			IsLast:               isLast,
+			EngineID:             e.id, // Pass engine ID for engine-specific configuration
 		})
 	}
 

pkg/workflow/copilot_mcp.go

@@ -23,6 +23,7 @@ func (e *CopilotEngine) RenderMCPConfig(yaml *strings.Builder, tools map[string]
 			InlineArgs:           true, // Copilot uses inline args format
 			Format:               "json",
 			IsLast:               isLast,
+			EngineID:             e.id, // Pass engine ID for engine-specific configuration
 		})
 	}
 

pkg/workflow/mcp-config-serena.go

@@ -99,7 +99,8 @@ func selectSerenaContainer(serenaTool any) string {
 // Supports two modes:
 // - "docker" (default): Uses Docker container with stdio transport (ghcr.io/githubnext/serena-mcp-server:latest)
 // - "local": Uses local uvx with HTTP transport on fixed port
-func renderSerenaMCPConfigWithOptions(yaml *strings.Builder, serenaTool any, isLast bool, includeCopilotFields bool, inlineArgs bool) {
+// The engineID parameter specifies which engine context to use (e.g., "copilot", "claude", "codex")
+func renderSerenaMCPConfigWithOptions(yaml *strings.Builder, serenaTool any, isLast bool, includeCopilotFields bool, inlineArgs bool, engineID string) {
 	customArgs := getSerenaCustomArgs(serenaTool)
 
 	// Determine the mode - check if serenaTool is a map with mode field
@@ -145,16 +146,22 @@ func renderSerenaMCPConfigWithOptions(yaml *strings.Builder, serenaTool any, isL
 		yaml.WriteString("                \"entrypoint\": \"serena\",\n")
 
 		// Entrypoint args for Serena MCP server
+		// Use engine-specific context (copilot, claude, codex, etc.)
+		context := engineID
+		if context == "" {
+			context = "codex" // fallback to codex for backwards compatibility
+		}
+
 		if inlineArgs {
-			yaml.WriteString("                \"entrypointArgs\": [\"start-mcp-server\", \"--context\", \"codex\", \"--project\", \"${{ github.workspace }}\"")
+			yaml.WriteString("                \"entrypointArgs\": [\"start-mcp-server\", \"--context\", \"" + context + "\", \"--project\", \"${{ github.workspace }}\"")
 			// Append custom args if present
 			writeArgsToYAMLInline(yaml, customArgs)
 			yaml.WriteString("],\n")
 		} else {
 			yaml.WriteString("                \"entrypointArgs\": [\n")
 			yaml.WriteString("                  \"start-mcp-server\",\n")
 			yaml.WriteString("                  \"--context\",\n")
-			yaml.WriteString("                  \"codex\",\n")
+			yaml.WriteString("                  \"" + context + "\",\n")
 			yaml.WriteString("                  \"--project\",\n")
 			yaml.WriteString("                  \"${{ github.workspace }}\"")
 			// Append custom args if present

pkg/workflow/mcp_config_comprehensive_test.go

@@ -651,7 +651,7 @@ func TestRenderSerenaMCPConfigWithOptions(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			var output strings.Builder
 
-			renderSerenaMCPConfigWithOptions(&output, tt.serenaTool, tt.isLast, tt.includeCopilotFields, tt.inlineArgs)
+			renderSerenaMCPConfigWithOptions(&output, tt.serenaTool, tt.isLast, tt.includeCopilotFields, tt.inlineArgs, "codex")
 
 			result := output.String()
 
@@ -1194,7 +1194,7 @@ func TestRenderSerenaMCPConfigLocalMode(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			var output strings.Builder
 
-			renderSerenaMCPConfigWithOptions(&output, tt.serenaTool, tt.isLast, tt.includeCopilotFields, tt.inlineArgs)
+			renderSerenaMCPConfigWithOptions(&output, tt.serenaTool, tt.isLast, tt.includeCopilotFields, tt.inlineArgs, "codex")
 
 			result := output.String()
 

pkg/workflow/mcp_renderer.go

@@ -23,6 +23,8 @@ type MCPRendererOptions struct {
 	Format string
 	// IsLast indicates if this is the last server in the configuration (affects trailing comma)
 	IsLast bool
+	// EngineID specifies the engine identifier (e.g., "copilot", "claude", "codex") for engine-specific configuration
+	EngineID string
 }
 
 // MCPConfigRendererUnified provides unified rendering methods for MCP configurations
@@ -177,15 +179,15 @@ func (r *MCPConfigRendererUnified) renderPlaywrightTOML(yaml *strings.Builder, p
 
 // RenderSerenaMCP generates Serena MCP server configuration
 func (r *MCPConfigRendererUnified) RenderSerenaMCP(yaml *strings.Builder, serenaTool any) {
-	mcpRendererLog.Printf("Rendering Serena MCP: format=%s, inline_args=%t", r.options.Format, r.options.InlineArgs)
+	mcpRendererLog.Printf("Rendering Serena MCP: format=%s, inline_args=%t, engine=%s", r.options.Format, r.options.InlineArgs, r.options.EngineID)
 
 	if r.options.Format == "toml" {
 		r.renderSerenaTOML(yaml, serenaTool)
 		return
 	}
 
 	// JSON format
-	renderSerenaMCPConfigWithOptions(yaml, serenaTool, r.options.IsLast, r.options.IncludeCopilotFields, r.options.InlineArgs)
+	renderSerenaMCPConfigWithOptions(yaml, serenaTool, r.options.IsLast, r.options.IncludeCopilotFields, r.options.InlineArgs, r.options.EngineID)
 }
 
 // renderSerenaTOML generates Serena MCP configuration in TOML format
@@ -226,10 +228,16 @@ func (r *MCPConfigRendererUnified) renderSerenaTOML(yaml *strings.Builder, seren
 		yaml.WriteString("          entrypoint = \"serena\"\n")
 
 		// Entrypoint args for Serena MCP server
+		// Use engine-specific context (copilot, claude, codex, etc.)
+		context := r.options.EngineID
+		if context == "" {
+			context = "codex" // fallback to codex for backwards compatibility
+		}
+
 		yaml.WriteString("          entrypointArgs = [\n")
 		yaml.WriteString("            \"start-mcp-server\",\n")
 		yaml.WriteString("            \"--context\",\n")
-		yaml.WriteString("            \"codex\",\n")
+		yaml.WriteString("            \"" + context + "\",\n")
 		yaml.WriteString("            \"--project\",\n")
 		yaml.WriteString("            \"${{ github.workspace }}\"")