diff --git a/conductor/tracks/module_taxonomy_refactor_20260627/state.toml b/conductor/tracks/module_taxonomy_refactor_20260627/state.toml index 0469b88d..466f4fbb 100644 --- a/conductor/tracks/module_taxonomy_refactor_20260627/state.toml +++ b/conductor/tracks/module_taxonomy_refactor_20260627/state.toml @@ -6,36 +6,36 @@ track_id = "module_taxonomy_refactor_20260627" name = "Module Taxonomy Refactor v2" version = "v2" status = "active" -current_phase = 0 -last_updated = "2026-06-27" +current_phase = 3 +last_updated = "2026-06-26" [blocked_by] -cruft_elimination_20260627 = "pending (the cruft track has a ProjectContext-in-models.py commit that needs to be coordinated)" +cruft_elimination_20260627 = "merged (ProjectContext + 5 sub landed in models.py at lines 797-873; safe to extract)" [blocks] [phases] -phase_0 = { status = "pending", checkpointsha = "", name = "Pre-flight + reset state.toml + v2 corrections" } +phase_0 = { status = "completed", checkpointsha = "c35cc494", name = "Pre-flight + reset state.toml + v2 corrections" } phase_1 = { status = "completed", checkpointsha = "be5607de", name = "MERGE ImGui LEAKS into gui_2.py (DONE in branch; verify only)" } phase_2 = { status = "completed", checkpointsha = "904aedc8", name = "MERGE vendor files into ai_client.py (DONE in branch; verify only)" } -phase_3 = { status = "in_progress", checkpointsha = "", name = "SPLIT models.py into mma.py + project.py + project_files.py + 6 sub-system merges (9 commits)" } +phase_3 = { status = "in_progress", checkpointsha = "", name = "SPLIT models.py into mma.py + project.py + project_files.py + 6 sub-system merges (9 commits; 3a + 3g already done in branch)" } phase_4 = { status = "pending", checkpointsha = "", name = "DELETE AGENT_TOOL_NAMES (1 commit)" } phase_5 = { status = "pending", checkpointsha = "", name = "Reduce models.py to Pydantic proxy helpers only (1 commit)" } phase_6 = { status = "pending", checkpointsha = "", name = "Verification + end-of-track report" } [tasks] -t0_1 = { status = "pending", commit_sha = "", description = "Reset the 5 'damaged' tasks in state.toml from 'damaged' to 'pending' with a note explaining the data is intact" } -t0_2 = { status = "pending", commit_sha = "", description = "Update state.toml to reflect the v2 plan (14 tasks instead of 22)" } -t0_3 = { status = "pending", commit_sha = "", description = "Update metadata.json to add VC13 (4-criteria rule documented) and VC14 (data/view/ops split documented)" } +t0_1 = { status = "completed", commit_sha = "c35cc494", description = "Reset the 5 'damaged' tasks in state.toml from 'damaged' to 'pending' with a note explaining the data is intact" } +t0_2 = { status = "completed", commit_sha = "c35cc494", description = "Update state.toml to reflect the v2 plan (14 tasks instead of 22)" } +t0_3 = { status = "completed", commit_sha = "c35cc494", description = "Update metadata.json to add VC13 (4-criteria rule documented) and VC14 (data/view/ops split documented)" } t1_0 = { status = "completed", commit_sha = "be5607de", description = "Verify the 5 ImGui LEAK commits are still in the branch (DONE; verify only)" } t2_0 = { status = "completed", commit_sha = "904aedc8", description = "Verify the 2 vendor file commits are still in the branch (DONE; verify only)" } -t3a_1 = { status = "pending", commit_sha = "", description = "Create src/mma.py with ThinkingSegment, Ticket, Track, WorkerContext, TrackState, TrackMetadata (copy from models.py; MMA Core per 4-criteria rule C1+C2+C3+C4)" } -t3b_1 = { status = "pending", commit_sha = "", description = "Create src/project.py with ProjectContext + 5 sub + config IO (copy from models.py; per 4-criteria rule C1+C3+C4)" } +t3a_1 = { status = "completed", commit_sha = "cd828e52", description = "Create src/mma.py with ThinkingSegment, Ticket, Track, WorkerContext, TrackState, TrackMetadata (copy from models.py; MMA Core per 4-criteria rule C1+C2+C3+C4)" } +t3b_1 = { status = "in_progress", commit_sha = "", description = "Create src/project.py with ProjectContext + 5 sub + config IO (copy from models.py; per 4-criteria rule C1+C3+C4)" } t3c_1 = { status = "pending", commit_sha = "", description = "Create src/project_files.py with FileItem, Preset, ContextPreset, ContextFileEntry, NamedViewPreset (copy from models.py; per 4-criteria rule C1+C3+C4)" } t3d_1 = { status = "pending", commit_sha = "", description = "Merge Tool + ToolPreset into src/tool_presets.py (per 4-criteria rule: fail C1+C2+C3; MERGE into existing)" } t3e_1 = { status = "pending", commit_sha = "", description = "Merge BiasProfile into src/tool_bias.py (per 4-criteria rule: fail C1+C2+C3; MERGE into existing)" } t3f_1 = { status = "pending", commit_sha = "", description = "Merge TextEditorConfig + ExternalEditorConfig into src/external_editor.py (per 4-criteria rule: fail C1+C2+C3; MERGE into existing)" } -t3g_1 = { status = "pending", commit_sha = "", description = "Merge Persona into src/personas.py (per 4-criteria rule: fail C1+C2+C3; MERGE into existing)" } +t3g_1 = { status = "completed", commit_sha = "d7872bea", description = "Merge Persona into src/personas.py (per 4-criteria rule: fail C1+C2+C3; MERGE into existing)" } t3h_1 = { status = "pending", commit_sha = "", description = "Merge WorkspaceProfile into src/workspace_manager.py (per 4-criteria rule: fail C1+C2+C3; MERGE into existing)" } t3i_1 = { status = "pending", commit_sha = "", description = "Merge MCP config dataclasses (MCPServerConfig, MCPConfiguration, VectorStoreConfig, RAGConfig, load_mcp_config) into src/mcp_client.py (per 4-criteria rule: C1+coupled, MERGE into MCP subsystem)" } t4_1 = { status = "pending", commit_sha = "", description = "Delete AGENT_TOOL_NAMES from src/models.py + update 8 consumer sites to use mcp_tool_specs.tool_names() (redundant; existing test asserts this)" } @@ -43,7 +43,7 @@ t5_1 = { status = "pending", commit_sha = "", description = "Reduce models.py to t6_1 = { status = "pending", commit_sha = "", description = "Run all 14 VCs; write TRACK_COMPLETION; update state.toml + tracks.md" } [verification] -phase_0_complete = false +phase_0_complete = true phase_1_complete = true phase_2_complete = true phase_3_complete = false @@ -51,6 +51,16 @@ phase_4_complete = false phase_5_complete = false phase_6_complete = false +[resume_context] +resumed_at = "2026-06-26T00:00:00+00:00" +note = "v2 plan resumed; Phase 0/1/2/3a/3g already complete in branch; remaining: 3b, 3c, 3d, 3e, 3f, 3h, 3i, 4, 5, 6. failcount state at 0/0 from prior reset; TIER-2 READ [all 11 canonical files] before Phase 3b." + +[taxonomy_law] +criteria = { "C1": "Cross-system usage (>= 3 unrelated systems)", "C2": "State machine / lifecycle", "C3": "Test file already exists", "C4": "Substantial size (> 30 lines OR > 5 fields)" } +decision_rule = "C1 OR C2 OR C3 -> DEDICATED FILE; ONLY C4 -> MERGE INTO DESTINATION; NONE -> KEEP" +data_view_ops_rule = "Data classes go in data files; rendering code goes in gui_2.py; operations go with the data" +exception = "imgui_scopes.py is the EXCEPTION (Python with context managers for ImGui scopes)" + [track_specific] file_change_summary = { files_deleted = 7, files_created = 3, files_modified = 10, potentially_deleted = 1 } net_files_change = "-4 files (65 -> 61, possibly 60 if models.py is eliminated)"