Fix Python same-client resume tests

Mark Python test sessions inactive before same-client resume so the duplicate active-session guard is preserved without destroying the server-side session.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Copilot

python/e2e/test_client_e2e.py

@@ -13,7 +13,7 @@
 )
 from copilot.session import PermissionHandler
 
-from .testharness import CLI_PATH
+from .testharness import CLI_PATH, mark_inactive_for_resume
 
 
 class TestClient:
@@ -270,6 +270,7 @@ async def test_should_resume_session_without_permission_handler(self):
         try:
             await client.start()
             session = await client.create_session()
+            mark_inactive_for_resume(session)
             resumed = await client.resume_session(session.session_id)
 
             assert resumed.session_id == session.session_id

python/e2e/test_commands_e2e.py

@@ -20,6 +20,7 @@
 from copilot.session import CommandDefinition, PermissionHandler
 
 from .testharness.context import SNAPSHOTS_DIR, get_cli_path_for_tests
+from .testharness.helper import mark_inactive_for_resume
 from .testharness.proxy import CapiProxy
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
@@ -258,6 +259,7 @@ async def test_session_with_commands_resumes_successfully(self, ctx):
         )
         session_id = session1.session_id
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id,
             on_permission_request=PermissionHandler.approve_all,

python/e2e/test_mcp_and_agents_e2e.py

@@ -8,7 +8,7 @@
 
 from copilot.session import CustomAgentConfig, MCPServerConfig, PermissionHandler
 
-from .testharness import E2ETestContext, get_final_assistant_message
+from .testharness import E2ETestContext, get_final_assistant_message, mark_inactive_for_resume
 
 TEST_MCP_SERVER = str(
     (Path(__file__).parents[2] / "test" / "harness" / "test-mcp-server.mjs").resolve()
@@ -64,6 +64,7 @@ async def test_should_accept_mcp_server_configuration_on_session_resume(
             }
         }
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id,
             on_permission_request=PermissionHandler.approve_all,
@@ -157,6 +158,7 @@ async def test_should_accept_custom_agent_configuration_on_session_resume(
             }
         ]
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id,
             on_permission_request=PermissionHandler.approve_all,

python/e2e/test_permissions_e2e.py

@@ -13,7 +13,7 @@
 )
 from copilot.session import PermissionHandler, PermissionRequestResult
 
-from .testharness import E2ETestContext
+from .testharness import E2ETestContext, mark_inactive_for_resume
 from .testharness.helper import read_file, write_file
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
@@ -140,6 +140,7 @@ async def test_should_deny_tool_operations_when_handler_explicitly_denies_after_
         def deny_all(request, invocation):
             return PermissionRequestResult()
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(session_id, on_permission_request=deny_all)
 
         denied_events = []
@@ -218,6 +219,7 @@ def on_permission_request(
             permission_requests.append(request)
             return PermissionRequestResult(kind="approve-once")
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id, on_permission_request=on_permission_request
         )

python/e2e/test_session_config_e2e.py

@@ -9,7 +9,7 @@
 from copilot import ModelCapabilitiesOverride, ModelSupportsOverride
 from copilot.session import PermissionHandler
 
-from .testharness import E2ETestContext
+from .testharness import E2ETestContext, mark_inactive_for_resume
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 
@@ -217,6 +217,7 @@ async def test_should_forward_custom_provider_headers_on_resume(self, ctx: E2ETe
         )
         session_id = session1.session_id
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id,
             on_permission_request=PermissionHandler.approve_all,
@@ -314,6 +315,7 @@ async def test_should_apply_workingdirectory_on_session_resume(self, ctx: E2ETes
         )
         session_id = session1.session_id
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id,
             on_permission_request=PermissionHandler.approve_all,
@@ -335,6 +337,7 @@ async def test_should_apply_systemmessage_on_session_resume(self, ctx: E2ETestCo
         session_id = session1.session_id
 
         resume_instruction = "End the response with RESUME_SYSTEM_MESSAGE_SENTINEL."
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id,
             on_permission_request=PermissionHandler.approve_all,
@@ -394,6 +397,7 @@ async def test_should_apply_instruction_directories_on_resume(self, ctx: E2ETest
             working_directory=project_dir,
         )
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session1.session_id,
             on_permission_request=PermissionHandler.approve_all,
@@ -416,6 +420,7 @@ async def test_should_apply_availabletools_on_session_resume(self, ctx: E2ETestC
         )
         session_id = session1.session_id
 
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id,
             on_permission_request=PermissionHandler.approve_all,

python/e2e/test_session_e2e.py

@@ -11,7 +11,12 @@
 from copilot.session import PermissionHandler
 from copilot.tools import Tool, ToolResult
 
-from .testharness import E2ETestContext, get_final_assistant_message, get_next_event_of_type
+from .testharness import (
+    E2ETestContext,
+    get_final_assistant_message,
+    get_next_event_of_type,
+    mark_inactive_for_resume,
+)
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
 
@@ -31,7 +36,7 @@ async def test_should_create_and_disconnect_sessions(self, ctx: E2ETestContext):
 
         await session.disconnect()
 
-        with pytest.raises(Exception, match="Session not found"):
+        with pytest.raises(Exception, match="Session has been disconnected"):
             await session.get_messages()
 
     async def test_should_have_stateful_conversation(self, ctx: E2ETestContext):
@@ -216,6 +221,7 @@ async def test_should_resume_a_session_using_the_same_client(self, ctx: E2ETestC
         assert "2" in answer.data.content
 
         # Resume using the same client
+        mark_inactive_for_resume(session1)
         session2 = await ctx.client.resume_session(
             session_id, on_permission_request=PermissionHandler.approve_all
         )
@@ -457,6 +463,7 @@ async def test_should_resume_session_with_custom_provider(self, ctx: E2ETestCont
         session_id = session.session_id
 
         # Resume the session with a provider
+        mark_inactive_for_resume(session)
         session2 = await ctx.client.resume_session(
             session_id,
             on_permission_request=PermissionHandler.approve_all,

python/e2e/testharness/__init__.py

@@ -1,7 +1,7 @@
 """Test harness for E2E tests."""
 
 from .context import CLI_PATH, DEFAULT_GITHUB_TOKEN, E2ETestContext
-from .helper import get_final_assistant_message, get_next_event_of_type
+from .helper import get_final_assistant_message, get_next_event_of_type, mark_inactive_for_resume
 from .proxy import CapiProxy
 
 __all__ = [
@@ -11,4 +11,5 @@
     "CapiProxy",
     "get_final_assistant_message",
     "get_next_event_of_type",
+    "mark_inactive_for_resume",
 ]

python/e2e/testharness/helper.py

@@ -139,6 +139,11 @@ def read_file(work_dir: str, filename: str) -> str:
         return f.read()
 
 
+def mark_inactive_for_resume(session: CopilotSession) -> None:
+    """Clear local active-session tracking without destroying the server session."""
+    session._mark_disconnected()
+
+
 async def get_next_event_of_type(session: CopilotSession, event_type: str, timeout: float = 30.0):
     """
     Wait for and return the next event of a specific type from a session.

python/test_commands_and_elicitation.py

@@ -107,6 +107,7 @@ async def mock_request(method, params):
 
             client._client.request = mock_request
 
+            session._mark_disconnected()
             await client.resume_session(
                 session.session_id,
                 on_permission_request=PermissionHandler.approve_all,
@@ -525,6 +526,7 @@ async def mock_request(method, params):
 
             client._client.request = mock_request
 
+            session._mark_disconnected()
             await client.resume_session(
                 session.session_id,
                 on_permission_request=PermissionHandler.approve_all,