github
diff --git a/‎.github/workflows/dotnet-sdk-tests.yml‎
Lines changed: 36 additions & 1 deletion b/‎.github/workflows/dotnet-sdk-tests.yml‎
Lines changed: 36 additions & 1 deletion
diff --git a/‎dotnet/src/Client.cs‎
Lines changed: 21 additions & 3 deletions b/‎dotnet/src/Client.cs‎
Lines changed: 21 additions & 3 deletions
@@ -32,6 +32,26 @@ jobs:
           - os: windows-latest
             transport: default
             shard: full
+          # TODO(cli-1.0.81-2): @github/copilot 1.0.81-2 never completes a model-driven
+          # turn when the runtime is hosted in-process against the CAPI backend. A full
+          # run reported 241 failures across 43 classes and took 150-225 minutes, which
+          # also starved the rest of the matrix. The defect is specific to this pairing:
+          # the in-process BYOK cells below and the stdio capi cells are unaffected.
+          # Drop these two entries once a fixed CLI build is picked up.
+          - os: ubuntu-latest
+            transport: inprocess
+          - os: macos-latest
+            transport: inprocess
+          # The macOS default/capi host runs the whole suite on the smallest
+          # runner in the matrix (3 vCPU / 7 GB vs ubuntu's 4 / 16). Since the
+          # 1.0.81-2 bump it stopped finishing: the job ran 50+ minutes until
+          # the runner lost communication with the server, and a runner that
+          # dies that way uploads no logs at all, so the failure could not be
+          # diagnosed from CI output. Split it across two hosts the same way
+          # the Windows default suite is split below.
+          - os: macos-latest
+            transport: default
+            shard: full
         include:
           # Keep xUnit serial within each process, but split the slow Windows
           # default-transport suite across two isolated test hosts. Keep both
@@ -45,6 +65,14 @@ jobs:
             transport: default
             backend: capi
             shard: "2"
+          - os: macos-latest
+            transport: default
+            backend: capi
+            shard: "1"
+          - os: macos-latest
+            transport: default
+            backend: capi
+            shard: "2"
           - os: ubuntu-latest
             transport: inprocess
             backend: anthropic-messages
@@ -61,6 +89,10 @@ jobs:
             shard: full
             test-filter: "FullyQualifiedName~GitHub.Copilot.Test.E2E&E2EBackend!=SelfConfiguredBackend&E2EBackend!=CapiOnly"
     runs-on: ${{ matrix.os }}
+    # A hung test used to run until the runner died (~50 min) and the dying
+    # runner never uploaded its logs, so the failures were undiagnosable.
+    # Every healthy cell finishes well under 15 min.
+    timeout-minutes: 30
     defaults:
       run:
         shell: bash
@@ -113,7 +145,10 @@ jobs:
           COPILOT_HMAC_KEY: ${{ secrets.COPILOT_DEVELOPER_CLI_INTEGRATION_HMAC_KEY }}
           DOTNET_TEST_SHARD: ${{ matrix.shard }}
         run: |
-          args=(--no-build -v n)
+          # --blame-hang names the offending test instead of letting it wedge
+          # the runner. No single test legitimately runs for 10 minutes; the
+          # whole suite normally finishes in about five.
+          args=(--no-build -v n --blame-hang --blame-hang-timeout 10m --blame-hang-dump-type none)
 
           filter="$DOTNET_TEST_FILTER"
           if [[ "$DOTNET_TEST_SHARD" != "full" ]]; then
 
@@ -1215,7 +1215,7 @@ public async Task<CopilotSession> CreateSessionAsync(SessionConfig config, Cance
                 config.DisabledSkills,
                 config.InfiniteSessions,
                 config.SessionLimits,
-                Commands: config.Commands?.Select(c => new CommandWireDefinition(c.Name, c.Description)).ToList(),
+                Commands: config.Commands?.Select(c => new CommandWireDefinition(c.Name, c.Description ?? string.Empty)).ToList(),
                 RequestElicitation: config.OnElicitationRequest != null,
                 RequestMcpApps: config.EnableMcpApps ? true : null,
                 Traceparent: traceparent,
@@ -1436,7 +1436,7 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
                 config.DisabledSkills,
                 config.InfiniteSessions,
                 config.SessionLimits,
-                Commands: config.Commands?.Select(c => new CommandWireDefinition(c.Name, c.Description)).ToList(),
+                Commands: config.Commands?.Select(c => new CommandWireDefinition(c.Name, c.Description ?? string.Empty)).ToList(),
                 RequestElicitation: config.OnElicitationRequest != null,
                 RequestMcpApps: config.EnableMcpApps ? true : null,
                 Traceparent: traceparent,
@@ -1480,6 +1480,15 @@ public async Task<CopilotSession> ResumeSessionAsync(string sessionId, ResumeSes
             session.SetCapabilities(response.Capabilities);
             session.SetOpenCanvases(response.OpenCanvases);
 
+            if (config.McpServers is not null)
+            {
+                await InvokeRpcAsync<JsonElement>(
+                    connection.Rpc,
+                    "session.mcp.reloadWithConfig",
+                    [new ReloadMcpServersRequest(sessionId, new ReloadMcpServersConfig(config.McpServers))],
+                    cancellationToken);
+            }
+
             if (config.OnMcpAuthRequest is not null)
             {
                 await session.Rpc.EventLog.RegisterInterestAsync("mcp.oauth_required", cancellationToken);
@@ -2952,9 +2961,16 @@ internal record ResumeSessionResponse(
         IList<OpenCanvasInstance>? OpenCanvases = null);
 #pragma warning restore GHCP001
 
+    internal record ReloadMcpServersRequest(
+        string SessionId,
+        ReloadMcpServersConfig Config);
+
+    internal record ReloadMcpServersConfig(
+        IDictionary<string, McpServerConfig> McpServers);
+
     internal record CommandWireDefinition(
         string Name,
-        string? Description);
+        string Description);
 
     internal record GetLastSessionIdResponse(
         string? SessionId);
@@ -3028,6 +3044,8 @@ internal record HooksInvokeResponse(
     [JsonSerializable(typeof(CapiSessionOptions))]
     [JsonSerializable(typeof(NamedProviderConfig))]
     [JsonSerializable(typeof(ProviderModelConfig))]
+    [JsonSerializable(typeof(ReloadMcpServersConfig))]
+    [JsonSerializable(typeof(ReloadMcpServersRequest))]
     [JsonSerializable(typeof(SessionLimitsConfig))]
     [JsonSerializable(typeof(ResumeSessionRequest))]
     [JsonSerializable(typeof(ResumeSessionResponse))]