Add tests for full coverage of tool validation branches

- Add test cases for valid create_message calls that pass validation
  (covering branches 261->266, 266->272, 269->272 in session.py)
- Add test for CreateMessageResult.content_as_list with single content
  (covering line 1245 else branch in types.py)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: ochafik

tests/server/test_session.py

@@ -360,6 +360,29 @@ async def test_create_message_tool_result_validation():
                     tools=[tool],
                 )
 
+            # Case 5: text-only message with tools (no tool_results) - passes validation
+            # This covers branch 261->266 (has_tool_results=False) and 266->272
+            # We use move_on_after since send_request will block waiting for response
+            with anyio.move_on_after(0.01):
+                await session.create_message(
+                    messages=[types.SamplingMessage(role="user", content=text)],
+                    max_tokens=100,
+                    tools=[tool],
+                )
+
+            # Case 6: valid matching tool_result/tool_use IDs - passes validation
+            # This covers branch 269->272 (IDs match, no error raised)
+            with anyio.move_on_after(0.01):
+                await session.create_message(
+                    messages=[
+                        types.SamplingMessage(role="user", content=text),
+                        types.SamplingMessage(role="assistant", content=tool_use),
+                        types.SamplingMessage(role="user", content=tool_result),
+                    ],
+                    max_tokens=100,
+                    tools=[tool],
+                )
+
 
 @pytest.mark.anyio
 async def test_other_requests_blocked_before_initialization():

tests/shared/test_streamable_http.py

@@ -210,16 +210,10 @@ async def handle_call_tool(name: str, args: dict[str, Any]) -> list[TextContent]
                 )
 
                 # Return the sampling result in the tool response
-                if isinstance(sampling_result.content, list):
-                    response = (
-                        sampling_result.content[0].text
-                        if sampling_result.content and sampling_result.content[0].type == "text"
-                        else None
-                    )
-                elif sampling_result.content.type == "text":
-                    response = sampling_result.content.text
+                if all(c.type == "text" for c in sampling_result.content_as_list):
+                    response = "\n".join(c.text for c in sampling_result.content_as_list if c.type == "text")
                 else:
-                    response = None
+                    response = str(sampling_result.content)
                 return [
                     TextContent(
                         type="text",
@@ -1248,13 +1242,8 @@ async def sampling_callback(
         nonlocal sampling_callback_invoked, captured_message_params
         sampling_callback_invoked = True
         captured_message_params = params
-        msg_content = params.messages[0].content
-        if isinstance(msg_content, list):
-            message_received = msg_content[0].text if msg_content and msg_content[0].type == "text" else None
-        elif msg_content.type == "text":
-            message_received = msg_content.text
-        else:
-            message_received = None
+        msg_content = params.messages[0].content_as_list[0]
+        message_received = msg_content.text if msg_content.type == "text" else None
 
         return types.CreateMessageResult(
             role="assistant",

tests/test_types.py

@@ -253,6 +253,11 @@ async def test_create_message_result_with_tool_use():
     assert result.stopReason == "toolUse"
     assert result.model == "claude-3"
 
+    # Test content_as_list with single content (covers else branch)
+    content_list = result.content_as_list
+    assert len(content_list) == 1
+    assert content_list[0] == result.content
+
 
 @pytest.mark.anyio
 async def test_client_capabilities_with_sampling_tools():