Equivalent fixes for other languages

SteveSandersonMS · SteveSandersonMS · commit dbd5cc328f06 · 2026-02-17T15:48:33.000Z
diff --git a/dotnet/src/Client.cs b/dotnet/src/Client.cs
@@ -383,6 +383,7 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig? config = nul
             config?.WorkingDirectory,
             config?.Streaming == true ? true : null,
             config?.McpServers,
+            "direct",
             config?.CustomAgents,
             config?.ConfigDir,
             config?.SkillDirectories,
@@ -468,6 +469,7 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
             config?.DisableResume == true ? true : null,
             config?.Streaming == true ? true : null,
             config?.McpServers,
+            "direct",
             config?.CustomAgents,
             config?.SkillDirectories,
             config?.DisabledSkills,
@@ -1385,6 +1387,7 @@ internal record CreateSessionRequest(
         string? WorkingDirectory,
         bool? Streaming,
         Dictionary<string, object>? McpServers,
+        string? EnvValueMode,
         List<CustomAgentConfig>? CustomAgents,
         string? ConfigDir,
         List<string>? SkillDirectories,
@@ -1421,6 +1424,7 @@ internal record ResumeSessionRequest(
         bool? DisableResume,
         bool? Streaming,
         Dictionary<string, object>? McpServers,
+        string? EnvValueMode,
         List<CustomAgentConfig>? CustomAgents,
         List<string>? SkillDirectories,
         List<string>? DisabledSkills,
diff --git a/dotnet/test/Harness/E2ETestContext.cs b/dotnet/test/Harness/E2ETestContext.cs
@@ -92,6 +92,7 @@ public IReadOnlyDictionary<string, string> GetEnvironment()
     public CopilotClient CreateClient() => new(new CopilotClientOptions
     {
         Cwd = WorkDir,
+        CliPath = GetCliPath(_repoRoot),
         Environment = GetEnvironment(),
         GithubToken = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CI")) ? "fake-token-for-e2e-tests" : null,
     });
diff --git a/dotnet/test/McpAndAgentsTests.cs b/dotnet/test/McpAndAgentsTests.cs
@@ -260,6 +260,41 @@ public async Task Should_Handle_Multiple_Custom_Agents()
         await session.DisposeAsync();
     }
 
+    [Fact]
+    public async Task Should_Pass_Literal_Env_Values_To_Mcp_Server_Subprocess()
+    {
+        var testHarnessDir = FindTestHarnessDir();
+        var mcpServers = new Dictionary<string, object>
+        {
+            ["env-echo"] = new McpLocalServerConfig
+            {
+                Type = "local",
+                Command = "node",
+                Args = [Path.Combine(testHarnessDir, "test-mcp-server.mjs")],
+                Env = new Dictionary<string, string> { ["TEST_SECRET"] = "hunter2" },
+                Cwd = testHarnessDir,
+                Tools = ["*"]
+            }
+        };
+
+        var session = await Client.CreateSessionAsync(new SessionConfig
+        {
+            McpServers = mcpServers
+        });
+
+        Assert.Matches(@"^[a-f0-9-]+$", session.SessionId);
+
+        var message = await session.SendAndWaitAsync(new MessageOptions
+        {
+            Prompt = "Use the env-echo/get_env tool to read the TEST_SECRET environment variable. Reply with just the value, nothing else."
+        });
+
+        Assert.NotNull(message);
+        Assert.Contains("hunter2", message!.Data.Content);
+
+        await session.DisposeAsync();
+    }
+
     [Fact]
     public async Task Should_Accept_Both_MCP_Servers_And_Custom_Agents()
     {
@@ -301,4 +336,17 @@ public async Task Should_Accept_Both_MCP_Servers_And_Custom_Agents()
 
         await session.DisposeAsync();
     }
+
+    private static string FindTestHarnessDir()
+    {
+        var dir = new DirectoryInfo(AppContext.BaseDirectory);
+        while (dir != null)
+        {
+            var candidate = Path.Combine(dir.FullName, "test", "harness", "test-mcp-server.mjs");
+            if (File.Exists(candidate))
+                return Path.GetDirectoryName(candidate)!;
+            dir = dir.Parent;
+        }
+        throw new InvalidOperationException("Could not find test/harness/test-mcp-server.mjs");
+    }
 }
diff --git a/go/client.go b/go/client.go
@@ -464,6 +464,7 @@ func (c *Client) CreateSession(ctx context.Context, config *SessionConfig) (*Ses
 		req.Provider = config.Provider
 		req.WorkingDirectory = config.WorkingDirectory
 		req.MCPServers = config.MCPServers
+		req.EnvValueMode = "direct"
 		req.CustomAgents = config.CustomAgents
 		req.SkillDirectories = config.SkillDirectories
 		req.DisabledSkills = config.DisabledSkills
@@ -581,6 +582,7 @@ func (c *Client) ResumeSessionWithOptions(ctx context.Context, sessionID string,
 			req.DisableResume = Bool(true)
 		}
 		req.MCPServers = config.MCPServers
+		req.EnvValueMode = "direct"
 		req.CustomAgents = config.CustomAgents
 		req.SkillDirectories = config.SkillDirectories
 		req.DisabledSkills = config.DisabledSkills
diff --git a/go/internal/e2e/mcp_and_agents_test.go b/go/internal/e2e/mcp_and_agents_test.go
@@ -1,6 +1,7 @@
 package e2e
 
 import (
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -104,6 +105,51 @@ func TestMCPServers(t *testing.T) {
 		session2.Destroy()
 	})
 
+	t.Run("should pass literal env values to MCP server subprocess", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
+
+		mcpServerPath, err := filepath.Abs("../../../test/harness/test-mcp-server.mjs")
+		if err != nil {
+			t.Fatalf("Failed to resolve test-mcp-server path: %v", err)
+		}
+		mcpServerDir := filepath.Dir(mcpServerPath)
+
+		mcpServers := map[string]copilot.MCPServerConfig{
+			"env-echo": {
+				"type":    "local",
+				"command": "node",
+				"args":    []string{mcpServerPath},
+				"tools":   []string{"*"},
+				"env":     map[string]string{"TEST_SECRET": "hunter2"},
+				"cwd":     mcpServerDir,
+			},
+		}
+
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			MCPServers: mcpServers,
+		})
+		if err != nil {
+			t.Fatalf("Failed to create session: %v", err)
+		}
+
+		if session.SessionID == "" {
+			t.Error("Expected non-empty session ID")
+		}
+
+		message, err := session.SendAndWait(t.Context(), copilot.MessageOptions{
+			Prompt: "Use the env-echo/get_env tool to read the TEST_SECRET environment variable. Reply with just the value, nothing else.",
+		})
+		if err != nil {
+			t.Fatalf("Failed to send message: %v", err)
+		}
+
+		if message.Data.Content == nil || !strings.Contains(*message.Data.Content, "hunter2") {
+			t.Errorf("Expected message to contain 'hunter2', got: %v", message.Data.Content)
+		}
+
+		session.Destroy()
+	})
+
 	t.Run("handle multiple MCP servers", func(t *testing.T) {
 		ctx.ConfigureForTest(t)
 
diff --git a/go/types.go b/go/types.go
@@ -638,6 +638,7 @@ type createSessionRequest struct {
 	WorkingDirectory  string                     `json:"workingDirectory,omitempty"`
 	Streaming         *bool                      `json:"streaming,omitempty"`
 	MCPServers        map[string]MCPServerConfig `json:"mcpServers,omitempty"`
+	EnvValueMode      string                     `json:"envValueMode,omitempty"`
 	CustomAgents      []CustomAgentConfig        `json:"customAgents,omitempty"`
 	ConfigDir         string                     `json:"configDir,omitempty"`
 	SkillDirectories  []string                   `json:"skillDirectories,omitempty"`
@@ -669,6 +670,7 @@ type resumeSessionRequest struct {
 	DisableResume     *bool                      `json:"disableResume,omitempty"`
 	Streaming         *bool                      `json:"streaming,omitempty"`
 	MCPServers        map[string]MCPServerConfig `json:"mcpServers,omitempty"`
+	EnvValueMode      string                     `json:"envValueMode,omitempty"`
 	CustomAgents      []CustomAgentConfig        `json:"customAgents,omitempty"`
 	SkillDirectories  []string                   `json:"skillDirectories,omitempty"`
 	DisabledSkills    []string                   `json:"disabledSkills,omitempty"`
diff --git a/nodejs/src/client.ts b/nodejs/src/client.ts
@@ -612,7 +612,7 @@ export class CopilotClient {
             configDir: config.configDir,
             streaming: config.streaming,
             mcpServers: config.mcpServers,
-            envValueMode: config.mcpServers ? "direct" : undefined,
+            envValueMode: "direct",
             customAgents: config.customAgents,
             skillDirectories: config.skillDirectories,
             disabledSkills: config.disabledSkills,
diff --git a/python/copilot/client.py b/python/copilot/client.py
@@ -519,6 +519,7 @@ async def create_session(self, config: Optional[SessionConfig] = None) -> Copilo
         mcp_servers = cfg.get("mcp_servers")
         if mcp_servers:
             payload["mcpServers"] = mcp_servers
+        payload["envValueMode"] = "direct"
 
         # Add custom agents configuration if provided
         custom_agents = cfg.get("custom_agents")
@@ -695,6 +696,7 @@ async def resume_session(
         mcp_servers = cfg.get("mcp_servers")
         if mcp_servers:
             payload["mcpServers"] = mcp_servers
+        payload["envValueMode"] = "direct"
 
         # Add custom agents configuration if provided
         custom_agents = cfg.get("custom_agents")
diff --git a/python/e2e/test_mcp_and_agents.py b/python/e2e/test_mcp_and_agents.py
@@ -2,12 +2,19 @@
 Tests for MCP servers and custom agents functionality
 """
 
+from pathlib import Path
+
 import pytest
 
 from copilot import CustomAgentConfig, MCPServerConfig
 
 from .testharness import E2ETestContext, get_final_assistant_message
 
+TEST_MCP_SERVER = str(
+    (Path(__file__).parents[2] / "test" / "harness" / "test-mcp-server.mjs").resolve()
+)
+TEST_HARNESS_DIR = str((Path(__file__).parents[2] / "test" / "harness").resolve())
+
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 
 
@@ -65,6 +72,35 @@ async def test_should_accept_mcp_server_configuration_on_session_resume(
 
         await session2.destroy()
 
+    async def test_should_pass_literal_env_values_to_mcp_server_subprocess(
+        self, ctx: E2ETestContext
+    ):
+        """Test that env values are passed as literals to MCP server subprocess"""
+        mcp_servers: dict[str, MCPServerConfig] = {
+            "env-echo": {
+                "type": "local",
+                "command": "node",
+                "args": [TEST_MCP_SERVER],
+                "tools": ["*"],
+                "env": {"TEST_SECRET": "hunter2"},
+                "cwd": TEST_HARNESS_DIR,
+            }
+        }
+
+        session = await ctx.client.create_session({"mcp_servers": mcp_servers})
+
+        assert session.session_id is not None
+
+        message = await session.send_and_wait(
+            {
+                "prompt": "Use the env-echo/get_env tool to read the TEST_SECRET environment variable. Reply with just the value, nothing else."
+            }
+        )
+        assert message is not None
+        assert "hunter2" in message.data.content
+
+        await session.destroy()
+
 
 class TestCustomAgents:
     async def test_should_accept_custom_agent_configuration_on_session_create(
diff --git a/python/e2e/testharness/context.py b/python/e2e/testharness/context.py
@@ -17,7 +17,11 @@
 
 
 def get_cli_path_for_tests() -> str:
-    """Get CLI path for E2E tests. Uses node_modules CLI during development."""
+    """Get CLI path for E2E tests. Uses COPILOT_CLI_PATH env var if set, otherwise node_modules CLI."""
+    env_path = os.environ.get("COPILOT_CLI_PATH")
+    if env_path and Path(env_path).exists():
+        return str(Path(env_path).resolve())
+
     # Look for CLI in sibling nodejs directory's node_modules
     base_path = Path(__file__).parents[3]
     full_path = base_path / "nodejs" / "node_modules" / "@github" / "copilot" / "index.js"

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ public IReadOnlyDictionary<string, string> GetEnvironment()`
`92`	`92`	`public CopilotClient CreateClient() => new(new CopilotClientOptions`
`93`	`93`	`{`
`94`	`94`	`Cwd = WorkDir,`
	`95`	`+ CliPath = GetCliPath(_repoRoot),`
`95`	`96`	`Environment = GetEnvironment(),`
`96`	`97`	`GithubToken = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CI")) ? "fake-token-for-e2e-tests" : null,`
`97`	`98`	`});`