Improved prompts to encourage better investigative flow

Improved abstraction
Fixed failing tests after refactor

tests/test_auto_model_planner_fix.py

@@ -198,20 +198,17 @@ class TestAutoModelPlannerFix:
         Verify that other tools still properly require model resolution.
 
         This ensures our fix doesn't break existing functionality.
-        Note: Debug tool now manages its own model calls like planner.
+        Note: Debug tool requires model resolution for expert analysis phase.
         """
         from tools.analyze import AnalyzeTool
         from tools.chat import ChatTool
         from tools.debug import DebugIssueTool
 
         # Test various tools still require models
-        tools_requiring_models = [ChatTool(), AnalyzeTool()]
+        tools_requiring_models = [ChatTool(), AnalyzeTool(), DebugIssueTool()]
 
         for tool in tools_requiring_models:
             assert tool.requires_model() is True, f"{tool.get_name()} should require model resolution"
 
-        # Test tools that manage their own model calls
-        tools_managing_own_models = [DebugIssueTool()]
-
-        for tool in tools_managing_own_models:
-            assert tool.requires_model() is False, f"{tool.get_name()} should manage its own model calls"
+        # Note: Debug tool requires model resolution for expert analysis phase
+        # Only planner truly manages its own model calls and doesn't need resolution

tests/test_debug.py

@@ -21,7 +21,7 @@ class TestDebugTool:
         assert "DEBUG & ROOT CAUSE ANALYSIS" in tool.get_description()
         assert tool.get_default_temperature() == 0.2  # TEMPERATURE_ANALYTICAL
         assert tool.get_model_category() == ToolModelCategory.EXTENDED_REASONING
-        assert tool.requires_model() is False  # Since it manages its own model calls
+        assert tool.requires_model() is True  # Requires model resolution for expert analysis
 
     def test_request_validation(self):
         """Test Pydantic request model validation."""
@@ -83,8 +83,9 @@ class TestDebugTool:
         assert "continuation_id" in schema["properties"]
         assert "images" in schema["properties"]  # Now supported for visual debugging
 
+        # Check model field is present (fixed from previous bug)
+        assert "model" in schema["properties"]
         # Check excluded fields are NOT present
-        assert "model" not in schema["properties"]
         assert "temperature" not in schema["properties"]
         assert "thinking_mode" not in schema["properties"]
         assert "use_websearch" not in schema["properties"]