Commit Graph
10 Commits
Author SHA1 Message Date
ed 5bf3cbc4c5 conductor(plan): v2 resume - mark Phase 0/3a/3g done; begin Phase 3b
TIER-2 READ AGENTS.md, conductor/workflow.md, conductor/edit_workflow.md,
conductor/tier2/githooks/forbidden-files.txt,
conductor/tracks/tier2_leak_prevention_20260620/spec.md,
conductor/code_styleguides/data_oriented_design.md,
conductor/code_styleguides/error_handling.md,
conductor/code_styleguides/type_aliases.md,
conductor/product-guidelines.md, conductor/code_styleguides/python.md,
docs/guide_meta_boundary.md before module_taxonomy_refactor_20260627/Phase3b.

The v2 spec/plan (c35cc494) is the canonical guide. Phases 0, 1, 2 are
done in the branch. Phase 3a (mma.py, cd828e52) and Phase 3g (persona
to personas.py, d7872bea) are already committed; back-compat re-exports
exist in src/models.py. The remaining work: 3b (project.py), 3c
(project_files.py), 3d-3f + 3h-3i (6 merges), 4 (delete
AGENT_TOOL_NAMES), 5 (reduce models.py), 6 (verify + report).

The cruft_elimination track is no longer a blocker: the ProjectContext
+ 5 sub dataclasses are at models.py:797-873 (the cruft track merged
them in earlier). The v2 plan can extract them.

failcount state: 0/0 (prior reset via c35cc494).
2026-06-26 09:36:39 -04:00
ed c35cc4947f conductor(track): module_taxonomy_refactor_20260627 v2 - 4-criteria rule + data/view/ops split
TIER-1 READ AGENTS.md + conductor/workflow.md + conductor/edit_workflow.md
+ conductor/code_styleguides/data_oriented_design.md + conductor/code_styleguides/error_handling.md
+ conductor/code_styleguides/type_aliases.md + conductor/code_styleguides/code_path_audit.md
+ conductor/tracks/module_taxonomy_refactor_20260627/spec.md + conductor/tracks/module_taxonomy_refactor_20260627/plan.md
+ docs/reports/FOLLOWUP_module_taxonomy_refactor_20260627_recoverable.md before this commit.

v2 fixes v1 gaps that gave Tier 2 discretion:

1. THE 4-CRITERIA DECISION RULE (the taxonomy law):
   - C1: Cross-system usage (consumed by >= 3 unrelated systems)
   - C2: State machine / lifecycle
   - C3: Test file already exists
   - C4: Substantial size (> 30 lines OR > 5 fields)
   - Rule: C1 OR C2 OR C3 -> DEDICATED FILE; ONLY C4 -> MERGE INTO DESTINATION; NONE -> KEEP

2. THE DATA/VIEW/OPS SPLIT (the GUI boundary):
   - Data classes go in data files (src/<system>.py)
   - View code (ImGui rendering) goes in src/gui_2.py
   - Ops (operations on data) go with the data
   - Exception: imgui_scopes.py is the EXCEPTION (Python with context managers)

3. ZERO TIER 2 DISCRETION:
   - Every move is pre-decided in the spec
   - Tier 2 executes, doesn't decide
   - v1 had 22 commits because of exploration; v2 has 16 because the work is prescriptive

4. PRESERVED Pydantic PROXIES:
   - _create_generate_request, _create_confirm_request, __getattr__ stay in models.py
   - They're API-specific; moving them is out of scope for v2

Applied to all 11 classes in models.py:
- DEDICATED: Ticket, Track, WorkerContext, TrackState, TrackMetadata, ThinkingSegment -> src/mma.py (6 classes; C1+C2+C3+C4)
- DEDICATED: FileItem, Preset, ContextPreset, ContextFileEntry, NamedViewPreset -> src/project_files.py (5 classes; C1+C3+C4)
- DEDICATED: ProjectContext + 5 sub + config IO -> src/project.py (1+5+functions; C1+C3+C4)
- MERGE: Tool, ToolPreset -> src/tool_presets.py (C1 NO)
- MERGE: BiasProfile -> src/tool_bias.py (C1 NO)
- MERGE: TextEditorConfig, ExternalEditorConfig -> src/external_editor.py (C1 NO)
- MERGE: Persona -> src/personas.py (C1 NO)
- MERGE: WorkspaceProfile -> src/workspace_manager.py (C1 NO)
- MERGE: MCPServerConfig, MCPConfiguration, VectorStoreConfig, RAGConfig, load_mcp_config -> src/mcp_client.py (C1 YES, coupled to MCP)
- DELETE: AGENT_TOOL_NAMES (redundant with mcp_tool_specs.tool_names())

Net: 65 -> 61 files (possibly 60 if models.py eliminated)
16 atomic commits (down from v1's 22)
14 VCs (added VC13 + VC14: verify the 4-criteria rule and data/view/ops split are documented)

The git stash ban is in place at 3 layers (commit 6240b07b). The timeline-
is-immutable principle is explicit in the agent prompt. The next Tier 2
should not be able to corrupt files the same way.
2026-06-26 07:55:46 -04:00
ed 27f7f51bb9 conductor(track): module_taxonomy_refactor_20260627 ABORTED - Phases 1-2 complete; Phase 3 partially complete with 5 tasks damaged by faulty bulk_move script
Summary:
- Phase 1 (MERGE ImGui LEAKS into gui_2.py): COMPLETE - 5 tasks shipped, architecture corrected per user feedback (data != view != ops; bg_shader_enabled state moved to AppController)
- Phase 2 (MERGE vendor files into ai_client.py): COMPLETE - 2 tasks shipped (VendorCapabilities + VendorMetric data; render helpers to gui_2)
- Phase 3.1 (Create src/mma.py): COMPLETE - ThinkingSegment, Ticket, Track, WorkerContext, TrackMetadata, TrackState moved
- Phase 3.4 (Persona -> personas.py): COMPLETE
- Phase 3.5-3.9: DAMAGED by bulk_move.py script that removed @dataclass decorators from models.py and appended empty region headers to 5 target files
- Phase 3.2, 3.3, 3.10, Phase 4, Phase 5: NOT ATTEMPTED

TRACK_COMPLETION report at docs/reports/TRACK_COMPLETION_module_taxonomy_refactor_20260627.md documents:
- Complete commit log
- Damage assessment + recovery plan
- VC verification status (6 of 12 met, 1 partial, 5 not met)
- Recommended next-agent actions

Recovery plan (~3 hours):
1. Remove garbage from 5 target files (~5 min)
2. Add @dataclass back to 10 classes in models.py (~5 min)
3. Verify baseline tests (~5 min)
4. Re-do Phases 3.5-3.9 using edit_file (~30 min)
5. Continue Phase 3.2, 3.3, 3.10 (~1 hour)
6. Phase 4 (~15 min)
7. Phase 5 (~30 min)
2026-06-26 07:31:34 -04:00
ed 904aedc845 conductor(plan): Mark Phase 2 complete (vendor_capabilities + vendor_state merged) 2026-06-26 07:10:30 -04:00
ed ac2a5ac3bd conductor(plan): Mark Phase 1.5 complete (no-op patch_modal stays) 2026-06-26 07:01:41 -04:00
ed a509194d1a conductor(plan): Mark Phase 1.4 complete (diff_viewer split) 2026-06-26 06:59:49 -04:00
ed b10b5bae87 conductor(plan): Mark Phase 1.3 complete (command_palette split + bg_shader state fix) 2026-06-26 06:55:31 -04:00
ed be5607dee8 conductor(plan): Mark Phase 1.2 complete (shaders merge) 2026-06-26 06:43:20 -04:00
ed 84f928e7cc conductor(plan): Mark Phase 1.1 complete (bg_shader merge) 2026-06-26 06:41:49 -04:00
ed cba6e7d7ee conductor(followup): module_taxonomy_refactor_20260627 - track artifacts
The user-reported models.py is a 'dumping ground' (1044 lines, 36 classes,
5+ unrelated domains). This track cleans it up PLUS addresses 5 ImGui
LEAKS that violate the 'ImGui belongs in gui_2.py' boundary PLUS
unifies 2 vendor files with ai_client.py.

TIER-1 READ AGENTS.md + conductor/workflow.md + conductor/edit_workflow.md
+ conductor/code_styleguides/data_oriented_design.md + conductor/code_styleguides/error_handling.md
+ conductor/code_styleguides/type_aliases.md + conductor/code_styleguides/code_path_audit.md
+ docs/reports/FOLLOWUP_module_taxonomy_20260627.md + conductor/tracks/cruft_elimination_20260627/SPEC_CORRECTION_phase_2.md
+ src/models.py before this commit.

User's principle: unify unless good reason (import load times or
definition pollution). No sub-directories; prefix naming.

Only 3 refactors justified (12 VCs total):

1. MERGE 5 ImGui LEAKS into gui_2.py (per user directive: 'all ImGui
   rendering should be in gui_2.py; only exception imgui_scopes.py'):
   - bg_shader.py, shaders.py, command_palette.py, diff_viewer.py,
     patch_modal.py -> content to gui_2.py, git rm originals

2. MERGE 2 vendor files into ai_client.py (per user directive: 'vendor
   files are the ai vendoring layer'):
   - vendor_capabilities.py + vendor_state.py -> ai_client.py
   - ai_client.py grows 3147 -> ~3310 lines (justified: unified)

3. SPLIT models.py (clear definition pollution: 5+ domains, 36 classes):
   - CREATE src/mma.py (MMA Core: ThinkingSegment, Ticket, Track,
     WorkerContext, TrackState)
   - CREATE src/project.py (ProjectContext + 5 sub + config IO)
   - CREATE src/project_files.py (FileItem, ContextPreset, etc.)
   - MERGE 6+ classes into existing sub-system files:
     - Persona -> personas.py
     - Tool/ToolPreset -> tool_presets.py
     - BiasProfile -> tool_bias.py
     - TextEditorConfig/ExternalEditorConfig -> external_editor.py
     - MCP config classes -> mcp_client.py
     - WorkspaceProfile -> workspace_manager.py
   - REDUCE models.py to ~30 lines (Pydantic proxies only) or DELETE

BONUS (user caught this): AGENT_TOOL_NAMES is REDUNDANT with
mcp_tool_specs.tool_names(). The existing test literally asserts
tool_names() ⊆ AGENT_TOOL_NAMES. DELETE the constant, update 8
consumer sites to use mcp_tool_specs.tool_names() directly.

Net scope: -4 files (65 -> 61; possibly 60 if models.py deleted).
22 atomic commits. 5 phases.

blocked_by: cruft_elimination_20260627 (the cruft track has a
ProjectContext-in-models.py commit that needs to coordinate with
this refactor's move to project.py)
2026-06-26 06:23:28 -04:00