fix: Address pr cmments

Author: Unshure

src/strands/agent/agent.py

@@ -33,7 +33,7 @@
 from .. import _identifier
 from .._async import run_async
 from ..event_loop.event_loop import event_loop_cycle
-from ..tools._tool_helpers import generate_interrupted_tool_result_content
+from ..tools._tool_helpers import generate_missing_tool_result_content
 
 if TYPE_CHECKING:
     from ..experimental.tools import ToolProvider
@@ -829,7 +829,7 @@ def _convert_prompt_to_messages(self, prompt: AgentInput) -> Messages:
                 self._append_message(
                     {
                         "role": "user",
-                        "content": generate_interrupted_tool_result_content(tool_use_ids),
+                        "content": generate_missing_tool_result_content(tool_use_ids),
                     }
                 )
             if isinstance(prompt, str):

src/strands/session/repository_session_manager.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Any, Optional
 
 from ..agent.state import AgentState
-from ..tools._tool_helpers import generate_interrupted_tool_result_content
+from ..tools._tool_helpers import generate_missing_tool_result_content
 from ..types.content import Message
 from ..types.exceptions import SessionException
 from ..types.session import (
@@ -194,7 +194,7 @@ def _fix_broken_tool_use(self, messages: list[Message]) -> list[Message]:
                             "Adding toolResult content blocks to create valid conversation."
                         )
                         # Create the missing toolResult content blocks
-                        missing_content_blocks = generate_interrupted_tool_result_content(missing_tool_use_ids)
+                        missing_content_blocks = generate_missing_tool_result_content(missing_tool_use_ids)
 
                         if tool_result_ids:
                             # If there were any toolResult ids, that means only some of the content blocks are missing

src/strands/tools/_tool_helpers.py

@@ -16,7 +16,7 @@ def noop_tool() -> None:
     pass
 
 
-def generate_interrupted_tool_result_content(tool_use_ids: list[str]) -> list[ContentBlock]:
+def generate_missing_tool_result_content(tool_use_ids: list[str]) -> list[ContentBlock]:
     """Generate ToolResult content blocks for orphaned ToolUse message."""
     return [
         {

tests/strands/agent/test_agent.py

@@ -2246,11 +2246,18 @@ def test_agent_fixes_orphaned_tool_use_on_new_prompt(mock_model, agenerator):
 
     # Should have added toolResult message
     assert len(agent.messages) >= 3
-    assert agent.messages[1]["role"] == "user"
-    assert "toolResult" in agent.messages[1]["content"][0]
-    assert agent.messages[1]["content"][0]["toolResult"]["toolUseId"] == "orphaned-123"
-    assert agent.messages[1]["content"][0]["toolResult"]["status"] == "error"
-    assert agent.messages[1]["content"][0]["toolResult"]["content"][0]["text"] == "Tool was interrupted."
+    assert agent.messages[1] == {
+        "role": "user",
+        "content": [
+            {
+                "toolResult": {
+                    "toolUseId": "orphaned-123",
+                    "status": "error",
+                    "content": [{"text": "Tool was interrupted."}],
+                }
+            }
+        ],
+    }
 
 
 def test_agent_fixes_multiple_orphaned_tool_uses(mock_model, agenerator):
@@ -2291,14 +2298,25 @@ def test_agent_fixes_multiple_orphaned_tool_uses(mock_model, agenerator):
     agent("Continue")
 
     # Should have toolResult for both toolUse IDs
-    tool_results = agent.messages[1]["content"]
-    assert len(tool_results) == 2
-    tool_use_ids = {tr["toolResult"]["toolUseId"] for tr in tool_results}
-    assert tool_use_ids == {"orphaned-123", "orphaned-456"}
-
-    for tool_result in tool_results:
-        assert tool_result["toolResult"]["status"] == "error"
-        assert tool_result["toolResult"]["content"][0]["text"] == "Tool was interrupted."
+    assert agent.messages[1] == {
+        "role": "user",
+        "content": [
+            {
+                "toolResult": {
+                    "toolUseId": "orphaned-123",
+                    "status": "error",
+                    "content": [{"text": "Tool was interrupted."}],
+                }
+            },
+            {
+                "toolResult": {
+                    "toolUseId": "orphaned-456",
+                    "status": "error",
+                    "content": [{"text": "Tool was interrupted."}],
+                }
+            },
+        ],
+    }
 
 
 def test_agent_skips_fix_for_valid_conversation(mock_model, agenerator):