Skip to content

Sort environment variable names when building Docker args in MCP container compiler #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelikhan merged 5 commits into from
Oct 7, 2025
Merged

Sort environment variable names when building Docker args in MCP container compiler #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4ef662
Initial plan
Copilot Oct 7, 2025
7612a92
Initial exploration of MCP env vars sorting issue
Copilot Oct 7, 2025
5fbe5ac
Sort environment variable names when building args list in mcp-server…
Copilot Oct 7, 2025
82a2195
Run make recompile and format JavaScript files
Copilot Oct 7, 2025
77c9959
Merge branch 'main' into copilot/sort-env-variables-in-compiler
pelikhan Oct 7, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/duplicate-code-detector.lock.yml
View file
Open in desktop

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

12 changes: 10 additions & 2 deletions pkg/parser/mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package parser
import (
"encoding/json"
"fmt"
"sort"
"strings"

"github.com/githubnext/gh-aw/pkg/constants"
Expand Down Expand Up @@ -480,8 +481,15 @@ func ParseMCPConfig(toolName string, mcpSection any, toolConfig map[string]any)
// Add environment variables
if env, hasEnv := mcpConfig["env"]; hasEnv {
if envMap, ok := env.(map[string]any); ok {
for key, value := range envMap {
if valueStr, ok := value.(string); ok {
// Sort environment variable keys to ensure deterministic arg order
var envKeys []string
for key := range envMap {
envKeys = append(envKeys, key)
}
sort.Strings(envKeys)

for _, key := range envKeys {
if valueStr, ok := envMap[key].(string); ok {
config.Args = append(config.Args, "-e", key)
config.Env[key] = valueStr
}
Expand Down
7 changes: 6 additions & 1 deletion pkg/workflow/mcp-config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,13 @@ func getMCPConfig(toolConfig map[string]any, toolName string) (*parser.MCPServer
result.Command = "docker"
result.Args = []string{"run", "--rm", "-i"}

// Add environment variables as -e flags
// Add environment variables as -e flags (sorted for deterministic output)
envKeys := make([]string, 0, len(result.Env))
for envKey := range result.Env {
envKeys = append(envKeys, envKey)
}
sort.Strings(envKeys)
for _, envKey := range envKeys {
result.Args = append(result.Args, "-e", envKey)
}

Expand Down
Loading