Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/issue-triage.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-claude-add-issue-comment.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-claude-add-issue-labels.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-claude-command.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-claude-create-issue.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-claude-create-pull-request.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-claude-mcp.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-claude-push-to-branch.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-claude-update-issue.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-codex-add-issue-comment.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-codex-add-issue-labels.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-codex-command.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-codex-create-issue.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-codex-create-pull-request.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-codex-mcp.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-codex-push-to-branch.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-codex-update-issue.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/test-proxy.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/weekly-research.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/mcps.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ You can configure the docker image version for GitHub tools:
```yaml
tools:
github:
docker_image_version: "sha-45e90ae" # Optional: specify version
docker_image_version: "sha-09deac4" # Optional: specify version
```

**Configuration Options**:
- `docker_image_version`: Docker image version (default: `"sha-45e90ae"`)
- `docker_image_version`: Docker image version (default: `"sha-09deac4"`)

## Tool Allow-listing

Expand Down
2 changes: 1 addition & 1 deletion pkg/parser/mcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func ExtractMCPConfigurations(frontmatter map[string]any, serverFilter string) (
Command: "docker",
Args: []string{
"run", "-i", "--rm", "-e", "GITHUB_PERSONAL_ACCESS_TOKEN",
"ghcr.io/github/github-mcp-server:sha-45e90ae",
"ghcr.io/github/github-mcp-server:sha-09deac4",
},
Env: make(map[string]string),
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/parser/mcp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestExtractMCPConfigurations(t *testing.T) {
Command: "docker",
Args: []string{
"run", "-i", "--rm", "-e", "GITHUB_PERSONAL_ACCESS_TOKEN",
"ghcr.io/github/github-mcp-server:sha-45e90ae",
"ghcr.io/github/github-mcp-server:sha-09deac4",
},
Env: map[string]string{"GITHUB_PERSONAL_ACCESS_TOKEN": "${GITHUB_TOKEN_REQUIRED}"},
Allowed: []string{},
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestExtractMCPConfigurations(t *testing.T) {
Command: "docker",
Args: []string{
"run", "-i", "--rm", "-e", "GITHUB_PERSONAL_ACCESS_TOKEN",
"ghcr.io/github/github-mcp-server:sha-45e90ae",
"ghcr.io/github/github-mcp-server:sha-09deac4",
},
Env: map[string]string{"GITHUB_PERSONAL_ACCESS_TOKEN": "${GITHUB_TOKEN_REQUIRED}"},
Allowed: []string{},
Expand Down
2 changes: 1 addition & 1 deletion pkg/workflow/compiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -2249,7 +2249,7 @@ func (c *Compiler) generateMCPSetup(yaml *strings.Builder, tools map[string]any,
}

func getGitHubDockerImageVersion(githubTool any) string {
githubDockerImageVersion := "sha-45e90ae" // Default Docker image version
githubDockerImageVersion := "sha-09deac4" // Default Docker image version
// Extract docker_image_version setting from tool properties
if toolConfig, ok := githubTool.(map[string]any); ok {
if versionSetting, exists := toolConfig["docker_image_version"]; exists {
Expand Down
12 changes: 6 additions & 6 deletions pkg/workflow/mcp_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tools:
// With Docker MCP always enabled, default is docker (not services)
expectedType: "docker",
expectedCommand: "docker",
expectedDockerImage: "ghcr.io/github/github-mcp-server:sha-45e90ae",
expectedDockerImage: "ghcr.io/github/github-mcp-server:sha-09deac4",
},
{
name: "custom docker image version",
Expand Down Expand Up @@ -205,7 +205,7 @@ func TestGenerateGitHubMCPConfig(t *testing.T) {
if !strings.Contains(result, `"command": "docker"`) {
t.Errorf("Expected Docker command but got:\n%s", result)
}
if !strings.Contains(result, `"ghcr.io/github/github-mcp-server:sha-45e90ae"`) {
if !strings.Contains(result, `"ghcr.io/github/github-mcp-server:sha-09deac4"`) {
t.Errorf("Expected Docker image but got:\n%s", result)
}
if strings.Contains(result, `"type": "http"`) {
Expand Down Expand Up @@ -288,7 +288,7 @@ tools:
args: ["run", "-i", "--rm", "custom/mcp-server:latest"]
---`,
expectedType: "docker", // GitHub always uses docker now
expectedDockerImage: "sha-45e90ae", // Default version
expectedDockerImage: "sha-09deac4", // Default version
},
{
name: "custom docker MCP with default settings",
Expand All @@ -303,7 +303,7 @@ tools:
args: ["run", "-i", "--rm", "custom/mcp-server:latest"]
---`,
expectedType: "docker", // Services mode removed - always Docker
expectedDockerImage: "sha-45e90ae", // Default version
expectedDockerImage: "sha-09deac4", // Default version
},
{
name: "custom docker MCP with different settings",
Expand All @@ -318,7 +318,7 @@ tools:
args: ["run", "-i", "--rm", "custom/mcp-server:latest"]
---`,
expectedType: "docker",
expectedDockerImage: "sha-45e90ae", // Default version
expectedDockerImage: "sha-09deac4", // Default version
},
{
name: "mixed MCP configuration with defaults",
Expand All @@ -338,7 +338,7 @@ tools:
args: ["run", "-i", "--rm", "-v", "/tmp:/workspace", "custom/tool:latest"]
---`,
expectedType: "docker", // GitHub should now use docker by default (not services)
expectedDockerImage: "sha-45e90ae", // Default version
expectedDockerImage: "sha-09deac4", // Default version
},
{
name: "custom docker MCP with custom Docker image version",
Expand Down