Merge remote-tracking branch 'origin/main' into stephentoub/port-csharp-validation

# Conflicts:
#	python/e2e/test_mcp_and_agents_e2e.py

Author: Copilot

dotnet/src/Generated/Rpc.cs

@@ -147,8 +147,8 @@ await session.SendAsync(new MessageOptions
             Prompt = "What is 9+9? Reply with just the number.",
         });
 
-        var pendingEvent = await pendingMessagesModified;
         var answer = await TestHelper.GetFinalAssistantMessageAsync(session);
+        var pendingEvent = await pendingMessagesModified;
 
         Assert.NotNull(pendingEvent);
         Assert.Contains("18", answer?.Data.Content ?? string.Empty);

dotnet/src/Generated/SessionEvents.cs

@@ -401,14 +401,6 @@ public async Task Should_Accept_Both_MCP_Servers_And_Custom_Agents()
         });
 
         Assert.Matches(@"^[a-f0-9-]+$", session.SessionId);
-
-        await session.SendAsync(new MessageOptions { Prompt = "What is 7+7?" });
-
-        // Use a longer timeout to tolerate slower MCP server spawning on Windows.
-        var message = await TestHelper.GetFinalAssistantMessageAsync(session, TimeSpan.FromSeconds(120));
-        Assert.NotNull(message);
-        Assert.Contains("14", message!.Data.Content);
-
         await session.DisposeAsync();
     }
 

dotnet/test/E2E/EventFidelityE2ETests.cs

@@ -403,22 +403,6 @@ func TestCombinedConfigurationE2E(t *testing.T) {
 			t.Error("Expected non-empty session ID")
 		}
 
-		_, err = session.Send(t.Context(), copilot.MessageOptions{
-			Prompt: "What is 7+7?",
-		})
-		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, "14") {
-			t.Errorf("Expected message to contain '14', got: %v", message.Data)
-		}
-
 		session.Disconnect()
 	})
 }

dotnet/test/E2E/SessionMcpAndAgentConfigE2ETests.cs

@@ -473,7 +473,7 @@ func TestRpcSessionStateE2E(t *testing.T) {
 			t.Errorf("Expected non-zero sessionStartTime, got %s", metrics.SessionStartTime)
 		}
 		if metrics.TotalNanoAiu != nil && *metrics.TotalNanoAiu < 0 {
-			t.Errorf("Expected non-negative totalNanoAiu, got %d", *metrics.TotalNanoAiu)
+			t.Errorf("Expected non-negative totalNanoAiu, got %f", *metrics.TotalNanoAiu)
 		}
 		for k, detail := range metrics.TokenDetails {
 			if detail.TokenCount < 0 {
@@ -482,7 +482,7 @@ func TestRpcSessionStateE2E(t *testing.T) {
 		}
 		for modelName, modelMetric := range metrics.ModelMetrics {
 			if modelMetric.TotalNanoAiu != nil && *modelMetric.TotalNanoAiu < 0 {
-				t.Errorf("Expected non-negative totalNanoAiu for model %q, got %d", modelName, *modelMetric.TotalNanoAiu)
+				t.Errorf("Expected non-negative totalNanoAiu for model %q, got %f", modelName, *modelMetric.TotalNanoAiu)
 			}
 			for tokenType, detail := range modelMetric.TokenDetails {
 				if detail.TokenCount < 0 {

go/internal/e2e/mcp_and_agents_e2e_test.go

@@ -56,7 +56,7 @@
     "author": "GitHub",
     "license": "MIT",
     "dependencies": {
-        "@github/copilot": "^1.0.51-1",
+        "@github/copilot": "^1.0.51-2",
         "vscode-jsonrpc": "^8.2.1",
         "zod": "^4.3.6"
     },