ed
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]
44 lines
1.3 KiB
Python
44 lines
1.3 KiB
Python
import pytest
|
|
from unittest.mock import MagicMock, patch
|
|
from src import paths
|
|
|
|
# We mock App to avoid the heavy initialization logic
|
|
class MockApp:
|
|
def __init__(self):
|
|
self.ui_conductor_dir = '/mock/conductor'
|
|
self.ui_logs_dir = '/mock/logs'
|
|
self.ui_scripts_dir = '/mock/scripts'
|
|
self.config = {"paths": {}}
|
|
self.ai_status = ""
|
|
self.save_config = MagicMock()
|
|
|
|
def init_state(self):
|
|
"""
|
|
[C: tests/test_system_prompt_exposure.py:TestSystemPromptExposure.test_app_controller_init_state_loads_prompts]
|
|
"""
|
|
pass
|
|
|
|
from src.gui_2 import App
|
|
_save_paths = App._save_paths
|
|
|
|
def test_save_paths():
|
|
mock_app = MockApp()
|
|
|
|
with patch('shutil.copy') as mock_copy, \
|
|
patch('src.paths.get_config_path') as mock_get_cfg, \
|
|
patch('src.paths.reset_resolved') as mock_reset, \
|
|
patch.object(MockApp, 'init_state') as mock_init:
|
|
|
|
mock_get_cfg.return_value = MagicMock()
|
|
mock_get_cfg.return_value.exists.return_value = True
|
|
|
|
mock_app.ui_conductor_dir = '/new/conductor'
|
|
mock_app._save_paths()
|
|
|
|
# Verify config update
|
|
assert 'conductor_dir' not in mock_app.config['paths']
|
|
mock_app.save_config.assert_called_once()
|
|
mock_copy.assert_called_once()
|
|
assert 'applied' in mock_app.ai_status
|
|
mock_reset.assert_called_once()
|
|
mock_init.assert_called_once() |