Private
Public Access
0
0
Files
manual_slop/tests/test_arch_boundary_phase2.py
T
ed 779d504c70 refactor(mcp_tool_specs): delete redundant AGENT_TOOL_NAMES; use tool_names() at consumer sites
AGENT_TOOL_NAMES was a hardcoded snapshot of mcp_tool_specs.tool_names()
in src/models.py. The pre-existing test
test_tool_names_subset_of_models_agent_tool_names literally asserted
'tool_names() ⊆ AGENT_TOOL_NAMES' (proving the redundancy), and
AGENT_TOOL_NAMES was not maintained in lockstep with the registry
(it would silently drift if a new tool was added).

This commit:
 1. Deletes AGENT_TOOL_NAMES from src/models.py (replaced by an
    explanatory comment in the Constants section).
 2. Updates 3 consumer sites in src/app_controller.py:
    - 'for t in models.AGENT_TOOL_NAMES' -> 'for t in mcp_tool_specs.tool_names()'
    - (in 2 methods: __init__ + a setter)
 3. Updates 2 test sites in tests/test_arch_boundary_phase2.py:
    - 'from src.models import AGENT_TOOL_NAMES' -> 'from src import mcp_tool_specs'
    - 'AGENT_TOOL_NAMES' references -> 'mcp_tool_specs.tool_names()'
 4. Removes the tautology test
    test_tool_names_subset_of_models_agent_tool_names from
    tests/test_mcp_tool_specs.py (it asserted 'AGENT_TOOL_NAMES
    superset of tool_names()' which becomes meaningless after
    AGENT_TOOL_NAMES is deleted). Also removes the now-unused
    'from src import models' import from that test file.

Verification: VC9
  git grep 'AGENT_TOOL_NAMES' -- 'src/*.py' 'tests/*.py'  # 0 hits
  from src import mcp_tool_specs
  mcp_tool_specs.tool_names()  # returns the canonical 45 tools
  from src.app_controller import AppController  # uses the new path

Tests verified (15/16 PASS; 1 pre-existing failure unrelated to this
commit):
  tests/test_arch_boundary_phase2.py (6 tests; 1 pre-existing
                                          failure: test_rejection_prevents_dispatch
                                          is a dialog-mock issue that
                                          predates Phase 4)
  tests/test_mcp_tool_specs.py (10 tests; the tautology test was removed;
                                          the remaining 10 pass)
2026-06-26 10:19:39 -04:00

101 lines
4.3 KiB
Python

import os
import sys
import unittest
from unittest.mock import patch, MagicMock
# Ensure project root is in path
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
class TestArchBoundaryPhase2(unittest.TestCase):
def setUp(self) -> None:
pass
def test_toml_exposes_all_dispatch_tools(self) -> None:
"""manual_slop.toml [agent.tools] must list every tool in mcp_client.dispatch()."""
from src import mcp_tool_specs
# We check the tool names in the source of mcp_client.dispatch
import inspect
import src.mcp_client as mcp
source = inspect.getsource(mcp.dispatch)
# This is a bit dynamic, but we can check if it covers our core tool names
for tool in mcp_tool_specs.tool_names():
if tool not in ("set_file_slice", "py_update_definition", "py_set_signature", "py_set_var_declaration"):
# Non-mutating tools should definitely be handled
pass
def test_toml_mutating_tools_disabled_by_default(self) -> None:
"""Verify that the core set of read-only tools is present."""
from src import mcp_tool_specs
tool_names = mcp_tool_specs.tool_names()
# Our architecture now uses a fixed set of high-signal tools
self.assertIn("read_file", tool_names)
self.assertIn("list_directory", tool_names)
self.assertIn("py_get_skeleton", tool_names)
def test_mcp_client_dispatch_completeness(self) -> None:
"""Verify that all tools in tool_schemas are handled by dispatch()."""
from src import mcp_client
# get_tool_schemas exists
available_tools = [t["name"] for t in mcp_client.get_tool_schemas()]
self.assertGreater(len(available_tools), 0)
def test_mutating_tool_triggers_callback(self) -> None:
"""All mutating tools must trigger the pre_tool_callback."""
from src.app_controller import AppController
# Use a real AppController to test its _confirm_and_run
with patch('src.app_controller.AppController.load_config', return_value={}), \
patch('src.performance_monitor.PerformanceMonitor'), \
patch('src.session_logger.open_session'), \
patch('src.session_logger.reset_session'), \
patch('src.app_controller.AppController._prune_old_logs'), \
patch('src.app_controller.AppController._init_ai_and_hooks'):
controller = AppController()
mock_cb = MagicMock(return_value="output")
# AppController implements its own _confirm_and_run, let's see how we can mock the HITL part
# In AppController._confirm_and_run, if test_hooks_enabled=False (default), it waits for a dialog
with patch("src.shell_runner.run_powershell", return_value="output"):
# Simulate auto-approval for test
controller.test_hooks_enabled = True
controller.ui_manual_approve = False
res = controller._confirm_and_run("echo hello", ".")
self.assertEqual(res, "output")
def test_rejection_prevents_dispatch(self) -> None:
"""When pre_tool_callback returns None (rejected), dispatch must NOT be called."""
from src.app_controller import AppController
with patch('src.app_controller.AppController.load_config', return_value={}), \
patch('src.performance_monitor.PerformanceMonitor'), \
patch('src.session_logger.open_session'), \
patch('src.session_logger.reset_session'), \
patch('src.app_controller.AppController._prune_old_logs'), \
patch('src.app_controller.AppController._init_ai_and_hooks'):
controller = AppController()
# Mock the wait() method of ConfirmDialog to return (False, script)
with patch("src.app_controller.ConfirmDialog") as mock_dialog_class:
mock_dialog = mock_dialog_class.return_value
mock_dialog.wait.return_value = (False, "script")
mock_dialog._uid = "test_uid"
with patch("src.shell_runner.run_powershell") as mock_run:
controller.test_hooks_enabled = False # Force manual approval (dialog)
res = controller._confirm_and_run("script", ".")
self.assertIsNone(res)
self.assertFalse(mock_run.called)
def test_non_mutating_tool_skips_callback(self) -> None:
"""Read-only tools must NOT trigger pre_tool_callback."""
from src import ai_client
# Check internal list or method
if hasattr(ai_client, '_is_mutating_tool'):
mutating = ["run_powershell", "set_file_slice"]
for t in mutating:
self.assertTrue(ai_client._is_mutating_tool(t))
self.assertFalse(ai_client._is_mutating_tool("read_file"))
self.assertFalse(ai_client._is_mutating_tool("list_directory"))