Merge branch 'main' into edburns/80-java-monorepo-add-phase-01

edburns · web-flow · commit 63b94d3e86d0 · 2026-05-20T15:18:59.000-07:00
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -4,7 +4,7 @@
 
 ## Big picture 🔧
 
-- The repo implements language SDKs (Node/TS, Python, Go, .NET, Java) that speak to the **Copilot CLI** via **JSON‑RPC** (see `README.md` and `nodejs/src/client.ts`).
+- The repo implements language SDKs (Node/TS, Python, Go, .NET, Rust, Java) that speak to the **Copilot CLI** via **JSON‑RPC** (see `README.md` and `nodejs/src/client.ts`).
 - Typical flow: your App → SDK client → JSON-RPC → Copilot CLI (server mode). The CLI must be installed or you can connect to an external CLI server via the `CLI URL option (language-specific casing)` (Node: `cliUrl`, Go: `CLIUrl`, .NET: `CliUrl`, Python: `cli_url`, Java: `cliUrl`).
 
 ## Most important files to read first 📚
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -129,7 +129,9 @@ jobs:
         uses: actions/upload-artifact@v7.0.0
         with:
           name: dotnet-package
-          path: dotnet/artifacts/*.nupkg
+          path: |
+            dotnet/artifacts/*.nupkg
+            dotnet/artifacts/*.snupkg
       - name: NuGet login (OIDC)
         if: github.ref == 'refs/heads/main'
         uses: NuGet/login@v1
@@ -142,7 +144,9 @@ jobs:
           user: stevesanderson
       - name: Publish to NuGet
         if: github.ref == 'refs/heads/main'
-        run: dotnet nuget push ./artifacts/*.nupkg --api-key ${{ steps.nuget-login.outputs.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+        run: |
+          dotnet nuget push ./artifacts/*.nupkg --api-key ${{ steps.nuget-login.outputs.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols
+          dotnet nuget push ./artifacts/*.snupkg --api-key ${{ steps.nuget-login.outputs.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
 
   publish-rust:
     name: Publish Rust SDK
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Thanks for your interest in contributing!
 
-This repository contains the Copilot SDK, a set of multi-language SDKs (Node/TypeScript, Python, Go, .NET) for building applications with the GitHub Copilot agent, maintained by the GitHub Copilot team.
+This repository contains the Copilot SDK, a set of multi-language SDKs (Node/TypeScript, Python, Go, .NET, Rust) for building applications with the GitHub Copilot agent, maintained by the GitHub Copilot team.
 
 Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE).
 
diff --git a/docs/features/index.md b/docs/features/index.md
@@ -1,6 +1,6 @@
 # Features
 
-These guides cover the capabilities you can add to your Copilot SDK application. Each guide includes examples in all supported languages (TypeScript, Python, Go, .NET, and Java).
+These guides cover the capabilities you can add to your Copilot SDK application. Each guide includes examples in supported languages (TypeScript, Python, Go, .NET, Java, and Rust) where available.
 
 > **New to the SDK?** Start with the [Getting Started tutorial](../getting-started.md) first, then come back here to add more capabilities.
 
diff --git a/docs/integrations/microsoft-agent-framework.md b/docs/integrations/microsoft-agent-framework.md
@@ -14,7 +14,7 @@ The Microsoft Agent Framework is the unified successor to Semantic Kernel and Au
 | **A2A protocol** | Agent-to-Agent communication standard supported by the framework |
 
 > [!NOTE]
-> MAF integration packages are available for **.NET** and **Python**. For TypeScript, Go, and Java, use the Copilot SDK directly—the standard SDK APIs already provide tool calling, streaming, and custom agents.
+> MAF integration packages are available for **.NET** and **Python**. For TypeScript, Go, Java, and Rust, use the Copilot SDK directly—the standard SDK APIs already provide tool calling, streaming, and custom agents.
 
 ## Prerequisites
 
diff --git a/docs/observability/opentelemetry.md b/docs/observability/opentelemetry.md
@@ -84,15 +84,30 @@ var client = new CopilotClient(new CopilotClientOptions()
 
 </details>
 
+<details>
+<summary><strong>Rust</strong></summary>
+
+<!-- docs-validate: skip -->
+```rust
+use github_copilot_sdk::{Client, ClientOptions, TelemetryConfig};
+
+let client = Client::start(ClientOptions::new()
+    .with_telemetry(TelemetryConfig::new()
+        .with_otlp_endpoint("http://localhost:4318"))
+).await?;
+```
+
+</details>
+
 ### TelemetryConfig options
 
-| Option | Node.js | Python | Go | .NET | Java | Description |
-|---|---|---|---|---|---|---|
-| OTLP endpoint | `otlpEndpoint` | `otlp_endpoint` | `OTLPEndpoint` | `OtlpEndpoint` | `otlpEndpoint` | OTLP HTTP endpoint URL |
-| File path | `filePath` | `file_path` | `FilePath` | `FilePath` | `filePath` | File path for JSON-lines trace output |
-| Exporter type | `exporterType` | `exporter_type` | `ExporterType` | `ExporterType` | `exporterType` | `"otlp-http"` or `"file"` |
-| Source name | `sourceName` | `source_name` | `SourceName` | `SourceName` | `sourceName` | Instrumentation scope name |
-| Capture content | `captureContent` | `capture_content` | `CaptureContent` | `CaptureContent` | `captureContent` | Whether to capture message content |
+| Option | Node.js | Python | Go | .NET | Java | Rust | Description |
+|---|---|---|---|---|---|---|---|
+| OTLP endpoint | `otlpEndpoint` | `otlp_endpoint` | `OTLPEndpoint` | `OtlpEndpoint` | `otlpEndpoint` | `otlp_endpoint` | OTLP HTTP endpoint URL |
+| File path | `filePath` | `file_path` | `FilePath` | `FilePath` | `filePath` | `file_path` | File path for JSON-lines trace output |
+| Exporter type | `exporterType` | `exporter_type` | `ExporterType` | `ExporterType` | `exporterType` | `exporter_type` | `"otlp-http"` or `"file"` |
+| Source name | `sourceName` | `source_name` | `SourceName` | `SourceName` | `sourceName` | `source_name` | Instrumentation scope name |
+| Capture content | `captureContent` | `capture_content` | `CaptureContent` | `CaptureContent` | `captureContent` | `capture_content` | Whether to capture message content |
 
 ### Trace context propagation
 
diff --git a/docs/troubleshooting/mcp-debugging.md b/docs/troubleshooting/mcp-debugging.md
@@ -446,7 +446,7 @@ When opening an issue or asking for help, collect:
 
 * [ ] SDK language and version
 * [ ] CLI version (`copilot --version`)
-* [ ] MCP server type (Node.js, Python, .NET, Go, etc.)
+* [ ] MCP server type (Node.js, Python, .NET, Go, Rust, etc.)
 * [ ] Full MCP server configuration (redact secrets)
 * [ ] Result of manual `initialize` test
 * [ ] Result of manual `tools/list` test  
diff --git a/dotnet/src/Types.cs b/dotnet/src/Types.cs
@@ -1842,7 +1842,7 @@ public sealed class McpStdioServerConfig : McpServerConfig
     /// Arguments to pass to the command.
     /// </summary>
     [JsonPropertyName("args")]
-    public IList<string> Args { get => field ??= []; set; }
+    public IList<string>? Args { get; set; }
 
     /// <summary>
     /// Environment variables to pass to the server.
diff --git a/dotnet/test/E2E/SessionMcpAndAgentConfigE2ETests.cs b/dotnet/test/E2E/SessionMcpAndAgentConfigE2ETests.cs
@@ -41,6 +41,34 @@ public async Task Should_Accept_MCP_Server_Configuration_On_Session_Create()
         await session.DisposeAsync();
     }
 
+    [Fact]
+    public async Task Should_Accept_MCP_Server_Configuration_Without_Args()
+    {
+        var mcpServers = new Dictionary<string, McpServerConfig>
+        {
+            ["test-server"] = new McpStdioServerConfig
+            {
+                Command = "echo",
+                Tools = ["*"]
+            }
+        };
+
+        var session = await CreateSessionAsync(new SessionConfig
+        {
+            McpServers = mcpServers
+        });
+
+        Assert.Matches(@"^[a-f0-9-]+$", session.SessionId);
+
+        await session.SendAsync(new MessageOptions { Prompt = "What is 2+2?" });
+
+        var message = await TestHelper.GetFinalAssistantMessageAsync(session);
+        Assert.NotNull(message);
+        Assert.Contains("4", message!.Data.Content);
+
+        await session.DisposeAsync();
+    }
+
     [Fact]
     public async Task Should_Accept_MCP_Server_Configuration_On_Session_Resume()
     {
diff --git a/go/internal/e2e/mcp_and_agents_e2e_test.go b/go/internal/e2e/mcp_and_agents_e2e_test.go
@@ -57,6 +57,47 @@ func TestMCPServersE2E(t *testing.T) {
 		session.Disconnect()
 	})
 
+	t.Run("accept MCP server config without args", func(t *testing.T) {
+		ctx.ConfigureForTest(t)
+
+		mcpServers := map[string]copilot.MCPServerConfig{
+			"test-server": copilot.MCPStdioServerConfig{
+				Command: "echo",
+				Tools:   []string{"*"},
+			},
+		}
+
+		session, err := client.CreateSession(t.Context(), &copilot.SessionConfig{
+			OnPermissionRequest: copilot.PermissionHandler.ApproveAll,
+			MCPServers:          mcpServers,
+		})
+		if err != nil {
+			t.Fatalf("Failed to create session: %v", err)
+		}
+
+		if session.SessionID == "" {
+			t.Error("Expected non-empty session ID")
+		}
+
+		_, err = session.Send(t.Context(), copilot.MessageOptions{
+			Prompt: "What is 2+2?",
+		})
+		if err != nil {
+			t.Fatalf("Failed to send message: %v", err)
+		}
+
+		message, err := testharness.GetFinalAssistantMessage(t.Context(), session)
+		if err != nil {
+			t.Fatalf("Failed to get final message: %v", err)
+		}
+
+		if md, ok := message.Data.(*copilot.AssistantMessageData); !ok || !strings.Contains(md.Content, "4") {
+			t.Errorf("Expected message to contain '4', got: %v", message.Data)
+		}
+
+		session.Disconnect()
+	})
+
 	t.Run("accept MCP server config on resume", func(t *testing.T) {
 		ctx.ConfigureForTest(t)
 
diff --git a/go/types.go b/go/types.go
@@ -480,7 +480,7 @@ type MCPStdioServerConfig struct {
 	Tools   []string          `json:"tools"`
 	Timeout int               `json:"timeout,omitempty"`
 	Command string            `json:"command"`
-	Args    []string          `json:"args"`
+	Args    []string          `json:"args,omitempty"`
 	Env     map[string]string `json:"env,omitempty"`
 	Cwd     string            `json:"cwd,omitempty"`
 }
diff --git a/nodejs/src/types.ts b/nodejs/src/types.ts
@@ -1165,7 +1165,7 @@ interface MCPServerConfigBase {
 export interface MCPStdioServerConfig extends MCPServerConfigBase {
     type?: "local" | "stdio";
     command: string;
-    args: string[];
+    args?: string[];
     /**
      * Environment variables to pass to the server.
      */
diff --git a/nodejs/test/e2e/mcp_and_agents.e2e.test.ts b/nodejs/test/e2e/mcp_and_agents.e2e.test.ts
@@ -44,6 +44,30 @@ describe("MCP Servers and Custom Agents", async () => {
             await session.disconnect();
         });
 
+        it("should accept MCP server configuration without args", async () => {
+            const mcpServers: Record<string, MCPServerConfig> = {
+                "test-server": {
+                    type: "local",
+                    command: "echo",
+                    tools: ["*"],
+                } as MCPStdioServerConfig,
+            };
+
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                mcpServers,
+            });
+
+            expect(session.sessionId).toBeDefined();
+
+            const message = await session.sendAndWait({
+                prompt: "What is 2+2?",
+            });
+            expect(message?.data.content).toContain("4");
+
+            await session.disconnect();
+        });
+
         it("should accept MCP server configuration on session resume", async () => {
             // Create a session first
             const session1 = await client.createSession({ onPermissionRequest: approveAll });
diff --git a/python/copilot/session.py b/python/copilot/session.py
@@ -786,7 +786,7 @@ class MCPStdioServerConfig(TypedDict, total=False):
     type: NotRequired[Literal["local", "stdio"]]  # Server type
     timeout: NotRequired[int]  # Timeout in milliseconds
     command: str  # Command to run
-    args: list[str]  # Command arguments
+    args: NotRequired[list[str]]  # Command arguments
     env: NotRequired[dict[str, str]]  # Environment variables
     cwd: NotRequired[str]  # Working directory
 
diff --git a/python/e2e/test_mcp_and_agents_e2e.py b/python/e2e/test_mcp_and_agents_e2e.py
@@ -44,6 +44,27 @@ async def test_should_accept_mcp_server_configuration_on_session_create(
 
         await session.disconnect()
 
+    async def test_should_accept_mcp_server_configuration_without_args(self, ctx: E2ETestContext):
+        """Test that MCP server configuration works without args field"""
+        mcp_servers: dict[str, MCPServerConfig] = {
+            "test-server": {
+                "command": "echo",
+                "tools": ["*"],
+            }
+        }
+
+        session = await ctx.client.create_session(
+            on_permission_request=PermissionHandler.approve_all, mcp_servers=mcp_servers
+        )
+
+        assert session.session_id is not None
+
+        message = await session.send_and_wait("What is 2+2?")
+        assert message is not None
+        assert "4" in message.data.content
+
+        await session.disconnect()
+
     async def test_should_accept_mcp_server_configuration_on_session_resume(
         self, ctx: E2ETestContext
     ):
diff --git a/rust/src/types.rs b/rust/src/types.rs
@@ -781,7 +781,7 @@ pub struct McpStdioServerConfig {
     /// Subprocess executable.
     pub command: String,
     /// Arguments to pass to the subprocess.
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub args: Vec<String>,
     /// Environment variables to set on the subprocess. Values are passed
     /// through literally to the child process.
diff --git a/rust/tests/e2e/mcp_and_agents.rs b/rust/tests/e2e/mcp_and_agents.rs
@@ -38,6 +38,48 @@ async fn accept_mcp_server_config_on_create() {
     .await;
 }
 
+#[tokio::test]
+async fn accept_mcp_server_config_without_args() {
+    with_e2e_context(
+        "mcp_and_agents",
+        "accept_mcp_server_config_without_args",
+        |ctx| {
+            Box::pin(async move {
+                ctx.set_default_copilot_user();
+                let client = ctx.start_client().await;
+
+                let mcp_servers = HashMap::from([(
+                    "test-server".to_string(),
+                    McpServerConfig::Stdio(McpStdioServerConfig {
+                        tools: vec!["*".to_string()],
+                        command: "echo".to_string(),
+                        ..McpStdioServerConfig::default()
+                    }),
+                )]);
+
+                let session = client
+                    .create_session(
+                        ctx.approve_all_session_config()
+                            .with_mcp_servers(mcp_servers),
+                    )
+                    .await
+                    .expect("create session");
+
+                let answer = session
+                    .send_and_wait("What is 2+2?")
+                    .await
+                    .expect("send")
+                    .expect("assistant message");
+                assert!(assistant_message_content(&answer).contains('4'));
+
+                session.disconnect().await.expect("disconnect session");
+                client.stop().await.expect("stop client");
+            })
+        },
+    )
+    .await;
+}
+
 #[tokio::test]
 async fn accept_mcp_server_config_on_resume() {
     with_e2e_context(
diff --git a/test/scenarios/README.md b/test/scenarios/README.md
@@ -1,6 +1,6 @@
 # SDK E2E Scenario Tests
 
-End-to-end scenario tests for the Copilot SDK. Each scenario demonstrates a specific SDK capability with implementations in TypeScript, Python, and Go.
+End-to-end scenario tests for the Copilot SDK. Each scenario demonstrates a specific SDK capability with implementations in TypeScript, Python, Go, C#, and Rust.
 
 ## Structure
 
@@ -35,4 +35,4 @@ COPILOT_CLI_PATH=/path/to/copilot GITHUB_TOKEN=$(gh auth token) bash <category>/
 
 - **Copilot CLI** — set `COPILOT_CLI_PATH`
 - **GitHub token** — set `GITHUB_TOKEN` or use `gh auth login`
-- **Node.js 20+**, **Python 3.10+**, **Go 1.24+** (per language)
+- **Node.js 20+**, **Python 3.11+**, **Go 1.24+**, **.NET 8+**, **Rust 1.94+** (per language)
diff --git a/test/scenarios/prompts/attachments/README.md b/test/scenarios/prompts/attachments/README.md
@@ -7,7 +7,7 @@ Demonstrates sending **file attachments** alongside a prompt using the Copilot S
 1. Creates a session with a custom system prompt in `replace` mode
 2. Resolves the path to `sample-data.txt` (a small text file in the scenario root)
 3. Sends: _"What languages are listed in the attached file?"_ with the file as an attachment
-4. Prints the response — which should list TypeScript, Python, and Go
+4. Prints the response — which should list TypeScript, Python, Go, C#, and Rust
 
 ## Attachment Format
 
@@ -51,7 +51,7 @@ The `sample-data.txt` file contains basic project metadata used as the attachmen
 Project: Copilot SDK Samples
 Version: 1.0.0
 Description: Minimal buildable samples demonstrating the Copilot SDK
-Languages: TypeScript, Python, Go
+Languages: TypeScript, Python, Go, C#, Rust
 ```
 
 ## Run
diff --git a/test/scenarios/prompts/attachments/sample-data.txt b/test/scenarios/prompts/attachments/sample-data.txt
@@ -1,4 +1,4 @@
 Project: Copilot SDK Samples
 Version: 1.0.0
 Description: Minimal buildable samples demonstrating the Copilot SDK
-Languages: TypeScript, Python, Go
+Languages: TypeScript, Python, Go, C#, Rust
diff --git a/test/scenarios/transport/README.md b/test/scenarios/transport/README.md
@@ -6,8 +6,8 @@ Minimal samples organized by **transport model** — the wire protocol used to c
 
 | Transport | Description | Languages |
 |-----------|-------------|-----------|
-| **[stdio](stdio/)** | SDK spawns `copilot` as a child process and communicates via stdin/stdout | TypeScript, Python, Go |
-| **[tcp](tcp/)** | SDK connects to a pre-running `copilot` TCP server | TypeScript, Python, Go |
+| **[stdio](stdio/)** | SDK spawns `copilot` as a child process and communicates via stdin/stdout | TypeScript, Python, Go, C#, Rust |
+| **[tcp](tcp/)** | SDK connects to a pre-running `copilot` TCP server | TypeScript, Python, Go, C#, Rust |
 | **[wasm](wasm/)** | SDK loads `copilot` as an in-process WASM module | TypeScript |
 
 ## How They Differ
@@ -23,7 +23,7 @@ Minimal samples organized by **transport model** — the wire protocol used to c
 
 - **Authentication** — set `GITHUB_TOKEN`, or run `gh auth login`
 - **Copilot CLI** — required for stdio and tcp (set `COPILOT_CLI_PATH`)
-- Language toolchains as needed (Node.js 20+, Python 3.10+, Go 1.24+)
+- Language toolchains as needed (Node.js 20+, Python 3.11+, Go 1.24+, .NET 8+, Rust 1.94+)
 
 ## Verification
 
diff --git a/test/snapshots/mcp_and_agents/accept_mcp_server_config_without_args.yaml b/test/snapshots/mcp_and_agents/accept_mcp_server_config_without_args.yaml
diff --git a/test/snapshots/mcp_and_agents/should_accept_mcp_server_configuration_without_args.yaml b/test/snapshots/mcp_and_agents/should_accept_mcp_server_configuration_without_args.yaml
