Fix other E2E tests following runtime change

Author: SteveSandersonMS

go/internal/e2e/session_test.go

@@ -407,7 +407,7 @@ func TestSession(t *testing.T) {
 			t.Errorf("Expected resumed session ID to match, got %q vs %q", session2.SessionID, sessionID)
 		}
 
-		answer2, err := testharness.GetFinalAssistantMessage(t.Context(), session2)
+		answer2, err := testharness.GetFinalAssistantMessage(t.Context(), session2, true)
 		if err != nil {
 			t.Fatalf("Failed to get assistant message from resumed session: %v", err)
 		}

go/internal/e2e/testharness/helper.go

@@ -9,7 +9,9 @@ import (
 )
 
 // GetFinalAssistantMessage waits for and returns the final assistant message from a session turn.
-func GetFinalAssistantMessage(ctx context.Context, session *copilot.Session) (*copilot.SessionEvent, error) {
+// If alreadyIdle is true, skip waiting for session.idle (useful for resumed sessions where the
+// idle event was ephemeral and not persisted in the event history).
+func GetFinalAssistantMessage(ctx context.Context, session *copilot.Session, alreadyIdle ...bool) (*copilot.SessionEvent, error) {
 	result := make(chan *copilot.SessionEvent, 1)
 	errCh := make(chan error, 1)
 
@@ -34,8 +36,9 @@ func GetFinalAssistantMessage(ctx context.Context, session *copilot.Session) (*c
 	defer unsubscribe()
 
 	// Also check existing messages in case the response already arrived
+	isAlreadyIdle := len(alreadyIdle) > 0 && alreadyIdle[0]
 	go func() {
-		existing, err := getExistingFinalResponse(ctx, session)
+		existing, err := getExistingFinalResponse(ctx, session, isAlreadyIdle)
 		if err != nil {
 			errCh <- err
 			return
@@ -90,7 +93,7 @@ func GetNextEventOfType(session *copilot.Session, eventType copilot.SessionEvent
 	}
 }
 
-func getExistingFinalResponse(ctx context.Context, session *copilot.Session) (*copilot.SessionEvent, error) {
+func getExistingFinalResponse(ctx context.Context, session *copilot.Session, alreadyIdle bool) (*copilot.SessionEvent, error) {
 	messages, err := session.GetMessages(ctx)
 	if err != nil {
 		return nil, err
@@ -125,10 +128,14 @@ func getExistingFinalResponse(ctx context.Context, session *copilot.Session) (*c
 
 	// Find session.idle and get last assistant message before it
 	sessionIdleIndex := -1
-	for i, msg := range currentTurnMessages {
-		if msg.Type == "session.idle" {
-			sessionIdleIndex = i
-			break
+	if alreadyIdle {
+		sessionIdleIndex = len(currentTurnMessages)
+	} else {
+		for i, msg := range currentTurnMessages {
+			if msg.Type == "session.idle" {
+				sessionIdleIndex = i
+				break
+			}
 		}
 	}
 

nodejs/test/e2e/harness/sdkTestHelper.ts

@@ -5,12 +5,13 @@
 import { AssistantMessageEvent, CopilotSession, SessionEvent } from "../../../src";
 
 export async function getFinalAssistantMessage(
-    session: CopilotSession
+    session: CopilotSession,
+    { alreadyIdle = false }: { alreadyIdle?: boolean } = {}
 ): Promise<AssistantMessageEvent> {
     // We don't know whether the answer has already arrived or not, so race both possibilities
     return new Promise<AssistantMessageEvent>(async (resolve, reject) => {
         getFutureFinalResponse(session).then(resolve).catch(reject);
-        getExistingFinalResponse(session)
+        getExistingFinalResponse(session, alreadyIdle)
             .then((msg) => {
                 if (msg) {
                     resolve(msg);
@@ -21,7 +22,8 @@ export async function getFinalAssistantMessage(
 }
 
 function getExistingFinalResponse(
-    session: CopilotSession
+    session: CopilotSession,
+    alreadyIdle: boolean = false
 ): Promise<AssistantMessageEvent | undefined> {
     return new Promise<AssistantMessageEvent | undefined>(async (resolve, reject) => {
         const messages = await session.getMessages();
@@ -37,9 +39,9 @@ function getExistingFinalResponse(
             return;
         }
 
-        const sessionIdleMessageIndex = currentTurnMessages.findIndex(
-            (m) => m.type === "session.idle"
-        );
+        const sessionIdleMessageIndex = alreadyIdle
+            ? currentTurnMessages.length
+            : currentTurnMessages.findIndex((m) => m.type === "session.idle");
         if (sessionIdleMessageIndex !== -1) {
             const lastAssistantMessage = currentTurnMessages
                 .slice(0, sessionIdleMessageIndex)

nodejs/test/e2e/session.test.ts

@@ -231,8 +231,10 @@ describe("Sessions", async () => {
         });
         expect(session2.sessionId).toBe(sessionId);
 
-        // TODO: There's an inconsistency here. When resuming with a new client, we don't see
-        // the session.idle message in the history, which means we can't use getFinalAssistantMessage.
+        // session.idle is ephemeral and not persisted, so use alreadyIdle
+        // to find the assistant message from the completed session.
+        const answer2 = await getFinalAssistantMessage(session2, { alreadyIdle: true });
+        expect(answer2?.data.content).toContain("2");
 
         const messages = await session2.getMessages();
         expect(messages).toContainEqual(expect.objectContaining({ type: "user.message" }));

python/e2e/test_session.py

@@ -190,7 +190,7 @@ async def test_should_resume_a_session_using_the_same_client(self, ctx: E2ETestC
             session_id, on_permission_request=PermissionHandler.approve_all
         )
         assert session2.session_id == session_id
-        answer2 = await get_final_assistant_message(session2)
+        answer2 = await get_final_assistant_message(session2, already_idle=True)
         assert "2" in answer2.data.content
 
         # Can continue the conversation statefully

python/e2e/testharness/helper.py

@@ -8,7 +8,7 @@
 from copilot import CopilotSession
 
 
-async def get_final_assistant_message(session: CopilotSession, timeout: float = 10.0):
+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.
 
@@ -46,7 +46,7 @@ def on_event(event):
 
     try:
         # Also check existing messages in case the response already arrived
-        existing = await _get_existing_final_response(session)
+        existing = await _get_existing_final_response(session, already_idle)
         if existing is not None:
             return existing
 
@@ -55,7 +55,7 @@ def on_event(event):
         unsubscribe()
 
 
-async def _get_existing_final_response(session: CopilotSession):
+async def _get_existing_final_response(session: CopilotSession, already_idle: bool = False):
     """Check existing messages for a final response."""
     messages = await session.get_messages()
 
@@ -78,11 +78,14 @@ async def _get_existing_final_response(session: CopilotSession):
             raise RuntimeError(err_msg)
 
     # Find session.idle and get last assistant message before it
-    session_idle_index = -1
-    for i, msg in enumerate(current_turn_messages):
-        if msg.type.value == "session.idle":
-            session_idle_index = i
-            break
+    if already_idle:
+        session_idle_index = len(current_turn_messages)
+    else:
+        session_idle_index = -1
+        for i, msg in enumerate(current_turn_messages):
+            if msg.type.value == "session.idle":
+                session_idle_index = i
+                break
 
     if session_idle_index != -1:
         # Find last assistant.message before session.idle