Copilot/update entrypoint args lockdown

pkg/workflow/github_lockdown_integration_test.go

@@ -39,11 +39,12 @@ Test lockdown mode with local GitHub MCP.
 `,
 			expected: []string{
 				`"type": "stdio"`,
+				`"entrypointArgs": ["stdio", "--lockdown-mode"]`,
 				`"GITHUB_LOCKDOWN_MODE": "1"`,
 				`"ghcr.io/github/github-mcp-server:`,
 			},
 			notExpected: []string{},
-			description: "Copilot with local mode and lockdown should render GITHUB_LOCKDOWN_MODE=1",
+			description: "Copilot with local mode and lockdown should render entrypointArgs with --lockdown-mode and GITHUB_LOCKDOWN_MODE=1",
 		},
 		{
 			name:   "copilot engine with lockdown enabled in remote mode",
@@ -90,13 +91,14 @@ tools:
 Test lockdown mode with Claude engine.
 `,
 			expected: []string{
+				`"entrypointArgs": ["stdio", "--lockdown-mode"]`,
 				`"GITHUB_LOCKDOWN_MODE": "1"`,
 				`"ghcr.io/github/github-mcp-server:`,
 			},
 			notExpected: []string{
 				`"type": "stdio"`, // Claude doesn't include type field
 			},
-			description: "Claude with lockdown should render GITHUB_LOCKDOWN_MODE=1",
+			description: "Claude with lockdown should render entrypointArgs with --lockdown-mode and GITHUB_LOCKDOWN_MODE=1",
 		},
 		{
 			name:   "codex engine with lockdown enabled",
@@ -116,11 +118,12 @@ tools:
 Test lockdown mode with Codex engine.
 `,
 			expected: []string{
+				`entrypointArgs = ["stdio", "--lockdown-mode"]`,
 				`"GITHUB_LOCKDOWN_MODE" = "1"`,
 				`ghcr.io/github/github-mcp-server:`,
 			},
 			notExpected: []string{},
-			description: "Codex (TOML) with lockdown should render GITHUB_LOCKDOWN_MODE=1",
+			description: "Codex (TOML) with lockdown should render entrypointArgs with --lockdown-mode and GITHUB_LOCKDOWN_MODE=1",
 		},
 		{
 			name:   "lockdown with read-only both enabled",
@@ -141,6 +144,7 @@ tools:
 Test lockdown and read-only modes together.
 `,
 			expected: []string{
+				`"entrypointArgs": ["stdio", "--lockdown-mode"]`,
 				`"GITHUB_LOCKDOWN_MODE": "1"`,
 				`"GITHUB_READ_ONLY": "1"`,
 			},

pkg/workflow/github_lockdown_test.go

@@ -123,6 +123,7 @@ func TestRenderGitHubMCPDockerConfigWithLockdown(t *testing.T) {
 			},
 			expected: []string{
 				`"type": "stdio"`,
+				`"entrypointArgs": ["stdio", "--lockdown-mode"]`,
 				`"GITHUB_LOCKDOWN_MODE": "1"`,
 				`"GITHUB_TOOLSETS": "default"`,
 				`"container": "ghcr.io/github/github-mcp-server:latest"`,
@@ -146,6 +147,7 @@ func TestRenderGitHubMCPDockerConfigWithLockdown(t *testing.T) {
 			},
 			notFound: []string{
 				`"GITHUB_LOCKDOWN_MODE"`,
+				`"entrypointArgs"`,
 			},
 		},
 		{
@@ -160,6 +162,7 @@ func TestRenderGitHubMCPDockerConfigWithLockdown(t *testing.T) {
 			},
 			expected: []string{
 				`"GITHUB_READ_ONLY": "1"`,
+				`"entrypointArgs": ["stdio", "--lockdown-mode"]`,
 				`"GITHUB_LOCKDOWN_MODE": "1"`,
 				`"container": "ghcr.io/github/github-mcp-server:v1.0.0"`,
 			},

pkg/workflow/mcp_renderer.go

@@ -557,6 +557,11 @@ func (r *MCPConfigRendererUnified) renderGitHubTOML(yaml *strings.Builder, githu
 			yaml.WriteString("]\n")
 		}
 
+		// Add entrypointArgs for lockdown mode
+		if lockdown {
+			yaml.WriteString("          entrypointArgs = [\"stdio\", \"--lockdown-mode\"]\n")
+		}
+
 		// Build environment variables
 		envVars := make(map[string]string)
 		envVars["GITHUB_PERSONAL_ACCESS_TOKEN"] = "$GH_AW_GITHUB_TOKEN"
@@ -729,6 +734,11 @@ func RenderGitHubMCPDockerConfig(yaml *strings.Builder, options GitHubMCPDockerO
 	// for Copilot (see convert_gateway_config_copilot.sh). This keeps the gateway
 	// config compatible with the schema which doesn't have the tools field.
 
+	// Add entrypointArgs for explicit lockdown mode (not applicable when lockdown is determined at runtime)
+	if options.Lockdown && !options.LockdownFromStep {
+		yaml.WriteString("                \"entrypointArgs\": [\"stdio\", \"--lockdown-mode\"],\n")
+	}
+
 	// Add env section for GitHub MCP server environment variables
 	yaml.WriteString("                \"env\": {\n")