Stabilize repeated real Gemini test runs

Author: KSemenenko

.gitignore

@@ -155,6 +155,7 @@ _TeamCity*
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
+/tests/.sandbox/
 
 # NCrunch
 _NCrunch_*

GeminiSharpSDK.Tests/Integration/GeminiExecIntegrationTests.cs

@@ -14,6 +14,7 @@ public class GeminiExecIntegrationTests
     private const string InvalidModel = "__geminisharp_invalid_model__";
     private const string SandboxPrefix = "GeminiExecIntegrationTests";
     private static readonly TimeSpan SandboxCommandTimeout = TimeSpan.FromSeconds(30);
+    private static readonly TimeSpan MultiTurnTimeout = TimeSpan.FromMinutes(3);
 
     [Test]
     public async Task RunAsync_UsesDefaultProcessRunner_EndToEnd()
@@ -43,21 +44,22 @@ public async Task RunAsync_SecondCallPassesResumeArgument_EndToEnd()
         using var sandbox = await RealGeminiTestSandbox.CreateAsync(SandboxPrefix, SandboxCommandTimeout);
 
         using var client = RealGeminiTestSupport.CreateClient();
-        using var cancellation = new CancellationTokenSource(TimeSpan.FromMinutes(3));
 
         var thread = client.StartThread(sandbox.CreateThreadOptions(settings.Model, ephemeral: false));
+        using var firstCancellation = new CancellationTokenSource(MultiTurnTimeout);
 
         var firstResult = await thread.RunAsync(
             FirstPrompt,
-            new TurnOptions { CancellationToken = cancellation.Token });
+            new TurnOptions { CancellationToken = firstCancellation.Token });
 
         var threadId = thread.Id;
         await Assert.That(threadId).IsNotNull();
         await Assert.That(firstResult.Usage).IsNotNull();
 
+        using var secondCancellation = new CancellationTokenSource(MultiTurnTimeout);
         var secondResult = await thread.RunAsync(
             SecondPrompt,
-            new TurnOptions { CancellationToken = cancellation.Token });
+            new TurnOptions { CancellationToken = secondCancellation.Token });
 
         await Assert.That(secondResult.Usage).IsNotNull();
         await Assert.That(thread.Id).IsEqualTo(threadId);

GeminiSharpSDK.Tests/Integration/RealGeminiIntegrationTests.cs

@@ -26,6 +26,7 @@ public class RealGeminiIntegrationTests
     private static readonly TimeSpan SessionVisibilityTimeout = TimeSpan.FromSeconds(10);
     private static readonly TimeSpan CliCommandTimeout = TimeSpan.FromSeconds(30);
     private static readonly TimeSpan PollInterval = TimeSpan.FromMilliseconds(200);
+    private static readonly TimeSpan MultiTurnTimeout = TimeSpan.FromMinutes(3);
 
     [Test]
     public async Task RunAsync_WithRealGeminiCli_ReturnsStructuredOutput()
@@ -88,25 +89,26 @@ public async Task RunAsync_WithRealGeminiCli_SecondTurnKeepsThreadId()
 
         using var client = RealGeminiTestSupport.CreateClient();
         var thread = StartRealIntegrationThread(client, settings.Model, sandbox.WorkingDirectory);
-        using var cancellation = new CancellationTokenSource(TimeSpan.FromMinutes(3));
 
         var schema = IntegrationOutputSchemas.StatusOnly();
+        using var firstCancellation = new CancellationTokenSource(MultiTurnTimeout);
 
         var first = await thread.RunAsync<StatusResponse>(
             "Reply with a JSON object where status is exactly \"ok\".",
             schema,
             IntegrationOutputJsonContext.Default.StatusResponse,
-            cancellation.Token);
+            firstCancellation.Token);
 
         var firstThreadId = thread.Id;
         await Assert.That(firstThreadId).IsNotNull();
         await Assert.That(first.Usage).IsNotNull();
 
+        using var secondCancellation = new CancellationTokenSource(MultiTurnTimeout);
         var second = await thread.RunAsync<StatusResponse>(
             "Again: reply with a JSON object where status is exactly \"ok\".",
             schema,
             IntegrationOutputJsonContext.Default.StatusResponse,
-            cancellation.Token);
+            secondCancellation.Token);
 
         await Assert.That(second.TypedResponse.Status).IsEqualTo("ok");
         await Assert.That(second.Usage).IsNotNull();

GeminiSharpSDK.Tests/Unit/GeminiClientTests.cs

@@ -10,6 +10,7 @@ public class GeminiClientTests
 {
     private const string ResumeSandboxPrefix = "GeminiClientTests-ResumeThread-";
     private static readonly TimeSpan SandboxCommandTimeout = TimeSpan.FromSeconds(30);
+    private static readonly TimeSpan MultiTurnTimeout = TimeSpan.FromMinutes(3);
 
     [Test]
     public async Task StartAsync_CanBeCalledConcurrently()
@@ -265,13 +266,13 @@ public async Task ResumeThread_WithThreadOptions_RunsWithRealGeminiCli()
             SandboxCommandTimeout);
 
         using var client = RealGeminiTestSupport.CreateClient();
-        using var cancellation = new CancellationTokenSource(TimeSpan.FromMinutes(3));
 
         var startedThread = client.StartThread(sandbox.CreateThreadOptions(settings.Model, ephemeral: false));
+        using var firstCancellation = new CancellationTokenSource(MultiTurnTimeout);
 
         var firstResult = await startedThread.RunAsync(
             "Reply with short plain text: ok.",
-            new TurnOptions { CancellationToken = cancellation.Token });
+            new TurnOptions { CancellationToken = firstCancellation.Token });
 
         var threadId = startedThread.Id;
         await Assert.That(threadId).IsNotNull();
@@ -280,10 +281,11 @@ public async Task ResumeThread_WithThreadOptions_RunsWithRealGeminiCli()
         var resumedThread = client.ResumeThread(
             threadId!,
             sandbox.CreateThreadOptions(settings.Model, ephemeral: false));
+        using var secondCancellation = new CancellationTokenSource(MultiTurnTimeout);
 
         var secondResult = await resumedThread.RunAsync(
             "Reply with short plain text: ok.",
-            new TurnOptions { CancellationToken = cancellation.Token });
+            new TurnOptions { CancellationToken = secondCancellation.Token });
 
         await Assert.That(secondResult.Usage).IsNotNull();
         await Assert.That(resumedThread.Id).IsEqualTo(threadId);

GeminiSharpSDK.Tests/Unit/GeminiThreadTests.cs

@@ -14,6 +14,7 @@ public class GeminiThreadTests
 {
     private const string SandboxPrefix = "GeminiThreadTests";
     private static readonly TimeSpan SandboxCommandTimeout = TimeSpan.FromSeconds(30);
+    private static readonly TimeSpan MultiTurnTimeout = TimeSpan.FromMinutes(3);
 
     [Test]
     [Property("RequiresGeminiAuth", "true")]
@@ -124,19 +125,20 @@ public async Task RunAsync_SecondTurnKeepsThreadId_WithRealGeminiCli()
 
         using var client = RealGeminiTestSupport.CreateClient();
         var thread = StartRealIntegrationThread(client, settings.Model, sandbox.WorkingDirectory);
-        using var cancellation = new CancellationTokenSource(TimeSpan.FromMinutes(3));
+        using var firstCancellation = new CancellationTokenSource(MultiTurnTimeout);
 
         var first = await thread.RunAsync(
             "Reply with short plain text: first.",
-            new TurnOptions { CancellationToken = cancellation.Token });
+            new TurnOptions { CancellationToken = firstCancellation.Token });
 
         var firstThreadId = thread.Id;
         await Assert.That(firstThreadId).IsNotNull();
         await Assert.That(first.Usage).IsNotNull();
 
+        using var secondCancellation = new CancellationTokenSource(MultiTurnTimeout);
         var second = await thread.RunAsync(
             "Reply with short plain text: second.",
-            new TurnOptions { CancellationToken = cancellation.Token });
+            new TurnOptions { CancellationToken = secondCancellation.Token });
 
         await Assert.That(second.Usage).IsNotNull();
         await Assert.That(thread.Id).IsEqualTo(firstThreadId);

docs/Testing/strategy.md

@@ -20,6 +20,7 @@ Verify `ManagedCode.GeminiSharpSDK` behavior against real Gemini CLI contracts,
 - Real integration runs must use existing Gemini CLI login/session; test harness does not use API key environment variables.
 - Auth-required real Gemini tests run under a shared parallel limiter so local full-suite execution does not deadlock or stall on concurrent headless CLI sessions.
 - Auth-required real Gemini thread/session tests must also run in unique git sandboxes under `tests/.sandbox/*` and keep those directories on disk for the duration of local test history, because Gemini CLI caches visited project paths in `~/.gemini/projects.json` and can fail later startup if a referenced sandbox disappears mid-suite.
+- Multi-turn real Gemini tests must allocate cancellation budgets per turn instead of sharing one timeout across the whole conversation, so a slow first turn does not starve the second turn and create flaky resume/thread assertions.
 - Real integration model selection must be explicit: set `GEMINI_TEST_MODEL`, define `model` in `~/.gemini/config.toml`, or rely on a recent local Gemini session that already recorded the active model in the current profile.
 - Cover error paths and cancellation paths.
 - Keep protocol parser coverage for all supported event/item kinds.