Further equivalent fixes

Author: SteveSandersonMS

go/internal/e2e/session_test.go

@@ -713,8 +713,10 @@ func TestSession(t *testing.T) {
 			t.Error("Expected to receive session.idle event")
 		}
 
-		// Verify the assistant response contains the expected answer
-		assistantMessage, err := testharness.GetFinalAssistantMessage(t.Context(), session)
+		// Verify the assistant response contains the expected answer.
+		// session.idle is ephemeral and not in GetMessages(), but we already
+		// confirmed idle via the live event handler above.
+		assistantMessage, err := testharness.GetFinalAssistantMessage(t.Context(), session, true)
 		if err != nil {
 			t.Fatalf("Failed to get assistant message: %v", err)
 		}

python/e2e/test_session.py

@@ -495,8 +495,10 @@ def on_event(event):
         assert "assistant.message" in event_types
         assert "session.idle" in event_types
 
-        # Verify the assistant response contains the expected answer
-        assistant_message = await get_final_assistant_message(session)
+        # Verify the assistant response contains the expected answer.
+        # session.idle is ephemeral and not in get_messages(), but we already
+        # confirmed idle via the live event handler above.
+        assistant_message = await get_final_assistant_message(session, already_idle=True)
         assert "300" in assistant_message.data.content
 
     async def test_should_create_session_with_custom_config_dir(self, ctx: E2ETestContext):

python/e2e/testharness/helper.py

@@ -8,7 +8,9 @@
 from copilot import CopilotSession
 
 
-async def get_final_assistant_message(session: CopilotSession, timeout: float = 10.0, already_idle: bool = False):
+async def get_final_assistant_message(
+    session: CopilotSession, timeout: float = 10.0, already_idle: bool = False
+):
     """
     Wait for and return the final assistant message from a session turn.