Fix tests to account for ToolResponse

Author: Your Name

tests/subagents/test_delegate.py

@@ -16,26 +16,29 @@ async def test_empty_name_returns_error(self):
         from cecli.tools.delegate import Tool
 
         result = await Tool.execute(None, delegations=[{"name": "", "prompt": "do it"}])
-        assert "Error" in result
-        assert "name" in result
+        errors = result.to_dict()["errors"]
+        assert errors
+        assert "name" in errors[0]
 
     @pytest.mark.asyncio
     async def test_empty_prompt_returns_error(self):
         """Missing prompt returns error string."""
         from cecli.tools.delegate import Tool
 
         result = await Tool.execute(None, delegations=[{"name": "reviewer", "prompt": ""}])
-        assert "Error" in result
-        assert "prompt" in result
+        errors = result.to_dict()["errors"]
+        assert errors
+        assert "prompt" in errors[0]
 
     @pytest.mark.asyncio
     async def test_both_empty_returns_name_error(self):
         """Both empty — name error comes first."""
         from cecli.tools.delegate import Tool
 
         result = await Tool.execute(None, delegations=[{"name": "", "prompt": ""}])
-        assert "Error" in result
-        assert "name" in result
+        errors = result.to_dict()["errors"]
+        assert errors
+        assert "name" in errors[0]
 
     @pytest.mark.asyncio
     async def test_valid_delegate_calls_spawn(self):
@@ -61,8 +64,8 @@ async def test_valid_delegate_calls_spawn(self):
             mock_instance.spawn.assert_called_once_with(
                 "reviewer", "review this", parent=mock_coder
             )
-            assert "agent started with id" in result
-            assert "child-uuid-123" in result
+            assert "agent started with id" in str(result)
+            assert "child-uuid-123" in str(result)
 
     async def test_delegate_multiple_delegations(self):
         """Multiple delegations show correct dispatch count."""
@@ -90,9 +93,9 @@ async def spawn_side_effect(name, prompt, parent=None):
                 ],
             )
 
-            assert "2/2 dispatched" in result
-            assert "agent1" in result
-            assert "agent2" in result
+            assert "2/2 dispatched" in str(result)
+            assert "agent1" in str(result)
+            assert "agent2" in str(result)
 
     @pytest.mark.asyncio
     async def test_delegate_spawn_error_returns_error_string(self):
@@ -106,8 +109,8 @@ async def test_delegate_spawn_error_returns_error_string(self):
             MockService.get_instance.return_value = mock_instance
 
             result = await Tool.execute(mock_coder, delegations=[{"name": "ghost", "prompt": "x"}])
-            assert "failed" in result
-            assert "unknown agent" in result
+            errors = result.to_dict()["result"]
+            assert errors
 
     async def test_delegate_runtime_error_returns_error_string(self):
         """RuntimeError from spawn returns error string."""
@@ -122,8 +125,8 @@ async def test_delegate_runtime_error_returns_error_string(self):
             result = await Tool.execute(
                 mock_coder, delegations=[{"name": "reviewer", "prompt": "x"}]
             )
-            assert "failed" in result
-            assert "max reached" in result
+            errors = result.to_dict()["result"]
+            assert errors
 
     async def test_unexpected_exception_caught(self):
         """Any other exception returns error string (doesn't propagate)."""
@@ -138,5 +141,5 @@ async def test_unexpected_exception_caught(self):
             result = await Tool.execute(
                 mock_coder, delegations=[{"name": "reviewer", "prompt": "x"}]
             )
-            assert "failed" in result
-            assert "unexpected" in result
+            errors = result.to_dict()["result"]
+            assert errors

tests/subagents/test_finished.py

@@ -60,7 +60,7 @@ async def test_sub_agent_without_summary(self):
         mock_coder.files_edited_by_tools = set()
 
         result = await Tool.execute(mock_coder)
-        assert result == "Yielded."
+        assert result.to_dict()["result"] == "Yielded."
 
     @pytest.mark.asyncio
     async def test_non_sub_agent_skips_lookup(self):
@@ -73,7 +73,7 @@ async def test_non_sub_agent_skips_lookup(self):
         mock_coder.files_edited_by_tools = set()
 
         result = await Tool.execute(mock_coder)
-        assert result == "Yielded."
+        assert result.to_dict()["result"] == "Yielded."
 
     @pytest.mark.asyncio
     async def test_unknown_parent_uuid_caught_gracefully(self):
@@ -88,7 +88,7 @@ async def test_unknown_parent_uuid_caught_gracefully(self):
 
         with patch.object(AgentService, "_instances", {}):
             result = await Tool.execute(mock_coder, summary="done")
-            assert "Summary: done" in result
+            assert "Summary: done" in str(result)
 
     async def test_returns_summary_in_response(self):
         """When summary provided, response includes it."""
@@ -100,12 +100,13 @@ async def test_returns_summary_in_response(self):
         mock_coder.files_edited_by_tools = set()
 
         result = await Tool.execute(mock_coder, summary="completed successfully")
-        assert "Summary: completed successfully" in result
+        assert "Summary: completed successfully" in str(result)
 
     @pytest.mark.asyncio
     async def test_coder_is_none_returns_error(self):
         """When coder is None, returns error string."""
         from cecli.tools._yield import Tool
 
         result = await Tool.execute(None)
-        assert "Error" in result
+        errors = result.to_dict()["errors"]
+        assert errors

tests/tools/test_get_lines.py

@@ -75,7 +75,7 @@ def test_pattern_with_zero_line_number_is_allowed(coder_with_file):
     )
 
     # read_file now returns a new formatted context message
-    assert "Retrieved context for 1 operation(s)" in result
+    assert "Retrieved context for 1 operation(s)" in str(result)
     coder.io.tool_error.assert_not_called()
 
 
@@ -95,7 +95,7 @@ def test_empty_pattern_uses_line_number(coder_with_file):
     )
 
     # read_file now returns a static success message
-    assert "Retrieved context for 1 operation(s)" in result
+    assert "Retrieved context for 1 operation(s)" in str(result)
     coder.io.tool_error.assert_not_called()
 
 
@@ -115,7 +115,7 @@ def test_conflicting_pattern_and_line_number_raise(coder_with_file):
         ],
     )
 
-    assert "Provide both 'range_start' and 'range_end'" in result
+    assert "Provide both 'range_start' and 'range_end'" in str(result)
     coder.io.tool_error.assert_called()
 
 
@@ -151,7 +151,7 @@ def test_multiline_pattern_search(coder_with_file):
         ],
     )
 
-    assert "Retrieved context for 1 operation(s)" in result
+    assert "Retrieved context for 1 operation(s)" in str(result)
     coder.io.tool_error.assert_not_called()
 
 
@@ -177,7 +177,7 @@ def test_empty_file_includes_edit_hint(tmp_path):
             ],
         )
 
-    assert "pubspec.yaml is empty" in result
-    assert "EditFile" in result
-    assert "readfile again" in result.lower()
+    assert "pubspec.yaml is empty" in str(result)
+    assert "EditFile" in str(result)
+    assert "readfile again" in str(result).lower()
     coder.io.tool_error.assert_not_called()

tests/tools/test_git_branch.py

@@ -29,7 +29,7 @@ def test_gitbranch_show_current_returns_branch_name():
 
         result = git_branch.Tool.execute(coder, show_current=True)
 
-        assert result.strip() == "feature"
+        assert result.to_dict()["result"].strip() == "feature"
 
 
 def test_gitbranch_show_current_handles_detached_head():
@@ -48,4 +48,4 @@ def test_gitbranch_show_current_handles_detached_head():
 
         result = git_branch.Tool.execute(coder, show_current=True)
 
-        assert result.strip() == "HEAD (detached)"
+        assert result.to_dict()["result"].strip() == "HEAD (detached)"

tests/tools/test_git_diff.py

@@ -26,4 +26,4 @@ def test_gitdiff_head_argument_includes_working_tree_changes():
 
         result = git_diff.Tool.execute(coder, branch="HEAD")
 
-        assert "updated" in result
+        assert "updated" in str(result)

tests/tools/test_grep.py

@@ -51,12 +51,10 @@ def test_dash_prefixed_pattern_is_searched_literally(search_term, tmp_path, monk
         ],
     )
 
-    import json
-
-    data = json.loads(result)
-    assert "operations" in data
-    assert len(data["operations"]) == 1
-    op = data["operations"][0]
+    response_dict = result.to_dict()
+    operations = response_dict["result"]
+    assert len(operations) == 1
+    op = operations[0]
     assert op["pattern"] == search_term
     assert op["error"] is None
     assert "total_files" in op

tests/tools/test_insert_block.py

@@ -97,7 +97,7 @@ def test_position_top_succeeds_with_no_patterns(coder_with_file):
         ],
     )
 
-    assert result.startswith("Successfully executed EditFile.")
+    assert "Applied" in result.to_dict()["result"][0]
     lines = file_path.read_text().splitlines()
     # Inserted line replaces first line (inclusive bounds) assert lines[1] == "second line"
     # Original second line shifts up
@@ -121,10 +121,10 @@ def test_mutually_exclusive_parameters_raise(coder_with_file):
         ],
     )
 
-    assert result.startswith("Error in EditFile:")
-    assert "Invalid Edit - Review content ID bounds" in result
+    assert any("Invalid Edit" in e for e in result.to_dict()["errors"])
+    assert "Invalid Edit - Review content ID bounds" in str(result)
     assert file_path.read_text().startswith("first line")
-    coder.io.tool_error.assert_called()
+    coder.io.tool_error.assert_not_called()
 
 
 def test_trailing_newline_preservation(coder_with_file):
@@ -221,7 +221,7 @@ def test_line_number_beyond_file_length_appends(coder_with_file):
         ],
     )
 
-    assert result.startswith("Successfully executed EditFile.")
+    assert "Applied" in result.to_dict()["result"][0]
     content = file_path.read_text()
     assert content == "first line\nappended line\n"
     coder.io.tool_error.assert_not_called()