diff --git a/.github/workflows/dotnet-sdk-tests.yml b/.github/workflows/dotnet-sdk-tests.yml
index b5871897f6..fa2e2dc757 100644
--- a/.github/workflows/dotnet-sdk-tests.yml
+++ b/.github/workflows/dotnet-sdk-tests.yml
@@ -34,7 +34,9 @@ jobs:
             shard: full
         include:
           # Keep xUnit serial within each process, but split the slow Windows
-          # default-transport suite across two isolated test hosts.
+          # default-transport suite across two isolated test hosts. Keep both
+          # target frameworks in each shard: separate framework jobs did not
+          # shorten the critical path and doubled the Windows job count.
           - os: windows-latest
             transport: default
             backend: capi
diff --git a/nodejs/vitest.config.ts b/nodejs/vitest.config.ts
index 03f6c779e9..bb07cb0174 100644
--- a/nodejs/vitest.config.ts
+++ b/nodejs/vitest.config.ts
@@ -1,11 +1,13 @@
 import { defineConfig } from "vitest/config";
 
+const integrationTestTimeout = process.platform === "win32" ? 60000 : 30000;
+
 export default defineConfig({
     test: {
         globals: true,
         environment: "node",
-        testTimeout: 30000, // 30 seconds for integration tests
-        hookTimeout: 30000,
+        testTimeout: integrationTestTimeout,
+        hookTimeout: integrationTestTimeout,
         teardownTimeout: 10000,
         isolate: true, // Run each test file in isolation
         pool: "forks", // Use process forking for better isolation
diff --git a/rust/tests/e2e/rpc_session_state.rs b/rust/tests/e2e/rpc_session_state.rs
index 01377780ec..c705d231c1 100644
--- a/rust/tests/e2e/rpc_session_state.rs
+++ b/rust/tests/e2e/rpc_session_state.rs
@@ -1098,11 +1098,11 @@ async fn should_report_implemented_errors_for_unsupported_session_rpc_paths() {
 }
 
 #[tokio::test]
-async fn should_compact_session_history_after_messages() {
+async fn should_report_processing_and_context_metadata() {
     super::support::with_shared_e2e_context(
         &E2E,
         "rpc_session_state",
-        "should_compact_session_history_after_messages",
+        "should_report_processing_and_context_metadata",
         |ctx| {
             Box::pin(async move {
                 ctx.set_default_copilot_user();
diff --git a/test/snapshots/rpc_session_state/should_report_processing_and_context_metadata.yaml b/test/snapshots/rpc_session_state/should_report_processing_and_context_metadata.yaml
new file mode 100644
index 0000000000..6760888d7b
--- /dev/null
+++ b/test/snapshots/rpc_session_state/should_report_processing_and_context_metadata.yaml
@@ -0,0 +1,10 @@
+models:
+  - claude-sonnet-4.5
+conversations:
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: "Reply with exactly: RUST_CONTEXT_INFO"
+      - role: assistant
+        content: RUST_CONTEXT_INFO