Fix nondeterministic Node E2E test

Author: SteveSandersonMS

nodejs/test/e2e/multi-client.test.ts

@@ -230,13 +230,16 @@ describe("Multi-client broadcast", async () => {
                 tools: [toolB],
             });
 
-            // Send a prompt that requires both tools
-            const response = await session1.sendAndWait({
-                prompt: "Use the city_lookup tool with countryCode 'US' and the currency_lookup tool with countryCode 'US'. Tell me both results.",
+            // Send prompts sequentially to avoid nondeterministic tool_call ordering
+            const response1 = await session1.sendAndWait({
+                prompt: "Use the city_lookup tool with countryCode 'US' and tell me the result.",
             });
+            expect(response1?.data.content).toContain("CITY_FOR_US");
 
-            expect(response?.data.content).toContain("CITY_FOR_US");
-            expect(response?.data.content).toContain("CURRENCY_FOR_US");
+            const response2 = await session1.sendAndWait({
+                prompt: "Now use the currency_lookup tool with countryCode 'US' and tell me the result.",
+            });
+            expect(response2?.data.content).toContain("CURRENCY_FOR_US");
 
             await session2.disconnect();
         }
@@ -267,12 +270,16 @@ describe("Multi-client broadcast", async () => {
             tools: [toolB],
         });
 
-        // Verify both tools work before disconnect
-        const bothResponse = await session1.sendAndWait({
-            prompt: "Use the stable_tool with input 'test1' and the ephemeral_tool with input 'test2'. Tell me both results.",
+        // Verify both tools work before disconnect (sequential to avoid nondeterministic tool_call ordering)
+        const stableResponse = await session1.sendAndWait({
+            prompt: "Use the stable_tool with input 'test1' and tell me the result.",
+        });
+        expect(stableResponse?.data.content).toContain("STABLE_test1");
+
+        const ephemeralResponse = await session1.sendAndWait({
+            prompt: "Use the ephemeral_tool with input 'test2' and tell me the result.",
         });
-        expect(bothResponse?.data.content).toContain("STABLE_test1");
-        expect(bothResponse?.data.content).toContain("EPHEMERAL_test2");
+        expect(ephemeralResponse?.data.content).toContain("EPHEMERAL_test2");
 
         // Disconnect client 2 without destroying the shared session
         await client2.forceStop();

test/snapshots/multi_client/disconnecting_client_removes_its_tools.yaml

@@ -5,26 +5,63 @@ conversations:
       - role: system
         content: ${system}
       - role: user
-        content: Use the stable_tool with input 'test1' and the ephemeral_tool with input 'test2'. Tell me both results.
+        content: Use the stable_tool with input 'test1' and tell me the result.
       - role: assistant
-        content: I'll call both tools for you and report the results.
+        content: I'll call the stable_tool with input 'test1' for you.
       - role: assistant
         tool_calls:
           - id: toolcall_0
             type: function
             function:
               name: report_intent
-              arguments: '{"intent":"Testing stable and ephemeral tools"}'
+              arguments: '{"intent":"Testing stable_tool"}'
       - role: assistant
         tool_calls:
           - id: toolcall_1
             type: function
             function:
               name: stable_tool
               arguments: '{"input":"test1"}'
+  - messages:
+      - role: system
+        content: ${system}
+      - role: user
+        content: Use the stable_tool with input 'test1' and tell me the result.
+      - role: assistant
+        content: I'll call the stable_tool with input 'test1' for you.
+        tool_calls:
+          - id: toolcall_0
+            type: function
+            function:
+              name: report_intent
+              arguments: '{"intent":"Testing stable_tool"}'
+          - id: toolcall_1
+            type: function
+            function:
+              name: stable_tool
+              arguments: '{"input":"test1"}'
+      - role: tool
+        tool_call_id: toolcall_0
+        content: Intent logged
+      - role: tool
+        tool_call_id: toolcall_1
+        content: STABLE_test1
+      - role: assistant
+        content: "The stable_tool returned: **STABLE_test1**"
+      - role: user
+        content: Use the ephemeral_tool with input 'test2' and tell me the result.
+      - role: assistant
+        content: I'll call the ephemeral_tool with input 'test2' for you.
       - role: assistant
         tool_calls:
           - id: toolcall_2
+            type: function
+            function:
+              name: report_intent
+              arguments: '{"intent":"Testing ephemeral_tool"}'
+      - role: assistant
+        tool_calls:
+          - id: toolcall_3
             type: function
             function:
               name: ephemeral_tool
@@ -33,39 +70,51 @@ conversations:
       - role: system
         content: ${system}
       - role: user
-        content: Use the stable_tool with input 'test1' and the ephemeral_tool with input 'test2'. Tell me both results.
+        content: Use the stable_tool with input 'test1' and tell me the result.
       - role: assistant
-        content: I'll call both tools for you and report the results.
+        content: I'll call the stable_tool with input 'test1' for you.
         tool_calls:
           - id: toolcall_0
             type: function
             function:
               name: report_intent
-              arguments: '{"intent":"Testing stable and ephemeral tools"}'
+              arguments: '{"intent":"Testing stable_tool"}'
           - id: toolcall_1
             type: function
             function:
               name: stable_tool
               arguments: '{"input":"test1"}'
-          - id: toolcall_2
-            type: function
-            function:
-              name: ephemeral_tool
-              arguments: '{"input":"test2"}'
       - role: tool
         tool_call_id: toolcall_0
         content: Intent logged
       - role: tool
         tool_call_id: toolcall_1
         content: STABLE_test1
+      - role: assistant
+        content: "The stable_tool returned: **STABLE_test1**"
+      - role: user
+        content: Use the ephemeral_tool with input 'test2' and tell me the result.
+      - role: assistant
+        content: I'll call the ephemeral_tool with input 'test2' for you.
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: report_intent
+              arguments: '{"intent":"Testing ephemeral_tool"}'
+          - id: toolcall_3
+            type: function
+            function:
+              name: ephemeral_tool
+              arguments: '{"input":"test2"}'
       - role: tool
         tool_call_id: toolcall_2
+        content: Intent logged
+      - role: tool
+        tool_call_id: toolcall_3
         content: EPHEMERAL_test2
       - role: assistant
-        content: |-
-          Both tools executed successfully:
-          - **stable_tool** returned: `STABLE_test1`
-          - **ephemeral_tool** returned: `EPHEMERAL_test2`
+        content: "The ephemeral_tool returned: **EPHEMERAL_test2**"
       - role: user
         content: >-
           <tools_changed_notice>
@@ -81,17 +130,18 @@ conversations:
 
           Use the stable_tool with input 'still_here'. Also try using ephemeral_tool if it is available.
       - role: assistant
-        content: I'll call the stable_tool and check on the ephemeral_tool availability.
+        content: I'll call the stable_tool with input 'still_here'. The ephemeral_tool is no longer available, so I can only use
+          the stable_tool.
       - role: assistant
         tool_calls:
-          - id: toolcall_3
+          - id: toolcall_4
             type: function
             function:
               name: report_intent
               arguments: '{"intent":"Testing tool availability"}'
       - role: assistant
         tool_calls:
-          - id: toolcall_4
+          - id: toolcall_5
             type: function
             function:
               name: stable_tool
@@ -100,39 +150,51 @@ conversations:
       - role: system
         content: ${system}
       - role: user
-        content: Use the stable_tool with input 'test1' and the ephemeral_tool with input 'test2'. Tell me both results.
+        content: Use the stable_tool with input 'test1' and tell me the result.
       - role: assistant
-        content: I'll call both tools for you and report the results.
+        content: I'll call the stable_tool with input 'test1' for you.
         tool_calls:
           - id: toolcall_0
             type: function
             function:
               name: report_intent
-              arguments: '{"intent":"Testing stable and ephemeral tools"}'
+              arguments: '{"intent":"Testing stable_tool"}'
           - id: toolcall_1
             type: function
             function:
               name: stable_tool
               arguments: '{"input":"test1"}'
-          - id: toolcall_2
-            type: function
-            function:
-              name: ephemeral_tool
-              arguments: '{"input":"test2"}'
       - role: tool
         tool_call_id: toolcall_0
         content: Intent logged
       - role: tool
         tool_call_id: toolcall_1
         content: STABLE_test1
+      - role: assistant
+        content: "The stable_tool returned: **STABLE_test1**"
+      - role: user
+        content: Use the ephemeral_tool with input 'test2' and tell me the result.
+      - role: assistant
+        content: I'll call the ephemeral_tool with input 'test2' for you.
+        tool_calls:
+          - id: toolcall_2
+            type: function
+            function:
+              name: report_intent
+              arguments: '{"intent":"Testing ephemeral_tool"}'
+          - id: toolcall_3
+            type: function
+            function:
+              name: ephemeral_tool
+              arguments: '{"input":"test2"}'
       - role: tool
         tool_call_id: toolcall_2
+        content: Intent logged
+      - role: tool
+        tool_call_id: toolcall_3
         content: EPHEMERAL_test2
       - role: assistant
-        content: |-
-          Both tools executed successfully:
-          - **stable_tool** returned: `STABLE_test1`
-          - **ephemeral_tool** returned: `EPHEMERAL_test2`
+        content: "The ephemeral_tool returned: **EPHEMERAL_test2**"
       - role: user
         content: >-
           <tools_changed_notice>
@@ -148,28 +210,27 @@ conversations:
 
           Use the stable_tool with input 'still_here'. Also try using ephemeral_tool if it is available.
       - role: assistant
-        content: I'll call the stable_tool and check on the ephemeral_tool availability.
+        content: I'll call the stable_tool with input 'still_here'. The ephemeral_tool is no longer available, so I can only use
+          the stable_tool.
         tool_calls:
-          - id: toolcall_3
+          - id: toolcall_4
             type: function
             function:
               name: report_intent
               arguments: '{"intent":"Testing tool availability"}'
-          - id: toolcall_4
+          - id: toolcall_5
             type: function
             function:
               name: stable_tool
               arguments: '{"input":"still_here"}'
       - role: tool
-        tool_call_id: toolcall_3
+        tool_call_id: toolcall_4
         content: Intent logged
       - role: tool
-        tool_call_id: toolcall_4
+        tool_call_id: toolcall_5
         content: STABLE_still_here
       - role: assistant
-        content: >-
-          **stable_tool** returned: `STABLE_still_here`
-
+        content: |-
+          The stable_tool returned: **STABLE_still_here**
 
-          The **ephemeral_tool** is no longer available (it was removed as indicated in the tools_changed_notice), so I
-          couldn't call it.
+          The ephemeral_tool is not available anymore (it was removed), so I could only call the stable_tool.