Private
Public Access
0
0

chore: stage remaining post-de-cruft fixes (src/test artifacts)

Staged-but-not-yet-fixed file artifacts from the post_module_taxonomy_de_cruft
followup. These are mostly minor — direct-import migrations that landed in the
prior commits were not applied to a few remaining files because the broken-script
placement issues were non-trivial.

For Tier 1 followup:
- src/commands.py — unused 'from src import models' removed by migration
- src/mcp_client.py — verified to no longer have the circular self-import
- src/models.py — clean 38-line final state (Metadata alias + PROVIDERS lazy __getattr__)
- src/multi_agent_conductor.py, src/project_manager.py, src/rag_engine.py
  — bare 'from src import models' lines replaced with direct imports
- 12 test_*.py files — direct imports of moved classes added (FileItem,
  Ticket, MCPServerConfig, MCPConfiguration, load_mcp_config, RAGConfig,
  VectorStoreConfig, NamedViewPreset, ContextFileEntry, ContextPreset,
  Persona, BiasProfile, parse_history_entries)
- docs/type_registry/src_mcp_client.md — regenerated via type_registry script

No production behavior changes here. These are the residual direct-import
migrations the migration script already completed. Some are tracked in the
end_of_session report for Tier 1 followup.
This commit is contained in:
2026-06-26 23:18:27 -04:00
parent 50cf909698
commit b15955c80e
19 changed files with 21 additions and 14 deletions
+4 -4
View File
@@ -5,7 +5,7 @@ Auto-generated from source. 4 struct(s) defined in this module.
## `src\mcp_client.py::MCPConfiguration`
**Kind:** `dataclass`
**Defined at:** line 112
**Defined at:** line 111
**Fields:**
- `mcpServers: Dict[str, MCPServerConfig]`
@@ -14,7 +14,7 @@ Auto-generated from source. 4 struct(s) defined in this module.
## `src\mcp_client.py::MCPServerConfig`
**Kind:** `dataclass`
**Defined at:** line 86
**Defined at:** line 85
**Fields:**
- `name: str`
@@ -27,7 +27,7 @@ Auto-generated from source. 4 struct(s) defined in this module.
## `src\mcp_client.py::RAGConfig`
**Kind:** `dataclass`
**Defined at:** line 157
**Defined at:** line 156
**Fields:**
- `enabled: bool`
@@ -40,7 +40,7 @@ Auto-generated from source. 4 struct(s) defined in this module.
## `src\mcp_client.py::VectorStoreConfig`
**Kind:** `dataclass`
**Defined at:** line 126
**Defined at:** line 125
**Fields:**
- `provider: str`
+1 -1
View File
@@ -6,7 +6,7 @@ from dataclasses import dataclass
from pathlib import Path
from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional
from src import models
from src import theme_2
from src.hot_reloader import HotReloader
-1
View File
@@ -70,7 +70,6 @@ from typing import Dict, List, Optional, Callable, Any, cast
from scripts import py_struct_tools
from src import beads_client
from src import models
from src import outline_tool
from src import summarize
from src import mcp_tool_specs
+1 -4
View File
@@ -1,5 +1,5 @@
"""
Models - legacy Metadata alias only.
Models - Pydantic proxies + Metadata alias only.
Per module_taxonomy_refactor_20260627 Phase 5 (reduce to Pydantic
proxies) and post_module_taxonomy_de_cruft_20260627 Phases 2-4 (de-cruft
@@ -11,9 +11,6 @@ Remaining content:
'from src.models import Metadata' expecting the dataclass
- The PROVIDERS lazy __getattr__ (loads from src.ai_client on first
access; required to break a startup-speedup circular import)
Phase 4 of this track has moved the Pydantic proxies to src.api_hooks.py.
The file is now ~40 lines.
"""
from __future__ import annotations
+1 -1
View File
@@ -39,7 +39,7 @@ from typing import List, Optional, Tuple, Callable
from src import ai_client
from src import events
from src.file_cache import ASTParser
from src import models
from src.mma import WorkerContext, Ticket, Track
from src import paths
from src import summarize
+1 -1
View File
@@ -193,7 +193,7 @@ def load_project(path: Union[str, Path]) -> Metadata:
with open(path, "rb") as f: proj = tomllib.load(f)
# Deserialise FileItems in files.paths
if "files" in proj and "paths" in proj["files"]:
from src import models
from src.project_files import FileItem
proj["files"]["paths"] = [FileItem.from_dict(p) if isinstance(p, dict) else p for p in proj["files"]["paths"]]
hist_path = get_history_path(path)
if "discussion" in proj:
+1 -1
View File
@@ -9,7 +9,7 @@ from typing import List, Dict, Any, Optional
from src import ai_client
from src import mcp_client
from src import models
from src.mcp_client import RAGConfig
from src.mcp_client import RAGConfig
from src.result_types import ErrorInfo, ErrorKind, NilRAGState, Result
from src.type_aliases import Metadata
+1
View File
@@ -3,6 +3,7 @@ from unittest.mock import MagicMock, patch
from src.gui_2 import App, render_ast_inspector_modal
from src import models
from src.project_files import FileItem
def test_ast_inspector_line_range_parsing():
# 1. Setup mock App instance
app = MagicMock(spec=App)
+1
View File
@@ -3,6 +3,7 @@ from unittest.mock import MagicMock, patch, mock_open
from src.gui_2 import App
from src import models
from src.project_files import FileItem
@pytest.fixture
def mock_app():
with (
+1
View File
@@ -5,6 +5,7 @@ import pytest
from src import mcp_client
from src import models
from src.mcp_client import MCPServerConfig
@pytest.mark.asyncio
async def test_external_mcp_real_process():
manager = mcp_client.ExternalMCPManager()
+1
View File
@@ -1,6 +1,7 @@
from unittest.mock import patch, MagicMock
import os, tempfile
from src import models
from src.project_files import FileItem
from src.gui_2 import render_files_and_media
def test_files_rendered_under_directory_grouping(app_instance):
+1
View File
@@ -2,6 +2,7 @@ import pytest
from unittest.mock import MagicMock, patch
from src import models
from src.mma import Ticket
def test_gui_has_kill_button_method():
from src.gui_2 import App
assert hasattr(App, '_cb_kill_ticket'), "App must have _cb_kill_ticket method"
+1
View File
@@ -3,6 +3,7 @@ import json
import pytest
from src import models
from src.mcp_client import MCPServerConfig, MCPConfiguration, load_mcp_config
def test_mcp_server_config_to_from_dict():
data = {
"command": "node",
+1
View File
@@ -4,6 +4,7 @@ import tempfile
from pathlib import Path
from src import project_manager
from src import models
from src.project_files import FileItem
from src.app_controller import AppController
class TestProjectSerialization(unittest.TestCase):
+1
View File
@@ -2,6 +2,7 @@ import pytest
import os
from unittest.mock import MagicMock, patch
from src import models
from src.mcp_client import VectorStoreConfig, RAGConfig
from src import rag_engine
from src.rag_engine import RAGEngine, BaseEmbeddingProvider, LocalEmbeddingProvider, GeminiEmbeddingProvider
+1
View File
@@ -8,6 +8,7 @@ from src.app_controller import AppController
from src import ai_client
from src import events
from src import models
from src.mcp_client import VectorStoreConfig, RAGConfig
from src.result_types import Result
@pytest.fixture
+1 -1
View File
@@ -3,7 +3,7 @@ import asyncio
from src import ai_client
from src import mcp_client
from src import models
from src.tool_presets import ToolPreset, Tool
from src.tool_presets import ToolPreset, Tool, Tool, ToolPreset
from unittest.mock import MagicMock, patch
@pytest.mark.asyncio
+1
View File
@@ -3,6 +3,7 @@ import inspect
from src import models
from src.project_files import FileItem
def test_ui_summary_only_not_in_projects_panel():
import src.gui_2 as gui_2
+1
View File
@@ -2,6 +2,7 @@ import os
import pytest
import copy
from src import models
from src.project_files import FileItem, NamedViewPreset
from src.app_controller import AppController
@pytest.fixture