7bcb5a8c07
Eliminates 22 call sites that bypassed the AppController state owner
and read/wrote config.toml directly. AppController is now the single
source of truth for self.config; gui_2.py, commands.py, etc. go
through controller.save_config() / controller.load_config().
Production changes:
- src/models.py: rename load_config -> _load_config_from_disk,
save_config -> _save_config_to_disk (private I/O primitives)
- src/app_controller.py: add public load_config()/save_config() methods
that own the state. Update 3 internal call sites and 3 ConductorEngine
call sites to pass max_workers from self.config
- src/multi_agent_conductor.py: ConductorEngine.__init__ now takes
max_workers as a parameter (caller responsibility, not I/O primitive)
- src/external_editor.py: get_default_launcher() takes config as a
parameter; gui_2.py:1311,4776 pass app.config
- src/gui_2.py: 17 sites of models.save_config(X.config) replaced with
X.save_config() (delegates via __getattr__ to controller)
- src/commands.py: save_all() uses app.save_config()
Test changes (route through controller, not I/O primitive):
- tests/conftest.py: mock_app and app_instance fixtures now patch
AppController.load_config/save_config instead of models I/O primitives
- 18 other test files: patches renamed from models._save_config_to_disk
to AppController.save_config (and same for load_config)
- tests/test_app_controller_mcp.py: use SLOP_CONFIG env var instead of
patching removed CONFIG_PATH module constant
- tests/test_parallel_execution.py: pass max_workers=2 explicitly to
ConductorEngine (caller no longer reads config)
- tests/test_gui_paths.py: add save_config=MagicMock() to MockApp;
assert on controller method, not I/O primitive
- tests/test_models_no_top_level_tomli_w.py: still calls private
_save_config_to_disk directly (the only allowed exception; tests
the lazy-load behavior of the primitive itself)
New files:
- scripts/audit_no_models_config_io.py: enforces the rule (--strict,
--json modes; AST-based docstring detection to avoid false positives)
- conductor/code_styleguides/config_state_owner.md: documents the rule
Verification:
- 67 targeted tests pass
- scripts/audit_no_models_config_io.py --strict returns 0
This is the architectural cleanup that surfaced during the
audit_architectural_cheats_20260607 review. Closes the smoke-gun
CONFIG_PATH module constant (already done in 0c7ebf22) AND the
free-function models.load_config/save_config smell.
[conductor(checkpoint): config-iO-refactor-20260607]
100 lines
4.3 KiB
Python
100 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 models
|
|
|
|
# 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 models.AGENT_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.models import AGENT_TOOL_NAMES
|
|
# Our architecture now uses a fixed set of high-signal tools
|
|
self.assertIn("read_file", AGENT_TOOL_NAMES)
|
|
self.assertIn("list_directory", AGENT_TOOL_NAMES)
|
|
self.assertIn("py_get_skeleton", AGENT_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")) |