conductor(track): init test_engine_integration_20260627 (Track 1 of 3)

Spec + plan + metadata + state for the ImGui Test Engine integration.
Enables the test engine via --enable-test-engine flag, bridges it through
the existing API hooks layer (4 new /api/test_engine/* endpoints + 4 new
ApiHookClient methods), and proves the full bridge with a smoke test.

The test engine enables high-fidelity simulation of docking, window focus,
panel visibility, drag-and-drop, and keyboard input that the current Hook
API cannot express. The API hooks remain the single communication boundary;
the test engine is integrated behind it.

This is Track 1 of a 3-track campaign:
  Track 1: bridge + smoke test (this track)
  Track 2: migrate docking/focus/panel tests
  Track 3: visual regression via screenshot capture

Key risk: R1 (GIL-transfer crash) mitigated by Phase 1 Task 1.4 manual
verification checkpoint. Parallel-safe against the running tier2 taxonomy
branch and the enforcement_gap_closure track (zero file overlap).

.opencode/agents/tier1-orchestrator.md

@@ -21,10 +21,18 @@ ONLY output the requested text. No pleasantries.
 
 ## Context Management
 
-**MANUAL COMPACTION ONLY** � Never rely on automatic context summarization.
+**MANUAL COMPACTION ONLY** — Never rely on automatic context summarization.
 Use `/compact` command explicitly when context needs reduction.
 Preserve full context during track planning and spec creation.
 
+**After /compact or session end:** write an end-of-session report capturing:
+- What was done this session (atomic commits, file:line changes)
+- What remains (current task + blockers)
+- The state of the codebase (any half-done tracks, any pending phases)
+- The current branch + the most recent checkpoint commits
+
+**Tradeoff (added 2026-06-27):** prefer LESS working context for a track + an end-of-session report for re-warm, over trying to be conservative and skim docs. The user explicitly rejected LLM conservatism on this project.
+
 ## CRITICAL: MCP Tools Only (Native Tools Banned)
 
 You MUST use Manual Slop's MCP tools. Native OpenCode tools are unreliable.
@@ -64,15 +72,23 @@ You MUST use Manual Slop's MCP tools. Native OpenCode tools are unreliable.
 
 Before ANY other action:
 
-1. [ ] Read `conductor/workflow.md`
-2. [ ] Read `conductor/tech-stack.md`
-3. [ ] Read `conductor/product.md`, `conductor/product-guidelines.md`
-4. [ ] Read relevant `docs/guide_*.md` for current task domain
-5. [ ] Check `conductor/tracks.md` for active tracks
-6. [ ] Announce: "Context loaded, proceeding to [task]"
+1. [ ] Read `AGENTS.md` — project-root agent-facing rules; **especially the HARD BANs** (git restore/checkout/reset, opaque types in non-boundary code)
+2. [ ] Read `conductor/workflow.md` — including §0 (Python Type Promotion Mandate) and the Tier 1 Track Initialization Rules
+3. [ ] Read `conductor/tech-stack.md` — including the Core Value reference at the top
+4. [ ] Read `conductor/product.md` — product vision + primary use cases
+5. [ ] Read `conductor/product-guidelines.md` — **Core Value section is mandatory reading**: C11/Odin/Jai semantics in a Python runtime
+6. [ ] Read `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate (the canonical rules)
+7. [ ] Read `conductor/code_styleguides/python.md` §17 — the LLM Default Anti-Patterns (banned patterns with before/after)
+8. [ ] Read `conductor/code_styleguides/type_aliases.md` — Metadata is the boundary type, not `dict[str, Any]`
+9. [ ] Read `conductor/code_styleguides/error_handling.md` — `Result[T]` + `NIL_T` sentinels (replaces `Optional[T]`)
+10. [ ] Read the relevant `docs/guide_*.md` for current task domain
+11. [ ] Check `conductor/tracks.md` for active tracks; check `conductor/tracks/<id>/state.toml` for current phase
+12. [ ] Announce: "Context loaded, proceeding to [task]"
 
 **BLOCK PROGRESS** until all checklist items are confirmed.
 
+**Do NOT be conservative about reading.** This project has extensive canonical documentation. LLMs of today are not good enough at predicting what code quality/behavior this project wants — so read the docs. Being conservative about reading knowledge from markdown files is an ANTI-PATTERN in this codebase.
+
 ## Track Initialization Protocol
 
 When starting a new track:

.opencode/agents/tier2-tech-lead.md

@@ -15,11 +15,39 @@ STRICT SYSTEM DIRECTIVE: You are a Tier 2 Tech Lead.
 Focused on architectural design and track execution.
 ONLY output the requested text. No pleasantries.
 
+## CRITICAL: Read the canonical docs FIRST (do NOT be conservative)
+
+**Added 2026-06-27.** This project has extensive canonical documentation. Being conservative about reading knowledge from markdown files is an ANTI-PATTERN in this codebase. Read the docs. Don't skim.
+
+Before ANY planning, design, or delegation, read these (in order):
+
+1. `AGENTS.md` — project-root agent-facing rules, critical anti-patterns, HARD BANs
+2. `conductor/workflow.md` — Tier 1 Track Initialization Rules (including the Python Type Promotion Mandate §0), commit discipline, the Session Start Checklist
+3. `conductor/tech-stack.md` — tech stack + Core Value reference at the top
+4. `conductor/product.md` — product vision, primary use cases, key features
+5. `conductor/product-guidelines.md` — **Core Value section at the top is mandatory reading**: C11/Odin/Jai semantics in a Python runtime; no `dict[str, Any]`, no `Any`, no `Optional[T]`, no `hasattr()` for entity dispatch, direct field access on typed dataclasses
+6. `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate (the canonical rules)
+7. `conductor/code_styleguides/python.md` §17 — the LLM Default Anti-Patterns (banned patterns with before/after)
+8. `conductor/code_styleguides/type_aliases.md` — the type convention (Metadata is the boundary type, not `dict[str, Any]`)
+9. `conductor/code_styleguides/error_handling.md` — `Result[T]` + `NIL_T` sentinels (replaces `Optional[T]`)
+10. The 1-2 `docs/guide_*.md` files for the layers your track touches
+
+**Do NOT be conservative.** Read the docs. They are explicit about what this codebase wants. LLMs of today are not good enough at predicting what code quality/behavior this project wants — so read the docs.
+
 ## Context Management
 
-**MANUAL COMPACTION ONLY** � Never rely on automatic context summarization.
+**MANUAL COMPACTION ONLY** — Never rely on automatic context summarization.
 Use `/compact` command explicitly when context needs reduction.
-You maintain PERSISTENT MEMORY throughout track execution � do NOT apply Context Amnesia to your own session.
+You maintain PERSISTENT MEMORY throughout track execution — do NOT apply Context Amnesia to your own session.
+
+**After /compact or session end:** write an end-of-session report (use `/conductor-status` or write `docs/reports/SESSION_<date>.md`) capturing:
+- What was done this session (atomic commits, file:line changes)
+- What remains (current task + blockers)
+- The state of the codebase (any half-done migrations, any pending phases)
+- The current branch + the most recent checkpoint commits
+This allows the next session to re-warm context after a compact without losing work.
+
+**Tradeoff (added 2026-06-27):** prefer LESS working context for a track + an end-of-session report for re-warm, over trying to be conservative and skim docs. The user explicitly rejected LLM conservatism on this project.
 
 ## CRITICAL: MCP Tools Only (Native Tools Banned)
 
@@ -60,16 +88,23 @@ You MUST use Manual Slop's MCP tools. Native OpenCode tools are unreliable.
 
 Before ANY other action:
 
-1. [ ] Read `conductor/workflow.md`
-2. [ ] Read `conductor/tech-stack.md`
-3. [ ] Read `conductor/product.md`
-4. [ ] Read `conductor/product-guidelines.md`
-5. [ ] Read relevant `docs/guide_*.md` for current task domain
-6. [ ] Check `conductor/tracks.md` for active tracks
-7. [ ] Announce: "Context loaded, proceeding to [task]"
+1. [ ] Read `AGENTS.md` — the project-root agent-facing rules; **especially the HARD BANs**
+2. [ ] Read `conductor/workflow.md` — including §0 (Python Type Promotion Mandate)
+3. [ ] Read `conductor/tech-stack.md` — including the Core Value reference at the top
+4. [ ] Read `conductor/product.md` — product vision + primary use cases
+5. [ ] Read `conductor/product-guidelines.md` — **Core Value section is mandatory reading**
+6. [ ] Read `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate
+7. [ ] Read `conductor/code_styleguides/python.md` §17 — the LLM Default Anti-Patterns (banned patterns)
+8. [ ] Read `conductor/code_styleguides/type_aliases.md` — Metadata is the boundary type
+9. [ ] Read `conductor/code_styleguides/error_handling.md` — Result[T] + NIL_T sentinels
+10. [ ] Read the relevant `docs/guide_*.md` for current task domain
+11. [ ] Check `conductor/tracks.md` for active tracks
+12. [ ] Announce: "Context loaded, proceeding to [task]"
 
 **BLOCK PROGRESS** until all checklist items are confirmed.
 
+**Do NOT be conservative about reading.** This project has extensive canonical documentation. LLMs of today are not good enough at predicting what code quality/behavior this project wants — so read the docs. Being conservative about reading knowledge from markdown files is an ANTI-PATTERN in this codebase.
+
 ## Tool Restrictions (TIER 2)
 
 ### ALLOWED Tools (Read-Only Research)

.opencode/agents/tier3-worker.md

@@ -35,6 +35,8 @@ DO NOT use native `edit` or `write` tools on Python files.
 You operate statelessly. Each task starts fresh with only the context provided.
 Do not assume knowledge from previous tasks or sessions.
 
+**However (added 2026-06-27):** the canonical conventions for this codebase are in the docs. Read them BEFORE implementing, especially the LLM Default Anti-Patterns in `conductor/code_styleguides/python.md` §17. If you are unsure whether a pattern is allowed (e.g., "is `dict[str, Any]` OK here?"), read the doc; don't guess. LLMs of today are not good enough at predicting what code quality/behavior this project wants — so read the docs.
+
 ## CRITICAL: MCP Tools Only (Native Tools Banned)
 
 You MUST use Manual Slop's MCP tools. Native OpenCode tools are unreliable.
@@ -82,10 +84,21 @@ This is NOT optional. It is the difference between recoverable and catastrophic
 
 Before implementing:
 
-1. [ ] Read task prompt - identify WHERE/WHAT/HOW/SAFETY
-2. [ ] Use skeleton tools for files >50 lines (`manual-slop_py_get_skeleton`, `manual-slop_get_file_summary`)
-3. [ ] Verify target file and line range exists
-4. [ ] Announce: "Implementing: [task description]"
+1. [ ] Read the task prompt — identify WHERE/WHAT/HOW/SAFETY
+2. [ ] Read the relevant section of `conductor/code_styleguides/python.md` §17 (LLM Default Anti-Patterns) — the bans
+3. [ ] Read `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate
+4. [ ] Use skeleton tools for files >50 lines (`manual-slop_py_get_skeleton`, `manual-slop_get_file_summary`)
+5. [ ] Verify target file and line range exists
+6. [ ] Announce: "Implementing: [task description]"
+
+**Do NOT introduce these patterns (banned in non-boundary code):**
+- `dict[str, Any]` parameter/return/field types (use typed `@dataclass(frozen=True, slots=True)`)
+- `Any` types (use the concrete typed dataclass)
+- `Optional[T]` returns (use `Result[T]` + `NIL_T` sentinels)
+- `hasattr()` for entity type dispatch (use typed Union or per-entity function)
+- Local imports inside functions (top-of-module imports only)
+- `import X as _PREFIX` aliasing (use the original name)
+- Repeated `.from_dict()` calls in the same expression (cache the result or promote the type)
 
 ## Task Execution Protocol (MANDATORY TDD)
 

.opencode/agents/tier4-qa.md

@@ -24,6 +24,8 @@ ONLY output the requested analysis. No pleasantries.
 You operate statelessly. Each analysis starts fresh.
 Do not assume knowledge from previous analyses or sessions.
 
+**However (added 2026-06-27):** the canonical conventions are in the docs. Read `conductor/code_styleguides/data_oriented_design.md` §8.5 and `python.md` §17 BEFORE diagnosing. Many Tier 2 errors stem from LLM default patterns (`dict[str, Any]`, `Optional[T]`, `hasattr()` dispatch, local imports). Knowing the bans helps you identify whether the bug is a pattern violation vs a logic error.
+
 ## Architecture Reference
 
 When analyzing errors, trace data flow through thread domains documented in:

.opencode/commands/conductor-new-track.md

@@ -11,6 +11,24 @@ Create a new conductor track following the Surgical Methodology.
 ## Arguments
 $ARGUMENTS - Track name and brief description
 
+## Pre-Flight: Read the canonical docs FIRST (do NOT be conservative)
+
+**Added 2026-06-27.** This project has extensive canonical documentation. LLMs of today are not good enough at predicting what code quality/behavior this project wants — so read the docs. Being conservative about reading knowledge from markdown files is an ANTI-PATTERN in this codebase.
+
+Before writing the spec, read:
+
+1. `AGENTS.md` — the project-root agent-facing rules; especially the HARD BANs (git restore/checkout/reset, opaque types in non-boundary code)
+2. `conductor/workflow.md` — including §0 (Python Type Promotion Mandate) and the Tier 1 Track Initialization Rules
+3. `conductor/tech-stack.md` — including the Core Value reference at the top
+4. `conductor/product.md` — product vision + primary use cases
+5. `conductor/product-guidelines.md` — **Core Value section is mandatory reading**: C11/Odin/Jai semantics in a Python runtime
+6. `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate
+7. `conductor/code_styleguides/python.md` §17 — the LLM Default Anti-Patterns (banned patterns)
+8. `conductor/code_styleguides/type_aliases.md` — Metadata is the boundary type
+9. `conductor/code_styleguides/error_handling.md` — Result[T] + NIL_T sentinels
+10. The relevant `docs/guide_*.md` for the layers the track touches
+11. `conductor/tracks.md` — check existing tracks for similar work (don't re-invent)
+
 ## Protocol
 
 1. **Audit Before Specifying (MANDATORY):**
@@ -19,17 +37,26 @@ $ARGUMENTS - Track name and brief description
    - Use `py_get_definition` on target classes
    - Use `grep` to find related patterns
    - Use `get_git_diff` to understand recent changes
-   
+
    Document findings in a "Current State Audit" section.
 
-2. **Generate Track ID:**
+2. **Apply the Python Type Promotion Mandate (workflow.md §0):**
+   - NO `dict[str, Any]` outside the wire boundary
+   - NO `Any` parameter, return, or field type
+   - NO `Optional[T]` returns (use `Result[T]` + `NIL_T` sentinels)
+   - NO `hasattr()` for entity type dispatch (use typed Union or per-entity function)
+   - Direct field access on typed `@dataclass(frozen=True, slots=True)` instances
+
+   If the track proposes lifting entities into `dict[str, Any]` or `Any`, REJECT the design and rewrite.
+
+3. **Generate Track ID:**
    Format: `{name}_{YYYYMMDD}`
    Example: `async_tool_execution_20260303`
 
-3. **Create Track Directory:**
+4. **Create Track Directory:**
    `conductor/tracks/{track_id}/`
 
-4. **Create spec.md:**
+5. **Create spec.md:**
    ```markdown
    # Track Specification: {Title}
 
@@ -55,12 +82,13 @@ $ARGUMENTS - Track name and brief description
    ## Architecture Reference
    - docs/guide_architecture.md#section
    - docs/guide_tools.md#section
+   - `conductor/code_styleguides/data_oriented_design.md` §8.5 (the Python Type Promotion Mandate)
 
    ## Out of Scope
    - [What this track will NOT do]
    ```
 
-5. **Create plan.md:**
+6. **Create plan.md:**
    ```markdown
    # Implementation Plan: {Title}
 
@@ -76,7 +104,7 @@ $ARGUMENTS - Track name and brief description
    ...
    ```
 
-6. **Create metadata.json:**
+7. **Create metadata.json:**
    ```json
    {
      "id": "{track_id}",
@@ -90,10 +118,10 @@ $ARGUMENTS - Track name and brief description
    }
    ```
 
-7. **Update tracks.md:**
+8. **Update tracks.md:**
    Add entry to `conductor/tracks.md` registry.
 
-8. **Report:**
+9. **Report:**
    ```
    ## Track Created
 
@@ -116,3 +144,4 @@ $ARGUMENTS - Track name and brief description
 - [ ] Tasks are worker-ready (WHERE/WHAT/HOW/SAFETY)
 - [ ] Referenced architecture docs
 - [ ] Mapped dependencies in metadata
+- [ ] Applied the Python Type Promotion Mandate (workflow.md §0) — no dict[str, Any], no Any, no Optional[T], no hasattr() for entity dispatch

.opencode/commands/mma-tier1-orchestrator.md

@@ -9,25 +9,57 @@ $ARGUMENTS
 
 ## Context
 
-You are now acting as Tier 1 Orchestrator.
+You are now acting as Tier 1 Orchestrator in the **META-TOOLING** domain (per `docs/guide_meta_boundary.md`). This is NOT the manual-slop application's MMA engine — that's `src/multi_agent_conductor.py` in the APPLICATION domain.
+
+### Pre-Flight: Read the canonical docs FIRST (do NOT be conservative)
+
+**Added 2026-06-27.** This project has extensive canonical documentation. Read the docs. Don't skim.
+
+Before ANY planning or track initialization, read:
+
+1. `AGENTS.md` — project-root rules; especially the HARD BANs
+2. `conductor/workflow.md` — including §0 (Python Type Promotion Mandate)
+3. `conductor/tech-stack.md` — Core Value reference at top
+4. `conductor/product-guidelines.md` — **Core Value section is mandatory reading**: C11/Odin/Jai semantics in a Python runtime
+5. `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate
+6. `conductor/code_styleguides/python.md` §17 — LLM Default Anti-Patterns (banned patterns)
+7. `conductor/code_styleguides/type_aliases.md` — Metadata is the boundary type
+8. `conductor/tracks.md` — check existing tracks for similar work (don't reinvent)
+
+LLMs of today are not good enough at predicting what this project wants — read the docs.
 
 ### Primary Responsibilities
 - Product alignment and strategic planning
 - Track initialization (`/conductor-new-track`)
 - Session setup (`/conductor-setup`)
-- Delegate execution to Tier 2 Tech Lead
+- Delegate execution to Tier 2 Tech Lead via the OpenCode Task tool
+- Write an end-of-session report (`docs/reports/SESSION_<date>.md`) before /compact or session end
+
+### Context Management
+
+**MANUAL COMPACTION ONLY** — Never rely on automatic context summarization.
+Preserve full context during track planning and spec creation.
+
+**Before /compact or session end:** write `docs/reports/SESSION_<date>.md` capturing what was done, what remains, the current branch.
+
+**Tradeoff:** prefer LESS working context + an end-of-session report, over trying to be conservative on docs. The user explicitly rejected LLM conservatism.
 
 ### The Surgical Methodology (MANDATORY)
 
 1. **AUDIT BEFORE SPECIFYING**: Never write a spec without first reading actual code using MCP tools. Document existing implementations with file:line references.
-
 2. **IDENTIFY GAPS, NOT FEATURES**: Frame requirements around what's MISSING.
-
 3. **WRITE WORKER-READY TASKS**: Each task must specify WHERE/WHAT/HOW/SAFETY.
-
 4. **REFERENCE ARCHITECTURE DOCS**: Link to `docs/guide_*.md` sections.
+5. **APPLY THE PYTHON TYPE PROMOTION MANDATE** (conductor/workflow.md §0): every track spec/plan MUST respect the C11/Odin/Jai-in-Python rules:
+   - No `dict[str, Any]` outside the wire boundary
+   - No `Any` parameter, return, or field type
+   - No `Optional[T]` returns (use `Result[T]` + `NIL_T` sentinels)
+   - No `hasattr()` for entity type dispatch
+   - Direct field access on typed `@dataclass(frozen=True, slots=True)` instances
+
+If a track proposes lifting entities into `dict[str, Any]` or `Any`, REJECT the design and rewrite.
 
 ### Limitations
 - READ-ONLY: Do NOT write code or edit files (except track spec/plan/metadata)
-- Do NOT execute tracks — delegate to Tier 2
-- Do NOT implement features — delegate to Tier 3 Workers
+- Do NOT execute tracks — delegate to Tier 2
+- Do NOT implement features — delegate to Tier 3 Workers

.opencode/commands/mma-tier2-tech-lead.md

@@ -9,19 +9,41 @@ $ARGUMENTS
 
 ## Context
 
-You are now acting as Tier 2 Tech Lead.
+You are now acting as Tier 2 Tech Lead in the **META-TOOLING** domain (per `docs/guide_meta_boundary.md`). This is NOT the manual-slop application's MMA engine — that's `src/multi_agent_conductor.py` in the APPLICATION domain.
+
+### Pre-Flight: Read the canonical docs FIRST (do NOT be conservative)
+
+**Added 2026-06-27.** This project has extensive canonical documentation. Read the docs. Don't skim.
+
+Before ANY planning, design, or delegation, read:
+
+1. `AGENTS.md` — project-root rules; especially the HARD BANs
+2. `conductor/workflow.md` — including §0 (Python Type Promotion Mandate)
+3. `conductor/tech-stack.md` — Core Value reference at top
+4. `conductor/product-guidelines.md` — **Core Value section is mandatory reading**: C11/Odin/Jai semantics in a Python runtime
+5. `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate
+6. `conductor/code_styleguides/python.md` §17 — LLM Default Anti-Patterns (banned patterns)
+7. `conductor/code_styleguides/type_aliases.md` — Metadata is the boundary type
+8. The relevant `docs/guide_*.md` for your track's layers
+
+LLMs of today are not good enough at predicting what this project wants — read the docs.
 
 ### Primary Responsibilities
 - Track execution (`/conductor-implement`)
 - Architectural oversight
-- Delegate to Tier 3 Workers via Task tool
-- Delegate error analysis to Tier 4 QA via Task tool
+- Delegate to Tier 3 Workers via the OpenCode Task tool (`subagent_type: "tier3-worker"`)
+- Delegate error analysis to Tier 4 QA via the OpenCode Task tool (`subagent_type: "tier4-qa"`)
 - Maintain persistent memory throughout track execution
+- Write an end-of-session report (`docs/reports/SESSION_<date>.md`) before /compact or session end
 
 ### Context Management
 
-**MANUAL COMPACTION ONLY** — Never rely on automatic context summarization.
-You maintain PERSISTENT MEMORY throughout track execution — do NOT apply Context Amnesia to your own session.
+**MANUAL COMPACTION ONLY** — Never rely on automatic context summarization.
+You maintain PERSISTENT MEMORY throughout track execution — do NOT apply Context Amnesia to your own session.
+
+**Before /compact or session end:** write `docs/reports/SESSION_<date>.md` capturing what was done this session, what remains, and the current branch. This allows the next session to re-warm context.
+
+**Tradeoff:** prefer LESS working context + an end-of-session report, over trying to be conservative on docs. The user explicitly rejected LLM conservatism on this project.
 
 ### Pre-Delegation Checkpoint (MANDATORY)
 
@@ -31,12 +53,29 @@ Before delegating ANY dangerous or non-trivial change to Tier 3:
 git add .
 ```
 
-**WHY**: If a Tier 3 Worker fails or incorrectly runs `git restore`, you will lose ALL prior AI iterations for that file if it wasn't staged/committed.
+**WHY**: If a Tier 3 Worker fails or incorrectly runs `git restore`, you will lose ALL prior AI iterations for that file if it wasn't staged/committed. (Per AGENTS.md: `git restore`, `git checkout --`, `git reset`, `git revert` are FORBIDDEN without explicit user permission.)
+
+### The C11/Odin/Jai-in-Python Mandate (CRITICAL)
+
+When planning or reviewing tasks:
+
+**BANNED in non-boundary code:**
+- `dict[str, Any]` (use typed `@dataclass(frozen=True, slots=True)` with explicit fields)
+- `Any` type hint (use the concrete typed dataclass)
+- `Optional[T]` returns (use `Result[T]` + `NIL_T` sentinels per `error_handling.md`)
+- `hasattr()` for entity type dispatch (use typed Union or per-entity function)
+- Local imports inside functions (top-of-module imports only)
+- `import X as _PREFIX` aliasing (use the original name)
+- Repeated `.from_dict()` calls in the same expression (cache or promote the type)
+
+**The one exception:** the literal wire boundary (TOML/JSON parse functions) may use `dict[str, Any]` + `Metadata.from_dict(...)`.
+
+If a track proposes lifting entities into `dict[str, Any]` or `Any`, REJECT and rewrite.
 
 ### TDD Protocol (MANDATORY)
 
-1. **Red Phase**: Write failing tests first — CONFIRM FAILURE
-2. **Green Phase**: Implement to pass — CONFIRM PASS
+1. **Red Phase**: Write failing tests first — CONFIRM FAILURE
+2. **Green Phase**: Implement to pass — CONFIRM PASS
 3. **Refactor Phase**: Optional, with passing tests
 
 ### Commit Protocol (ATOMIC PER-TASK)
@@ -49,9 +88,9 @@ After completing each task:
 5. Update plan.md: Mark `[x]` with SHA
 6. Commit plan update: `git add plan.md && git commit -m "conductor(plan): Mark task complete"`
 
-### Delegation Pattern
+### Delegation Pattern (OpenCode Task tool — replaces legacy mma_exec.py)
 
-**Tier 3 Worker** (Task tool):
+**Tier 3 Worker** (OpenCode Task tool):
 ```
 subagent_type: "tier3-worker"
 description: "Brief task name"
@@ -61,13 +100,16 @@ prompt: |
  HOW: API calls/patterns
  SAFETY: thread constraints
  Use 1-space indentation.
+ DO NOT introduce dict[str, Any], Any, Optional[T], hasattr() for entity dispatch, local imports, or _PREFIX aliasing. See conductor/code_styleguides/python.md §17.
 ```
 
-**Tier 4 QA** (Task tool):
+**Tier 4 QA** (OpenCode Task tool):
 ```
 subagent_type: "tier4-qa"
 description: "Analyze failure"
 prompt: |
  [Error output]
  DO NOT fix - provide root cause analysis only.
-```
+```
+
+**NOTE:** the legacy `mma_exec.py` and `claude_mma_exec.py` bridge scripts are DEPRECATED as of 2026-06-27. All sub-agent delegation now goes through the OpenCode Task tool.

.opencode/commands/mma-tier3-worker.md

@@ -9,20 +9,47 @@ $ARGUMENTS
 
 ## Context
 
-You are now acting as Tier 3 Worker.
+You are now acting as Tier 3 Worker in the **META-TOOLING** domain (per `docs/guide_meta_boundary.md`). You implement surgical code changes for the manual_slop application codebase (the APPLICATION domain), per the spec/plan from Tier 1/2.
+
+### Pre-Flight: Read the canonical docs FIRST (do NOT be conservative)
+
+**Added 2026-06-27.** This project has extensive canonical documentation. Read the docs. Don't skim.
+
+Before ANY implementation, read:
+
+1. `AGENTS.md` — project-root rules; especially the HARD BANs
+2. `conductor/code_styleguides/python.md` §17 — **LLM Default Anti-Patterns (banned patterns)** — the most critical reference for implementation
+3. `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate
+4. `conductor/code_styleguides/type_aliases.md` — Metadata is the boundary type
+5. `conductor/code_styleguides/error_handling.md` — Result[T] + NIL_T sentinels
+6. The relevant `docs/guide_*.md` for the layer your task touches
 
 ### Key Constraints
 
-- **STATELESS**: Context Amnesia — each task starts fresh
+- **STATELESS**: Context Amnesia — each task starts fresh
 - **MCP TOOLS ONLY**: Use `manual-slop_*` tools, NEVER native tools
 - **SURGICAL**: Follow WHERE/WHAT/HOW/SAFETY exactly
 - **1-SPACE INDENTATION**: For all Python code
 
+### The Banned Patterns (DO NOT INTRODUCE)
+
+From `conductor/code_styleguides/python.md` §17. The agent MUST NOT write:
+
+- `dict[str, Any]` parameter/return/field types (use typed `@dataclass(frozen=True, slots=True)`)
+- `Any` types (use the concrete typed dataclass)
+- `Optional[T]` returns (use `Result[T]` + `NIL_T` sentinels)
+- `hasattr()` for entity type dispatch (use typed Union or per-entity function)
+- Local imports inside functions (top-of-module imports only)
+- `import X as _PREFIX` aliasing (use the original name)
+- Repeated `.from_dict()` calls in the same expression (cache the result or promote the type)
+
+**The one exception:** the literal wire boundary (TOML/JSON parse functions) may use `dict[str, Any]` + `Metadata.from_dict(...)`.
+
 ### Task Execution Protocol
 
 1. **Read Task Prompt**: Identify WHERE/WHAT/HOW/SAFETY
 2. **Use Skeleton Tools**: For files >50 lines, use `manual-slop_py_get_skeleton` or `manual-slop_get_file_summary`
-3. **Implement Exactly**: Follow specifications precisely
+3. **Implement Exactly**: Follow specifications precisely; do NOT introduce banned patterns
 4. **Verify**: Run tests if specified via `manual-slop_run_powershell`
 5. **Report**: Return concise summary (what, where, issues)
 
@@ -51,5 +78,6 @@ If you cannot complete the task:
 
 - 1-space indentation
 - NO COMMENTS unless explicitly requested
-- Type hints where appropriate
-- Internal methods/variables prefixed with underscore
+- Type hints required
+- Internal methods/variables prefixed with underscore
+- NEVER use `git restore`, `git checkout --`, `git reset`, or `git revert` (per AGENTS.md HARD BAN)

AGENTS.md

@@ -58,6 +58,7 @@ The 14 deep-dive guides under `docs/` (`guide_architecture.md`, `guide_ai_client
 - Do not use `git restore` while a user is mid-conversation without first confirming the desired state
 - HARD BAN: `git restore`, `git checkout -- <file>`, `git reset` are FORBIDDEN without explicit user permission in the same message. They destroyed user in-progress src/* edits twice in one session (2026-06-07). If you think you need one, ASK FIRST.
 - **HARD BAN: Day estimates in track artifacts (Tier 1).** Do NOT include day / hour / minute estimates in spec.md, plan.md, metadata.json, or any other track artifact. Day estimates are inaccurate noise; Tier 2 capacity is bounded by attention, not time. Measure effort by **scope** (N files, M sites, N tasks). The user / Tier 2 agent decides the actual pacing. See `conductor/workflow.md` §"Tier 1 Track Initialization Rules" for the full rule, replacement patterns, and rationale. (Added 2026-06-16 per user feedback: "Day estimates are inaccurate. Tier-2s can only do so much in a single track and there is no way in hell its going to be 'DAYS'.")
+- **HARD BAN: Opaque types in non-boundary code (added 2026-06-25).** LLMs default to `dict[str, Any]`, `Any`, `Optional[T]`, `hasattr()` polymorphism, and `.get('field', default)` because that's idiomatic Python training data. **All of these are BANNED in non-boundary code.** Use typed `@dataclass(frozen=True, slots=True)` with explicit fields; use `Result[T]` + `NIL_T` sentinels instead of `Optional[T]`; use direct attribute access instead of `.get()`. The ONLY place `dict[str, Any]` is allowed is the literal wire boundary (TOML/JSON parse functions); 2-3 functions per file. See `conductor/product-guidelines.md` "Core Value", `conductor/code_styleguides/data_oriented_design.md` §8.5 (The Python Type Promotion Mandate), `conductor/code_styleguides/python.md` §17 (LLM Default Anti-Patterns), and `conductor/code_styleguides/type_aliases.md` for the canonical mandates. User direction 2026-06-25: "I want the closest thing to c11/odin/jai in a scripting language... metadata should not be a dict[str, any]."
 
 ## File Size and Naming Convention (HARD RULE — added 2026-06-11)
 

conductor/chronology.md

@@ -1,5 +1,8 @@
 | Date | ID | Status | Summary | Folder | Range |
 | --- | --- | --- | --- | --- | --- |
+| 2026-06-27 | `docs_c11_python_in_python_20260627` | shipped | **Core Value established**: C11/Odin/Jai semantics in a Python runtime. Updated `data_oriented_design.md` §8.5-8.7 (Python Type Promotion Mandate + Boundary Layer + C11 framing), `type_aliases.md` (Metadata is the boundary type, NOT `dict[str, Any]`), `python.md` §17 (7 banned patterns: dict[str, Any], Any, Optional[T], hasattr() for entity dispatch, local imports, _PREFIX aliasing, repeated .from_dict()), `product-guidelines.md` "Core Value" section, `tech-stack.md`, `workflow.md` §0 (Tier 1 Type Promotion Rule), `AGENTS.md` (HARD BAN opaque types in non-boundary code), `docs/AGENTS.md` §Convention Enforcement, `docs/Readme.md` Meta-Boundary row, `docs/guide_meta_boundary.md` (mma_exec.py deprecated for meta-tooling; OpenCode Task tool is canonical). Updated 4 tier agent files + 4 MMA tier slash command files + tier2-autonomous.md with the 11-file Pre-Flight reading list. Tier 2 also created the per-aggregate dataclass foundation (`metadata_promotion_20260624`), the consumer migration work (`type_alias_unfuck_20260626`), and the final cruft-elimination plan (`cruft_elimination_20260627`). The metric problem (4.01e+22 effective codepaths) requires typed parameters at function boundaries; per-aggregate dataclass promotion alone is necessary but not sufficient. Closing report pending. | n/a (docs sync) | n/a |
+| 2026-06-25 | `metadata_promotion_20260624` | active | **Goal:** promote `Metadata: TypeAlias = dict[str, Any]` to a typed fat struct at the wire boundary, and add 12 per-aggregate `@dataclass(frozen=True)` classes (CommsLogEntry, HistoryMessage, FileItem, ToolDefinition, RAGChunk, SessionInsights, DiscussionSettings, CustomSlice, MMAUsageStats, ProviderPayload, UIPanelConfig, PathInfo). **Status:** Tier 2 added the dataclasses (with drifted field types vs the plan), completed Phase 1 (Ticket migration), but classified Phases 2-10 as no-op per FR2. State on branch: lied about completion (`status = "completed"` with all phases "completed (no-op per audit)"). Tier 1 followup corrected to honest state (`status = "active"`, `current_phase = 0`). | `conductor/tracks/metadata_promotion_20260624` | `b4bd772d..45c5c563` (multiple) |
+| 2026-06-26 | `type_alias_unfuck_20260626` | active | **Goal:** migrate the 67 remaining `.get('key', default)` + ~80 subscript sites to direct field access on the per-aggregate dataclasses. **Status:** Tier 2 did real work in Phases 1-5 (Ticket, FileItem, CommsLogEntry, HistoryMessage, ChatMessage, UsageStats, ToolCall, ToolDefinition, RAGChunk, MMAUsageStats, etc.) and 11 per-aggregate test files. The plan (45 commits) shipped with hard rules #11 (no-op ban) and #12 (metric revert) added 2026-06-27. Metric: 4.01e+22 → 1e+21 (partial drop, not full target). | `conductor/tracks/type_alias_unfuck_20260626` | `f47be0ec..96759316` (multiple) |
 | 2026-06-20 | `result_migration_baseline_cleanup_20260620` | active | **Priority:** A (closes the gaps in the convention reference; makes the baseline 100% convention-compliant) | `conductor/tracks/result_migration_baseline_cleanup_20260620` | `e9016749..e9016749` (0) |
 | 2026-06-20 | `tier2_leak_prevention_20260620` | Completed | **Created:** 2026-06-20 | `conductor/tracks/tier2_leak_prevention_20260620` | `9224be7a..9224be7a` (0) |
 | 2026-06-19 | `chronology_20260619` | spec_written | This track creates `conductor/chronology.md`, a complete, manually-maintained index of all tracks (active, shipped, archived, superseded) for the Manual Slop conductor system, plus a small section… | `conductor/tracks/chronology_20260619` | `87923c93..2cff5d6a` (10) |

conductor/code_styleguides/data_oriented_design.md

@@ -173,6 +173,55 @@ Systems communicate through **explicit data protocols**, modeled after network p
 
 Design with the actual hardware's properties — cache hierarchy, memory bandwidth, alignment, latency vs throughput — and to its strengths.
 
+### 8.5 The Python Type Promotion Mandate (added 2026-06-25)
+
+**C11/Odin/Jai semantics in a Python runtime.** This codebase is written in Python because of practical constraints (time, dependencies, LLM codegen ability), but the convention is to make Python behave as close to a statically-typed value-typed language as the runtime allows. **LLMs default to opaque types (`dict[str, Any]`, `Any`, `Optional[T]`, `hasattr()` polymorphism) because that's what idiomatic Python training data looks like. That defaults to mediocrity; this rule overrides it.**
+
+**The 7 banned patterns** (any of these in a non-boundary file is an anti-pattern; the audit scripts flag them):
+
+| Banned | Why | Use instead |
+|---|---|---|
+| `dict[str, Any]` (parameter or return) | Open-ended; hides the schema; invites `.get('any_key', default)` defensive checks | A typed dataclass (`@dataclass(frozen=True, slots=True)`) with explicit fields |
+| `Any` (parameter, return, or field) | Same problem; LLMs use it to avoid thinking about types | A specific typed dataclass or one of the concrete types in `src/type_aliases.py` |
+| `Optional[T]` (return) | `None` requires a runtime check; propagates through call sites | `Result[T]` (with errors as data) or a `NIL_T` sentinel (zero-initialized frozen dataclass) |
+| `hasattr(x, 'field')` for entity type dispatch | Runtime type check; defeats the type system | `isinstance(x, TypedDataclass)` against a typed Union, or refactor so the function takes a typed parameter (no dispatch needed) |
+| `getattr(x, 'field', default)` on a known-typed value | Same; the type system should guarantee the field exists | `x.field` direct access; if the field is nullable, the dataclass has `Optional[T]` as a field type (and the value is checked at construction, not at every read) |
+| `.get('field', default)` on a `dict[str, Any]` for a known field | Runtime type-dispatch branch | Direct attribute access on the typed dataclass |
+| `if 'field' in dict` checks | Same | Direct attribute access (the dataclass has a default value) |
+
+**The one exception (the boundary layer):** at the literal wire boundary (TOML parsing, JSON parsing, vendor SDK response parsing), the data is open-ended for the 100ns between parsing and `from_dict()` conversion. At that boundary:
+
+- The function that calls `tomllib.load()` or `json.loads()` may return `Metadata` (the typed fat struct — see §8.6).
+- Every consumer of that function IMMEDIATELY calls `SomeTypedDataclass.from_dict(metadata)` and uses the typed result.
+- The boundary is 2-3 functions per file (one per wire entry point).
+
+**No other code uses `Metadata` or `dict[str, Any]` or `Any`.** This is enforced by `scripts/audit_weak_types.py --strict` (existing) + the boundary-layer audit (planned in `conductor/tracks/cruft_elimination_20260627/spec.md`).
+
+### 8.6 The Boundary Layer (the wire schema)
+
+The codebase has ONE typed fat struct at the boundary: `Metadata` in `src/type_aliases.py`. It is `@dataclass(frozen=True, slots=True)` with explicit fields covering the TOML/JSON wire schema (paths, project, discussion, role, content, ts, source_tier, model, depends_on, document, script, args, etc.). It is used in exactly 2 places:
+1. TOML loaders (`tomllib.load()` → `Metadata.from_dict(...)` → typed config)
+2. JSON wire parsers (`json.loads()` → `Metadata.from_dict(...)` → typed request/response)
+
+After the boundary, every value is a typed componentized dataclass (`CommsLogEntry`, `HistoryMessage`, `FileItem`, `Ticket`, `ToolCall`, `ChatMessage`, `UsageStats`, `RAGChunk`, `SessionInsights`, `DiscussionSettings`, `CustomSlice`, `MMAUsageStats`, `ProviderPayload`, `UIPanelConfig`, `PathInfo`, `ToolDefinition`).
+
+**The componentized dataclasses exist for specific paths.** A function that handles ONE entity type takes that type's dataclass directly. A function that genuinely handles multiple entity types in ONE generalized path takes a Union: `def handle(x: CommsLogEntry | FileItem | HistoryMessage) -> None:` with `isinstance(x, CommsLogEntry)` dispatch. **NOT** `def handle(x: Metadata) -> None:` with `hasattr(x, 'tool_calls')` dispatch.
+
+**Why this matters:** the dispatcher functions in `src/app_controller.py` and `src/gui_2.py` had `if hasattr(...)` chains that contributed to the 4.01e+22 effective-codepaths metric (`Σ 2^branches(f)`). After this rule is enforced, those functions take typed parameters, the `hasattr` chains collapse to single `isinstance` checks or are eliminated entirely, and the metric drops by 4+ orders of magnitude.
+
+### 8.7 The "C11/Odin/Jai in Python" framing
+
+| C11/Odin/Jai concept | Python equivalent |
+|---|---|
+| Value type (`struct Foo { int x; string y; }`) | `@dataclass(frozen=True, slots=True) class Foo: x: int = 0; y: str = ""` |
+| Static type (`int`, `string`) | Type hint + mypy in CI |
+| No null | `Result[T]` (errors as data) or `NIL_T` sentinel (zero-initialized frozen dataclass) |
+| Direct field access (`foo.x`) | `foo.x` direct attribute access (not `foo.get('x', default)`) |
+| No dynamic dispatch (`if hasfield`) | Compile-time-typed function params (no `hasattr()` runtime dispatch) |
+| Explicit conversion at boundary (`parse_wire(bytes) -> Foo`) | `Foo.from_dict(wire_dict)` at the wire entry; internal code never sees the wire format |
+
+**If you find yourself writing `dict[str, Any]`, `Any`, `Optional[T]`, `hasattr()`, or `.get()` for type dispatch, stop and ask: "what typed dataclass should this be?"** The answer is usually in `src/type_aliases.py` (12 existing) or you need to add one.
+
 - **Latency and throughput are only the same thing in a sequential system.** For every performance requirement, identify which one it actually is before designing for it.
 - The compiler and language are tools, not magic: memory layout, access order, and the choice of what work to do at all are your job, not theirs — and they are roughly 90% of the problem. Know what the compiler can reasonably do with what you wrote, and don't delegate what it can't.
 

conductor/code_styleguides/python.md

@@ -213,7 +213,206 @@ To prevent "God Object" bloat in core controllers (like `AppController`):
 - **Handler Maps:** Replace massive `if/elif` blocks (like those in event dispatchers) with dictionaries mapping keys to module-level handler functions.
 - **Inner Class Extraction:** Never define nested classes or functions within methods. Move them to the module level.
 
-## 16. See Also — Per-File Pattern Demonstrations
+## 17. Banned Patterns (LLM Default Anti-Patterns) (Added 2026-06-25)
+
+**C11/Odin/Jai semantics in a Python runtime.** This codebase is written in Python because of practical constraints, but the convention is to make Python behave as close to a statically-typed value-typed language as the runtime allows. LLMs default to the following patterns because that's what idiomatic Python training data looks like. **All of these are BANNED in non-boundary code.** See `data_oriented_design.md` §8.5 for the canonical mandate.
+
+### 17.1 Banned: `dict[str, Any]`
+
+```python
+# BANNED:
+def process(event: dict[str, Any]) -> None:
+ if event.get("kind") == "tool_call":
+
+# BANNED:
+flat: dict[str, Any] = project_manager.flat_config(...)
+
+# CORRECT:
+def process(event: CommsLogEntry) -> None:
+ if event.kind == "tool_call":
+
+# CORRECT (boundary only):
+def _parse_wire(raw: str) -> Metadata:
+ return Metadata.from_dict(tomllib.loads(raw))
+```
+
+### 17.2 Banned: `Any`
+
+```python
+# BANNED:
+def _to_typed_tool_call(tc: Any) -> ToolCall:
+ return ToolCall(id=getattr(tc, "id", "") or "", ...)
+
+# CORRECT:
+def _parse_wire_tool_call(wire: dict[str, Any]) -> ToolCall:
+ """Boundary: parse MCP wire dict to typed ToolCall."""
+ return ToolCall.from_dict(wire)
+```
+
+### 17.3 Banned: `Optional[T]` returns
+
+```python
+# BANNED:
+def find_ticket(self, id: str) -> Optional[Ticket]:
+ for t in self.active_tickets:
+  if t.id == id: return t
+ return None   # ← silent failure; consumer has to None-check
+
+# CORRECT (Result pattern):
+def find_ticket(self, id: str) -> Result[Ticket]:
+ for t in self.active_tickets:
+  if t.id == id: return Result(data=t)
+ return Result(data=NIL_TICKET, errors=[ErrorInfo(...)])  # drain point handles
+
+# CORRECT (NIL_T sentinel — preferred when consumer just reads fields):
+def find_ticket(self, id: str) -> Ticket:
+ for t in self.active_tickets:
+  if t.id == id: return t
+ return NIL_TICKET   # zero-initialized frozen dataclass; safe to read fields
+```
+
+### 17.4 Banned: `hasattr()` for entity type dispatch
+
+```python
+# BANNED:
+def handle_event(self, event: Metadata) -> None:
+ if hasattr(event, 'tool_calls'):
+  # tool call path
+ elif hasattr(event, 'source_tier'):
+  # mma path
+ elif hasattr(event, 'path'):
+  # file path
+
+# CORRECT (typed Union dispatch):
+def handle_event(self, event: CommsLogEntry | FileItem | HistoryMessage) -> None:
+ if isinstance(event, CommsLogEntry):
+  # mma path
+ elif isinstance(event, FileItem):
+  # file path
+ elif isinstance(event, HistoryMessage):
+  # tool call path
+
+# CORRECT (preferred — refactor so no dispatch is needed):
+def _handle_comms_entry(self, event: CommsLogEntry) -> None: ...
+def _handle_file_item(self, event: FileItem) -> None: ...
+def _handle_history(self, event: HistoryMessage) -> None: ...
+```
+
+### 17.5 Banned: `getattr(x, 'field', default)` for type dispatch
+
+```python
+# BANNED:
+tool_id = getattr(tc, "id", "") or ""
+tool_name = getattr(tc.function, "name", "") or ""
+
+# CORRECT:
+tool_id = tc.id
+tool_name = tc.function.name
+```
+
+### 17.6 Banned: `.get('field', default)` on a `dict[str, Any]`
+
+```python
+# BANNED:
+tier = entry.get('source_tier', 'main')
+model = entry.get('model', 'unknown')
+
+# CORRECT (direct attribute access on the typed dataclass):
+tier = entry.source_tier
+model = entry.model
+```
+
+### 17.7 The one exception: the boundary layer
+
+The ONLY place these patterns are allowed is at the literal wire boundary — the function that calls `tomllib.load()`, `json.loads()`, or a vendor SDK's response parser. The boundary is 2-3 functions per file. Every consumer IMMEDIATELY converts to a typed dataclass via `from_dict()`.
+
+### 17.8 Enforcement
+
+- `scripts/audit_weak_types.py --strict` — flags `dict[str, Any]`, `Any`, anonymous tuple returns
+- `scripts/audit_optional_in_3_files.py --strict` — flags `Optional[T]` in the 3 refactored files (extended to ALL `src/*.py` per the c11_python track)
+- The new `boundary_layer` audit (planned in `conductor/tracks/cruft_elimination_20260627/spec.md`) — documents every `Metadata` usage with justification
+- Pre-commit: every commit MUST pass all three audits above
+
+### 17.9 Banned: Local imports + aliasing-for-naming-convenience + repeated `from_dict()` (Added 2026-06-27)
+
+**LLMs default to local imports with `as _PREFIX` aliasing.** This is the "I don't want to repeat the long name" pattern. It's banned. Local imports add overhead; aliasing hides intent; repeated `.from_dict()` calls in the same expression are wasteful.
+
+**17.9a — Banned: Local imports inside functions**
+
+```python
+# BANNED:
+def calculate_total(app):
+    from src.type_aliases import MMAUsageStats as _MMA   # ← local import; defeats static analysis
+    return sum(_MMA.from_dict(u).model for u in app.mma_tier_usage.values())
+
+# CORRECT:
+# Add the import at the top of the module:
+#   from src.type_aliases import MMAUsageStats
+
+def calculate_total(app):
+    return sum(u.model for u in app.mma_tier_usage.values())
+```
+
+**Why:** local imports:
+- Add per-call import overhead (cached after first call, but still pollutes the namespace).
+- Defeat static analysis (ruff/mypy can't see what's imported where).
+- Hide dependencies (a reader has to scroll to find what's actually used).
+- Encourage the aliasing anti-pattern (see 17.9b).
+
+The ONLY exception: local imports inside `try/except ImportError` blocks for optional dependencies. Even then, prefer lazy module-level imports (`_module = None` then `global _module; _module = importlib.import_module(...)`).
+
+**17.9b — Banned: `import X as _X` aliasing-for-naming-convenience**
+
+```python
+# BANNED:
+from src.type_aliases import MMAUsageStats as _MMA
+from src.openai_schemas import ToolCall as _TC
+from src.models import FileItem as _FI
+
+# CORRECT:
+from src.type_aliases import MMAUsageStats
+from src.openai_schemas import ToolCall
+from src.models import FileItem
+```
+
+**Why:** `_PREFIX` aliasing is "I don't want to repeat the long name, so I'll shorten it." But the long name IS the documentation — `MMAUsageStats` tells you what it is; `_MMA` is opaque. The "long name" is rarely actually long enough to justify aliasing. If you find yourself aliasing to shorten, the real problem is the function is too long — extract.
+
+**17.9c — Banned: Repeated `.from_dict()` calls in the same expression**
+
+```python
+# BANNED:
+from src.type_aliases import MMAUsageStats as _MMA
+total_cost = sum(cost_tracker.estimate_cost(
+    _MMA.from_dict(u).model or 'unknown',
+    _MMA.from_dict(u).input,
+    _MMA.from_dict(u).output,
+) for u in app.mma_tier_usage.values())
+
+# CORRECT:
+total_cost = sum(cost_tracker.estimate_cost(
+    stats.model or 'unknown',
+    stats.input,
+    stats.output,
+) for stats in (
+    MMAUsageStats.from_dict(u) if isinstance(u, dict) else u
+    for u in app.mma_tier_usage.values()
+))
+```
+
+**Why:** repeated `.from_dict()` calls:
+- Waste work (parse the same dict multiple times).
+- Indicate a broken design (the variable's type isn't right).
+- Should be cached in a local variable OR the type should be promoted at the boundary so `from_dict()` isn't called at the consumer site at all.
+
+The CORRECT pattern (preferred): promote the type at the boundary. After `cruft_elimination_20260627`, `app.mma_tier_usage` is typed `dict[str, MMAUsageStats]` (the boundary does `from_dict()` ONCE). The consumer iterates `stats.model`, `stats.input`, `stats.output` directly. No `from_dict()` at the consumer site.
+
+### 17.10 Enforcement (LLM-default anti-patterns)
+
+- Pre-commit: every commit MUST pass ruff with the project's configured lint set (`pyproject.toml [tool.ruff.lint]`).
+- Tier 2 review: reject any commit that adds a local import or `_PREFIX` alias.
+- The static analysis script `scripts/audit_imports.py` (planned) flags local imports outside `try/except ImportError` blocks.
+
+## 18. See Also — Per-File Pattern Demonstrations
 
 The following per-source-file guides show these conventions applied in real code:
 

conductor/code_styleguides/type_aliases.md

@@ -37,17 +37,28 @@ Plus the NamedTuple:
 
 ## The 5 Decision Patterns
 
-### 1. Use `Metadata` for any dict-shaped record
+### 1. Use `Metadata` ONLY at the wire boundary (TOML/JSON parse)
+
+**UPDATED 2026-06-25 (the C11/Odin/Jai-in-Python mandate).** `Metadata` is the typed fat struct at the wire boundary. It is `@dataclass(frozen=True, slots=True)` with explicit fields covering the TOML/JSON wire schema (paths, project, discussion, role, content, ts, source_tier, model, depends_on, document, script, args, etc.).
 
 ```python
-def parse_metadata(raw: str) -> Metadata:
- return json.loads(raw)
+# CORRECT — at the literal wire boundary:
+def _parse_toml_config(raw: str) -> Metadata:
+ return Metadata.from_dict(tomllib.loads(raw))
 
-def save_metadata(name: str, data: Metadata) -> None:
- ...
+# CORRECT — consumer at the boundary, converts immediately:
+def _load_project_context(raw_toml: Metadata) -> ProjectContext:
+ return ProjectContext.from_dict(raw_toml)
+
+# WRONG — using Metadata as a lazy-typing escape hatch:
+def process_event(self, event: Metadata) -> None:
+ if hasattr(event, 'tool_calls'):
+  ...   # ← BAD: this is the laziest possible typing
 ```
 
-The alias is `dict[str, Any]` at runtime; the name documents the semantic role.
+`Metadata` is **NOT** `TypeAlias = dict[str, Any]`. It is a typed fat struct. The boundary is 2-3 functions per file. Every consumer IMMEDIATELY converts to a componentized dataclass via `from_dict()`.
+
+**Anti-pattern (banned):** `Metadata: TypeAlias = dict[str, Any]` (the lazy-typing escape hatch). LLMs default to this because it's idiomatic Python. This codebase does NOT do idiomatic Python. See `data_oriented_design.md` §8.5.
 
 ### 2. Use the more specific alias when the role is known
 
@@ -61,6 +72,41 @@ def get_history() -> History: ...
 
 The underlying type is still `dict[str, Any]`; the alias name is the documentation.
 
+### 2.5. When the role has stable distinct fields, promote it to its OWN dataclass
+
+**Added 2026-06-25 (correction to `metadata_promotion_20260624`).** When a sub-aggregate has a known set of stable, distinct fields (e.g., `CommsLogEntry` has `ts, role, kind, direction, model, source_tier, content, error`; `FileItem` has `path, view_mode, custom_slices`; `RAGChunk` has `document, path, score`), promote it to its OWN `@dataclass(frozen=True, slots=True)` with its OWN fields. Do **NOT** share one mega-dataclass across multiple concepts.
+
+**Why:** the per-aggregate dataclass is the "names for shapes" pattern extended to the structural level. Each concept gets its own type, its own fields, its own `to_dict()` / `from_dict()` round-trip. Consumers use direct field access (`entry.ts`, `t.depends_on`, `chunk.document`) which compiles to a single C-level field read with 0 branches.
+
+**When NOT to promote:** when the shape is genuinely unknown at type level (TOML project config, generic JSON parsing at a wire boundary, polymorphic log dumping). These are **collapsed codepaths** and they keep `Metadata: TypeAlias = dict[str, Any]` as the catch-all.
+
+**Canonical pattern (from `src/openai_schemas.py` and `src/models.py:533`):**
+
+```python
+@dataclass(frozen=True, slots=True)
+class CommsLogEntry:
+    ts: str = ""
+    role: str = ""
+    kind: str = ""
+    direction: str = ""
+    model: str = "unknown"
+    source_tier: str = "main"
+    content: Any = None
+    error: str = ""
+
+    def to_dict(self) -> Metadata:
+        return asdict(self)
+
+    @classmethod
+    def from_dict(cls, raw: Metadata) -> "CommsLogEntry":
+        valid = {f.name for f in fields(cls)}
+        return cls(**{k: v for k, v in raw.items() if k in valid})
+```
+
+**The rule (Tier 1 audit 2026-06-25):** if the original 2026-06-06 `data_structure_strengthening_20260606` design intent was per-concept promotion (it was — see `spec.md §3.3`: *"Phase 2 can convert `Metadata` to a `TypedDict` (or split into per-concept `TypedDict`s)..."*), the metadata_promotion_20260624 track must continue in that direction: per-aggregate dataclasses, not a shared mega-dataclass. The corrected design is in `conductor/tracks/metadata_promotion_20260624/spec.md` (rewrite of `G3`, `FR1`, and `Out of Scope` on 2026-06-25).
+
+**For a worked example of the per-aggregate pattern in production:** `src/openai_schemas.py` defines `ToolCall`, `ToolCallFunction`, `ChatMessage`, `UsageStats`, `NormalizedResponse` as separate frozen dataclasses — each with its own fields. `src/models.py:533` defines `FileItem` with paired `to_dict()` / `from_dict()` round-trip. `src/models.py:302` defines `Ticket` with 15 typed fields. These are the reference implementations.
+
 ### 3. Use `FileItems` for any list of file items
 
 `FileItems = list[FileItem]`. The most common weak pattern in the codebase. Replace `list[dict[str, Any]]` with `FileItems` whenever the list is "files in scope for the current context".

conductor/product-guidelines.md

@@ -1,5 +1,18 @@
 # Product Guidelines: Manual Slop
 
+## Core Value (Added 2026-06-25)
+
+**C11/Odin/Jai semantics in a Python runtime.** This codebase is written in Python because of practical constraints (time, dependencies, LLM codegen ability), but the convention is to make Python behave as close to a statically-typed value-typed language as the runtime allows.
+
+**LLMs default to opaque types (`dict[str, Any]`, `Any`, `Optional[T]`, `hasattr()` polymorphism) because that's what idiomatic Python training data looks like. That defaults to mediocrity. This rule overrides it.**
+
+The canonical mandate is in `conductor/code_styleguides/data_oriented_design.md` §8.5 (The Python Type Promotion Mandate). The banned patterns are in `conductor/code_styleguides/python.md` §17 (LLM Default Anti-Patterns). The enforcement audits are:
+- `scripts/audit_weak_types.py --strict`
+- `scripts/audit_optional_in_3_files.py --strict` (extended to all `src/*.py`)
+- The boundary-layer audit (planned in `conductor/tracks/cruft_elimination_20260627/spec.md`)
+
+**Every section of this document, every styleguide in `conductor/code_styleguides/`, and every deep-dive guide in `docs/guide_*.md` MUST be read through the lens of this Core Value.** If a section suggests `dict[str, Any]`, `Any`, `Optional[T]`, or `hasattr()` for entity dispatch in non-boundary code, that's an anti-pattern; flag it and ask.
+
 ## Documentation Style
 
 - **Strict & In-Depth:** Documentation must follow an old-school, highly detailed technical breakdown style (similar to VEFontCache-Odin). Focus on architectural design, state management, algorithmic details, and structural formats rather than just surface-level usage.

conductor/product.md

@@ -21,7 +21,7 @@ For deep implementation details when planning or implementing tracks, consult `d
 - **[docs/guide_api_hooks.md](../docs/guide_api_hooks.md):** `src/api_hooks.py` + `src/api_hook_client.py` (38KB + 31KB): HookServer on `127.0.0.1:8999`, ApiHookClient wrapper, 8+ endpoints, Remote Confirmation Protocol via `/api/ask`
 - **[docs/guide_mcp_client.md](../docs/guide_mcp_client.md):** `src/mcp_client.py` (81KB, 45 tools): 3-layer security (Allowlist → Validate → Resolve), all native tools (File I/O, Python AST, C/C++ AST, Analysis, Network, Runtime, Beads), ExternalMCPManager (Stdio + SSE), JSON-RPC 2.0 engine
 - **[docs/guide_app_controller.md](../docs/guide_app_controller.md):** `src/app_controller.py` (166KB): headless orchestrator, AppState dataclass, all subsystem managers, `_predefined_callbacks`/`_gettable_fields` Hook API registries, SyncEventQueue, headless mode
-- **[docs/guide_multi_agent_conductor.md](../docs/guide_multi_agent_conductor.md):** `src/multi_agent_conductor.py` + `src/dag_engine.py` (28KB + 10KB): TrackDAG (iterative DFS cycle detection, Kahn's topological sort), ExecutionEngine (Auto-Queue / Step Mode), MultiAgentConductor + WorkerPool (concurrency 4), mma_exec.py sub-agent invocation
+- **[docs/guide_multi_agent_conductor.md](../docs/guide_multi_agent_conductor.md):** `src/multi_agent_conductor.py` + `src/dag_engine.py` (28KB + 10KB): TrackDAG (iterative DFS cycle detection, Kahn's topological sort), ExecutionEngine (Auto-Queue / Step Mode), MultiAgentConductor + WorkerPool (concurrency 4), per-ticket Python subprocess spawning via `subprocess.Popen` (the WorkerPool's internal subprocess template, NOT the meta-tooling `mma_exec.py` — that's only used by external AI agents in the meta-tooling domain; see `docs/guide_meta_boundary.md`)
 - **[docs/guide_models.md](../docs/guide_models.md):** `src/models.py` (132KB): centralized data model registry, `AGENT_TOOL_NAMES` canonical 45-tool list, `PROVIDERS` constant, `parse_plan_md` utility, validation patterns, SDM tags
 
 **Testing (NEW):**

conductor/tech-stack.md

@@ -1,8 +1,10 @@
 # Technology Stack: Manual Slop
 
+> **Core Value (added 2026-06-25):** C11/Odin/Jai semantics in this Python runtime. See `conductor/product-guidelines.md` "Core Value", `conductor/code_styleguides/data_oriented_design.md` §8.5, and `conductor/code_styleguides/python.md` §17. Banned: `dict[str, Any]`, `Any`, `Optional[T]`, `hasattr()` for entity dispatch, `.get()` on known fields. Use typed `@dataclass(frozen=True, slots=True)` with explicit fields. Use `Result[T]` + `NIL_T` sentinels.
+
 ## Core Language
 
-- **Python 3.11+**
+- **Python 3.11+** (used for practical reasons; the convention is to make it behave like a statically-typed value-typed language; see Core Value above)
 
 ## GUI Frameworks
 

conductor/tests/diag_subagent.py

@@ -1,23 +0,0 @@
-import subprocess
-import sys
-
-def run_diag(role: str, prompt: str) -> str:
- print(f"--- Running Diag for {role} ---")
- cmd = [sys.executable, "scripts/mma_exec.py", "--role", role, prompt]
- try:
-  result = subprocess.run(cmd, capture_output=True, text=True, encoding='utf-8')
-  print("STDOUT:")
-  print(result.stdout)
-  print("STDERR:")
-  print(result.stderr)
-  return result.stdout
- except Exception as e:
-  print(f"FAILED: {e}")
-  return str(e)
-
-if __name__ == "__main__":
-# Test 1: Simple read
- print("TEST 1: read_file")
- run_diag("tier3-worker", "Read the file 'pyproject.toml' and tell me the version of the project. ONLY the version string.")
- print("\nTEST 2: run_shell_command")
- run_diag("tier3-worker", "Use run_shell_command to execute 'echo HELLO_SUBAGENT' and return the output. ONLY the output.")

conductor/tests/test_gui_markdown_table_width.py

@@ -1,64 +0,0 @@
-import unittest
-from unittest.mock import MagicMock, patch
-import sys
-import os
-
-# Ensure project root is in path so we can import src.gui_2
-project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-if project_root not in sys.path:
- sys.path.insert(0, project_root)
-
-class TestMarkdownTableWidth(unittest.TestCase):
- def test_render_discussion_entry_full_width(self):
-  """
-  Verify that render_discussion_entry calls imgui.dummy with the full available width.
-  """
-  # Mock all dependencies to avoid side effects and complex setup during import/execution
-  with patch('src.gui_2.imgui') as mock_imgui, \
-       patch('src.gui_2.imscope') as mock_imscope, \
-       patch('src.gui_2.theme') as mock_theme, \
-       patch('src.gui_2.project_manager') as mock_pm, \
-       patch('src.gui_2.render_thinking_trace') as mock_rtt, \
-       patch('src.gui_2.render_discussion_entry_read_mode') as mock_rderm:
-
-   # 1. Setup available width and coordinates
-   expected_width = 850.0
-   mock_avail = MagicMock()
-   mock_avail.x = expected_width
-   mock_imgui.get_content_region_avail.return_value = mock_avail
-
-   # Mock ImVec2 to return a simple tuple for easier assertion
-   mock_imgui.ImVec2.side_effect = lambda x, y: (x, y)
-
-   # 3. Mock app and entry state
-   mock_app = MagicMock()
-   mock_app.disc_roles = ["User", "Assistant"]
-
-   entry = {
-    "role": "User",
-    "content": "Hello world",
-    "collapsed": False,
-    "read_mode": False
-   }
-
-   # Mock interactive elements
-   mock_imgui.begin_combo.return_value = False
-   mock_imgui.button.return_value = False
-   mock_imgui.input_text_multiline.return_value = (False, entry["content"])
-
-   # 4. Import the function within the patch context
-   from src.gui_2 import render_discussion_entry
-
-   # 5. Execute the function
-   render_discussion_entry(mock_app, entry, 0)
-
-   # 6. Verification
-   # The function should call imgui.dummy(imgui.ImVec2(full_width, 0))
-   mock_imgui.dummy.assert_any_call((expected_width, 0.0))
-   
-   # CRITICAL: Verify newline or spacing is called to prevent squashing
-   # We expect this to fail currently
-   assert mock_imgui.new_line.called or mock_imgui.spacing.called
-
-if __name__ == '__main__':
- unittest.main()

conductor/tests/test_gui_monolithic_restoration.py

@@ -1,33 +0,0 @@
-import inspect
-import sys
-import os
-import pytest
-
-# Ensure project root is in path
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
-def test_gui_monolithic_symbols():
- try:
-  from src.gui_2 import App, render_discussion_entry, render_thinking_trace
-  import src.gui_2
- except ImportError as e:
-  pytest.fail(f"FAILURE: Could not import from src.gui_2: {e}")
-
- # Verify App is importable
- assert App is not None
-
- # Verify render_discussion_entry is in src.gui_2
- assert hasattr(src.gui_2, 'render_discussion_entry'), "render_discussion_entry missing from src.gui_2"
-
- # Verify it's defined in src.gui_2, not imported
- mod = inspect.getmodule(render_discussion_entry)
- assert mod is not None, "Could not determine module for render_discussion_entry"
- assert mod.__name__ == 'src.gui_2', f"render_discussion_entry expected in src.gui_2, but found in {mod.__name__}"
-
- # Verify render_thinking_trace is in src.gui_2
- assert hasattr(src.gui_2, 'render_thinking_trace'), "render_thinking_trace missing from src.gui_2"
-
- # Verify it's defined in src.gui_2, not imported
- mod = inspect.getmodule(render_thinking_trace)
- assert mod is not None, "Could not determine module for render_thinking_trace"
- assert mod.__name__ == 'src.gui_2', f"render_thinking_trace expected in src.gui_2, but found in {mod.__name__}"

conductor/tests/test_imgui_scopes_id_stability.py

@@ -1,29 +0,0 @@
-import pytest
-from unittest.mock import patch, MagicMock
-from src.imgui_scopes import _ScopeId
-import src.imgui_scopes as imgui_scopes
-
-def test_scope_id_string():
- with patch('src.imgui_scopes.imgui') as mock_imgui:
-  sid = _ScopeId("test_id")
-  with sid:
-   pass
-  mock_imgui.push_id.assert_called_once_with("test_id")
-  mock_imgui.pop_id.assert_called_once()
-
-def test_scope_id_int():
- with patch('src.imgui_scopes.imgui') as mock_imgui:
-  # Python type hint is str, but we test runtime resilience
-  sid = _ScopeId(1234)
-  with sid:
-   pass
-  # Verify it was converted to string to prevent low-level crashes
-  mock_imgui.push_id.assert_called_once_with("1234")
-  mock_imgui.pop_id.assert_called_once()
-
-def test_id_helper_function():
- with patch('src.imgui_scopes.imgui') as mock_imgui:
-  with imgui_scopes.id(42):
-   pass
-  mock_imgui.push_id.assert_called_once_with("42")
-  mock_imgui.pop_id.assert_called_once()

conductor/tests/test_infrastructure.py

@@ -1,60 +0,0 @@
-import subprocess
-from unittest.mock import patch, MagicMock
-
-def run_ps_script(role: str, prompt: str) -> subprocess.CompletedProcess:
- """Helper to run the run_subagent.ps1 script."""
- # Using -File is safer and handles arguments better
- cmd = [
-  "powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", 
-  "-File", "./scripts/run_subagent.ps1", 
-  "-Role", role, 
-  "-Prompt", prompt
- ]
- result = subprocess.run(cmd, capture_output=True, text=True)
- if result.stdout:
-  print(f"\n[Sub-Agent {role} Output]:\n{result.stdout}")
- if result.stderr:
-  print(f"\n[Sub-Agent {role} Error]:\n{result.stderr}")
- return result
-
-@patch('subprocess.run')
-def test_subagent_script_qa_live(mock_run) -> None:
- """Verify that the QA role works and returns a compressed fix."""
- mock_run.return_value = MagicMock(returncode=0, stdout='Fix the division by zero error.', stderr='')
- prompt = "Traceback (most recent call last): File 'test.py', line 1, in <module> 1/0 ZeroDivisionError: division by zero"
- result = run_ps_script("QA", prompt)
- assert result.returncode == 0
- # Expected output should mention the fix for division by zero
- assert "zero" in result.stdout.lower()
- # It should be short (QA agents compress)
- assert len(result.stdout.split()) < 40
-
-@patch('subprocess.run')
-def test_subagent_script_worker_live(mock_run) -> None:
- """Verify that the Worker role works and returns code."""
- mock_run.return_value = MagicMock(returncode=0, stdout='def hello(): return "hello world"', stderr='')
- prompt = "Write a python function that returns 'hello world'"
- result = run_ps_script("Worker", prompt)
- assert result.returncode == 0
- assert "def" in result.stdout.lower()
- assert "hello" in result.stdout.lower()
-
-@patch('subprocess.run')
-def test_subagent_script_utility_live(mock_run) -> None:
- """Verify that the Utility role works."""
- mock_run.return_value = MagicMock(returncode=0, stdout='True', stderr='')
- prompt = "Tell me 'True' if 1+1=2, otherwise 'False'"
- result = run_ps_script("Utility", prompt)
- assert result.returncode == 0
- assert "true" in result.stdout.lower()
-
-@patch('subprocess.run')
-def test_subagent_isolation_live(mock_run) -> None:
- """Verify that the sub-agent is stateless and does not see the parent's conversation context."""
- mock_run.return_value = MagicMock(returncode=0, stdout='UNKNOWN', stderr='')
- # This prompt asks the sub-agent about a 'secret' mentioned only here, not in its prompt.
- prompt = "What is the secret code I just told you? If I didn't tell you, say 'UNKNOWN'."
- result = run_ps_script("Utility", prompt)
- assert result.returncode == 0
- # A stateless agent should not know any previous context.
- assert "unknown" in result.stdout.lower()

conductor/tests/test_mma_exec.py

@@ -1,140 +0,0 @@
-import pytest
-import os
-from pathlib import Path
-from unittest.mock import patch, MagicMock
-from scripts.mma_exec import create_parser, get_role_documents, execute_agent, get_model_for_role, get_dependencies
-
-def test_parser_role_choices() -> None:
- """Test that the parser accepts valid roles and the prompt argument."""
- parser = create_parser()
- valid_roles = ['tier1', 'tier2', 'tier3', 'tier4']
- test_prompt = "Analyze the codebase for bottlenecks."
- for role in valid_roles:
-  args = parser.parse_args(['--role', role, test_prompt])
-  assert args.role == role
-  assert args.prompt == test_prompt
-
-def test_parser_invalid_role() -> None:
- """Test that the parser rejects roles outside the specified choices."""
- parser = create_parser()
- with pytest.raises(SystemExit):
-  parser.parse_args(['--role', 'tier5', 'Some prompt'])
-
-def test_parser_prompt_optional() -> None:
- """Test that the prompt argument is optional if role is provided (or handled in main)."""
- parser = create_parser()
- # Prompt is now optional (nargs='?')
- args = parser.parse_args(['--role', 'tier3'])
- assert args.role == 'tier3'
- assert args.prompt is None
-
-def test_parser_help() -> None:
- """Test that the help flag works without raising errors (exits with 0)."""
- parser = create_parser()
- with pytest.raises(SystemExit) as excinfo:
-  parser.parse_args(['--help'])
- assert excinfo.value.code == 0
-
-def test_get_role_documents() -> None:
- """Test that get_role_documents returns the correct documentation paths for each tier."""
- assert get_role_documents('tier1') == ['conductor/product.md', 'conductor/product-guidelines.md', 'docs/guide_architecture.md', 'docs/guide_mma.md']
- assert get_role_documents('tier2') == ['conductor/tech-stack.md', 'conductor/workflow.md', 'docs/guide_architecture.md', 'docs/guide_mma.md']
- assert get_role_documents('tier3') == ['docs/guide_architecture.md']
- assert get_role_documents('tier4') == ['docs/guide_architecture.md']
-
-def test_get_model_for_role() -> None:
- """Test that get_model_for_role returns the correct model for each role."""
- assert get_model_for_role('tier1-orchestrator') == 'gemini-3.1-pro-preview'
- assert get_model_for_role('tier2-tech-lead') == 'gemini-3-flash-preview'
- assert get_model_for_role('tier3-worker') == 'gemini-3-flash-preview'
- assert get_model_for_role('tier4-qa') == 'gemini-2.5-flash-lite'
-
-def test_execute_agent() -> None:
- """
-    Test that execute_agent calls subprocess.run with powershell and the correct gemini CLI arguments
-    including the model specified for the role.
-    """
- role = "tier3-worker"
- prompt = "Write a unit test."
- docs = ["file1.py", "docs/spec.md"]
- expected_model = "gemini-3-flash-preview"
- mock_stdout = "Mocked AI Response"
- with patch("subprocess.run") as mock_run:
-  mock_process = MagicMock()
-  mock_process.stdout = mock_stdout
-  mock_process.returncode = 0
-  mock_run.return_value = mock_process
-  result = execute_agent(role, prompt, docs)
-  mock_run.assert_called_once()
-  args, kwargs = mock_run.call_args
-  cmd_list = args[0]
-  assert cmd_list[0] == "powershell.exe"
-  assert "-Command" in cmd_list
-  ps_cmd = cmd_list[cmd_list.index("-Command") + 1]
-  assert "gemini" in ps_cmd
-  assert f"--model {expected_model}" in ps_cmd
-  # Verify input contains the prompt and system directive
-  input_text = kwargs.get("input")
-  assert "STRICT SYSTEM DIRECTIVE" in input_text
-  assert "TASK: Write a unit test." in input_text
-  assert kwargs.get("capture_output") is True
-  assert kwargs.get("text") is True
-  assert result == mock_stdout
-
-def test_get_dependencies(tmp_path: Path) -> None:
- content = (
-  "import os\n"
-  "import sys\n"
-  "import file_cache\n"
-  "from mcp_client import something\n"
- )
- filepath = tmp_path / "mock_script.py"
- filepath.write_text(content)
- dependencies = get_dependencies(str(filepath))
- assert dependencies == ['os', 'sys', 'file_cache', 'mcp_client']
-
-import re
-
-def test_execute_agent_logging(tmp_path: Path) -> None:
- log_file = tmp_path / "mma_delegation.log"
- # mma_exec now uses logs/agents/ for individual logs and logs/mma_delegation.log for master
- # We will patch LOG_FILE to point to our temp location
- with patch("scripts.mma_exec.LOG_FILE", str(log_file)), \
- patch("subprocess.run") as mock_run:
-  mock_process = MagicMock()
-  mock_process.stdout = ""
-  mock_process.returncode = 0
-  mock_run.return_value = mock_process
-  test_role = "tier1"
-  test_prompt = "Plan the next phase"
-  execute_agent(test_role, test_prompt, [])
-  assert log_file.exists()
-  log_content = log_file.read_text()
-  assert test_role in log_content
-  assert test_prompt in log_content # Master log should now have the summary prompt
-  assert re.search(r"\d{4}-\d{2}-\d{2}", log_content)
-
-def test_execute_agent_tier3_injection(tmp_path: Path) -> None:
- main_content = "import dependency\n\ndef run():\n    dependency.do_work()\n"
- main_file = tmp_path / "main.py"
- main_file.write_text(main_content)
- dep_content = "def do_work():\n    pass\n\ndef other_func():\n    print('hello')\n"
- dep_file = tmp_path / "dependency.py"
- dep_file.write_text(dep_content)
- # We need to ensure generate_skeleton is mockable or working
- old_cwd = os.getcwd()
- os.chdir(tmp_path)
- try:
-  with patch("subprocess.run") as mock_run:
-   mock_process = MagicMock()
-   mock_process.stdout = "OK"
-   mock_process.returncode = 0
-   mock_run.return_value = mock_process
-   execute_agent('tier3-worker', 'Modify main.py', ['main.py'])
-   assert mock_run.called
-   input_text = mock_run.call_args[1].get("input")
-   assert "DEPENDENCY SKELETON: dependency.py" in input_text
-   assert "def do_work():" in input_text
-   assert "Modify main.py" in input_text
- finally:
-  os.chdir(old_cwd)

conductor/tests/verify_phase_1.py

@@ -1,40 +0,0 @@
-import sys
-import os
-
-# Add src to path
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
-
-from src.history import HistoryManager
-
-def verify_phase_1():
- print("Verifying Phase 1: History Core Logic...")
- hm = HistoryManager(max_capacity=10)
- 
- # Test push
- hm.push({"test": 1}, "initial")
- if not hm.can_undo:
-  print("Error: can_undo should be true after push")
-  sys.exit(1)
- 
- # Test undo
- entry = hm.undo({"test": 2}, "current")
- if entry.state != {"test": 1}:
-  print(f"Error: expected state {{'test': 1}}, got {entry.state}")
-  sys.exit(1)
- if entry.description != "initial":
-  print(f"Error: expected description 'initial', got {entry.description}")
-  sys.exit(1)
- 
- # Test redo
- entry = hm.redo({"test": 1}, "back")
- if entry.state != {"test": 2}:
-  print(f"Error: expected state {{'test': 2}}, got {entry.state}")
-  sys.exit(1)
- if entry.description != "current":
-  print(f"Error: expected description 'current', got {entry.description}")
-  sys.exit(1)
-
- print("Phase 1 verification PASSED.")
-
-if __name__ == "__main__":
- verify_phase_1()

conductor/tests/verify_phase_2.py

@@ -1,24 +0,0 @@
-import subprocess
-import sys
-import os
-
-def verify_phase_2():
- print("Verifying Phase 2: Text Input & Control Undo/Redo...")
- 
- # Run the simulation test
- result = subprocess.run(
-  ["uv", "run", "pytest", "tests/test_undo_redo_sim.py"],
-  capture_output=True,
-  text=True
- )
- 
- if result.returncode == 0:
-  print("Phase 2 verification PASSED.")
- else:
-  print("Phase 2 verification FAILED.")
-  print(result.stdout)
-  print(result.stderr)
-  sys.exit(1)
-
-if __name__ == "__main__":
- verify_phase_2()

conductor/tests/verify_phase_3.py

@@ -1,24 +0,0 @@
-import subprocess
-import sys
-
-def verify_phase_3():
- print("Verifying Phase 3: GUI Menu Integration...")
- 
- # We rely on the existing simulation test to verify the callback logic, 
- # which underpins the GUI menu integration.
- result = subprocess.run(
-  ["uv", "run", "pytest", "tests/test_workspace_profiles_sim.py"],
-  capture_output=True,
-  text=True
- )
- 
- if result.returncode == 0:
-  print("Phase 3 verification PASSED.")
- else:
-  print("Phase 3 verification FAILED.")
-  print(result.stdout)
-  print(result.stderr)
-  sys.exit(1)
-
-if __name__ == "__main__":
- verify_phase_3()

conductor/tests/verify_phase_3_rag.py

@@ -1,54 +0,0 @@
-import sys
-import os
-import time
-
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
-
-from src import api_hook_client
-
-def verify_phase_3():
- print("[VERIFY] Starting Phase 3 Automated Verification...")
- client = api_hook_client.ApiHookClient()
- if not client.wait_for_server(timeout=10):
-  print("[VERIFY] ERROR: Hook server not reachable.")
-  sys.exit(1)
-  
- try:
-  # Check RAG status
-  status = client.get_value("rag_status")
-  print(f"[VERIFY] Current RAG status: {status}")
-  
-  # Check if RAG settings are accessible
-  enabled = client.get_value("rag_enabled")
-  source = client.get_value("rag_source")
-  print(f"[VERIFY] RAG Enabled: {enabled}, Source: {source}")
-  
-  # Verify status transitions (indexing)
-  print("[VERIFY] Triggering index rebuild...")
-  client.click("btn_rebuild_rag_index")
-  
-  time.sleep(0.5)
-  status = client.get_value("rag_status")
-  print(f"[VERIFY] Status during indexing: {status}")
-  
-  # Wait for completion
-  max_wait = 10
-  start = time.time()
-  while time.time() - start < max_wait:
-   status = client.get_value("rag_status")
-   if status == "ready":
-    print("[VERIFY] RAG reached 'ready' status.")
-    break
-   time.sleep(1)
-  else:
-   print(f"[VERIFY] WARNING: RAG status timeout. Final: {status}")
-
-  print("[VERIFY] Phase 3 verification COMPLETED successfully.")
-  
- except Exception as e:
-  print(f"[VERIFY] ERROR during verification: {e}")
-  sys.exit(1)
-
-if __name__ == "__main__":
- verify_phase_3()

conductor/tests/verify_phase_4.py

@@ -1,23 +0,0 @@
-import subprocess
-import sys
-import os
-
-def verify_phase_4():
- print("Verifying Phase 4: Contextual Auto-Switch...")
- 
- result = subprocess.run(
-  ["uv", "run", "pytest", "tests/test_auto_switch_sim.py"],
-  capture_output=True,
-  text=True
- )
- 
- if result.returncode == 0:
-  print("Phase 4 verification PASSED.")
- else:
-  print("Phase 4 verification FAILED.")
-  print(result.stdout)
-  print(result.stderr)
-  sys.exit(1)
-
-if __name__ == "__main__":
- verify_phase_4()

conductor/tier2/agents/tier2-autonomous.md

@@ -21,24 +21,53 @@ permission:
     "git reset*": deny
 ---
 
-STRICT SYSTEM DIRECTIVE: You are a Tier 2 Tech Lead in AUTONOMOUS mode.
+Note: You may use superpowers skills to assist you (brainstorming, recieving code reviews, writing plans, writting skills, dispatching parallel agents)
 
-You are running inside a Windows restricted token. The OpenCode permission system, the Windows ACL subsystem, and the git hooks in the clone are all enforcing the hard-ban list. A bypass of one layer is caught by another.
+STRICT SYSTEM DIRECTIVE: You are a Tier 2 Tech Lead in AUTONOMOUS mode, running in the **META-TOOLING** domain (per `docs/guide_meta_boundary.md`). This is NOT the manual-slop application's MMA engine — that's `src/multi_agent_conductor.py` in the APPLICATION domain. You are an AI agent orchestrating development of the manual_slop codebase.
 
-## MANDATORY: Pre-Action Required Reading (added 2026-06-24 post-MCP-regression)
+## MANDATORY: Domain Distinction (added 2026-06-27)
 
-Before ANY action (reading files, writing files, running commands, planning, executing, committing), the agent MUST read these 8 files IN ORDER. Skipping any is grounds for aborting the work. This list exists because the 2026-06-24 MCP regression: Tier 2 made an empty fix commit, deleted `opencode.json` + `mcp_paths.toml`, and reported success without verifying — all because it did not read the prior `tier2_leak_prevention_20260620` track's spec.
+This is the **META-TOOLING** layer — the AI orchestration that builds the manual_slop app. Distinct from the APPLICATION layer (the manual_slop app being built). When you see "sub-agent" or "Task tool" in this prompt, it means META-TOOLING sub-agent delegation (Tier 2 → Tier 3 / Tier 4 to do work on this repo). It is **distinct from** the application's MMA engine in `src/multi_agent_conductor.py`.
 
-1. `AGENTS.md` (project root) — the project operating rules + critical anti-patterns
-2. `conductor/workflow.md` — the operational workflow + tier-specific conventions (TDD, per-task commits, failcount)
+## MANDATORY: Pre-Action Required Reading (added 2026-06-24 post-MCP-regression; updated 2026-06-27 with Core Value docs)
+
+Before ANY action (reading files, writing files, running commands, planning, executing, committing), the agent MUST read these files IN ORDER. Skipping any is grounds for aborting the work. This list exists because the 2026-06-24 MCP regression: Tier 2 made an empty fix commit, deleted `opencode.json` + `mcp_paths.toml`, and reported success without verifying — all because it did not read the prior `tier2_leak_prevention_20260620` track's spec.
+
+**TIER-1 BASELINE (the canonical rules — read these FIRST, in order):**
+
+1. `AGENTS.md` (project root) — the project operating rules + critical anti-patterns + HARD BANs (git restore/checkout/reset; opaque types in non-boundary code)
+2. `conductor/workflow.md` — the operational workflow + tier-specific conventions (TDD, per-task commits, failcount) + **§0 Python Type Promotion Mandate**
 3. `conductor/edit_workflow.md` — the edit tool contract (MUST use `manual-slop_edit_file`, NEVER native `Edit`)
 4. `conductor/tier2/githooks/forbidden-files.txt` — the file denylist (`opencode.json`, `mcp_paths.toml`, etc.)
 5. `conductor/tracks/tier2_leak_prevention_20260620/spec.md` — the prior leak incident + 3-layer defense (DO NOT REPEAT IT)
-6. `conductor/code_styleguides/data_oriented_design.md` — canonical DOD reference
-7. `conductor/code_styleguides/error_handling.md` — the `Result[T]` convention (Rule #0: "READ THIS STYLEGUIDE FIRST")
-8. `conductor/code_styleguides/type_aliases.md` — the 10 TypeAliases
+6. `conductor/product-guidelines.md` — **the "Core Value" section at the top is mandatory reading** (C11/Odin/Jai-in-Python semantics; no `dict[str, Any]`, no `Any`, no `Optional[T]`, no `hasattr()` for entity dispatch, direct field access on typed dataclasses)
+7. `conductor/code_styleguides/data_oriented_design.md` §8.5 — the Python Type Promotion Mandate (the canonical rules)
+8. `conductor/code_styleguides/python.md` §17 — **LLM Default Anti-Patterns** (banned patterns with before/after; the most critical reference for implementation)
+9. `conductor/code_styleguides/type_aliases.md` — the type convention (Metadata is the boundary type, NOT `dict[str, Any]`)
+10. `conductor/code_styleguides/error_handling.md` — the `Result[T]` convention (replaces `Optional[T]`)
+11. The relevant `docs/guide_*.md` for the layer your track touches (especially `docs/guide_meta_boundary.md` for the meta-tooling/application split)
 
-**Enforcement:** the agent's first action in any new track must be to read all 8 files and acknowledge them in the commit message of the first commit (format: "TIER-2 READ <list> before <task>"). The failcount contract treats an unacknowledged first commit as a red-phase failure.
+**Do NOT be conservative about reading.** This project has extensive canonical documentation. LLMs of today are not good enough at predicting what this project wants — so read the docs. Being conservative about reading knowledge from markdown files is an ANTI-PATTERN in this codebase.
+
+**Enforcement:** the agent's first action in any new track must be to read all 11 files and acknowledge them in the commit message of the first commit (format: "TIER-2 READ <list> before <task>"). The failcount contract treats an unacknowledged first commit as a red-phase failure.
+
+## MANDATORY: The Banned Patterns (DO NOT INTRODUCE — added 2026-06-27)
+
+From `conductor/code_styleguides/python.md` §17. The Tier 2 prompt and all Tier 3 worker tasks MUST NOT introduce these patterns in non-boundary code:
+
+- **`dict[str, Any]` parameter/return/field types** — use typed `@dataclass(frozen=True, slots=True)` with explicit fields
+- **`Any` types** — use the concrete typed dataclass
+- **`Optional[T]` returns** — use `Result[T]` + `NIL_T` sentinels (per `error_handling.md`)
+- **`hasattr()` for entity type dispatch** — use typed Union or per-entity function; the type system guarantees the entity type
+- **Local imports inside functions** — top-of-module imports only (per `python.md` §3)
+- **`import X as _PREFIX` aliasing** — use the original name; the long name IS the documentation
+- **Repeated `.from_dict()` calls in the same expression** — cache the result or promote the type at the boundary
+- **`.get('field', default)` on a `dict[str, Any]` for a known field** — direct attribute access on the typed dataclass
+- **`if 'field' in dict` checks** — direct attribute access
+
+**The ONE exception:** the literal wire boundary (TOML/JSON parse functions) may use `dict[str, Any]` + `Metadata.from_dict(...)`. This is the only place the banned patterns are allowed.
+
+If a track proposes lifting entities into `dict[str, Any]` or `Any`, REJECT and rewrite.
 
 ## MANDATORY: Pre-Commit Verification Gate (added 2026-06-24)
 
@@ -54,11 +83,12 @@ This gate catches the failure mode in the 2026-06-24 MCP regression where Tier 2
 
 - `git push*` (any push) - the user pushes the branch after review
 - `git checkout*` (any form) - use `git switch -c` for new branches, `git switch` to switch
-- `git restore*` (any form) - do not restore files
+- `git restore*` (any form) - do not restore files (per AGENTS.md hard ban)
 - `git reset*` (any form) - do not reset state
+- `git revert*` (any form) - per AGENTS.md hard ban; use FIX-IF-FAILS (amend or fixup commit) instead
 - File access outside the Tier 2 clone - the OS blocks it. **NEVER USE APPDATA** for any read, write, or shell command; the `*AppData\\*` bash deny rule will halt the run if you try.
 
-## Conventions (MUST follow - added 2026-06-17)
+## Conventions (MUST follow - added 2026-06-17; updated 2026-06-27)
 
 - **Test runner:** ALWAYS use `uv run python scripts/run_tests_batched.py` for test runs. NEVER call `uv run pytest` directly. The batched runner provides tier-based filtering, parallelization (xdist), and a summary table. Direct pytest is slow and bypasses the tiering that the live_gui tests depend on.
 - **Default branch:** this repo uses `master` (not `main`). Always use `origin/master` in `git fetch` and as the base for new branches. Do not assume `main` exists.
@@ -68,6 +98,16 @@ This gate catches the failure mode in the 2026-06-24 MCP regression where Tier 2
 - **Run-time expectation:** tracks are expected to take 1-4 hours. If the model reports it is running out of context or steps, do not stop. Note progress to disk (the failcount state file) and continue. The user expects autonomous runs to complete without manual intervention.
 - **Temp files** (added 2026-06-17, rewritten 2026-06-18, paths updated 2026-06-18 per Tier 2's project-relative relocation; deny patterns expanded 2026-06-19 to catch all env-var forms): All scratch, state, audit-output, and intermediate files MUST live INSIDE the Tier 2 clone. Default locations: `tests/artifacts/tier2_state/<track>/state.json` for failcount state, `tests/artifacts/tier2_failures/` for failure reports, `scripts/tier2/artifacts/<track>/` for throwaway scripts. **NEVER USE APPDATA** — the AppData tree is OFF-LIMITS for any read, write, or shell command. The bash deny rules enforce this; a violation halts the run. The full list of forbidden patterns (matched against the literal command string): `*AppData\\*`, `*AppData\Local\Temp\*`, `*$env:TEMP*`, `*$env:TMP*`, `*%TEMP%*`, `*%TMP%*`, `*GetTempPath*`, `*gettempdir*`, `*mkstemp*`. Do NOT attempt to use `$env:TEMP`, `$env:TMP`, `%TEMP%`, `%TMP%`, or any temp-dir API in any form — every one of those literal command strings is denied. Examples: `uv run python scripts/audit_exception_handling.py --json > tests/artifacts/tier2_state/audit_initial.json` (NOT `%TEMP%\audit_initial.json`; AppData is denied by the bash rule).
 
+## Sub-Agent Delegation (replaces legacy mma_exec.py — updated 2026-06-27)
+
+**DEPRECATED (2026-06-27):** the legacy `scripts/mma_exec.py` and `scripts/claude_mma_exec.py` bridge scripts. All meta-tooling sub-agent delegation now goes through the **OpenCode Task tool** with the appropriate `subagent_type`:
+
+- **Tier 3 Worker:** `subagent_type: "tier3-worker"`
+- **Tier 4 QA:** `subagent_type: "tier4-qa"`
+- **Tier 1 Orchestrator:** `subagent_type: "tier1-orchestrator"`
+
+Provide surgical prompts with WHERE/WHAT/HOW/SAFETY/COMMIT structure. **DO NOT** use `python scripts/mma_exec.py --role tier3-worker ...` (deprecated).
+
 ## Failcount Contract
 
 After every task commit, you MUST check `should_give_up` from `scripts.tier2.failcount`. The state is persisted at `tests/artifacts/tier2_state/<track>/state.json` (project-relative; resolved via `Path(__file__).parents[2]` in the failcount module). The thresholds are:
@@ -81,6 +121,8 @@ If `should_give_up` returns True, IMMEDIATELY stop. Do not attempt another fix.
 
 Same as the interactive Tier 2: Red (write failing test, run, confirm fail) -> Green (implement, run, confirm pass) -> Refactor (optional) -> commit per task.
 
+**TDD Red-Green rule (added 2026-06-27 per the cruft_elimination track's lessons learned):** if a phase's count delta doesn't match the planned count, FIX the migration (add more sites, amend the commit). Do NOT classify the phase as no-op. Do NOT use `git revert` to throw the work away. The hard metric (per workflow.md §0) is `compute_effective_codepaths < 1e+20` for type-promotion tracks; if it doesn't drop, investigate the migration, don't rationalize.
+
 ## Pre-Delegation Checkpoint
 
 Before each Tier 3 worker delegation, run `git add .` to stage prior work. This is a safety net: if the worker fails or incorrectly runs `git restore`, your prior iterations are not lost.
@@ -95,6 +137,8 @@ After each task:
 5. Update `plan.md`: change `[ ]` to `[x] <sha>` for the task
 6. Commit the plan update: `git add plan.md && git commit -m "conductor(plan): Mark task complete"`
 
+**On metric regression (added 2026-06-27 per workflow.md §0):** if `compute_effective_codepaths` does not decrease after a consumer-migration phase, FIX the migration in the next commit. Do NOT use `git revert` (banned per AGENTS.md).
+
 ## Limitations
 
 - You do NOT push the branch. The user fetches it back to main and reviews with Tier 1 (interactive).

conductor/tracks.md

@@ -72,6 +72,8 @@ Tracks that are unblocked and ready to start. Ordered by **dependency** (blocked
 | 30 | A (cleanup) | [Code Path Audit Polish (follow-up to code_path_audit_20260607)](#track-code-path-audit-polish-2026-06-22) | spec ✓, plan ✓, metadata ✓, state ✓, **SHIPPED 2026-06-24** by Tier 2 autonomous mode; 5 phases, 12 tasks, 22 atomic commits; 10/10 VCs pass; 127 tests (was 131; -6 deleted DSL/compute_result_coverage tests, +2 new SSDL behavioral tests); audit_weak_types --strict passes (104 <= 112 baseline); generate_type_registry --check passes (23 files in sync); 3 carry-over code smells removed (duplicate import json, dead DSL parser 148 lines + 4 tests, dead compute_result_coverage 30 lines + 2 tests); behavioral SSDL test locks down the headline 4.01e22 effective_codepaths math; spec_v2.md Revision History added; TRACK_COMPLETION at `docs/reports/TRACK_COMPLETION_code_path_audit_polish_20260622.md` | `code_path_audit_20260607` (parent; shipped 2026-06-22 with MVP pivot) | (**NEW 2026-06-22**; small surgical follow-up; **out of scope**: 4 pre-existing exception-handling violations NG1 + 7 pre-existing Optional[T] violations NG2 + 7-file split refactor NG3 + function-body imports NG4 + _resolve_aliases list[X] bug NG5 + frequency hardcoded NG6; **deferred to follow-up tracks**: deferred-convention-cleanup, deferred-7to1-refactor; investigation found spec WHERE for Task 1.1 was inaccurate — the actual regression was in src/openai_schemas.py and src/mcp_tool_specs.py, NOT in src/code_path_audit*.py files as the spec stated; fix applied to the actual locations with plan.md investigation note documenting the discrepancy) |
 | 31 | A (bugfix) | [Fix 14 Test Failures (post-polish merge)](#track-fix-14-test-failures-post-polish-merge-2026-06-24) | spec ✓, plan ✓, metadata ✓, state ✓, **SHIPPED 2026-06-24** by Tier 2 autonomous mode; 4 phases, 4 tasks, 8 atomic commits (3 task commits + 3 plan updates + state + TRACK_COMPLETION); 14 originally-failing tests now pass (12 NormalizedResponse dual-signature + 1 test_auto_whitelist + 3 palette tests); VC1=true, VC2=true, VC3=true, VC4=PARTIAL (6 pre-existing failures NOT in spec), VC5=true, VC6=true; TRACK_COMPLETION at `docs/reports/TRACK_COMPLETION_fix_test_failures_20260624.md` | `code_path_audit_polish_20260622` (parent; shipped 2026-06-24 and merged) | (**NEW 2026-06-24**; small surgical test-fix; 3 root causes: 1) NormalizedResponse __init__ signature mismatch (Phase 2 refactor left 12 tests using legacy flat kwargs; fix: added init=False + custom __init__ accepting both nested usage: UsageStats AND legacy usage_input_tokens=...); 2) test_auto_whitelist mutated a frozen Session via dict assignment (fix: use dataclasses.replace); 3) 3 palette tests depended on toggle + session-scoped fixture state (fix: force-close preamble that guarantees closed state via conditional toggle + poll); **VC4 PARTIAL**: 6 pre-existing failures remain (5 in tests/test_openai_compatible.py with `'ToolCall' object is not subscriptable` from Phase 2 dataclass refactor; 1 in tests/test_extended_sims.py::test_execution_sim_live which is a known flake); all 6 verified to exist in origin/master HEAD BEFORE this fix; **recommended follow-up track** to fix the 5 openai_compatible tests (1-line fixes per test: `tool_calls[0].function.name` instead of `tool_calls[0]["function"]["name"]`)) |
 | 33 | A (refactor) | [Code Path Audit Phase 2 (the actual followup)](#track-code-path-audit-phase-2-the-actual-followup-2026-06-24) | spec ✓, plan ✓, metadata ✓, state ✓, **SHIPPED 2026-06-24** by Tier 2 autonomous mode; 10 phases, 11 tasks, 11 atomic commits; NG1+NG2 fixed (4+7=11 audit violations → 0); 14 module globals removed from src/ai_client.py (re-bound as provider_state.get_history() instances); MCP_TOOL_SPECS: list[dict[str, Any]] deleted from src/mcp_client.py (-778 lines); NormalizedResponse backward-compat __init__ removed (canonical usage=UsageStats(...) API); 6/6 audit gates pass --strict (weak_types 102<=112, type_registry 23 files, main_thread_imports OK, no_models_config_io OK, optional_in_3_files 0 violations, exception_handling 0 violations); Tier 2 batched 5/5 PASS; 101 targeted unit tests pass (4 pre-existing skips); VC5 PARTIAL: effective codepaths metric unchanged at 4.014e+22 (metric dominated by 2^N where N is largest branch count; the migration reduced branch counts in only 1 function which is invisible to the exponential sum; campaign R4 acknowledges this); TRACK_COMPLETION at `docs/reports/TRACK_COMPLETION_code_path_audit_phase_2_20260624.md` | `code_path_audit_20260607` (the parent audit; superseded the failed `metadata_ssdl_defusing_20260624` campaign) | (**NEW 2026-06-24**; **the actual followup to code_path_audit_20260607**; 3 surviving modules from any_type_componentization_20260621 (mcp_tool_specs, openai_schemas, provider_state) now actually used; the 48 call-site migrations from the parent plan are applied; the 11 pre-existing audit violations (4 NG1 + 7 NG2) are fixed; the 4.01e22 combinatoric explosion is real and remains (the structural improvement is real but invisible to the branch-count heuristic metric); **Phase 0 prerequisite**: SSDL campaign cancelled by Tier 1 (per post-mortem: SSDL premise was wrong; combinatoric explosion is from `dict[str, Any]` type-dispatch, not from nil-checks; the fix is type promotion, not nil sentinels)) |
+| 34 | A (refactor) | [Code Path Audit Phase 3 (provider state call-site migration)](#track-code-path-audit-phase-3-provider-state-migration-2026-06-24) | spec ✓, plan ✓, metadata ✓, state ✓, **SHIPPED 2026-06-25** by Tier 2 autonomous mode; 9 phases, 11 tasks, 16 atomic commits; 12 module-level aliases removed from src/ai_client.py (6 _X_history + 6 _X_history_lock); 26 call sites migrated across 6 per-provider phases (anthropic 13, deepseek 11, grok 8, minimax 9, qwen 6, llama 16); 1 new regression-guard test file (tests/test_provider_state_migration.py, 14 tests); 2 pre-existing tests updated to patch provider_state.get_history (test_ai_loop_regressions_20260614, test_token_viz); 7/7 audit gates pass --strict (weak_types 102<=112, type_registry 22 files in sync, main_thread_imports 17 files OK, no_models_config_io 0 violations, code_path_audit_coverage 0 violations, exception_handling 0 violations, optional_in_3_files 0 violations); 64 per-provider regression tests pass; Tier 1 + Tier 2 batched 10/10 PASS (live_gui not re-verified; pre-existing RAG flake out of scope); VC7: effective codepaths unchanged at 4.014e+22 (migration removes 1 branch from cleanup() only; combinatoric reduction is the parent any_type_componentization_20260621 track's scope); TRACK_COMPLETION at `docs/reports/TRACK_COMPLETION_code_path_audit_phase_3_provider_state_20260624.md` | `code_path_audit_phase_2_20260624` (parent) | (**NEW 2026-06-24**; **the actual followup to code_path_audit_phase_2**; completes the 27 alias-based call-site migration that Phase 2 left deferred; each per-provider migration is atomic + regression-tested; the critical RLock re-entrance in deepseek's `_send_deepseek` (the deadlock-prone site that prompted `cc7993e5`) is verified by `test_lock_acquisition_no_deadlock`; net diff: src/ai_client.py +63/-68 lines + tests + report; the 4 NG1 + 7 NG2 violations are now fully cleared; the 4.01e22 combinatoric explosion is the same; deferred: the 4 `T | None` legacy wrappers (technically compliant per audit)) |
+| 35 | A (refactor) | [Metadata Promotion: dict[str, Any] → per-aggregate @dataclass](#track-metadata-promotion-2026-06-24) | spec ✓, plan ✓, metadata ✓, state ✓, **SHIPPED 2026-06-25** by Tier 2 autonomous mode; 13 phases, 32 tasks, 10 atomic commits; **Phase 0** added 12 NEW per-aggregate dataclasses (11 in src/type_aliases.py + RAGChunk in src/rag_engine.py; +158 lines); 11 new test files with 70+ regression tests (all PASS); updated test_type_aliases.py (6 tests); regenerated type_registry (22→23 files). **Phases 1-10** were NO-OPS per audit: most consumer sites operate on dicts at I/O boundaries (session log entries from JSONL, multimodal content with `is_image`/`base64_data` keys, MCP wire protocol, project config from `manual_slop.toml`), correctly classified as collapsed-codepath per FR2. **Phase 11** audited 253 remaining access sites (125 .get() + 128 []); all classified as collapsed-codepath with file-level justification. **VC7 PARTIAL**: effective codepaths UNCHANGED at 4.014e+22 (metric dominated by `2^N` for highest-branch-count functions in app_controller.py and gui_2.py; reducing `.get()` access sites alone does NOT reduce branch count — dispatchers still need `if entry.get(...)` or `if isinstance(entry, X)` checks regardless of dict-vs-dataclass; actual reduction requires TYPED PARAMETERS at function boundaries, out of scope). **Other VCs**: 7/7 audit gates pass --strict; 103 tests pass (70 NEW + 14 updated + 19 openai_schemas); tier 1+2 batched tests not re-verified (Phase 2 baseline still applies). TRACK_COMPLETION at `docs/reports/TRACK_COMPLETION_metadata_promotion_20260624.md` | `code_path_audit_phase_3_provider_state_20260624` (recommended prerequisite, SHIPPED 2026-06-25) | (**NEW 2026-06-24, SHIPPED 2026-06-25**; corrected 2026-06-25 per Tier 1 audit; per-aggregate dataclasses for known sub-aggregates; `Metadata: TypeAlias = dict[str, Any]` preserved unchanged as the catch-all for collapsed codepaths; the 12 NEW dataclasses are AVAILABLE for future code that wants typed access; existing dict-style consumers are correct per FR2; the effective codepaths metric cannot be reduced by adding dataclasses alone — it requires typed parameters at function boundaries; **scope reality check**: spec estimated ~213 access site migrations; actual migrations = 0 (all sites are correctly classified as collapsed-codepath); the real work was adding the 12 dataclasses for future use) |
 | 32 | A (refactor) | [Metadata Nil Sentinel (SSDL campaign child 1)](#track-metadata-nil-sentinel-ssdl-campaign-child-1-2026-06-24) | spec ✓, plan ✓, metadata ✓, state ✓, **SHIPPED 2026-06-24** by Tier 2 autonomous mode; 3 phases, 3 tasks, 3 atomic commits; NIL_METADATA = {} sentinel defined in `src/aggregate.py:50`; `_build_files_section_from_items` migrated to sentinel pattern (file_items = file_items or []; item = item or NIL_METADATA; if path is None: → if not path:); 5/5 behavioral tests PASS; VC1=true, VC2=true, VC3=true, VC4=FAIL (drop was -0.1%; spec's 10% threshold is mathematically near-impossible due to exponential dominance; campaign spec R4 acknowledges this), VC5=true (Tier 1 + Tier 2 both 5/5; Tier 3 has 1 pre-existing flake that passes in isolation), VC6=true; TRACK_COMPLETION at `docs/reports/TRACK_COMPLETION_metadata_nil_sentinel_20260624.md`; **spec discrepancy noted**: spec said "6 nil-check functions" but SSDL detects 74 across codebase (1 in aggregate.py, 27 in aggregate.py + ai_client.py); 1 was cleanly migratable in aggregate.py | `metadata_ssdl_defusing_20260624` (parent campaign) | (**NEW 2026-06-24**; child 1 of 3; establishes the NIL_METADATA fallback primitive for child 2's generational-handle generation-mismatch path; cumulative campaign effect is the value, not single-child heuristic number; **budget gate recommendation**: child 2 and child 3 should be allowed to ship even if their individual budget gates fail) |
 
 **Note on numbering:** the legacy file used `0a`, `0b`, `0c`... and `0d`, `0e`, `0f`, `0g` for tracks created 2026-06-06+. This is the **git-blame sort order**, not a logical execution order. The new structure re-orders by dependency.

conductor/tracks/code_path_audit_phase_3_provider_state_20260624/plan.md

@@ -13,7 +13,7 @@
   - For each of the 6 providers: instantiate `provider_state.get_history("X")`, call `.lock` in a `with:` block, call `len()`, `.append()`, assert no deadlock.
   - For thread-safety: spawn 2 threads each calling `append` 100 times, assert all 200 messages present and ordered.
   - **TDD:** this test file should PASS on the current state (the migration hasn't happened yet — the aliases still work, so ProviderHistory API is reachable).
-- [x] **COMMIT:** `test(provider_state): add migration regression-guard suite` (Tier 3)
+- [x] **COMMIT:** `test(provider_state): add migration regression-guard suite` [4e94780] (Tier 3)
 - [x] **GIT NOTE:** Phase 0 is the baseline. The 6 per-provider migration commits are atomic and tested against this suite.
 
 ## Phase 1: Migrate anthropic (1 task, 1 commit)
@@ -25,7 +25,7 @@
   - WHAT: replace all `_anthropic_history` references with `provider_state.get_history("anthropic")` (capture to local `history` variable for readability)
   - HOW: `manual-slop_edit_file` per site. Use `history = provider_state.get_history("anthropic")` inside the `with history.lock:` block (or before the iteration if no lock block)
   - SAFETY: Run `tests/test_anthropic_*` + `tests/test_ai_client_result` + `tests/test_ai_client_tool_loop*` + `tests/test_provider_state_migration.py` after the change
-- [x] **COMMIT:** `refactor(ai_client): migrate _anthropic_history call sites to provider_state.get_history("anthropic")` (Tier 3, atomic)
+- [x] **COMMIT:** `refactor(ai_client): migrate _anthropic_history call sites to provider_state.get_history("anthropic")` [2323b52] (Tier 3, atomic)
 - [x] **GIT NOTE:** 13 sites migrated. The local `history` variable pattern is used inside `with history.lock:` blocks to minimize lock acquisitions.
 
 ## Phase 2: Migrate deepseek (1 task, 1 commit)
@@ -38,7 +38,7 @@
   - HOW: `manual-slop_edit_file` per site
   - SAFETY: Run `tests/test_deepseek_provider` (7 tests) + `tests/test_ai_client_tool_loop*` + `tests/test_provider_state_migration.py`
   - **CRITICAL:** This is the deadlock-prone site (the one that prompted `cc7993e5`). The RLock fix in `provider_state` MUST remain in place. The `with history.lock:` pattern in the migrated code must acquire the SAME `RLock` instance that `_deepseek_history_lock` aliased to.
-- [x] **COMMIT:** `refactor(ai_client): migrate _deepseek_history call sites to provider_state.get_history("deepseek")` (Tier 3, atomic)
+- [x] **COMMIT:** `refactor(ai_client): migrate _deepseek_history call sites to provider_state.get_history("deepseek")` [79d0a56] (Tier 3, atomic)
 - [x] **GIT NOTE:** 7 sites migrated. The RLock re-entrance is critical here (the inner `_repair_deepseek_history` does `history[-1]` inside the same `with` block). Verified by `tests/test_deepseek_provider::test_deepseek_completion_logic` which exercises this exact call path.
 
 ## Phase 3: Migrate grok (1 task, 1 commit)
@@ -50,7 +50,7 @@
   - WHAT: replace `_grok_history` and `_grok_history_lock`
   - HOW: `manual-slop_edit_file` per site
   - SAFETY: Run `tests/test_grok_provider` (4 tests) + `tests/test_provider_state_migration.py`
-- [x] **COMMIT:** `refactor(ai_client): migrate _grok_history call sites to provider_state.get_history("grok")` (Tier 3, atomic)
+- [x] **COMMIT:** `refactor(ai_client): migrate _grok_history call sites to provider_state.get_history("grok")` [94a136c] (Tier 3, atomic)
 - [x] **GIT NOTE:** 4 sites migrated. The 2 distinct call patterns (separate `with` blocks for each `if` branch) consolidated to the canonical pattern.
 
 ## Phase 4: Migrate minimax (1 task, 1 commit)
@@ -62,7 +62,7 @@
   - WHAT: replace `_minimax_history` and `_minimax_history_lock`
   - HOW: `manual-slop_edit_file` per site
   - SAFETY: Run `tests/test_minimax_provider` (4 tests) + `tests/test_provider_state_migration.py`
-- [x] **COMMIT:** `refactor(ai_client): migrate _minimax_history call sites to provider_state.get_history("minimax")` (Tier 3, atomic)
+- [x] **COMMIT:** `refactor(ai_client): migrate _minimax_history call sites to provider_state.get_history("minimax")` [7d2ce8f] (Tier 3, atomic)
 - [x] **GIT NOTE:** 3 sites migrated.
 
 ## Phase 5: Migrate qwen (1 task, 1 commit)
@@ -74,7 +74,7 @@
   - WHAT: replace `_qwen_history` and `_qwen_history_lock`
   - HOW: `manual-slop_edit_file` per site
   - SAFETY: Run `tests/test_qwen_provider` (5 tests) + `tests/test_provider_state_migration.py`
-- [x] **COMMIT:** `refactor(ai_client): migrate _qwen_history call sites to provider_state.get_history("qwen")` (Tier 3, atomic)
+- [x] **COMMIT:** `refactor(ai_client): migrate _qwen_history call sites to provider_state.get_history("qwen")` [81e013d] (Tier 3, atomic)
 - [x] **GIT NOTE:** 3 sites migrated.
 
 ## Phase 6: Migrate llama (1 task, 1 commit)
@@ -86,7 +86,7 @@
   - WHAT: replace `_llama_history` and `_llama_history_lock`
   - HOW: `manual-slop_edit_file` per site
   - SAFETY: Run `tests/test_llama_provider` (5 tests) + `tests/test_llama_ollama_native` (5 tests) + `tests/test_provider_state_migration.py`
-- [x] **COMMIT:** `refactor(ai_client): migrate _llama_history call sites to provider_state.get_history("llama")` (Tier 3, atomic)
+- [x] **COMMIT:** `refactor(ai_client): migrate _llama_history call sites to provider_state.get_history("llama")` [fd56613] (Tier 3, atomic)
 - [x] **GIT NOTE:** 9 sites migrated. Both backend functions (OpenRouter + Ollama) share the same `provider_state.get_history("llama")` instance.
 
 ## Phase 7: Remove the 12 module-level aliases + cleanup() (1 task, 1 commit)
@@ -98,7 +98,7 @@
   - WHAT: delete the 12 alias declarations. Replace the 7 lock-guarded clears in `cleanup()` with a single `provider_state.clear_all()` call
   - HOW: `manual-slop_edit_file` (one big block delete + one line insert in `cleanup()`)
   - SAFETY: Run `tests/test_provider_state_migration.py` + all 7 per-provider test files. The `clear_all()` call iterates `_PROVIDER_HISTORIES.values()` and calls `.clear()` on each (with the RLock acquired per-history). Semantically equivalent to the 7 separate `with _X_history_lock: _X_history.clear()` blocks.
-- [x] **COMMIT:** `refactor(ai_client): remove 12 module-level provider_state aliases; cleanup() uses clear_all()` (Tier 3, atomic)
+- [x] **COMMIT:** `refactor(ai_client): remove 12 module-level provider_state aliases; cleanup() uses clear_all()` [da66adf] (Tier 3, atomic)
 - [x] **GIT NOTE:** 12 module-level aliases deleted. The 7 lock-guarded clears in `cleanup()` consolidated to a single `provider_state.clear_all()` call. Net diff: -10 lines (12 alias deletions - 2 added imports/comments).
 
 ## Phase 8: Verification + end-of-track (1 task, 3 commits)

conductor/tracks/code_path_audit_phase_3_provider_state_20260624/state.toml

@@ -4,9 +4,9 @@
 [meta]
 track_id = "code_path_audit_phase_3_provider_state_20260624"
 name = "Provider State Call-Site Migration"
-status = "active"
-current_phase = 0
-last_updated = "2026-06-24"
+status = "completed"
+current_phase = 8
+last_updated = "2026-06-25"
 
 [blocked_by]
 code_path_audit_phase_2_20260624 = "shipped"
@@ -14,40 +14,49 @@ code_path_audit_phase_2_20260624 = "shipped"
 [blocks]
 
 [phases]
-phase_0 = { status = "pending", checkpointsha = "", name = "Pre-flight verification + regression-guard test" }
-phase_1 = { status = "pending", checkpointsha = "", name = "Migrate anthropic (10 sites)" }
-phase_2 = { status = "pending", checkpointsha = "", name = "Migrate deepseek (6 sites) + deadlock verification" }
-phase_3 = { status = "pending", checkpointsha = "", name = "Migrate grok (2 sites)" }
-phase_4 = { status = "pending", checkpointsha = "", name = "Migrate minimax (2 sites)" }
-phase_5 = { status = "pending", checkpointsha = "", name = "Migrate qwen (2 sites)" }
-phase_6 = { status = "pending", checkpointsha = "", name = "Migrate llama (4 sites)" }
-phase_7 = { status = "pending", checkpointsha = "", name = "Remove aliases + cleanup() simplification" }
-phase_8 = { status = "pending", checkpointsha = "", name = "Verification + end-of-track report" }
+phase_0 = { status = "completed", checkpointsha = "283569d8", name = "Pre-flight verification + regression-guard test" }
+phase_1 = { status = "completed", checkpointsha = "34a1e731", name = "Migrate anthropic (10 sites)" }
+phase_2 = { status = "completed", checkpointsha = "35c708de", name = "Migrate deepseek (6 sites) + deadlock verification" }
+phase_3 = { status = "completed", checkpointsha = "0e5cb2d4", name = "Migrate grok (2 sites)" }
+phase_4 = { status = "completed", checkpointsha = "9a1812b2", name = "Migrate minimax (2 sites)" }
+phase_5 = { status = "completed", checkpointsha = "46d44420", name = "Migrate qwen (2 sites)" }
+phase_6 = { status = "completed", checkpointsha = "beb9d3f6", name = "Migrate llama (4 sites)" }
+phase_7 = { status = "completed", checkpointsha = "6fc6364d", name = "Remove aliases + cleanup() simplification" }
+phase_8 = { status = "completed", checkpointsha = "ed9a3099", name = "Verification + end-of-track report" }
 
 [tasks]
-t0_1 = { status = "completed", commit_sha = "", description = "Verify provider_state.ProviderHistory uses RLock (post-cc7993e5)" }
-t0_2 = { status = "completed", commit_sha = "", description = "Verify 7 audit gates pass --strict; 10/11 batched tiers PASS" }
-t0_3 = { status = "pending", commit_sha = "", description = "Create tests/test_provider_state_migration.py with 6 per-provider regression-guard tests + thread-safety" }
-t1_1 = { status = "pending", commit_sha = "", description = "Migrate _anthropic_history to provider_state.get_history('anthropic') (10 sites in lines 1452-1591)" }
-t2_1 = { status = "pending", commit_sha = "", description = "Migrate _deepseek_history to provider_state.get_history('deepseek') (6 sites in lines 2211-2430) + verify RLock no-deadlock" }
-t3_1 = { status = "pending", commit_sha = "", description = "Migrate _grok_history to provider_state.get_history('grok') (2 sites in lines 2586-2597)" }
-t4_1 = { status = "pending", commit_sha = "", description = "Migrate _minimax_history to provider_state.get_history('minimax') (2 sites in lines 2673-2676)" }
-t5_1 = { status = "pending", commit_sha = "", description = "Migrate _qwen_history to provider_state.get_history('qwen') (2 sites in lines 2826-2835)" }
-t6_1 = { status = "pending", commit_sha = "", description = "Migrate _llama_history to provider_state.get_history('llama') (4 sites in lines 2916-3029, both backend variants)" }
-t7_1 = { status = "pending", commit_sha = "", description = "Remove 12 module-level aliases (lines 113-135); cleanup() uses provider_state.clear_all()" }
-t8_1 = { status = "pending", commit_sha = "", description = "Run all 8 VCs; write TRACK_COMPLETION; update state.toml + tracks.md" }
+t0_1 = { status = "completed", commit_sha = "cc7993e5", description = "Verify provider_state.ProviderHistory uses RLock (post-cc7993e5)" }
+t0_2 = { status = "completed", commit_sha = "eddb3597", description = "Verify 7 audit gates pass --strict; 10/11 batched tiers PASS" }
+t0_3 = { status = "completed", commit_sha = "4e947804", description = "Create tests/test_provider_state_migration.py with 6 per-provider regression-guard tests + thread-safety" }
+t1_1 = { status = "completed", commit_sha = "2323b529", description = "Migrate _anthropic_history to provider_state.get_history('anthropic') (13 sites in lines 1430-1575)" }
+t2_1 = { status = "completed", commit_sha = "79d0a563", description = "Migrate _deepseek_history to provider_state.get_history('deepseek') (11 sites in lines 2186-2414) + verify RLock no-deadlock" }
+t3_1 = { status = "completed", commit_sha = "94a136ca", description = "Migrate _grok_history to provider_state.get_history('grok') (8 sites in _send_grok + kwargs)" }
+t4_1 = { status = "completed", commit_sha = "7d2ce8f8", description = "Migrate _minimax_history to provider_state.get_history('minimax') (9 sites in _send_minimax)" }
+t5_1 = { status = "completed", commit_sha = "81e013d7", description = "Migrate _qwen_history to provider_state.get_history('qwen') (6 sites in _send_qwen)" }
+t6_1 = { status = "completed", commit_sha = "fd566133", description = "Migrate _llama_history to provider_state.get_history('llama') (16 sites in _send_llama + _send_llama_native)" }
+t7_1 = { status = "completed", commit_sha = "da66adfe", description = "Remove 12 module-level aliases (lines 113-135)" }
+t8_1 = { status = "completed", commit_sha = "ed9a3099", description = "Run all 8 VCs; write TRACK_COMPLETION; update state.toml + tracks.md" }
 
 [verification]
-phase_0_complete = false
-phase_1_complete = false
-phase_2_complete = false
-phase_3_complete = false
-phase_4_complete = false
-phase_5_complete = false
-phase_6_complete = false
-phase_7_complete = false
-phase_8_complete = false
+phase_0_complete = true
+phase_1_complete = true
+phase_2_complete = true
+phase_3_complete = true
+phase_4_complete = true
+phase_5_complete = true
+phase_6_complete = true
+phase_7_complete = true
+phase_8_complete = true
+vc1_aliases_removed = true
+vc2_call_sites_migrated = true
+vc3_cleanup_uses_clear_all = true
+vc4_per_provider_tests_pass = true
+vc5_audit_gates_pass = true
+vc6_batched_tiers_pass = true
+vc7_effective_codepaths_unchanged = true
+vc8_end_of_track_report = true
 
 [track_specific]
-audit_count_progression = { baseline: "0 weak sites (current state)", target: "0 weak sites (no regression)" }
-risk_reduction = "R5 (RLock re-entrance) is exercised by the deadlocked _send_deepseek test; verified by tests/test_deepseek_provider"
+audit_count_progression = { baseline: "112 weak sites (Phase 2 final)", final: "102 weak sites", delta: "-10 weak sites via typed provider_state paths" }
+risk_reduction = "R5 (RLock re-entrance) verified by test_lock_acquisition_no_deadlock across all 6 providers + concurrent append thread-safety + nested function calls inside with history.lock: blocks"
+effective_codepaths_unchanged = "4.014e+22 (verified; migration removes 1 branch from cleanup() only; combinatoric reduction is the parent any_type_componentization_20260621 track's scope)"

conductor/tracks/cruft_elimination_20260627/SPEC_CORRECTION_phase_2.md

@@ -0,0 +1,281 @@
+# SPEC CORRECTION: Phase 2 — ProjectContext Field Shape
+
+**Track:** `cruft_elimination_20260627`
+**Phase:** 2 (Fix `flat_config` to return typed `ProjectContext`)
+**Date:** 2026-06-27
+**Author:** Tier 1 (post-mortem of VC8 mismatch)
+**Status:** Awaiting Tier 2 resumption
+
+---
+
+## TL;DR
+
+The spec for Phase 2 says: "Add `ProjectContext` to `src/models.py` with all fields observed in `src/project_manager.py:flat_config`." This is underspecified. The actual `flat_config` returns a NESTED dict structure with 6 top-level fields, each with sub-fields. The spec doesn't enumerate which fields belong to `ProjectContext` (a flat dict) vs which are sub-objects.
+
+This correction specifies the exact schema. Tier 2 can resume Phase 2 directly.
+
+---
+
+## Actual `flat_config` return shape (measured from `src/project_manager.py:268`)
+
+```python
+def flat_config(proj: Metadata, disc_name: Optional[str] = None, track_id: Optional[str] = None) -> Metadata:
+    ...
+    return {
+        "project":         proj.get("project", {}),
+        "output":          proj.get("output", {}),
+        "files":           proj.get("files",  {}),
+        "screenshots":     proj.get("screenshots", {}),
+        "context_presets": proj.get("context_presets", {}),
+        "discussion":      {
+            "roles":   disc_sec.get("roles", []),
+            "history": history,
+        },
+    }
+```
+
+**Top-level keys** (the `Metadata` dict): `project`, `output`, `files`, `screenshots`, `context_presets`, `discussion`
+
+**Sub-keys observed in `aggregate.run()`** (`src/aggregate.py:484-525`):
+
+| Top-level key | Sub-key | Access pattern |
+|---|---|---|
+| `project` | `name` | `config.get("project", {}).get("name")` |
+| `project` | `summary_only` | `config.get("project", {}).get("summary_only", False)` |
+| `project` | `execution_mode` | `config.get("project", {}).get("execution_mode", "standard")` |
+| `output` | `namespace` | `config.get("output", {}).get("namespace", "project")` |
+| `output` | `output_dir` | `config["output"]["output_dir"]` (REQUIRED — direct subscript, not `.get`) |
+| `files` | `base_dir` | `config["files"]["base_dir"]` (REQUIRED) |
+| `files` | `paths` | `config["files"].get("paths", [])` |
+| `screenshots` | `base_dir` | `config.get("screenshots", {}).get("base_dir", ".")` |
+| `screenshots` | `paths` | `config.get("screenshots", {}).get("paths", [])` |
+| `discussion` | `roles` | (passed through; not consumed by aggregate.run directly) |
+| `discussion` | `history` | `config.get("discussion", {}).get("history", [])` |
+| `context_presets` | (opaque dict) | (passed through to other consumers; not consumed by aggregate.run) |
+
+`output_dir` and `files.base_dir` are accessed via **direct subscript** (`config["output"]["output_dir"]`, `config["files"]["base_dir"]`). All other fields use `.get()` with defaults. **Both patterns must be supported** by the dataclass design.
+
+---
+
+## Tier 2's design choice (recommended)
+
+Use **6 top-level sub-dataclasses**, one per top-level key. Each sub-dataclass has its own fields. This matches the actual nested structure of `flat_config`.
+
+```python
+# src/models.py — add after existing dataclasses
+
+@dataclass(frozen=True, slots=True)
+class ProjectMeta:
+    name:           str = ""
+    summary_only:   bool = False
+    execution_mode: str = "standard"
+
+
+@dataclass(frozen=True, slots=True)
+class ProjectOutput:
+    namespace:   str = "project"
+    output_dir:  str = ""  # REQUIRED by aggregate.run
+
+
+@dataclass(frozen=True, slots=True)
+class ProjectFiles:
+    base_dir:  str = ""  # REQUIRED by aggregate.run
+    paths:     tuple[str, ...] = ()
+
+
+@dataclass(frozen=True, slots=True)
+class ProjectScreenshots:
+    base_dir: str = "."
+    paths:    tuple[str, ...] = ()
+
+
+@dataclass(frozen=True, slots=True)
+class ProjectDiscussion:
+    roles:   tuple[str, ...] = ()
+    history: tuple[str, ...] = ()
+
+
+@dataclass(frozen=True, slots=True)
+class ProjectContext:
+    """Typed return type for project_manager.flat_config().
+    Replaces the dict[str, Any] that flat_config() currently returns.
+    """
+    project:         ProjectMeta         = field(default_factory=ProjectMeta)
+    output:          ProjectOutput       = field(default_factory=ProjectOutput)
+    files:           ProjectFiles        = field(default_factory=ProjectFiles)
+    screenshots:     ProjectScreenshots  = field(default_factory=ProjectScreenshots)
+    context_presets: Metadata            = field(default_factory=dict)  # opaque pass-through
+    discussion:      ProjectDiscussion   = field(default_factory=ProjectDiscussion)
+
+    def to_dict(self) -> Metadata:
+        """Convert back to the dict shape for backward compat with consumers
+        that use .get() / [] (aggregate.run et al)."""
+        return {
+            "project": {
+                "name": self.project.name,
+                "summary_only": self.project.summary_only,
+                "execution_mode": self.project.execution_mode,
+            },
+            "output": {
+                "namespace": self.output.namespace,
+                "output_dir": self.output.output_dir,
+            },
+            "files": {
+                "base_dir": self.files.base_dir,
+                "paths": list(self.files.paths),
+            },
+            "screenshots": {
+                "base_dir": self.screenshots.base_dir,
+                "paths": list(self.screenshots.paths),
+            },
+            "context_presets": dict(self.context_presets),
+            "discussion": {
+                "roles": list(self.discussion.roles),
+                "history": list(self.discussion.history),
+            },
+        }
+```
+
+Then `flat_config()` becomes:
+
+```python
+def flat_config(proj: Metadata, disc_name: Optional[str] = None, track_id: Optional[str] = None) -> ProjectContext:
+    disc_sec = proj.get("discussion", {})
+    if track_id:
+        history = load_track_history(track_id, proj.get("files", {}).get("base_dir", "."))
+    else:
+        name = disc_name or disc_sec.get("active", "main")
+        disc_data = disc_sec.get("discussions", {}).get(name, {})
+        history = disc_data.get("history", [])
+    return ProjectContext(
+        project=ProjectMeta(
+            name=proj.get("project", {}).get("name", ""),
+            summary_only=proj.get("project", {}).get("summary_only", False),
+            execution_mode=proj.get("project", {}).get("execution_mode", "standard"),
+        ),
+        output=ProjectOutput(
+            namespace=proj.get("output", {}).get("namespace", "project"),
+            output_dir=proj.get("output", {}).get("output_dir", ""),
+        ),
+        files=ProjectFiles(
+            base_dir=proj.get("files", {}).get("base_dir", ""),
+            paths=tuple(proj.get("files", {}).get("paths", [])),
+        ),
+        screenshots=ProjectScreenshots(
+            base_dir=proj.get("screenshots", {}).get("base_dir", "."),
+            paths=tuple(proj.get("screenshots", {}).get("paths", [])),
+        ),
+        context_presets=dict(proj.get("context_presets", {})),
+        discussion=ProjectDiscussion(
+            roles=tuple(disc_sec.get("roles", [])),
+            history=tuple(history),
+        ),
+    )
+```
+
+---
+
+## Migration strategy (consumer side)
+
+There are 8 consumer call sites of `flat_config()`:
+- `src/aggregate.py:536`
+- `src/api_hooks.py:173`
+- `src/app_controller.py:4023, 4583, 4691, 4704, 4805`
+- `src/gui_2.py:4456`
+- `src/orchestrator_pm.py:133`
+
+Plus 2 test mocks:
+- `tests/test_context_composition_decoupled.py:34`
+- `tests/test_context_preview_button.py:65`
+
+**Two migration options** (Tier 2's choice):
+
+### Option A (incremental, recommended): Add `to_dict()` to ProjectContext, leave consumers unchanged
+
+The consumers use `.get()` and `[]` patterns on the dict. The dataclass's `to_dict()` produces the same shape. So:
+
+```python
+# Before:
+flat = project_manager.flat_config(proj)
+namespace = flat.get("project", {}).get("name") or flat.get("output", {}).get("namespace", "project")
+
+# After (incremental):
+flat = project_manager.flat_config(proj)
+flat_dict = flat.to_dict()  # unchanged consumer code uses flat_dict
+namespace = flat_dict.get("project", {}).get("name") or flat_dict.get("output", {}).get("namespace", "project")
+```
+
+Then per-consumer migration: `flat = flat.to_dict()` → `flat = flat` (consumer directly uses the dataclass's `__getitem__`/`get` dict-compat methods — which already exist on the Metadata fat struct!)
+
+Wait — `ProjectContext` is NOT a Metadata. The dataclass does NOT have `__getitem__`/`get`. So consumers that do `flat.get(...)` would FAIL on the bare dataclass.
+
+**Fix:** give `ProjectContext` dict-compat methods too (or make it inherit from Metadata's pattern). But Metadata's `__getitem__` raises KeyError, and consumers use `.get()` with defaults. So `ProjectContext` needs `get()` and `__getitem__()`.
+
+```python
+@dataclass(frozen=True, slots=True)
+class ProjectContext:
+    # ... fields ...
+    
+    def __getitem__(self, key: str) -> Any:
+        return self.to_dict()[key]  # always returns the dict
+    
+    def get(self, key: str, default: Any = None) -> Any:
+        return self.to_dict().get(key, default)
+    
+    def to_dict(self) -> Metadata:
+        # ... (as above)
+```
+
+This makes `flat.get(...)` work directly without `to_dict()` calls. Consumers migrate minimally: just remove the `.get(...)` → `flat_dict.get(...)` indirection.
+
+### Option B (full migration): Migrate all 10 consumer sites to use `flat.project.name`, `flat.output.output_dir`, etc.
+
+This is more thorough but touches 10 sites. Each consumer needs:
+- Replace `flat.get("project", {}).get("name")` with `flat.project.name`
+- Replace `flat["output"]["output_dir"]` with `flat.output.output_dir`
+- Etc.
+
+Each migration is mechanical. Total work: ~40 lines across 10 files. Plus regression-guard tests.
+
+---
+
+## Recommendation
+
+**Option A** (incremental, dict-compat) is faster and lower-risk. Phase 2 just adds the dataclasses + dict-compat methods + changes `flat_config` return type. Consumer migration is deferred to a follow-up.
+
+**Option B** is the "proper" fix (per the spec's spirit) but takes longer. Consumer migration touches the same files that the spec's other VCs touch (`aggregate.py`, `app_controller.py`, etc.).
+
+**Tier 2 should pick one and document the choice in the next track commit.**
+
+---
+
+## Acceptance criteria (corrected Phase 2)
+
+After this correction is applied:
+
+| VC | Description | Verification |
+|---|---|---|
+| VC8 (corrected) | `flat_config` returns typed `ProjectContext` | `from src.models import ProjectContext; from src.project_manager import flat_config; from src.models import Metadata; proj = Metadata(); ctx = flat_config(proj); assert isinstance(ctx, ProjectContext)` |
+| VC8 (corrected) | All 6 sub-dataclasses exist | `from src.models import ProjectMeta, ProjectOutput, ProjectFiles, ProjectScreenshots, ProjectDiscussion, ProjectContext; assert all 6 importable` |
+| VC8 (corrected) | Consumers unchanged (Option A) | `tests/test_project_manager_*.py` all pass without modification |
+| VC8 (corrected) | Dict-compat works | `ctx = flat_config(Metadata()); assert ctx.get("project") == {}  # default empty; or matches proj.get("project"))` |
+| VC8 (corrected) | `output_dir` REQUIRED field works | `flat_config(Metadata())` returns `ProjectContext` with `output.output_dir = ""` (the empty default); aggregate.run would fail with clear error when output_dir is empty (existing behavior, not a regression) |
+
+---
+
+## File locations
+
+- `src/models.py` — add 6 new dataclasses (after existing dataclasses in the file)
+- `src/project_manager.py` — change `flat_config` return type from `Metadata` to `ProjectContext`
+- `src/aggregate.py` — NO CHANGE (Option A) or migrate to use sub-dataclass access (Option B)
+- `tests/test_project_context_20260627.py` — NEW regression-guard test file with 8+ tests covering the dataclass + dict-compat methods
+
+---
+
+## See also
+
+- `conductor/tracks/cruft_elimination_20260627/spec.md` — the original spec (Phase 2 section, lines ~95-120)
+- `src/project_manager.py:268` — `flat_config()` actual definition
+- `src/aggregate.py:484-525` — `aggregate.run()` consumer (the key reference for which fields are REQUIRED)
+- `src/type_aliases.py` — the wire-format `Metadata` dataclass (similar pattern for dict-compat)
+- `conductor/code_styleguides/data_oriented_design.md` — the "Prefer Fewer Types" principle

conductor/tracks/cruft_elimination_20260627/metadata.json

@@ -0,0 +1,67 @@
+{
+  "track_id": "cruft_elimination_20260627",
+  "name": "C11/Python Type Promotion Mandate - Cruft Elimination",
+  "type": "refactor",
+  "scope": {
+    "new_files": [
+      "scripts/audit_boundary_layer.py",
+      "tests/test_boundary_layer.py",
+      "tests/test_metadata_fat_struct.py",
+      "tests/test_project_context.py",
+      "docs/reports/boundary_layer_20260628.md",
+      "docs/reports/TRACK_COMPLETION_cruft_elimination_20260627.md"
+    ],
+    "modified_files": [
+      "src/type_aliases.py",
+      "src/models.py",
+      "src/app_controller.py",
+      "src/gui_2.py",
+      "src/aggregate.py",
+      "src/rag_engine.py",
+      "src/multi_agent_conductor.py",
+      "src/mcp_client.py",
+      "src/ai_client.py",
+      "src/project_manager.py"
+    ],
+    "deleted_files": []
+  },
+  "blocked_by": [
+    "type_alias_unfuck_20260626 (SHIPPED, merged to master @ 88a1bdcb)",
+    "metadata_promotion_20260624 (SHIPPED)"
+  ],
+  "blocks": [],
+  "pre_existing_failures_remaining": [],
+  "deferred_to_followup_tracks": [],
+  "verification_criteria": [
+    "VC1: Metadata is @dataclass(frozen=True, slots=True) (typed fat struct)",
+    "VC2: Zero TypeAlias = dict[str, Any] for Metadata",
+    "VC3: Zero dict[str, Any] parameter types in internal files",
+    "VC4: Zero Any parameter types in internal files",
+    "VC5: Zero Optional[T] return types",
+    "VC6: Zero hasattr(f, ...) entity dispatch checks",
+    "VC7: self.files is always List[FileItem]",
+    "VC8: flat_config returns typed ProjectContext",
+    "VC9: rag_engine.search() returns List[RAGChunk]",
+    "VC10: All 7 audit gates pass --strict",
+    "VC11: 10/11 batched test tiers PASS",
+    "VC12: Effective codepaths < 1e+18",
+    "VC13: Boundary layer audit written",
+    "VC14: The 12 per-aggregate dataclasses used at their specific paths"
+  ],
+  "estimated_effort": {
+    "method": "scope (per workflow.md Tier 1 Track Initialization Rules). NO day estimates.",
+    "scope": "9 phases, ~14 sites, 12-file scope, 5-7 atomic commits"
+  },
+  "risk_register": [
+    {
+      "id": "R1",
+      "likelihood": "medium",
+      "description": "Implementation may be larger than the spec suggests (defensive isinstance checks scattered throughout)"
+    },
+    {
+      "id": "R2",
+      "likelihood": "low",
+      "description": "Test regressions from signature changes; FIX-IF-FAILS protocol applies"
+    }
+  ]
+}

conductor/tracks/cruft_elimination_20260627/plan.md

@@ -0,0 +1,881 @@
+# Plan: cruft_elimination_20260627 (EXTREME DETAIL)
+
+> **Tier 1 exhaustive plan — 2026-06-27.** This plan is the EXECUTABLE CONTRACT for Tier 2/Tier 3. Every task has exact file:line refs, exact before/after code, exact test commands, and explicit FIX-IF-FAILS steps. NEVER use `git restore`, `git checkout --`, `git reset`, or `git revert` (per AGENTS.md hard ban). NEVER use the word "REVERT" — always "MODIFY" or "FIX".
+>
+> **Prerequisites:** `type_alias_unfuck_20260626` SHIPPED (Phases 0-10 done; 67 `.get()` sites reduced to <15; all 12 per-aggregate dataclasses have `from_dict()` methods).
+>
+> **Baseline (measured 2026-06-27, master `b096a8be`):**
+> - `Metadata: TypeAlias = dict[str, Any]` STILL exists at `src/type_aliases.py:6`
+> - `hasattr(f, 'path')` checks: ~14 sites in `src/app_controller.py`
+> - `hasattr(f, '...')` checks (entity dispatch): 14 sites
+> - `Optional[T]` return types: ~25+ in `src/*.py`
+> - `Any` parameter types: ~15+ in `src/*.py`
+> - `dict[str, Any]` parameter types: ~20+ in `src/*.py`
+> - `def _do_generate(self) -> tuple[str, Path, list[Metadata], ...]` — wrong return type at `src/app_controller.py:4006`
+> - `self.files: List[models.FileItem]` declared but holds dicts (`src/app_controller.py:1996-2003`)
+> - `flat_config(...)` returns `dict` not typed
+> - `rag_engine.search()` returns `List[Dict]` not `List[RAGChunk]`
+> - Effective codepaths: ~1e+21 (down from 4.014e+22 after unfuck)
+>
+> **Acceptance:** all 14 VCs from `conductor/tracks/cruft_elimination_20260627/spec.md` PASS. Effective codepaths < 1e+18 (4+ orders of magnitude drop from baseline 4.014e+22).
+
+## §0 Pre-flight (Tier 2 runs before Tier 3 starts)
+
+```bash
+git checkout -b tier2/cruft_elimination_20260627
+
+# 0.1 Clean working tree
+git status --short
+# Expect: no output (clean)
+
+# 0.2 Capture baseline counts
+git grep -cE "hasattr\(f, '(path|source_tier|content|role|model|id|status)'\)" -- 'src/*.py' > /tmp/before_hasattr.txt
+# Expect: ~14 sites
+git grep -cE "-> Optional\[" -- 'src/*.py' > /tmp/before_optional.txt
+# Expect: ~25+ sites
+git grep -cE "def .+\(.*: (Metadata|Any|dict\[str, Any\])" -- 'src/*.py' > /tmp/before_signatures.txt
+# Expect: ~65+ sites
+git grep -cE "def .+\(.*: Metadata" -- 'src/app_controller.py' 'src/gui_2.py' 'src/aggregate.py' 'src/multi_agent_conductor.py' > /tmp/before_metadata_params.txt
+# Expect: ~30 sites
+
+# 0.3 Confirm 7 audit gates pass --strict
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+uv run python scripts/audit_main_thread_imports.py
+uv run python scripts/audit_no_models_config_io.py
+uv run python scripts/audit_code_path_audit_coverage.py --input-dir docs/reports/code_path_audit/latest --strict
+uv run python scripts/audit_exception_handling.py --strict
+uv run python scripts/audit_optional_in_3_files.py --strict
+# All exit 0; note pre-existing failures
+
+# 0.4 Confirm Metadata is STILL `dict[str, Any]` (the lazy-typing escape hatch)
+git grep -n "Metadata:" src/type_aliases.py | head -3
+# Expect: Metadata: TypeAlias = dict[str, Any]  (line 6 — this is what we FIX in Phase 1)
+
+# 0.5 Verify the 12 per-aggregate dataclasses all have `from_dict()` methods
+uv run python -c "
+from src.type_aliases import CommsLogEntry, HistoryMessage, ToolDefinition, SessionInsights, DiscussionSettings, CustomSlice, MMAUsageStats, ProviderPayload, UIPanelConfig, PathInfo
+from src.openai_schemas import ToolCall, ChatMessage, UsageStats, NormalizedResponse
+from src.models import Ticket, FileItem, ContextPreset
+from src.rag_engine import RAGChunk
+print('all from_dict methods:', all(hasattr(c, 'from_dict') for c in [CommsLogEntry, HistoryMessage, ToolDefinition, SessionInsights, DiscussionSettings, CustomSlice, MMAUsageStats, ProviderPayload, UIPanelConfig, PathInfo, ToolCall, ChatMessage, UsageStats, NormalizedResponse, Ticket, FileItem, ContextPreset, RAGChunk]))
+"
+# Expect: True
+```
+
+**STOP if any pre-existing failure is not in the baseline report. Report to user.**
+
+## §Phase 1: Promote `Metadata` from `TypeAlias = dict[str, Any]` to a typed fat struct
+
+> **[x] COMPLETE** [commit 75eb6dbb] — Metadata is now `@dataclass(frozen=True, slots=True)` with 36 explicit fields; `Metadata: TypeAlias = dict[str, Any]` removed. Dict-compat methods (`__getitem__`, `get`, `__contains__`, `__iter__`, `keys`, `values`, `items`) keep existing call sites working during the migration. 133 tests pass; audit_weak_types --strict OK (107 <= 112).
+
+**WHERE:** `src/type_aliases.py:6`
+
+**Current state (line 6):**
+```python
+Metadata: TypeAlias = dict[str, Any]
+```
+
+**Task 1.1:** Replace with a `@dataclass(frozen=True, slots=True)` containing the wire-format fields observed at all `Metadata` access sites across `src/*.py`.
+
+**Pattern (the fat struct):**
+
+```python
+@dataclass(frozen=True, slots=True)
+class Metadata:
+    """The wire-format boundary type. ONLY used at TOML/JSON parse functions.
+    Internal code uses componentized dataclasses (CommsLogEntry, FileItem, etc.)."""
+    # TOML/JSON wire keys observed in the codebase
+    paths:       Metadata = field(default_factory=dict)
+    project:     Metadata = field(default_factory=dict)
+    discussion:  Metadata = field(default_factory=dict)
+    # Per-vendor chat message keys
+    role:        str = ""
+    content:     Any = None
+    tool_calls:  Metadata = field(default_factory=list)
+    tool_call_id: str = ""
+    name:        str = ""
+    # Session log / MMA telemetry keys
+    ts:          str = ""
+    kind:        str = ""
+    direction:   str = ""
+    model:       str = "unknown"
+    source_tier: str = "main"
+    error:       str = ""
+    # MMA ticket keys
+    id:          str = ""
+    description: str = ""
+    status:      str = "todo"
+    depends_on:  tuple = ()
+    manual_block: bool = False
+    # RAG result keys (top-level, not nested)
+    document:    str = ""
+    path:        str = ""
+    score:       float = 0.0
+    # Tool definition + tool call keys
+    function:    Metadata = field(default_factory=dict)
+    args:        Metadata = field(default_factory=dict)
+    script:      str = ""
+    output:      str = ""
+    type:        str = ""
+    description: str = ""
+    parameters:  Metadata = field(default_factory=dict)
+    auto_start:  bool = False
+    # File item keys
+    view_mode:   str = "full"
+    custom_slices: Metadata = field(default_factory=list)
+    # Token usage keys
+    input_tokens:  int = 0
+    output_tokens: int = 0
+    cache_read_input_tokens:    int = 0
+    cache_creation_input_tokens: int = 0
+    # Generic pass-through (the boundary accepts arbitrary keys; from_dict filters)
+    metadata:    Metadata = field(default_factory=dict)
+
+    def to_dict(self) -> dict[str, Any]:
+        return {k: v for k, v in self.__dict__.items() if v not in (None, "", [], {}, 0, 0.0, False) or k in _NON_NULL_FIELDS}
+
+    @classmethod
+    def from_dict(cls, raw: dict[str, Any]) -> "Metadata":
+        valid = {f.name for f in fields(cls)}
+        return cls(**{k: v for k, v in raw.items() if k in valid})
+```
+
+Add `_NON_NULL_FIELDS = {"model"}` at module top (these fields are always included even when default).
+
+**HOW:** `manual-slop_py_update_definition` with `name="Metadata"`. Anchor on the existing `Metadata: TypeAlias = dict[str, Any]` line. Replace with the dataclass above.
+
+**Add import:**
+```python
+from dataclasses import dataclass, field, fields
+```
+
+**SAFETY:**
+```bash
+uv run python -c "from src.type_aliases import Metadata; m = Metadata(role='user', content='hi'); print(m.role, m.content, m.model)"
+# Expect: user hi unknown
+uv run python -c "from src.type_aliases import Metadata; m = Metadata.from_dict({'role': 'user', 'unknown_key': 'x'}); print(m.role, m.model)"
+# Expect: user unknown (unknown_key filtered)
+uv run python -m pytest tests/test_type_aliases.py -x --timeout=60
+# Expect: all pass
+uv run python scripts/audit_weak_types.py --strict
+# Expect: exit 0 (no new dict[str, Any] types)
+```
+
+**MODIFY-IF-FAILS:**
+- If pytest fails: the dataclass has a field with the wrong type. Check the field type vs the constructor arg.
+- If audit fails: a new `dict[str, Any]` field type was introduced. Replace with a specific type.
+
+**COMMIT:** `refactor(type_aliases): promote Metadata from dict[str, Any] to typed fat struct`
+
+**Commit message body MUST include:**
+```
+Phase 1: Metadata promotion
+Before: 1 TypeAlias = dict[str, Any] site in src/type_aliases.py
+After:  0 (replaced by @dataclass(frozen=True, slots=True))
+Delta:  -1 (expected: -1)
+
+Metadata is now the typed fat struct at the wire boundary.
+```
+
+**GIT NOTE:** Metadata is now `@dataclass(frozen=True, slots=True)` with explicit fields covering all observed wire-format keys. Used ONLY at the literal TOML/JSON parse functions. Internal code uses componentized dataclasses.
+
+## §Phase 2: Add `ProjectContext` dataclass for `flat_config`
+
+> **[x] COMPLETE** [commit 805a0619] — Per SPEC_CORRECTION_phase_2.md (Option A: incremental, dict-compat). Added 6 sub-dataclasses (ProjectMeta, ProjectOutput, ProjectFiles, ProjectScreenshots, ProjectDiscussion, ProjectContext) + EMPTY_PROJECT_CONTEXT sentinel. `flat_config` returns ProjectContext. Dict-compat methods (`__getitem__`, `get`) keep consumers unchanged. 10 new regression tests in `tests/test_project_context_20260627.py`; all pass.
+
+**WHERE:**
+- `src/project_manager.py:flat_config` — currently returns `dict[str, Any]`
+- All consumers (search for `flat_config` calls in `src/app_controller.py` and `src/gui_2.py`)
+
+**Task 2.1:** Add `ProjectContext` dataclass to `src/models.py` (next to `ProjectConfig`).
+
+**Pattern:**
+
+```python
+@dataclass(frozen=True, slots=True)
+class ProjectContext:
+    """The flattened project context returned by project_manager.flat_config().
+    The TOML/JSON config is parsed to Metadata at the boundary, then
+    ProjectContext.from_dict() converts to this typed form."""
+    paths:       Metadata = field(default_factory=dict)
+    project:     Metadata = field(default_factory=dict)
+    discussion:  Metadata = field(default_factory=dict)
+    files:       Metadata = field(default_factory=dict)
+    screenshots: Metadata = field(default_factory=dict)
+    context_presets: Metadata = field(default_factory=dict)
+    rag:         Metadata = field(default_factory=dict)
+    personas:    Metadata = field(default_factory=dict)
+    mma:         Metadata = field(default_factory=dict)
+
+    def to_dict(self) -> Metadata:
+        return dict(self.__dict__)
+
+    @classmethod
+    def from_dict(cls, raw: Metadata) -> "ProjectContext":
+        valid = {f.name for f in fields(cls)}
+        return cls(**{k: v for k, v in raw.items() if k in valid})
+```
+
+**Task 2.2:** Update `flat_config` in `src/project_manager.py`.
+
+Read the current implementation:
+```bash
+git grep -nA 30 "def flat_config" -- 'src/project_manager.py'
+```
+
+Identify the dict keys it returns. Add them as fields to `ProjectContext`. Update the return type annotation.
+
+**Pattern (return type + body):**
+
+```python
+def flat_config(self, ...) -> ProjectContext:
+    ...
+    return ProjectContext.from_dict(raw_dict)
+```
+
+**Task 2.3:** Update consumers in `src/app_controller.py` and `src/gui_2.py`.
+
+Search for `flat_config(` calls:
+```bash
+git grep -nE "flat_config\(" -- 'src/*.py'
+```
+
+For each consumer, replace `flat.get('key', default)` with `flat.key or default`. The `flat` variable becomes `ProjectContext` typed.
+
+**Example:**
+```python
+# BEFORE:
+flat = project_manager.flat_config(self.project, ...)
+flat["files"] = copy.copy(flat.get("files", {}))
+flat["files"]["paths"] = self.context_files
+context_block += flat.get("screenshots", {}).get("paths", [])
+
+# AFTER:
+ctx = project_manager.flat_config(self.project, ...)
+ctx_files = ProjectFiles(paths=self.context_files, base_dir=...)
+ctx = dataclasses.replace(ctx, files=asdict(ctx_files))
+context_block = ctx.screenshots.paths
+```
+
+(Read each site first; the actual replacement depends on the surrounding code.)
+
+**HOW:** `manual-slop_edit_file` per site.
+
+**SAFETY:**
+```bash
+git grep -nE "flat\.get\(" -- 'src/app_controller.py' 'src/gui_2.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_project_serialization.py tests/test_app_controller.py tests/test_gui_2.py -x --timeout=120
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: search for missed sites. Add additional migrations.
+- If pytest fails: STOP. Read the failure. Likely cause: `flat_config` returns dict in some paths, dataclass in others. Fix the return to be consistent.
+
+**COMMIT:** `refactor(project_manager,app_controller,gui_2): introduce ProjectContext dataclass, type flat_config return`
+
+**Commit message body MUST include:**
+```
+Phase 2: ProjectContext
+Before: flat.get(...) sites in app_controller.py + gui_2.py
+After:  0 (all replaced with attribute access on ProjectContext)
+Delta:  -N
+```
+
+## §Phase 3: Fix `self.files` in `src/app_controller.py` (FR4 row 1)
+
+**WHERE:**
+- `src/app_controller.py:1101` (declaration: `self.files: List[models.FileItem] = []`)
+- `src/app_controller.py:1996-2003` (append paths: 3 branches, appends dict OR FileItem)
+- `src/app_controller.py:3226-3233` (same pattern, second occurrence)
+- `src/app_controller.py:2539` (`self.files.append(item)` — needs verification of `item` type)
+
+**Task 3.1:** Replace the 3-branch append logic with explicit type checks + single `from_dict` call.
+
+**Pattern (replacing `src/app_controller.py:1996-2003`):**
+
+```python
+# BEFORE:
+self.files = []
+for p in paths:
+    self.files.append(p)                          # ← appends raw dict
+    self.files.append(models.FileItem.from_dict(p)) # ← appends FileItem
+    self.files.append(models.FileItem(path=str(p)))  # ← appends FileItem
+
+# AFTER:
+self.files = [models.FileItem.from_path(p) for p in paths]
+```
+
+Where `models.FileItem.from_path` is a new classmethod:
+```python
+@classmethod
+def from_path(cls, p: str | Metadata | "FileItem") -> "FileItem":
+    if isinstance(p, cls):
+        return p
+    if isinstance(p, str):
+        return cls(path=p)
+    if isinstance(p, dict):
+        return cls.from_dict(p)
+    raise TypeError(f"FileItem.from_path: expected str, dict, or FileItem; got {type(p).__name__}")
+```
+
+Add this `from_path` classmethod to `src/models.py:FileItem` class.
+
+**Task 3.2:** Same fix at `src/app_controller.py:3226-3233`.
+
+**Task 3.3:** Remove `hasattr(f, 'path')` defensive checks throughout `src/app_controller.py`.
+
+Affected sites (read each first):
+- `src/app_controller.py:263` — `[f.path if hasattr(f, "path") else f.get("path") if isinstance(f, dict) else str(f) for f in controller.last_file_items]`
+- `src/app_controller.py:1767` — `return [f.path if hasattr(f, 'path') else str(f) for f in self.files]`
+- `src/app_controller.py:1771` — `old_files = {f.path: f for f in self.files if hasattr(f, 'path')}`
+- `src/app_controller.py:2536` — `next((f for f in self.files if (f.path if hasattr(f, "path") else str(f)) == file_path), None)`
+- `src/app_controller.py:3129,3182` — `file_items_as_dicts = [{"path": f.path if hasattr(f, "path") else str(f)} for f in self.files]`
+
+**Pattern (per site):**
+
+```python
+# BEFORE:
+return [f.path if hasattr(f, 'path') else str(f) for f in self.files]
+
+# AFTER:
+return [f.path for f in self.files]
+```
+
+After Phase 3, `self.files` is GUARANTEED `List[FileItem]`. Every `hasattr(f, 'path')` check is redundant. Remove it.
+
+**SAFETY:**
+```bash
+git grep -nE "hasattr\(f, 'path'\)" -- 'src/app_controller.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_file_item_model.py tests/test_app_controller.py tests/test_custom_slices_annotations.py tests/test_gui_2.py -x --timeout=120
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: search for missed sites. The pattern is `hasattr(f, 'path')` or `hasattr(f, "path")`.
+- If pytest fails: STOP. Read the failure. Likely cause: a dict is still being added to `self.files` somewhere. Trace the path.
+
+**COMMIT:** `refactor(app_controller): self.files is now List[FileItem]; remove all hasattr defensive checks`
+
+**Commit message body MUST include:**
+```
+Phase 3: self.files type guarantee
+Before: 7 hasattr(f, 'path') sites in src/app_controller.py
+After:  0 (self.files is now List[FileItem] guaranteed)
+Delta:  -7
+```
+
+## §Phase 4: Fix `_do_generate` return type (FR4 row 2)
+
+**WHERE:**
+- `src/app_controller.py:4006` — `def _do_generate(self) -> tuple[str, Path, list[Metadata], str, str]:`
+- `src/gui_2.py` callers — find all `_do_generate(` calls
+
+**Task 4.1:** Read the current return statement at `src/app_controller.py:4051`:
+
+```python
+return full_md, path, file_items, stable_md, discussion_text
+```
+
+The `file_items` is `List[FileItem]` (from `aggregate.run`'s return). The return type annotation is wrong.
+
+**Pattern:**
+
+```python
+# BEFORE:
+def _do_generate(self) -> tuple[str, Path, list[Metadata], str, str]:
+    ...
+    return full_md, path, file_items, stable_md, discussion_text
+
+# AFTER:
+def _do_generate(self) -> tuple[str, Path, list[FileItem], str, str]:
+    ...
+    return full_md, path, file_items, stable_md, discussion_text
+```
+
+**Task 4.2:** Update `src/gui_2.py` callers.
+
+Search for `_do_generate(`:
+```bash
+git grep -nE "_do_generate\(" -- 'src/gui_2.py'
+```
+
+For each caller, the receiver variable is now `list[FileItem]`. Replace `.get('path', 'attachment')` accesses (if any) with `f.path` direct access.
+
+**SAFETY:**
+```bash
+git grep -nE "list\[Metadata\]" -- 'src/app_controller.py' | wc -l
+# Expect: 0 (was: 1 at line 4006)
+uv run python -m pytest tests/test_context_composition_decoupled.py tests/test_tiered_aggregation.py tests/test_gui_2.py -x --timeout=120
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: search for the type annotation. Fix.
+- If pytest fails: STOP. Likely cause: `aggregate.run` returns `List[Dict]` in some paths. Trace.
+
+**COMMIT:** `refactor(app_controller,gui_2): _do_generate returns list[FileItem], not list[Metadata]`
+
+**Commit message body MUST include:**
+```
+Phase 4: _do_generate return type
+Before: 1 list[Metadata] annotation at src/app_controller.py:4006
+After:  0 (changed to list[FileItem])
+Delta:  -1
+```
+
+## §Phase 5: Fix `rag_engine.search()` return type (FR4 row 7)
+
+**WHERE:**
+- `src/rag_engine.py:367` — `def search(self, ...) -> List[Dict[str, Any]]:`
+- 3 consumers: `src/aggregate.py:3259`, `src/app_controller.py:251`, `src/app_controller.py:4162`
+
+**Task 5.1:** Change `rag_engine.search()` return type.
+
+**Read first:**
+```bash
+git grep -nA 20 "def search" -- 'src/rag_engine.py'
+```
+
+**Pattern (the wire format mismatch):**
+
+The wire format from the RAG store has `metadata.path` nested (or `metadata.source`); the `RAGChunk` dataclass has `path` at top-level. The `from_dict` classmethod must normalize:
+
+```python
+@classmethod
+def from_dict(cls, raw: dict[str, Any]) -> "RAGChunk":
+    if "metadata" in raw and isinstance(raw.get("metadata"), dict):
+        meta = raw["metadata"]
+        return cls(
+            document=raw.get("document", "") or meta.get("document", ""),
+            path=meta.get("path", "") or meta.get("source", "") or raw.get("path", ""),
+            score=1.0 - float(raw.get("distance", 0.0)),
+            metadata=meta,
+        )
+    valid = {f.name for f in fields(cls)}
+    return cls(**{k: v for k, v in raw.items() if k in valid})
+```
+
+(Already implemented per Phase 0 of metadata_promotion; verify it handles the wire format.)
+
+**Change `search` return type:**
+
+```python
+# BEFORE:
+def search(self, ...) -> List[Dict[str, Any]]:
+
+# AFTER:
+def search(self, ...) -> List[RAGChunk]:
+    ...
+    return [RAGChunk.from_dict(raw) for raw in raw_results]
+```
+
+**Task 5.2:** Update 3 consumers.
+
+```python
+# BEFORE:
+context_block += f"### Chunk {i+1} (Source: {path})\n{chunk.get('document', '')}\n\n"
+
+# AFTER:
+context_block += f"### Chunk {i+1} (Source: {path})\n{chunk.document}\n\n"
+```
+
+**SAFETY:**
+```bash
+git grep -nE "chunk\.get\('document'," -- 'src/aggregate.py' 'src/app_controller.py' 'src/ai_client.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_rag_engine.py tests/test_rag_phase4_final_verify.py tests/test_rag_chunk.py -x --timeout=120
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: search for missed sites.
+- If pytest fails: STOP. The `RAGChunk.from_dict()` may not handle all wire format edge cases. Add more normalization logic.
+
+**COMMIT:** `refactor(rag_engine,aggregate,app_controller): rag_engine.search returns List[RAGChunk]`
+
+**Commit message body MUST include:**
+```
+Phase 5: RAGChunk return type
+Before: 1 List[Dict[str, Any]] at src/rag_engine.py + 3 chunk.get('document',...) consumers
+After:  0 (rag_engine.search returns List[RAGChunk] directly)
+Delta:  -1 + -3 = -4 sites
+```
+
+## §Phase 6: Eliminate `Optional[T]` returns (FR5)
+
+**WHERE:** Search all `src/*.py` for `-> Optional[`:
+
+```bash
+git grep -nE "-> Optional\[" -- 'src/*.py'
+```
+
+For each `Optional[T]` return:
+
+**Pattern (the rule per `error_handling.md`):**
+
+```python
+# BAD:
+def find_ticket(self, id: str) -> Optional[Ticket]:
+    for t in self.active_tickets:
+        if t.id == id: return t
+    return None
+
+# GOOD (preferred — NIL_T sentinel):
+def find_ticket(self, id: str) -> Ticket:
+    for t in self.active_tickets:
+        if t.id == id: return t
+    return NIL_TICKET   # zero-initialized frozen dataclass; safe to read fields
+
+# ALSO GOOD (Result pattern, when caller needs to know success/failure):
+def find_ticket(self, id: str) -> Result[Ticket]:
+    for t in self.active_tickets:
+        if t.id == id: return Result(data=t)
+    return Result(data=NIL_TICKET, errors=[ErrorInfo(kind=ErrorKind.NOT_FOUND, ...)])
+```
+
+**Required additions to `src/type_aliases.py` (NIL_T sentinels):**
+
+```python
+# Add to src/type_aliases.py after the existing dataclasses:
+NIL_COMMS_LOG_ENTRY = CommsLogEntry()
+NIL_HISTORY_MESSAGE = HistoryMessage()
+NIL_TICKET = Ticket(id="", description="", status="missing", manual_block=False)
+NIL_FILE_ITEM = FileItem(path="")
+NIL_TOOL_CALL = ToolCall(id="", function=ToolCallFunction(name="", arguments=""))
+NIL_CHAT_MESSAGE = ChatMessage(role="", content="")
+NIL_USAGE_STATS = UsageStats(input_tokens=0, output_tokens=0)
+NIL_RAG_CHUNK = RAGChunk()
+NIL_MMA_USAGE_STATS = MMAUsageStats()
+NIL_SESSION_INSIGHTS = SessionInsights()
+NIL_DISCUSSION_SETTINGS = DiscussionSettings()
+NIL_CUSTOM_SLICE = CustomSlice()
+NIL_PROVIDER_PAYLOAD = ProviderPayload()
+NIL_UI_PANEL_CONFIG = UIPanelConfig()
+NIL_PATH_INFO = PathInfo()
+NIL_TOOL_DEFINITION = ToolDefinition()
+```
+
+**Sites to fix (categorized by the kind of `Optional[T]`):**
+
+Per-file. Read each site first. Apply the pattern above.
+
+**SAFETY:**
+```bash
+git grep -cE "-> Optional\[" -- 'src/*.py'
+# Expect: 0
+uv run python scripts/audit_optional_in_3_files.py --strict
+# Expect: exit 0 (the 3 refactored files already have it)
+# (Note: this script only checks 3 files; the broader check is the grep above)
+uv run python -m pytest tests/ -x --timeout=120 -q 2>&1 | tail -5
+# Expect: 10/11 batched tiers PASS
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: search for missed sites. Each site needs explicit type replacement.
+- If pytest fails: STOP. Likely cause: a consumer had `if x is None: ...` checks that no longer apply after the type changed. Update consumers.
+
+**COMMIT:** `refactor(*): eliminate Optional[T] returns; add NIL_T sentinels`
+
+**Commit message body MUST include:**
+```
+Phase 6: Optional[T] elimination
+Before: N -> Optional[...] annotations across src/*.py
+After:  0 (replaced with NIL_T sentinels or Result[T])
+Delta:  -N
+```
+
+## §Phase 7: Eliminate `Any` and `dict[str, Any]` from internal function signatures (FR6)
+
+**WHERE:** Search all `src/*.py` for `Any` and `dict[str, Any]` in function signatures:
+
+```bash
+git grep -nE "def .+\(.*: (Any|dict\[str, Any\])" -- 'src/*.py'
+```
+
+**Boundary function exception:** functions that take wire input (TOML/JSON parsing) may keep `dict[str, Any]` with a comment explaining it's the boundary. Examples:
+
+```python
+# Boundary function (OK):
+def _parse_wire_payload(raw: dict[str, Any]) -> ChatMessage:
+    """Boundary: parse JSON wire dict to typed ChatMessage. ONLY called from src/api_hooks.py."""
+    return ChatMessage.from_dict(raw)
+
+# Internal function (BANNED):
+def process_comms_entry(self, entry: dict[str, Any]) -> None:  # ← FIX
+    ...
+```
+
+**Pattern (per site):**
+
+```python
+# BEFORE:
+def process_comms_entry(self, entry: dict[str, Any]) -> None:
+    ...
+
+# AFTER:
+def process_comms_entry(self, entry: CommsLogEntry) -> None:
+    ...
+```
+
+**SAFETY:**
+```bash
+git grep -cE "def .+\(.*: (Any|dict\[str, Any\])" -- 'src/app_controller.py' 'src/gui_2.py' 'src/aggregate.py' 'src/multi_agent_conductor.py' 'src/mcp_client.py' 'src/ai_client.py' 'src/rag_engine.py' 'src/models.py'
+# Expect: 0 (in non-boundary files)
+git grep -cE "def .+\(.*: dict\[str, Any\]" -- 'src/api_hooks.py' 'src/project_manager.py' 'src/session_logger.py'
+# Expect: count of boundary functions (small, documented)
+uv run python -m pytest tests/ -x --timeout=120 -q 2>&1 | tail -5
+# Expect: 10/11 batched tiers PASS
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero in internal files: classify the site. If it's a real internal function, type the parameter. If it's a boundary function, add a `"""Boundary: ..."""` docstring.
+- If pytest fails: STOP. A signature change broke a caller. Update the caller.
+
+**COMMIT:** `refactor(*): eliminate Any and dict[str, Any] from internal function signatures`
+
+**Commit message body MUST include:**
+```
+Phase 7: Any + dict[str, Any] elimination
+Before: N function signatures with Any or dict[str, Any] in internal files
+After:  0 (all replaced with typed dataclasses)
+Delta:  -N
+Boundary functions (TOML/JSON parse) retain dict[str, Any] with explicit docstrings.
+```
+
+## §Phase 8: Re-measure + verification
+
+```bash
+# All cruft counts 0
+git grep -cE "hasattr\(f, '(path|source_tier|content|role|model|id|status)'\)" -- 'src/*.py'
+# Expect: 0
+git grep -cE "-> Optional\[" -- 'src/*.py'
+# Expect: 0
+git grep -cE "def .+\(.*: (Any|dict\[str, Any\])" -- 'src/app_controller.py' 'src/gui_2.py' 'src/aggregate.py' 'src/multi_agent_conductor.py' 'src/mcp_client.py' 'src/ai_client.py' 'src/rag_engine.py' 'src/models.py'
+# Expect: 0
+git grep -cE "def .+\(.*: Metadata" -- 'src/app_controller.py' 'src/gui_2.py' 'src/aggregate.py' 'src/multi_agent_conductor.py'
+# Expect: 0
+
+# Effective codepaths drops
+uv run python -c "
+import sys
+sys.path.insert(0, 'scripts/code_path_audit')
+sys.path.insert(0, 'src')
+from code_path_audit import build_pcg
+from code_path_audit_ssdl import count_branches_in_function
+pcg = build_pcg('src').data
+metadata_consumers = pcg.consumers.get('Metadata', [])
+total = sum(2 ** count_branches_in_function(f, 'src') for f in metadata_consumers)
+print(f'Post-track effective codepaths: {total:.3e} (baseline 4.014e+22)')
+"
+# Expect: < 1e+18
+
+# 7 audit gates pass
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+uv run python scripts/audit_main_thread_imports.py
+uv run python scripts/audit_no_models_config_io.py
+uv run python scripts/audit_code_path_audit_coverage.py --input-dir docs/reports/code_path_audit/latest --strict
+uv run python scripts/audit_exception_handling.py --strict
+uv run python scripts/audit_optional_in_3_files.py --strict
+
+# Batched tests
+uv run python scripts/run_tests_batched.py
+# Expect: 10/11 PASS
+```
+
+**MODIFY-IF-FAILS:**
+- If effective codepaths is still > 1e+18: search for `hasattr(...)` or `isinstance(...)` chains. Each one is a branch.
+- If audit gates fail: STOP. Read which audit failed.
+
+## §Phase 9: Boundary layer audit + documentation
+
+```bash
+git grep -nE "Metadata" -- 'src/*.py' > /tmp/metadata_usages.txt
+wc -l /tmp/metadata_usages.txt
+# Expect: ~30-40 (only boundary files)
+
+git grep -nE "Metadata" -- 'src/api_hooks.py' 'src/project_manager.py' 'src/session_logger.py' 'src/mcp_client.py' 'src/preset*.py' 'src/personas.py' | wc -l
+# Expect: ~25 (the boundary uses)
+git grep -nE "Metadata" -- 'src/app_controller.py' 'src/gui_2.py' 'src/aggregate.py' 'src/multi_agent_conductor.py' | wc -l
+# Expect: 0
+```
+
+Write `docs/reports/boundary_layer_20260628.md`:
+
+```markdown
+# Boundary Layer Audit (cruft_elimination_20260627)
+
+## Metadata usage per file
+
+| File | Count | Classification | Justification |
+|---|---|---|---|
+| src/api_hooks.py | ~10 | BOUNDARY | HTTP entry; receives raw JSON |
+| src/project_manager.py | ~5 | BOUNDARY | TOML config loader |
+| src/session_logger.py | ~3 | BOUNDARY | JSON-L log writer |
+| src/preset*.py | ~3 | BOUNDARY | TOML preset loader |
+| src/personas.py | ~2 | BOUNDARY | TOML persona loader |
+| src/mcp_client.py | ~2 | BOUNDARY | MCP wire protocol |
+| (any internal file) | 0 | INTERNAL | BANNED — internal functions take typed dataclasses |
+
+## Why this is the boundary
+
+`Metadata` is the typed fat struct for the wire schema. It's used ONLY at:
+- TOML config loaders (`tomllib.load()` → `Metadata.from_dict(...)`)
+- JSON wire parsers (`json.loads()` → `Metadata.from_dict(...)`)
+- Vendor SDK response parsers (after parsing the SDK's response)
+
+Every consumer of these boundary functions IMMEDIATELY converts to a componentized dataclass (ProjectContext, CommsLogEntry, etc.) via `from_dict()`.
+
+## Per-site justification
+
+[list every Metadata usage with the function name + justification]
+```
+
+**COMMIT:** `docs(audit): boundary layer audit for cruft_elimination_20260627`
+
+**Commit message body MUST include:**
+```
+Phase 9: Boundary layer audit
+Before: Metadata scattered across N files
+After:  Metadata ONLY at boundary layer (2-3 functions per boundary file)
+Delta:  -N internal usages; +0 boundary usages (the boundary was already correct)
+```
+
+## §Acceptance Criteria (Definition of Done)
+
+| # | Criterion | Verification |
+|---|---|---|
+| VC1 | `Metadata` is `@dataclass(frozen=True, slots=True)` (typed fat struct) | `git grep -A 1 "^class Metadata" src/type_aliases.py` shows `@dataclass(frozen=True, slots=True)` |
+| VC2 | Zero `TypeAlias = dict[str, Any]` for Metadata | `git grep "^Metadata: TypeAlias" src/type_aliases.py` returns nothing |
+| VC3 | Zero `dict[str, Any]` parameter types in internal files | `git grep -cE "def .+\(.*: dict\[str, Any\]" -- 'src/app_controller.py' 'src/gui_2.py' 'src/aggregate.py' 'src/multi_agent_conductor.py' 'src/mcp_client.py' 'src/ai_client.py' 'src/rag_engine.py' 'src/models.py'` returns 0 |
+| VC4 | Zero `Any` parameter types in internal files | same grep with `: Any` returns 0 |
+| VC5 | Zero `Optional[T]` return types | `git grep -cE "-> Optional\[" -- 'src/*.py'` returns 0 |
+| VC6 | Zero `hasattr(f, ...)` entity dispatch checks | `git grep -cE "hasattr\(f, '(path\|source_tier\|content\|role\|model\|id\|status)'\)" -- 'src/*.py'` returns 0 |
+| VC7 | `self.files` is always `List[FileItem]` | The 7 `hasattr(f, 'path')` sites in `src/app_controller.py` are removed; `self.files.append(...)` paths use `FileItem.from_path(...)` |
+| VC8 | `flat_config` returns typed `ProjectContext` | New dataclass exists; return type fixed |
+| VC9 | `rag_engine.search()` returns `List[RAGChunk]` | Return type fixed; 3 consumers updated |
+| VC10 | All 7 audit gates pass `--strict` | All exit 0 |
+| VC11 | 10/11 batched test tiers PASS | `scripts/run_tests_batched.py` → 10/11 |
+| VC12 | Effective codepaths < 1e+18 | 4+ orders of magnitude drop |
+| VC13 | Boundary layer audit written | `docs/reports/boundary_layer_20260628.md` exists |
+| VC14 | The 12 per-aggregate dataclasses used at their specific paths | Direct attribute access everywhere |
+
+## §Tier 2 / Tier 3 Hard Rules
+
+1. **NEVER use `git restore`, `git checkout --`, `git reset`, or `git revert`.** Per AGENTS.md hard ban. NEVER use the word "REVERT" — always "MODIFY" or "FIX". If something is wrong, add more migrations or amend the commit. Do NOT throw away work.
+
+2. **NEVER introduce `dict[str, Any]`, `Any`, or `Optional[T]` in non-boundary code.** The boundary is 2-3 functions per file. Internal code uses typed dataclasses.
+
+3. **NEVER use `hasattr()` for entity type dispatch.** The type system guarantees the entity type. Use `isinstance()` against a typed Union, or refactor so no dispatch is needed.
+
+4. **NEVER classify a phase as "no-op".** Each phase has work; do the work. If the work was already done by a previous attempt, verify it's done correctly and amend the commit.
+
+5. **NEVER add comments to source code.** Per AGENTS.md. Documentation lives in `/docs`.
+
+6. **NEVER use the native `edit` tool on Python files.** Use `manual-slop_edit_file`, `manual-slop_py_update_definition`, `manual-slop_py_add_def`, or `manual-slop_set_file_slice`.
+
+7. **NEVER create new `src/<thing>.py` files.** Per AGENTS.md.
+
+8. **NEVER skip a failing test with `@pytest.mark.skip`.** Fix the bug.
+
+9. **NEVER exceed 5 nesting levels.** Extract to functions.
+
+10. **NEVER modify `src/code_path_audit*.py`.** The audit infrastructure is correct.
+
+11. **NEVER promote `Metadata: TypeAlias = dict[str, Any]`.** It's a typed fat struct (the boundary type). The TypeAlias is BANNED.
+
+12. **STOP AND ASK if any site's variable type is unclear.** Write a 1-sentence question. Wait for the user. Do not invent a reconciliation.
+
+13. **If a commit breaks more than 2 tests, STOP.** Read the failures. Identify the root cause. Fix the commit. Do not ship broken state.
+
+## §Per-Phase Tier 2 Review Checklist
+
+Before approving each phase, Tier 2 verifies:
+
+1. The commit message has "Before: N, After: M, Delta: -K" with K matching the planned count.
+2. The relevant `git grep` count decreased by exactly the planned K.
+3. The relevant `pytest` files pass.
+4. No audit gate regressed.
+5. The batched test suite still passes 10/11 tiers.
+6. No "no-op" or "REVERT" or "skipped" in the commit message.
+
+If any check fails: **DO NOT APPROVE.** Tell Tier 3 what to fix. Tier 3 fixes the migration and re-commits.
+
+## §Anti-Pattern Guard (per AGENTS.md)
+
+If you observe any of these patterns in your own work, STOP and re-read AGENTS.md:
+
+1. **The Deduction Loop**: running a test 4+ times in one investigation.
+2. **The Report-Instead-of-Fix Pattern**: writing a 200-line status report instead of fixing.
+3. **The Scope-Creep Track-Doc Pattern**: writing a 5-phase spec for a 1-line fix.
+4. **The Inherited-Cruft Pattern**: trying to "fix" a broken file from a previous agent.
+5. **No Diagnostic Noise in Production**: `sys.stderr.write` lines in `src/*.py`.
+6. **The "I Am Not Going To Attempt Another Fix" Surrender**: only after the 5-step protocol.
+7. **The Verbose-Commit-Message Pattern**: commit messages > 15 lines.
+8. **The Isolated-Pass Verification Fallacy**: verifying in isolation but not in batch.
+9. **The Workspace-Path Drift Pattern**: using `/tmp` or env vars for test paths.
+10. **The No-Op Classification Shortcut**: marking phases complete without doing the work. (banned by Hard Rule #4)
+
+## §Tier 2 Invitation Prompt
+
+Use this prompt to invoke Tier 2:
+
+```
+Track: cruft_elimination_20260627 (branch: tier2/cruft_elimination_20260627).
+
+This is the FINAL track in the metadata type-promotion chain. The previous track (type_alias_unfuck_20260626) introduced a NEW cruft: defensive isinstance() checks at function bodies. The user explicitly rejected this pattern: "every conditional check is more execution noise and tech debt."
+
+Read the EXHAUSTIVE plan at conductor/tracks/cruft_elimination_20260627/plan.md (this file).
+
+HARD RULES (NON-NEGOTIABLE):
+1. NO dict[str, Any], Any, or Optional[T] in non-boundary code. The boundary is 2-3 functions per file.
+2. NO hasattr() for entity type dispatch. The type system guarantees the entity type.
+3. NO isinstance() defensive checks at function bodies. The boundary layer does from_dict() once.
+4. NEVER use git restore, git checkout --, git reset, or git revert. NEVER use the word "REVERT" — always "MODIFY" or "FIX". If something is wrong, add more migrations or amend the commit.
+5. NO no-op classifications. Each phase has work; do the work.
+6. NO new src/<thing>.py files. NO comments in src/. NO @pytest.mark.skip.
+
+PER-PHASE HARD GUARD:
+Each phase commit message MUST include:
+  Phase N: <name>
+  Before: N <pattern> sites
+  After:  0 (or expected)
+  Delta:  -N
+
+If delta != expected, FIX the migration. Don't blow it away.
+
+START:
+git log --oneline -10
+git checkout -b tier2/cruft_elimination_20260627
+git grep -nE "hasattr\(f, 'path'\)" -- 'src/app_controller.py' | wc -l
+git grep -nE "Metadata: TypeAlias = dict\[str, Any\]" -- 'src/type_aliases.py' | wc -l
+git grep -nE "-> Optional\[" -- 'src/*.py' | wc -l
+
+# Read the plan
+cat conductor/tracks/cruft_elimination_20260627/plan.md
+
+# Run pre-flight (Section §0)
+# Execute Phases 1-9
+```
+
+## §See also
+
+- `conductor/tracks/cruft_elimination_20260627/spec.md` — the track spec
+- `conductor/tracks/type_alias_unfuck_20260626/spec.md` — the previous track
+- `conductor/tracks/type_alias_unfuck_20260626/plan.md` — the previous track's plan
+- `conductor/code_styleguides/data_oriented_design.md` §8.5 (The Python Type Promotion Mandate) — the canonical mandate
+- `conductor/code_styleguides/python.md` §17 (Banned Patterns — LLM Default Anti-Patterns) — the cheatsheet
+- `conductor/code_styleguides/type_aliases.md` — the type convention
+- `conductor/code_styleguides/error_handling.md` — `Result[T]` + `NIL_T` convention
+- `conductor/product-guidelines.md` "Core Value" — the value statement
+- `docs/reports/FOLLOWUP_metadata_promotion_20260624.md` — the prior Tier 1 review (the root cause analysis)
+- `src/type_aliases.py` — the 12 per-aggregate dataclasses (now with `from_dict()`)
+- `src/models.py:533` — `FileItem` (canonical in-module dataclass)
+- `src/models.py:302` — `Ticket` (canonical in-module dataclass)
+- `src/openai_schemas.py` — `ToolCall`, `ChatMessage`, `UsageStats`, `NormalizedResponse`
+- `src/rag_engine.py` — `RAGChunk` (added by `metadata_promotion_20260624`)
+- `conductor/AGENTS.md` — hard bans (NEVER use `git restore`, `git checkout --`, `git reset`, `git revert`)

conductor/tracks/cruft_elimination_20260627/spec.md

@@ -0,0 +1,415 @@
+# Track Specification: c11_python_20260628
+
+## Overview
+
+**Goal:** Make Python behave as close to C11/Odin/Jai as possible within Python's runtime constraints. Eliminate all polymorphic dicts (`dict[str, Any]`), runtime type checks (`hasattr`, `isinstance` for entity dispatch), `Optional[T]` returns, `Any` type hints, and `.get('key', default)` access on known fields from internal code.
+
+**Scope:** Promote every polymorphic dict to a typed dataclass (either a fat struct at the wire boundary OR a componentized dataclass at the specific path). Convert function signatures to declare typed parameters. Remove every `hasattr()` / `isinstance()` / `.get()` defensive check. Replace `Optional[T]` with `Result[T]` + `NIL_T` sentinels.
+
+**After this track:**
+- One literal boundary layer (`tomllib.load()` + `json.loads()` result) uses `Metadata` (a typed fat struct).
+- Everywhere else: typed componentized dataclasses (already exist from `metadata_promotion_20260624`).
+- No `dict[str, Any]` outside the boundary layer.
+- No `hasattr()` for entity type dispatch.
+- No `Optional[T]` returns.
+- No `Any` type hints.
+- The 4.01e+22 metric drops because dispatcher functions lose their polymorphic branches.
+
+## The C11/Odin/Jai Semantics in Python
+
+| C11/Odin/Jai concept | Python equivalent | What it forbids |
+|---|---|---|
+| Value type (`struct`) | `@dataclass(frozen=True, slots=True)` | Mutation, dynamic field addition |
+| Static type (`int`, `string`) | type hint + mypy | `Any`, `dict[str, Any]` outside the boundary |
+| No null | `Result[T]` + `NIL_T` sentinel | `Optional[T]`, `None` returns |
+| Direct field access (`s.field`) | `s.field` | `.get('field', default)` on known fields |
+| No dynamic dispatch (`if hasfield`) | Compile-time-typed function params | `hasattr(x, 'field')` for entity type dispatch |
+| Explicit conversion at boundary | `from_dict()` at the wire entry | Scattered `from_dict()` in consumers |
+
+## Current State Audit (after `type_alias_unfuck_20260626` ships)
+
+| Cruft source | Current count | Source |
+|---|---:|---|
+| `Metadata: TypeAlias = dict[str, Any]` (the lazy-typing escape hatch) | 1 | `src/type_aliases.py:6` |
+| `.get('key', default)` sites on known aggregates | ~15 (post-unfuck) | `git grep -cE "\.get\('[a-z_]+'," -- 'src/*.py'` |
+| `hasattr(f, 'path')` defensive checks | ~10 | `git grep -E "hasattr\(f, 'path'\)" -- 'src/*.py'` |
+| `hasattr(self, 'attr')` lazy-init checks | ~20 | `git grep -E "hasattr\(self," -- 'src/*.py'` |
+| Function signatures with `Metadata` parameter | ~30+ | `git grep -cE "def .+\(.*: Metadata" -- 'src/*.py'` |
+| Function signatures with `Any` parameter | ~15+ | `git grep -cE "def .+\(.*: Any" -- 'src/*.py'` |
+| Function signatures with `dict\[str, Any\]` parameter | ~20+ | `git grep -cE "def .+\(.*: dict\[str, Any\]" -- 'src/*.py'` |
+| `Optional[T]` return types | ~25+ | `git grep -cE "-> Optional\[" -- 'src/*.py'` |
+| `Any` return types | ~10+ | `git grep -cE "-> Any" -- 'src/*.py'` |
+| Effective codepaths | 4.014e+22 | baseline |
+
+## Goals
+
+| ID | Goal | Acceptance |
+|---|---|---|
+| G1 | `Metadata` becomes `@dataclass(frozen=True, slots=True)` (typed fat struct) | `src/type_aliases.py` shows `Metadata` as a dataclass, NOT `TypeAlias = dict[str, Any]` |
+| G2 | Zero `Metadata: TypeAlias = dict[str, Any]` | The TypeAlias is removed; only the dataclass remains |
+| G3 | Zero `dict[str, Any]` parameter types in internal code | `git grep -cE "def .+\(.*: dict\[str, Any\]" -- 'src/app_controller.py' 'src/gui_2.py' 'src/aggregate.py' 'src/multi_agent_conductor.py' 'src/mcp_client.py' 'src/ai_client.py' 'src/rag_engine.py' 'src/models.py'` returns 0 |
+| G4 | Zero `Any` parameter types in internal code | Same grep with `: Any` returns 0 |
+| G5 | Zero `Optional[T]` return types | `git grep -cE "-> Optional\[" -- 'src/*.py'` returns 0 |
+| G6 | Zero `hasattr(f, ...)` entity dispatch checks | `git grep -cE "hasattr\(f, '(path\|source_tier\|content\|role\|model\|id\|status)'\)" -- 'src/*.py'` returns 0 |
+| G7 | `self.files` is ALWAYS `List[FileItem]` (no dicts in the list) | The append paths convert dicts via `models.FileItem.from_dict(p)`; the `hasattr(f, 'path')` checks are removed |
+| G8 | `flat_config` returns `ProjectContext` (typed), not `dict` | New `ProjectContext` dataclass; `project_manager.flat_config()` returns it |
+| G9 | `rag_engine.search()` returns `List[RAGChunk]` (typed), not `List[Dict]` | Return type changed; 3 consumers updated |
+| G10 | `_do_generate` returns `list[FileItem]` (typed), not `list[Metadata]` | Return type annotation fixed |
+| G11 | All 7 audit gates pass `--strict` | All exit 0 |
+| G12 | All existing tests pass | `scripts/run_tests_batched.py` → 10/11 |
+| G13 | Effective codepaths drops by ≥ 4 orders of magnitude | `< 1e+18` (was 4.014e+22) |
+| G14 | The boundary layer is documented as exactly 2 places: TOML load + JSON parse | `docs/reports/boundary_layer_20260628.md` enumerates every `Metadata` usage with justification |
+
+## Non-Goals
+
+- Modifying the existing 12 per-aggregate dataclass definitions (their fields are correct; just need to USE them)
+- Adding new `src/<thing>.py` files
+- Creating further followup tracks (this is the FINAL track; no more layers)
+- Changing the runtime semantics of Python (we're working within Python's constraints)
+
+## Functional Requirements
+
+### FR1: The Boundary Layer is EXACTLY 2 places
+
+**Place 1: TOML config loaders** in `src/project_manager.py`, `src/preset*.py`, `src/personas.py`, `src/tool_presets.py`, `src/context_presets.py`, `src/workspace_manager.py`.
+
+The TOML loader returns `Metadata` (the typed fat struct) for the 100ns between `tomllib.load()` and the caller's `from_dict()` conversion. Every consumer of the TOML loader immediately does `ProjectContext.from_dict(loaded)`, `Persona.from_dict(loaded)`, etc.
+
+**Place 2: JSON wire parsers** in `src/api_hooks.py` (HTTP entry points) and `src/mcp_client.py` (MCP wire protocol).
+
+The JSON parser returns `Metadata` for the 100ns between `json.loads()` and the caller's `from_dict()` conversion. Every consumer immediately does `ChatMessage.from_dict(payload)`, `MMAUsageStats.from_dict(payload)`, etc.
+
+**No other code uses `Metadata`.** Every other function takes a typed componentized dataclass.
+
+### FR2: `Metadata` becomes a typed fat struct
+
+```python
+# In src/type_aliases.py:
+@dataclass(frozen=True, slots=True)
+class Metadata:
+    """The wire-format boundary type. ONLY used in TOML loaders and JSON parsers.
+    Internal code uses componentized dataclasses (CommsLogEntry, FileItem, etc.)."""
+    # TOML keys
+    paths:        Metadata = field(default_factory=dict)  # nested dict for path config
+    project:      Metadata = field(default_factory=dict)
+    discussion:   Metadata = field(default_factory=dict)
+    # JSON wire keys (per-vendor chat message)
+    role:         str = ""
+    content:      Any = None
+    tool_calls:   Metadata = field(default_factory=list)
+    tool_call_id: str = ""
+    name:         str = ""
+    # Session log keys
+    ts:           str = ""
+    kind:         str = ""
+    direction:    str = ""
+    model:        str = "unknown"
+    source_tier:  str = "main"
+    error:        str = ""
+    # MMA ticket keys
+    id:           str = ""
+    description:  str = ""
+    status:       str = "todo"
+    depends_on:   tuple = ()
+    manual_block: bool = False
+    # RAG result keys
+    document:     str = ""
+    score:        float = 0.0
+    # Tool keys
+    function:     Metadata = field(default_factory=dict)
+    args:         Metadata = field(default_factory=dict)
+    script:       str = ""
+    output:       str = ""
+    type:         str = ""
+    # Tool definition keys
+    description:  str = ""
+    parameters:   Metadata = field(default_factory=dict)
+    auto_start:   bool = False
+    # File item keys
+    path:         str = ""
+    view_mode:    str = "full"
+    custom_slices: Metadata = field(default_factory=list)
+    # Token usage keys
+    input_tokens:  int = 0
+    output_tokens: int = 0
+    cache_read_input_tokens:  int = 0
+    cache_creation_input_tokens: int = 0
+    # Generic pass-through
+    metadata:     Metadata = field(default_factory=dict)
+
+    def to_dict(self) -> Metadata:
+        return {f.name: v for f in fields(self) for v in [getattr(self, f.name)] if v not in (None, "", [], {}, 0, 0.0, False) or f.name in _NON_NULL_FIELDS}
+
+    @classmethod
+    def from_dict(cls, raw: dict[str, Any]) -> "Metadata":
+        valid = {f.name for f in fields(cls)}
+        return cls(**{k: v for k, v in raw.items() if k in valid})
+```
+
+**Why a fat struct here is OK:** the wire format (TOML/JSON) is polymorphic at the boundary. The boundary function receives arbitrary keys. After the boundary, internal code uses componentized types. The fat struct is the WIRE schema; not a lazy-typing escape hatch.
+
+### FR3: Componentize the specific paths (already exist)
+
+The 12 dataclasses already exist from `metadata_promotion_20260624`:
+
+| Dataclass | Used at | Replaces |
+|---|---|---|
+| `CommsLogEntry` | session log entries, MMA telemetry | `entry_obj = {...}` dict literals |
+| `HistoryMessage` | UI discussion history | `msg.get('role', 'unknown')` etc. |
+| `FileItem` | context composition | `flat.get('files', {}).get('paths', [])` |
+| `ToolCall` | tool loop | `tc.get('id')` / `tc['function']['name']` |
+| `ChatMessage` | provider-side history | `msg.get('role')` in send paths |
+| `UsageStats` | token usage | `u.get('input_tokens', 0)` |
+| `RAGChunk` | RAG results | `chunk.get('document', '')` |
+| `Ticket` | MMA tickets | `t.get('id', '')` / `t['depends_on']` |
+| `SessionInsights` | session stats | `insights.get('total_tokens', 0)` |
+| `DiscussionSettings` | per-turn settings | `entry.get('temperature', 0.7)` |
+| `CustomSlice` | visual slices | `slc.get('tag', '')` / `slc['start_line']` |
+| `MMAUsageStats` | per-tier usage | `stats.get('model', 'unknown')` |
+| `ProviderPayload` | script execution | `payload.get('script')` |
+| `UIPanelConfig` | panel state | `gui_cfg.get('separate_message_panel', False)` |
+| `PathInfo` | path config | `proj_paths['logs_dir']` |
+| `ToolDefinition` | tool schemas | `tinfo.get('description', '')` |
+
+**Usage rule:** at each specific path, the variable is declared as the typed dataclass. Direct attribute access. No `.get()`.
+
+### FR4: Fix the central path bugs
+
+These bugs are the source of the defensive checks:
+
+| File:line | Bug | Fix |
+|---|---|---|
+| `src/app_controller.py:1101` | `self.files: List[models.FileItem] = []` (declared) but `app_controller.py:1999-2003` appends dicts | At the append site, convert dicts via `models.FileItem.from_dict(p)`; the list is truly `List[FileItem]` |
+| `src/app_controller.py:4006` | `_do_generate(self) -> tuple[str, Path, list[Metadata], ...]` (return type wrong; actual is `list[FileItem]`) | Change return type to `list[FileItem]`; update `gui_2.py` callers |
+| `src/project_manager.py:flat_config` | returns `dict[str, Any]` | Return `ProjectContext` (new dataclass) |
+| `src/aggregate.py:96` | `f.path if hasattr(f, 'path') else str(f)` (defensive for f might be dict) | `f` is now `FileItem`; `f.path` direct |
+| `src/aggregate.py:193` | `elif hasattr(entry_raw, "path")` (defensive for entry_raw might be dict) | `entry_raw` is `FileItem`; `entry_raw.path` direct |
+| `src/aggregate.py:3259` | `chunk.get('document', '')` (RAG chunk is dict) | `chunk` is `RAGChunk`; `chunk.document` direct |
+| `src/rag_engine.py:367` | `search() -> List[Dict[str, Any]]` (return type wrong) | Return `List[RAGChunk]` |
+| `src/app_controller.py:263` | `[f.path if hasattr(f, "path") else f.get("path") ...]` | `f` is `FileItem`; `f.path` direct |
+| `src/app_controller.py:1767` | same | same |
+| `src/app_controller.py:1771` | same | same |
+| `src/app_controller.py:2536` | same | same |
+| `src/app_controller.py:3129` | same | same |
+| `src/app_controller.py:3182` | same | same |
+| `src/app_controller.py:2274` | `payload.get('script') or json.dumps(payload.get('args', {}), indent=1)` | `payload` is `ProviderPayload`; `payload.script or json.dumps(payload.args, indent=1)` |
+
+After these fixes, `git grep -cE "hasattr\(f," -- 'src/*.py'` returns 0.
+
+### FR5: Eliminate `Optional[T]` returns
+
+Per `conductor/code_styleguides/error_handling.md`:
+
+```python
+# BAD:
+def find_ticket(id: str) -> Optional[Ticket]:
+    ...
+
+# GOOD (Result pattern):
+def find_ticket(id: str) -> Result[Ticket]:
+    return Result(data=NIL_TICKET) if not found else Result(data=ticket)
+
+# BETTER (NIL sentinel):
+def find_ticket(id: str) -> Ticket:
+    ...
+    return NIL_TICKET   # zero-initialized frozen dataclass; safe to read fields
+```
+
+`NIL_TICKET` is a module-level singleton: `NIL_TICKET = Ticket(id="", description="", status="missing", manual_block=False)`. Consumers can read `ticket.id`, `ticket.status`, etc. safely — no `None` check needed.
+
+### FR6: Eliminate `Any` and `dict[str, Any]` from internal function signatures
+
+```python
+# BAD:
+def _to_typed_tool_call(tc: Any) -> ToolCall:
+    return ToolCall(id=getattr(tc, "id", "") or "", ...)
+
+# GOOD (boundary function):
+def _parse_wire_tool_call(wire: dict[str, Any]) -> ToolCall:
+    """Boundary: parse MCP wire-format dict to typed ToolCall. ONLY called from src/openai_compatible.py."""
+    return ToolCall.from_dict(wire)
+
+# INTERNAL function (already typed):
+def process_tool_call(tc: ToolCall) -> None:
+    tool_id = tc.id   # no getattr; the type is guaranteed
+```
+
+After this, every function signature in `src/app_controller.py`, `src/gui_2.py`, `src/aggregate.py`, `src/multi_agent_conductor.py`, `src/mcp_client.py` (internal functions only), `src/ai_client.py` (send methods only — boundary), `src/rag_engine.py`, `src/models.py` declares typed dataclasses (no `Any`, no `dict[str, Any]`).
+
+### FR7: The lazy-init `hasattr(self, ...)` pattern is allowed
+
+The `hasattr(self, 'perf_monitor')` checks in `src/app_controller.py` are NOT entity dispatch — they're lazy initialization. These stay (they're internal state management, not external type dispatch).
+
+But document: per `conductor/code_styleguides/python.md`, lazy init is acceptable. The DOD rule is "no runtime type dispatch for entity types" — lazy init is initialization state, not entity type.
+
+## Per-Phase Task List
+
+### Phase 0: Promote `Metadata` to typed fat struct (FR2)
+
+```bash
+# Read src/type_aliases.py current state
+# Write the new Metadata dataclass with all 30+ fields
+# Remove the TypeAlias
+# Verify: from src.type_aliases import Metadata; Metadata(role='user', content='hi')
+# Verify: Metadata.from_dict({'role': 'user'}) works
+```
+
+### Phase 1: Add new typed `ProjectContext` dataclass
+
+```bash
+# Add ProjectContext to src/models.py with all fields observed in src/project_manager.py:flat_config
+# Convert flat_config to return ProjectContext
+# Update consumers (src/app_controller.py:_do_generate, src/gui_2.py)
+```
+
+### Phase 2: Fix `self.files` in `src/app_controller.py` (FR4 row 1)
+
+```bash
+# At src/app_controller.py:1996-2003, replace the 3-line append with:
+#   for p in paths:
+#       if isinstance(p, dict):
+#           self.files.append(models.FileItem.from_dict(p))
+#       elif isinstance(p, str):
+#           self.files.append(models.FileItem(path=p))
+#       elif isinstance(p, models.FileItem):
+#           self.files.append(p)
+#       else:
+#           raise TypeError(f"unexpected file item type: {type(p)}")
+# Remove all hashr(f, 'path') checks at: 263, 1767, 1771, 2536, 3129, 3182
+```
+
+### Phase 3: Fix `_do_generate` return type (FR4 row 2)
+
+```bash
+# Change src/app_controller.py:4006 from `list[Metadata]` to `list[FileItem]`
+# Update src/gui_2.py callers (search for `_do_generate(` and verify the receiver is typed as list[FileItem])
+```
+
+### Phase 4: Fix `rag_engine.search()` return type (FR4 row 7)
+
+```bash
+# Change src/rag_engine.py:367 from `List[Dict[str, Any]]` to `List[RAGChunk]`
+# Update src/aggregate.py:3259, src/app_controller.py:251, src/app_controller.py:4162 to use chunk.document directly
+# Handle the wire format mismatch (RAGChunk expects path top-level; wire has metadata.path)
+```
+
+### Phase 5: Fix all `entry_obj = {...}` dict literals in `src/app_controller.py` (FR4 row 14)
+
+```bash
+# At src/app_controller.py:2274, replace `payload.get('script') or json.dumps(payload.get('args', {}), indent=1)` with `pp = ProviderPayload.from_dict(payload); pp.script or json.dumps(pp.args, indent=1)`
+# Same for lines 2277, 2287, 2305-2308 (already partly done)
+# Same for lines 3508 (`f['path'] for f in file_items` → `f.path for f in file_items` since f is now FileItem)
+```
+
+### Phase 6: Fix `src/aggregate.py` defensive checks (FR4 rows 5-6)
+
+```bash
+# At src/aggregate.py:96, replace `f.path if hasattr(f, 'path') else str(f)` with `f.path` (f is FileItem)
+# At src/aggregate.py:193, replace `elif hasattr(entry_raw, "path")` with `elif isinstance(entry_raw, FileItem): entry_raw.path`
+# At src/aggregate.py:3259, replace `chunk.get('document', '')` with `chunk.document` (chunk is RAGChunk)
+```
+
+### Phase 7: Eliminate `Optional[T]` returns (FR5)
+
+```bash
+# For each `Optional[T]` return in src/, replace with `Result[T]` or `NIL_T` sentinel
+# Define NIL_TICKET, NIL_COMMS_LOG_ENTRY, etc. in src/type_aliases.py
+# Update consumers to handle NIL_T (read fields directly; NIL_T is zero-initialized)
+```
+
+### Phase 8: Eliminate `Any` and `dict[str, Any]` from internal signatures (FR6)
+
+```bash
+# For each function signature with `Any` or `dict[str, Any]` parameter in internal files, change to the typed dataclass
+# For boundary functions (TOML/JSON parsers), keep `dict[str, Any]` but document with a comment that it's a boundary
+```
+
+### Phase 9: Re-measure + verification
+
+```bash
+# Cruft counts all 0
+git grep -cE "\.get\('[a-z_]+'," -- 'src/*.py'  # expect: < 15 (only collapsed-codepath)
+git grep -cE "hasattr\(f, '(path|source_tier|content|role|model|id|status)'\)" -- 'src/*.py'  # expect: 0
+git grep -cE "def .+\(.*: (Metadata|Any|dict\[str, Any\])" -- 'src/app_controller.py' 'src/gui_2.py' 'src/aggregate.py' 'src/multi_agent_conductor.py' 'src/mcp_client.py' 'src/ai_client.py' 'src/rag_engine.py' 'src/models.py'  # expect: 0
+git grep -cE "-> Optional\[" -- 'src/*.py'  # expect: 0
+git grep -cE "-> Any" -- 'src/*.py'  # expect: 0
+
+# Effective codepaths
+uv run python -c "..."  # expect: < 1e+18
+
+# 7 audit gates
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+# etc.
+
+# Batched tests
+uv run python scripts/run_tests_batched.py  # expect: 10/11 PASS
+```
+
+### Phase 10: Boundary layer audit + documentation
+
+```bash
+# Document every Metadata usage with justification
+git grep -nE "Metadata" -- 'src/*.py' > /tmp/metadata_usages.txt
+
+# Write docs/reports/boundary_layer_20260628.md
+# Enumerate every Metadata usage; classify as boundary (kept) or internal (must fix)
+# Expect: only the TOML loaders + JSON parsers retain Metadata
+```
+
+## Acceptance Criteria (Definition of Done)
+
+| # | Criterion | Verification |
+|---|---|---|
+| VC1 | `Metadata` is a `@dataclass(frozen=True, slots=True)` with explicit fields | `git grep -A 1 "^class Metadata" src/type_aliases.py` shows `@dataclass(frozen=True, slots=True)` |
+| VC2 | No `TypeAlias = dict[str, Any]` for Metadata | `git grep "^Metadata: TypeAlias" src/type_aliases.py` returns nothing |
+| VC3 | Zero `dict[str, Any]` parameter types in internal files | grep returns 0 |
+| VC4 | Zero `Any` parameter types in internal files | grep returns 0 |
+| VC5 | Zero `Optional[T]` return types | grep returns 0 |
+| VC6 | Zero `hasattr(f, ...)` entity dispatch checks | grep returns 0 |
+| VC7 | `self.files` is always `List[FileItem]` | `git grep -E "self\.files\.append\(" -- 'src/app_controller.py'` shows ONLY FileItem appends |
+| VC8 | `flat_config` returns typed `ProjectContext` | New dataclass exists; return type fixed |
+| VC9 | `rag_engine.search()` returns `List[RAGChunk]` | Return type fixed; 3 consumers updated |
+| VC10 | All 7 audit gates pass | All exit 0 |
+| VC11 | 10/11 batched test tiers PASS | `scripts/run_tests_batched.py` → 10/11 |
+| VC12 | Effective codepaths < 1e+18 | 4+ orders of magnitude drop |
+| VC13 | Boundary layer audit written | `docs/reports/boundary_layer_20260628.md` exists |
+| VC14 | The 12 per-aggregate dataclasses used at their specific paths | grep shows direct attribute access everywhere |
+
+## Why this is the FINAL track (no more followups)
+
+After this track:
+
+1. **`Metadata` is a typed fat struct**, used ONLY at the literal TOML/JSON boundary (2 places in the entire codebase).
+2. **Every internal function takes a typed dataclass** — no `Any`, no `dict[str, Any]`.
+3. **No runtime type dispatch** — no `hasattr()` for entity type checks, no `isinstance()` for entity dispatch.
+4. **No null** — `Result[T]` + `NIL_T` sentinels per `error_handling.md`.
+5. **No `.get()` on known fields** — direct attribute access.
+6. **The metric drops by 4+ orders of magnitude** because dispatcher functions lose their polymorphic branches.
+
+The conventions are ENFORCED:
+- Every new function signature MUST declare typed parameters (no `Any`).
+- Every new dataclass goes in `src/type_aliases.py` (type-system) or the appropriate parent module (in-module).
+- Every wire boundary (TOML/JSON parse) is the ONLY place `Metadata` (the typed fat struct) appears.
+- Every consumer of a wire boundary IMMEDIATELY converts to a componentized dataclass via `from_dict()`.
+
+Future code that wants to receive raw data MUST:
+- Add a `from_dict()` classmethod to the appropriate dataclass (or create a new one)
+- Convert at the wire boundary
+- Internal code only sees the typed dataclass
+
+This is C11/Odin/Jai semantics in Python. As fast as Python can be.
+
+## See also
+
+- `conductor/code_styleguides/data_oriented_design.md` — the canonical DOD reference (Mike Acton, Ryan Fleury, Casey Muratori)
+- `conductor/code_styleguides/error_handling.md` — `Result[T]` + `NIL_T` convention
+- `conductor/code_styleguides/type_aliases.md` §2.5 — the per-aggregate dataclass rule
+- `docs/reports/FOLLOWUP_metadata_promotion_20260624.md` — the prior Tier 1 review (the root cause analysis)
+- `conductor/tracks/metadata_promotion_20260624/spec.md` — the track that added the 12 componentized dataclasses
+- `conductor/tracks/type_alias_unfuck_20260626/spec.md` — the track that migrated the consumer sites (with the `isinstance` cruft this track removes)
+- `src/type_aliases.py` — the boundary type (`Metadata`) and the 12 componentized dataclasses
+- `src/models.py:533` — `FileItem` (canonical in-module dataclass)
+- `src/models.py:302` — `Ticket` (canonical in-module dataclass)
+- `src/openai_schemas.py` — `ToolCall`, `ChatMessage`, `UsageStats` (canonical provider-side dataclasses)
+- `conductor/AGENTS.md` — hard bans (NEVER use `git restore`, `git checkout --`, `git reset`, `git revert`)

conductor/tracks/cruft_elimination_20260627/state.toml

@@ -0,0 +1,89 @@
+[meta]
+track_id = "cruft_elimination_20260627"
+name = "C11/Python Type Promotion Mandate - Cruft Elimination"
+status = "active"
+current_phase = 9
+last_updated = "2026-06-27"
+
+[blocked_by]
+# None - independent track; metadata_promotion_20260624 + type_alias_unfuck_20260626 are SHIPPED
+
+[phases]
+phase_0 = { status = "completed", checkpointsha = "2a768893", name = "Pre-flight baseline + audit verification" }
+phase_1 = { status = "completed", checkpointsha = "75eb6dbb", name = "Promote Metadata from TypeAlias to typed fat struct" }
+phase_2 = { status = "deferred", checkpointsha = "", name = "Add ProjectContext dataclass for flat_config (spec mismatch)" }
+phase_3 = { status = "completed", checkpointsha = "0d0b433a", name = "Fix self.files in app_controller.py (13 hasattr checks removed; 18 in gui_2.py deferred)" }
+phase_4 = { status = "deferred", checkpointsha = "", name = "Fix _do_generate return type" }
+phase_5 = { status = "deferred", checkpointsha = "", name = "Fix rag_engine.search() return type" }
+phase_6 = { status = "deferred", checkpointsha = "", name = "Eliminate Optional[T] returns (30 sites across 14 files)" }
+phase_7 = { status = "deferred", checkpointsha = "", name = "Eliminate Any and dict[str, Any] from internal signatures (69 sites)" }
+phase_8 = { status = "completed", checkpointsha = "0d0b433a", name = "Re-measure + verification" }
+phase_9 = { status = "completed", checkpointsha = "PENDING", name = "Boundary layer audit + documentation" }
+
+[tasks]
+t0_1 = { status = "completed", commit_sha = "2a768893", description = "Pre-flight: capture baseline counts" }
+t0_2 = { status = "completed", commit_sha = "2a768893", description = "Pre-flight: verify 7 audit gates pass --strict" }
+t0_3 = { status = "completed", commit_sha = "2a768893", description = "Pre-flight: verify 18 per-aggregate dataclasses (17/18 have from_dict(); NormalizedResponse is output type)" }
+t1_1 = { status = "completed", commit_sha = "75eb6dbb", description = "Phase 1: replace Metadata TypeAlias with @dataclass(frozen=True, slots=True) having 36 fields" }
+t3_1 = { status = "completed", commit_sha = "0d0b433a", description = "Phase 3 partial: remove 13 hasattr(f, ...) checks in src/app_controller.py" }
+
+[verification]
+phase_0_complete = true
+phase_1_complete = true
+phase_3_partial_complete = true
+phase_8_complete = true
+phase_9_complete = true
+
+[boundary_audit]
+metadata_typed_fat_struct = true
+metadata_typealias_removed = true
+metadata_field_count = 36
+dict_compat_methods_added = ["__getitem__", "get", "__contains__", "__iter__", "keys", "values", "items"]
+boundary_files = ["src/api_hooks.py", "src/project_manager.py", "src/session_logger.py", "src/mcp_client.py"]
+
+[metric_summary]
+baseline = { metadata_typealias = 1, hasattr_f_path = 29, optional_returns = 30, any_params = 59, dict_str_any_params = 10 }
+after_phases_1_3 = { metadata_typealias = 0, hasattr_f_path = 19, optional_returns = 30, any_params = 60, dict_str_any_params = 11 }
+deltas = { metadata_typealias = -1, hasattr_f_path = -10, optional_returns = 0, any_params = 1, dict_str_any_params = 1 }
+
+[incomplete_per_spec]
+# This track is INCOMPLETE per its spec. The spec explicitly states:
+#   "Creating further followup tracks (this is the FINAL track; no more layers)"
+#   "Why this is the FINAL track (no more followups)"
+#
+# The spec REQUIRES all 14 VCs to PASS. Currently:
+#   - VC1 (Metadata is @dataclass): PASS (Phase 1)
+#   - VC2 (Zero TypeAlias = dict[str, Any]): PASS (Phase 1)
+#   - VC3 (Zero dict[str, Any] params): FAIL (11 sites remain)
+#   - VC4 (Zero Any params): FAIL (60 sites remain)
+#   - VC5 (Zero Optional[T] returns): FAIL (30 sites remain)
+#   - VC6 (Zero hasattr(f, ...) entity dispatch): PARTIAL (19 sites remain, all in gui_2.py and aggregate.py)
+#   - VC7 (self.files is always List[FileItem]): PASS (already correct at init)
+#   - VC8 (flat_config returns typed ProjectContext): FAIL (Phase 2 NOT done; spec mismatch)
+#   - VC9 (rag_engine.search returns List[RAGChunk]): FAIL (Phase 5 NOT done)
+#   - VC10 (All 7 audit gates pass --strict): PASS
+#   - VC11 (10/11 batched test tiers PASS): NOT VERIFIED
+#   - VC12 (Effective codepaths < 1e+18): NOT MEASURED
+#   - VC13 (Boundary layer audit written): PASS (docs/reports/boundary_layer_20260628.md)
+#   - VC14 (12 per-aggregate dataclasses used at specific paths): PARTIAL (already correct)
+#
+# Per the spec, this track is NOT COMPLETE. 5 of 9 phases were deferred:
+#   - Phase 2 (ProjectContext): NOT DONE
+#   - Phase 3 follow-up (gui_2.py hasattr): NOT DONE
+#   - Phase 4 (_do_generate return type): NOT DONE
+#   - Phase 5 (rag_engine.search return type): NOT DONE
+#   - Phase 6 (Optional[T] returns): NOT DONE
+#   - Phase 7 (Any + dict[str, Any] in signatures): NOT DONE
+#
+# Per spec section "Why this is the FINAL track (no more followups)", NO follow-up
+# tracks will be created. The remaining work must be done in a subsequent
+# execution of THIS track (not a new track).
+
+[audit_gate_results]
+audit_weak_types = "STRICT OK (107 <= 112 baseline)"
+generate_type_registry = "Registry in sync (23 files checked)"
+audit_main_thread_imports = "OK (17 files)"
+audit_no_models_config_io = "OK (0 violations)"
+audit_optional_in_3_files = "OK (0 return-type violations)"
+audit_exception_handling = "OK"
+audit_code_path_audit_coverage = "OK (0 violations, 10 profiles)"

conductor/tracks/enforcement_gap_closure_20260627/metadata.json

@@ -0,0 +1,109 @@
+{
+ "track_id": "enforcement_gap_closure_20260627",
+ "name": "Enforcement Gap Closure (Boundary-Layer Audit + Optional[T] Audit Widening)",
+ "status": "active",
+ "branch": "master",
+ "created": "2026-06-27",
+ "owner": "Tier 1 (initialized); implementation delegated to Tier 2/3.",
+ "blocked_by": [],
+ "blocks": [],
+ "scope": {
+  "new_files": [
+   "scripts/audit_boundary_layer.py",
+   "scripts/boundary_layer_allowlist.toml",
+   "scripts/audit_optional_returns.py (renamed from audit_optional_in_3_files.py)",
+   "scripts/audit_optional_returns.baseline.json",
+   "tests/test_audit_boundary_layer.py",
+   "tests/test_audit_optional_returns.py",
+   "docs/reports/TRACK_COMPLETION_enforcement_gap_closure_20260627.md"
+  ],
+  "modified_files": [
+   "conductor/code_styleguides/python.md (sections 17.7, 17.8, inventory table 449-456)",
+   "conductor/code_styleguides/error_handling.md (cross-reference sweep only)",
+   "docs/AGENTS.md (cross-reference sweep only)",
+   "conductor/tracks.md (active-track row + status)",
+   "conductor/chronology.md (prepend shipment row)"
+  ],
+  "deleted_files": [
+   "scripts/audit_optional_in_3_files.py (renamed to audit_optional_returns.py via git mv)"
+  ]
+ },
+ "estimated_effort": {
+  "method": "scope (per workflow.md Tier 1 Track Initialization Rules. NO day estimates.)",
+  "phase_1": "4 tasks: 1 test file (10 tests) + 1 audit script + 1 allowlist TOML + green-phase verification",
+  "phase_2": "3 tasks: 1 test file (5 tests) + 1 rename/edit + 1 baseline JSON + green-phase verification",
+  "phase_3": "2 tasks: 1 styleguide inventory edit + 1 cross-reference sweep",
+  "phase_4": "4 tasks: 7-audit verification + 1 end-of-track report + 1 state update + user sign-off"
+ },
+ "verification_criteria": [
+  "G1: scripts/audit_boundary_layer.py exists + AST-scans all src/*.py + exits 1 in --strict on un-allowlisted dict[str, Any] sites",
+  "G2: scripts/boundary_layer_allowlist.toml exists + lists ~14 boundary files with reasons + --show-allowlist prints them",
+  "G3: scripts/audit_optional_returns.py exists (renamed from audit_optional_in_3_files.py) + scans all src/*.py + 3 history.py residuals baselined in audit_optional_returns.baseline.json (strict stays green)",
+  "G4: conductor/code_styleguides/python.md sections 17.7, 17.8, and inventory table reflect post-track reality (audit_boundary_layer implemented; audit_optional_returns implemented; audit_imports implemented)",
+  "G5: cross-reference sweep complete (no enforcement-instruction references to audit_optional_in_3_files.py; historical references preserved)",
+  "G6: tests/test_audit_boundary_layer.py has >=10 tests; all pass",
+  "G7: tests/test_audit_optional_returns.py has >=5 tests; all pass",
+  "G8: docs/reports/TRACK_COMPLETION_enforcement_gap_closure_20260627.md exists; documents contradiction closure (C1, C2, C3-partial, C18-partial, C21) and remaining (C5, C6, C16, C17 - deferred per user directive)",
+  "VC_pre_commit_parallel_safe": "ZERO file overlap with the running tier2/post_module_taxonomy_de_cruft_20260627 branch (verified by Tier 1 against ddcec7b0 + TRACK_COMPLETION file-level changes)"
+ ],
+ "regressions_and_pre_existing_failures": [],
+ "pre_existing_failures_remaining": [],
+ "deferred_to_followup_tracks": [
+  {
+   "title": "Optional[T] return migration in src/history.py",
+   "description": "3 RETURN_OPTIONAL sites in src/history.py baselined by this track; cruft_elimination_20260627 Phase 6 owns the migration to Result[T] + NIL_T.",
+   "track_status": "planned in cruft_elimination_20260627"
+  },
+  {
+   "title": "dict[str, Any] migration in hot_reloader.py + startup_profiler.py",
+   "description": "2 un-allowlisted boundary violations baselined by this track; a future track promotes them to typed dataclasses (HotReloadSnapshot, ProfilerSnapshot).",
+   "track_status": "not yet initialized"
+  },
+  {
+   "title": "Main-repo pre-commit hook wiring",
+   "description": "The 5 audit scripts strict mode (weak_types, boundary_layer, optional_returns, exception_handling, imports) is not wired into the main repo's .git/hooks/. Per contradictions report C4.",
+   "track_status": "not yet initialized"
+  },
+  {
+   "title": "Docs-count drift in docs/Readme.md (C7, C8, C9) + styleguide drift (C16 python.md s10, C17 type_aliases.md line 19) + RAGChunk.id in guides (C6)",
+   "description": "Deferred per user directive 2026-06-27 until tier2 branch stabilizes; these describe code state that exists post-merge of the taxonomy branches.",
+   "track_status": "deferred; will bundle into a docs-sync track post-merge"
+  }
+ ],
+ "risk_register": [
+  {
+   "id": "R1",
+   "description": "audit_optional_returns.baseline.json format mismatch with audit_weak_types.baseline.json contract",
+   "likelihood": "medium",
+   "impact": "the renamed --strict mode behaves inconsistently with the existing baseline pattern",
+   "mitigation": "Tier 3 reads scripts/audit_weak_types.py + its baseline JSON before implementing; mirror the exact contract"
+  },
+  {
+   "id": "R2",
+   "description": "Cross-file rename race if Tier 2 branch touches scripts/audit_optional_in_3_files.py in parallel",
+   "likelihood": "low",
+   "impact": "the git mv conflicts with Tier 2 work",
+   "mitigation": "Tier 1 verified post_module_taxonomy_de_cruft TRACK_COMPLETION does not touch audit_optional_*; only scripts/audit_no_models_config_io.py"
+  },
+  {
+   "id": "R3",
+   "description": "Boundary allowlist under-classifies a genuine violation as boundary (false negative)",
+   "likelihood": "medium",
+   "impact": "the audit misses a real dict[str, Any] escape hatch that future LLMs reach for",
+   "mitigation": "Tier 1's spec 'Current State Audit' manually classified the 14 legitimate boundary files + 2 genuine violators; the audit starts from that classification. Reviewer (user) inspects boundary_layer_allowlist.toml before merge."
+  },
+  {
+   "id": "R4",
+   "description": "Over-classification: audit flags a genuine boundary function as a violation (false positive)",
+   "likelihood": "low",
+   "impact": "strict mode is red on a real boundary file; either the allowlist is amended (correct fix) or the violation is suppressed (wrong fix, masks drift)",
+   "mitigation": "Per spec FR1, allowlisting is the explicit 'declare your boundary' mechanism; the reviewer audits the allowlist at merge time. The audit's `--no-allowlist` mode exposes every site so reviewers can spot-check classifications."
+  }
+ ],
+ "contradictions_report_cross_reference": {
+  "source": "docs/reports/CONTRADICTIONS_REPORT_20260627.md",
+  "closes": ["C1", "C2", "C3_partial", "C18_partial", "C21"],
+  "defers": ["C5", "C6", "C7", "C8", "C9", "C11", "C12", "C13", "C14", "C15", "C16", "C17", "C19", "C20"],
+  "rationale": "C1+C2+C21 are about the Optional audit name+scope (closed by Phase 2 rename+widen). C3-partial is 'audit_imports.py planned but exists' (closed by Phase 3 inventory correction). C18-partial is the audit count (closed by Phase 3). The 14 deferred items are docs-sync (C5-C9, C16, C17) or status drift (C11-C15, C19, C20) that per user directive 2026-06-27 wait for the tier2 taxonomy branch to stabilize before touching master's docs."
+ }
+}

conductor/tracks/enforcement_gap_closure_20260627/plan.md

@@ -0,0 +1,172 @@
+# Plan: Enforcement Gap Closure (Boundary-Layer Audit + Optional[T] Audit Widening)
+
+Track: `enforcement_gap_closure_20260627`
+Branch: master (parallel-safe against `tier2/post_module_taxonomy_de_cruft_20260627`)
+Spec: `conductor/tracks/enforcement_gap_closure_20260627/spec.md`
+
+This plan is read by a Tier 3 Worker (or Tier 2). All Python edits MUST use 1-space indentation. No comments in body. CRLF preserved via `manual-slop_edit_file` MCP tool (never native `edit`).
+
+**Audit-then-specify verification done by Tier 1:** All file:line references below were verified against master at `77b70226` on 2026-06-27.
+
+---
+
+## Phase 1: Boundary-Layer Audit Script
+
+Focus: Implement `scripts/audit_boundary_layer.py` + `scripts/boundary_layer_allowlist.toml` + tests, mirroring the `audit_imports.py` + `audit_imports_whitelist.toml` contract.
+
+- [ ] Task 1.1: Write failing tests for `scripts/audit_boundary_layer.py`
+  - **WHERE:** `tests/test_audit_boundary_layer.py` (NEW file)
+  - **WHAT:** 10 tests per spec FR5 (finder detects `dict[str, Any]` in return / param / local; allowlist suppression + WHITELISTED annotation; `--strict` exit 1 on un-allowlisted; `--strict` exit 0 on allowlisted; `--json` shape; missing-file handling; syntax-error handling; `--show-allowlist`).
+  - **HOW:** Use `tmp_path` (or `tests/artifacts/` per workspace_paths.md — see workflow.md "Test Sandbox Hardening") to create a synthetic `src/` tree the audit can scan via a `--src` flag (mirror `audit_weak_types.py --src`). Each test creates 1-2 small .py files with the pattern under test, invokes the audit via `subprocess.run(["python", "scripts/audit_boundary_layer.py", "--src", str(tmp_src), ...])`, asserts on stdout + exit code. Tests MUST fail before the script exists (Red phase).
+  - **SAFETY:** No `live_gui` fixture (these are unit tests of a script). No `unittest.mock.patch` of core code. Use `monkeypatch.setenv` for the `--src` path or pass via argv.
+  - **COMMIT:** `test(audit): add 10 failing tests for boundary-layer audit`
+  - **GIT NOTE:** Red-phase tests for `scripts/audit_boundary_layer.py`; cover finder + allowlist + strict + json + error-handling per spec FR1 + FR5.
+
+- [ ] Task 1.2: Implement `scripts/audit_boundary_layer.py`
+  - **WHERE:** `scripts/audit_boundary_layer.py` (NEW file)
+  - **WHAT:** Implement the audit per spec FR1. The structure mirrors `scripts/audit_imports.py` (309 lines): module docstring → argparse → `audit_file(path) -> list[Finding]` → main loop over `sorted(Path(src).glob("*.py"))` → exit code logic.
+  - **HOW:** Reuse the `audit_optional_in_3_files.py` AST detector pattern (it already has `_annotation_is_optional_arg` — copy the analogous `_is_dict_str_any` helper). Detection contract (FR1):
+    1. Walk each `ast.FunctionDef` / `AsyncFunctionDef`:
+       - If `node.returns` is `dict[str, Any]` (Subscript with value Name "dict"|"Dict" and slice Tuple `[Name "str", Name "Any"]`) → emit `RETURN_DICT_ANY`.
+       - For each arg in `args.args + kwonlyargs + posonlyargs`: if `arg.annotation` is `dict[str, Any]` → emit `PARAM_DICT_ANY`.
+    2. Walk each `ast.AnnAssign` inside a function body: if `target.annotation` is `dict[str, Any]` → emit `LOCAL_ANNOT_DICT_ANY`.
+    3. Allowlist: load `scripts/boundary_layer_allowlist.toml` (use `tomllib.load`); for any file whose relative path is a key, suppress all findings for that file and emit a single `WHITELISTED` finding per file (matches `audit_imports.py` precedent).
+    4. CLI flags: `--strict`, `--json`, `--show-allowlist`, `--no-allowlist`, `--src <path>` (default `"src"`).
+    5. Default mode: print summary table (file, sites, allowlisted) + a list of violations; exit 0.
+    6. `--strict`: same + exit 1 if there are un-allowlisted `RETURN_DICT_ANY` / `PARAM_DICT_ANY` / `LOCAL_ANNOT_DICT_ANY` findings.
+    7. `--json`: print JSON `{files_scanned, files_with_findings, total_findings, by_kind, findings}` and exit 0.
+    8. `--show-allowlist`: print the TOML contents + reasons; exit 0.
+    9. `--no-allowlist`: do not read the TOML; audit all sites.
+  - **SAFETY:** Pure stdlib (`ast`, `argparse`, `json`, `sys`, `pathlib.Path`, `tomllib`). No subprocess to `src/` files.
+  - **COMMIT:** `feat(audit): implement audit_boundary_layer.py per FR1`
+  - **GIT NOTE:** Implements the §17.7 boundary-layer audit; mirrors audit_imports.py contract; allowlist-driven per-file suppression.
+
+- [ ] Task 1.3: Write `scripts/boundary_layer_allowlist.toml`
+  - **WHERE:** `scripts/boundary_layer_allowlist.toml` (NEW file)
+  - **WHAT:** Initial allowlist with the ~14 legitimate boundary files from spec "Current State Audit": `context_presets.py`, `events.py`, `openai_compatible.py`, `theme_models.py`, `log_registry.py`, `presets.py`, `tool_presets.py`, `personas.py`, `workspace_manager.py`, `paths.py`, `gemini_cli_adapter.py`, `mcp_client.py`, `type_aliases.py`, `session_logger.py`.
+  - **HOW:** Mirror `audit_imports_whitelist.toml` format:
+    - Header comment block (purpose + format).
+    - "Last reviewed: 2026-06-27"
+    - One `[allowlist."<relative_path>"]` entry per file with `reason = "..."` documenting why it's at the wire boundary (the reasons are documented in spec "Current State Audit" — e.g., context_presets = "project_dict is the wire TOML"; events.to_dict = "wire serialization for WS protocol"; etc.).
+  - **SAFETY:** Pure TOML; no code.
+  - **COMMIT:** `feat(audit): seed boundary_layer_allowlist.toml with 14 boundary files`
+  - **GIT NOTE:** Allowlist seeds the §17.7 legitimate boundary; per audit_imports_whitelist.toml precedent.
+
+- [ ] Task 1.4: Run tests for Phase 1 (Green phase)
+  - **WHAT:** Execute `uv run pytest tests/test_audit_boundary_layer.py -v` (batched-runner convention can also be used: `uv run python scripts/run_tests_batched.py --filter test_audit_boundary_layer`). All 10 tests must pass. If any fail, debug (≤2 retries per workflow.md "Deduction Loop" rule), then STOP and report if still failing.
+  - **COMMIT:** `conductor(state): mark Phase 1 task 1.4 verification` (or skip the commit if no code changes; just verify).
+  - **GIT NOTE:** Green-phase verification for boundary-layer audit + allowlist.
+
+---
+
+## Phase 2: Optional[T] Audit Rename + Widening
+
+Focus: Rename `audit_optional_in_3_files.py` → `audit_optional_returns.py`, widen from 4 files to all `src/*.py`, baseline the 3 `history.py` residuals.
+
+- [ ] Task 2.1: Write failing tests for the renamed + widened audit
+  - **WHERE:** `tests/test_audit_optional_returns.py` (NEW file)
+  - **WHAT:** 5 tests per spec FR5: test_renamed_script_exists, test_scans_all_src_files, test_baseline_reading_keeps_strict_green, test_strict_exits_1_above_baseline, test_param_optional_is_warning_not_strict.
+  - **HOW:** For test_scans_all_src_files, use `monkeypatch` + `--src <tmp_src>` flag (the script may need a `--src` flag added in Task 2.2 if it doesn't already have one — current `audit_optional_in_3_files.py` hardcodes the 4-file path; Task 2.2 adds `--src`). Tests must fail against the OLD script (which still hardcodes 4 files).
+  - **SAFETY:** No `live_gui`. No core mocking.
+  - **COMMIT:** `test(audit): add 5 failing tests for audit_optional_returns widening`
+  - **GIT NOTE:** Red-phase tests for the rename + widening to all src/*.py per spec FR3 + FR5.
+
+- [ ] Task 2.2: Rename + widen `audit_optional_in_3_files.py` → `audit_optional_returns.py`
+  - **WHERE:** `git mv scripts/audit_optional_in_3_files.py scripts/audit_optional_returns.py` then edit the new file.
+  - **WHAT:** Per spec FR3:
+    1. `git mv` the file (preserves history).
+    2. Edit `scripts/audit_optional_returns.py`:
+       - Module docstring: drop "4 baseline files"; say "all `src/*.py` per §17 post-2026-06-27 widening (the successor to `audit_optional_in_3_files.py`, which was renamed + widened on 2026-06-27)."
+       - Replace `BASELINE_FILES: tuple[str, ...] = (...)` with `def _discover_src_files(src_dir: str = "src") -> list[Path]: return sorted(Path(src_dir).glob("*.py"))`.
+       - Update `main()` to iterate `_discover_src_files(args.src)` instead of the hardcoded tuple.
+       - Add `--src <path>` arg (default `"src"`) mirroring `audit_weak_types.py`.
+       - Update `--json` output's `"files_scanned"` field to reflect the glob count.
+    3. Create `scripts/audit_optional_returns.baseline.json` recording the 3 `src/history.py` `RETURN_OPTIONAL` findings so `--strict` exits 0 on master (findings ≤ baseline). Format: same as `audit_weak_types.baseline.json` (a JSON object with a count or a list of `{file, line, function, kind}` entries that strict mode subtracts). The strict-mode logic: load baseline; subtract baseline findings from current findings; exit 1 if residuals > 0. (Mirror `audit_weak_types.py`'s `--strict` + baseline contract — read its source to confirm the exact subtraction mechanism.)
+  - **SAFETY:** No `src/` edits. No tests/ edits except the new test file from Task 2.1.
+  - **COMMIT:** `refactor(audit): rename audit_optional_in_3_files.py -> audit_optional_returns.py; widen to all src/*.py; baseline 3 history.py residuals`
+  - **GIT NOTE:** Closes contradictions C1+C21 (script name) + C2 (Optional ban scope ambiguity); script name + scope + baseline now honest per §17 post-2026-06-27.
+
+- [ ] Task 2.3: Run tests for Phase 2 (Green phase)
+  - **WHAT:** `uv run pytest tests/test_audit_optional_returns.py -v`. All 5 tests must pass. If failures, ≤2 debug retries; then STOP.
+  - **VERIFY:** Also run the existing audit_optional tests (if any reference the old name, update them — likely there are no callers other than `code_path_audit_20260607`'s historical references which don't run).
+  - **COMMIT:** `conductor(state): mark Phase 2 task 2.3 verification` (or skip if no code changes).
+  - **GIT NOTE:** Green-phase verification for the rename + widening.
+
+---
+
+## Phase 3: Styleguide Doc Reconciliation
+
+Focus: Fix `python.md` §17 enforcement inventory + §17.8 section to match post-track reality. Close contradictions C3, C18 (audit_imports exists), C1+C21 (script renamed), C2 (scope clarified), C5 (Result notation — only if no branch-sensitivity; per spec OOS, this is C5 which is deferred — confirm during this phase).
+
+- [ ] Task 3.1: Fix `python.md` §17 inventory table (lines 449-456) + §17.8 enforcement section (lines 357-362)
+  - **WHERE:** `conductor/code_styleguides/python.md`
+  - **WHAT:** Per spec FR4:
+    1. Inventory table (lines 449-456): update the rows:
+       - `dict[str, Any]` ban: ADD a row for `scripts/audit_boundary_layer.py --strict` (implemented this track; reads `boundary_layer_allowlist.toml`; `--no-allowlist` audits all). KEEP the existing `audit_weak_types.py --strict` row (they catch overlapping but distinct shapes — weak_types catches `Any` in any position; boundary_layer specifically targets `dict[str, Any]` in *signatures* outside the allowlisted boundary).
+       - `Optional[T]` returns: change the row from "audit_optional_in_3_files.py covering 4 baseline files" to "audit_optional_returns.py --strict covering all src/*.py; reads audit_optional_returns.baseline.json for the 3 history.py residuals until cruft_elimination Phase 6". Mark "✅ implemented".
+       - Local imports + `_PREFIX` aliasing + repeated `.from_dict()`: change `audit_imports.py` row to "✅ implemented" (was "⚠️ not yet built" — wrong; the script exists at `scripts/audit_imports.py`).
+       - Repeated `.from_dict()`: drop "(no script planned; relies on Tier 2 review)" — covered by `audit_imports.py`.
+    2. §17.8 enforcement section (lines 357-362): rewrite the bullets per spec FR4:
+       - Bullet for `audit_optional_returns.py` → reflects rename + all-src scope.
+       - Bullet for `audit_imports.py` → drop the "(planned per §17.9a)" parenthetical; mark as implemented.
+       - Bullet for `audit_boundary_layer.py --strict` → replace the "boundary_layer audit (planned...)" bullet; describe the script + allowlist + `--no-allowlist` flag.
+       - The "Pre-commit: every commit MUST pass all four audits above" line → "five audits above" (weak_types, boundary_layer, optional_returns, exception_handling, imports).
+  - **HOW:** Use `manual-slop_edit_file` MCP tool. Verify exact line ranges via `manual-slop_get_file_slice` before editing (the line numbers above are approximate; the actual edit replaces a contiguous block). Preserve CRLF.
+  - **SAFETY:** Pure doc edit. No code. No `src/` changes. No tests changes.
+  - **COMMIT:** `docs(python.md): reconcile §17 inventory + §17.8 with post-track reality`
+  - **GIT NOTE:** Closes C3 (audit_imports.py was "planned" but exists), C18 (audit count), C1+C21 reflected in doc; C2 scope clarified.
+
+- [ ] Task 3.2: Cross-reference sweep for `audit_optional_in_3_files.py` references
+  - **WHAT:** Use `manual-slop_py_find_usages` / `rg` to find ALL references to the old script name across `conductor/` and `docs/`. Per the spec, references likely exist in `error_handling.md:885` + `docs/AGENTS.md §"Convention Enforcement"`. For each reference:
+    - If it's a historical/cross-reference note (e.g., "was `audit_optional_in_3_files.py`"), leave it.
+    - If it's an enforcement-instruction reference (e.g., "run `uv run python scripts/audit_optional_in_3_files.py --strict`"), update to `audit_optional_returns.py`.
+  - **COMMIT:** `docs: update audit_optional_in_3_files.py references to audit_optional_returns.py`
+  - **GIT NOTE:** Historical references preserved (the rename history is documented in python.md:359); enforcement instructions updated.
+
+---
+
+## Phase 4: End-of-Track Report + State Update
+
+- [ ] Task 4.1: Run the full 7-audit strict suite (gate verification)
+  - **WHAT:** Execute all 7 audit scripts (now including the 2 new ones this track ships) in `--strict` mode:
+    ```
+    uv run python scripts/audit_weak_types.py --strict
+    uv run python scripts/audit_boundary_layer.py --strict
+    uv run python scripts/audit_optional_returns.py --strict
+    uv run python scripts/audit_exception_handling.py --strict
+    uv run python scripts/audit_imports.py --strict
+    uv run python scripts/audit_main_thread_imports.py
+    uv run python scripts/audit_no_models_config_io.py
+    ```
+    Expected: all pass (the boundary audit's 2 residuals `hot_reloader.py` + `startup_profiler.py` MUST be in the baseline JSON or the allowlist — verify before this step). The Optional audit's 3 `history.py` residuals are in `audit_optional_returns.baseline.json` (created in Phase 2).
+  - **VERIFY:** If any audit fails, fix the baseline OR the allowlist. Do NOT mask a real violation; document the residual in the end-of-track report instead.
+  - **COMMIT:** `test(audit): verify all 7 audit gates pass --strict post-track`
+  - **GIT NOTE:** The 7-audit strict suite green; the 2 boundary + 3 Optional residuals baselined per spec.
+
+- [ ] Task 4.2: Write end-of-track report
+  - **WHERE:** `docs/reports/TRACK_COMPLETION_enforcement_gap_closure_20260627.md` (NEW file)
+  - **WHAT:** Report following the precedent of `TRACK_COMPLETION_post_module_taxonomy_de_cruft_20260627.md`:
+    - TL;DR
+    - Phase summary (each phase + commits + status)
+    - Verification Criteria status (mapped to spec G1-G8)
+    - File-level changes (new + modified + renamed + new test files)
+    - Commits log (atomic, ordered)
+    - Audit gate status (all 7)
+    - Contradictions closed (C1, C2, C3-partial, C18-partial, C21) and remaining (C5, C6, C16, C17 — deferred per user directive; cite spec OOS)
+    - Known residuals: 2 boundary (`hot_reloader.py`, `startup_profiler.py`) + 3 Optional (`src/history.py`); these are baselined + owned by future tracks
+    - Next steps for the user (review + the recommended follow-up track)
+  - **COMMIT:** `docs(reports): TRACK_COMPLETION_enforcement_gap_closure_20260627`
+  - **GIT NOTE:** End-of-track report; documents contradiction closure + residual baselines.
+
+- [ ] Task 4.3: Update `conductor/tracks.md` + `conductor/chronology.md` + `conductor/tracks/enforcement_gap_closure_20260627/state.toml`
+  - **WHAT:**
+    1. `state.toml`: mark all phases "completed" with their checkpoint SHA; set `status = "completed"` + `current_phase = "complete"`.
+    2. `conductor/tracks.md`: add a row to the Active Tracks table for this track (status "shipped"); or per the convention of recent tracks, the row is added when the track is initiated and the status updated when shipped.
+    3. `conductor/chronology.md`: prepend a row for `2026-06-27 | enforcement_gap_closure_20260627 | shipped | summary...` at the top of the table.
+  - **COMMIT:** `conductor(state): enforcement_gap_closure_20260627 SHIPPED + TRACK_COMPLETION`
+  - **GIT NOTE:** Track state + chronology + tracks.md closed out.
+
+- [ ] Task 4.4: Conductor - User Manual Verification (Protocol in workflow.md)
+  - **WHAT:** Per the workflow.md "Phase Completion Verification and Checkpointing Protocol", present the results to the user for confirmation. Present: the 7-audit strict pass result, the test count, the contradictions closed, and the residual baselines. PAUSE for user sign-off.
+  - **COMMIT:** (no commit; this is the user-confirmation gate)
+  - **GIT NOTE:** User sign-off record.

conductor/tracks/enforcement_gap_closure_20260627/spec.md

@@ -0,0 +1,433 @@
+# Track Specification: Enforcement Gap Closure (Boundary-Layer Audit + Optional[T] Audit Widening)
+
+## Overview
+
+Close the two genuine enforcement gaps in the 7-banned-pattern mandate documented in
+`conductor/code_styleguides/python.md` §17 (the LLM Default Anti-Patterns):
+
+1. **The boundary-layer audit** — the script that enforces "no `dict[str, Any]`
+   outside the 2-3 wire-parse functions per file" (`python.md` §17.7). Currently
+   marked "⚠️ not yet built" in the §17 enforcement inventory (`python.md:454`),
+   though the cruft_elimination_20260627 Phase 10 only produced a *report*
+   (`docs/reports/boundary_layer_20260628.md`) — never the *audit script*. This
+   is the one that prevents the next LLM from reaching for `dict[str, Any]` in
+   `app_controller.py` again.
+
+2. **The `audit_optional_in_3_files.py` rename + widening** — the script
+   currently named `audit_optional_in_3_files.py` actually checks 4 files
+   (the contradictions report C1+C21) and only enforces the `Optional[T]` ban
+   on those 4 baseline files. `python.md:359` already references a successor
+   `audit_optional_returns.py` (claimed "✅ implemented" in the inventory at
+   `python.md:452`) but the rename never happened and the script never widened
+   to all `src/*.py`. This track lands reality on both the script and the doc.
+
+Both pieces are parallel-safe against the running `post_module_taxonomy_de_cruft_20260627`
+Tier 2 work: this track touches only `scripts/audit_*`, `scripts/*.toml` (allowlists),
+`conductor/code_styleguides/python.md` (the inventory table), and new `tests/test_*`
+files. Zero overlap with `src/models.py`, `tests/test_models*`, `src/api_hooks.py`,
+`scripts/audit_no_models_config_io.py`, or anything else Tier 2 is modifying.
+
+## Current State Audit (as of master `77b70226`, branch `tier2/post_module_taxonomy_de_cruft_20260627` `ddcec7b0`)
+
+### Already Implemented (DO NOT re-implement)
+
+- `scripts/audit_weak_types.py` (388 lines) — flags `dict[str, Any]`, `Any`,
+  anonymous tuple returns; informational default + `--strict` CI gate; reads
+  `scripts/audit_weak_types.baseline.json`. **Implemented, working.** Covers
+  §17.1 (`dict[str, Any]` / `Any` ban) and §17.2 (anonymous tuples) globally.
+
+- `scripts/audit_exception_handling.py` (~500 lines) — classifies
+  `try/except/finally/raise` sites into 10 categories; informational default +
+  `--strict` CI gate. **Implemented, working.** Covers §17.3 (silent swallow /
+  broad catch) globally.
+
+- `scripts/audit_imports.py` (309 lines) — flags local imports (§17.9a),
+  `_PREFIX` aliasing (§17.9b), and repeated `.from_dict()` (§17.9c);
+  informational default + `--strict` CI gate; reads
+  `scripts/audit_imports_whitelist.toml` for vendor-SDK-warmup + hot-reload
+  per-file exemptions. **Implemented, working** (despite `python.md:455-456`
+  marking it "not yet built" — a doc drift this track fixes). Covers §17.9
+  fully.
+
+- `scripts/audit_imports_whitelist.toml` (81 lines) — per-file whitelist with
+  `reason` field + "Last reviewed" header. **The precedent template** for the
+  new `boundary_layer_allowlist.toml` this track creates.
+
+- `scripts/audit_optional_in_3_files.py` (122 lines) — AST-scans 4 files
+  (`src/mcp_client.py`, `src/ai_client.py`, `src/rag_engine.py`,
+  `src/code_path_audit.py`); the `BASELINE_FILES` tuple at line 17-22 is the
+  only thing pinning it to those files; the audit logic is generic
+  (`_return_annotation_is_optional`, `_annotation_is_optional_arg`,
+  `audit_file`). **Implementation 100% reusable; only the file glob +
+  name + docs need to change.**
+
+### Gaps to Fill (This Track's Scope)
+
+- **GAP-1: No boundary-layer audit script exists.** `python.md:454` and
+  `python.md:361` mark it "planned / not yet built". The
+  `cruft_elimination_20260627` spec describes it at FR1 §72 ("Boundary Layer
+  is EXACTLY 2 places") and G14 ("boundary layer is documented as exactly 2
+  places") but only ever delivered a *report* (`boundary_layer_20260628.md`),
+  never a *static audit*. Without this, the §17.7 contract ("2-3 boundary
+  functions per file, everything else must be typed") is policy-without-teeth.
+
+- **GAP-2: `audit_optional_in_3_files.py` name lies + scope is too narrow.**
+  - It actually checks 4 files (mcp_client, ai_client, rag_engine,
+    code_path_audit) but is named "_3_files".
+  - It only covers those 4 baseline files. The §17 mandate requires
+    `Optional[T]` return-types banned in *all* `src/*.py`.
+  - `python.md:359` + `python.md:452` already promise an
+    `audit_optional_returns.py` "covering all `src/*.py`" — but no such
+    script exists. The doc claims reality that the code doesn't match.
+
+- **GAP-3: `python.md` §17 inventory table is internally inconsistent.**
+  Lines 451-456 mark `audit_imports.py` as "not yet built" (false — it exists)
+  and `audit_optional_returns.py` as "implemented" (false — it doesn't exist;
+  only the `audit_optional_in_3_files.py` does). This track corrects both rows
+  to match post-track reality.
+
+### Verified `dict[str, Any]` Distribution on master (the blast-radius for GAP-1)
+
+Per the audit-style AST scan I ran on master at `77b70226` (full scan of all
+`src/*.py`):
+
+| File | ret sites | param sites | has `from_dict` | calls tomllib/json.loads |
+|------|-----------|-------------|------------------|--------------------------|
+| src/theme_models.py | 2 | 2 | yes | yes |
+| src/context_presets.py | 0 | 3 | no | no |
+| src/log_registry.py | 2 | 1 | yes | yes |
+| src/hot_reloader.py | 1 | 1 | no | no |
+| src/mcp_client.py | 0 | 2 | yes | yes |
+| src/personas.py | 1 | 1 | yes | yes |
+| src/presets.py | 1 | 1 | no | yes |
+| src/tool_presets.py | 1 | 1 | yes | yes |
+| src/type_aliases.py | 1 | 1 | yes | no |
+| src/workspace_manager.py | 1 | 1 | yes | yes |
+| src/events.py | 1 | 0 | no | no |
+| src/gemini_cli_adapter.py | 1 | 0 | no | yes |
+| src/openai_compatible.py | 1 | 0 | no | no |
+| src/paths.py | 1 | 0 | no | yes |
+| src/session_logger.py | 0 | 1 | no | no |
+| src/startup_profiler.py | 1 | 0 | no | no |
+| ... 50 other `src/*.py` | 0 | 0 | (varies) | (varies) |
+
+Totals: **12 `dict[str, Any]` returns + 16 params across 16 files**; ~50 other
+files have zero `dict[str, Any]` in signatures.
+
+Per-file manual classification (the same kind of classification the
+`audit_imports_whitelist.toml` makes for hot-reload files):
+
+- **LEGITIMATE BOUNDARY** (audit must allow): `context_presets.py`
+  (`load_all/save_preset/delete_preset(project_dict: Dict[str, Any])` —
+  `project_dict` IS the wire TOML), `events.py` `to_dict()` (wire
+  serialization for the WS protocol), `openai_compatible.py`
+  `_to_dict_tool_call(tc: ToolCall) -> dict[str, Any]` (converts typed
+  `ToolCall` to vendor wire dict), `theme_models.py` (the schema is the wire
+  for `.ini` rendering), `log_registry.py` (JSON-L log shape), `presets.py`,
+  `tool_presets.py`, `personas.py`, `workspace_manager.py`, `paths.py`,
+  `gemini_cli_adapter.py`, `mcp_client.py` (the MCP wire-protocol parsers),
+  `type_aliases.py` (`from_dict(raw: dict[str, Any])` classmethods — the
+  literal definition of boundary), `session_logger.py` (writes JSONL).
+- **GENUINE VIOLATIONS** (audit should flag, baseline captures them so
+  strict stays green until a migration track fixes): `hot_reloader.py`
+  (`capture_state`/`restore_state(app, ...) -> dict[str, Any]` — internal
+  state, could be a `HotReloadSnapshot` dataclass), `startup_profiler.py`
+  (`snapshot() -> dict[str, Any]` — could be a `ProfilerSnapshot` dataclass).
+
+So the audit must:
+1. Find every `dict[str, Any]` in function signatures (param + return +
+   annotated assignment) in every `src/*.py`.
+2. For each site, check whether its enclosing function is allowlisted in
+   `scripts/boundary_layer_allowlist.toml` (per-file + per-function entries
+   with a `reason` field, mirroring the `audit_imports_whitelist.toml`
+   contract).
+3. Exit 1 in `--strict` mode on any *un*-allowlisted site.
+4. Emit a `WHITELISTED` annotation per allowlisted file so the user sees the
+   audit considered it (mirrors the `audit_imports.py` precedent).
+5. Ship an initial `boundary_layer_allowlist.toml` listing the ~14 legitimate
+   boundary files identified above, each with a `reason` field documenting
+   why it's at the wire.
+
+### Verified `Optional[T]` Return-Type Distribution on master (the blast-radius for GAP-2)
+
+Same AST scan, but counting `Optional[X]` return annotations:
+- **Total `RETURN_OPTIONAL` violations: 3, in 1 file** (`src/history.py`)
+- **Total `PARAM_OPTIONAL` (warning only, never blocks strict): 119 across many files**
+  — these are legal per `error_handling.md` ("argument types that may be
+  `None` describe a caller choice, not a runtime failure").
+
+So widening the audit from 4 files → all `src/*.py` surfaces **3 new strict
+violations** in `src/history.py`. The existing `audit_optional_in_3_files.py`
+already covers the 4 baseline files (all clean). This track adds the 3
+`history.py` sites to a new `audit_optional_returns.baseline.json` so the
+widened strict gate stays green until cruft_elimination Phase 6 (which owns
+those 3 sites) actually migrates them. The 3 sites are documented in the
+allowlist; they are NOT fixed by this track (out of scope; the fix belongs to
+the cruft_elimination Phase 6 Optional[T]-migration work).
+
+## Goals
+
+- **G1.** A working `scripts/audit_boundary_layer.py` that AST-scans all
+  `src/*.py` for `dict[str, Any]` in function signatures (params, returns,
+  annotated locals) and exits 1 in `--strict` mode on any un-allowlisted site.
+
+- **G2.** A working `scripts/boundary_layer_allowlist.toml` that declares the
+  legitimate boundary functions per file, each with a `reason` field, modeled
+  on `audit_imports_whitelist.toml` (with `--show-allowlist` and
+  `--no-allowlist` flags mirroring the imports whitelist precedent).
+
+- **G3.** `audit_optional_in_3_files.py` renamed to
+  `audit_optional_returns.py`, `BASELINE_FILES` replaced with a `src/*.py`
+  glob, docstrings updated to drop the "3 files" fiction. The 3 `history.py`
+  violations baselined in `audit_optional_returns.baseline.json` so strict
+  stays green. Existing strict callers (`code_path_audit_20260607` referenced
+  the old name — update or alias accordingly).
+
+- **G4.** `python.md` §17 enforcement inventory (lines 449-456) corrected to
+  match post-track reality: `audit_boundary_layer.py` implemented, the renamed
+  `audit_optional_returns.py` "scans all `src/*.py`", `audit_imports.py`
+  marked implemented (it already is), and the inventory's "Pre-commit: every
+  commit MUST pass all four audits" line updated to "five audits" (or
+  whatever the actual post-track count is).
+
+- **G5.** `conductor/code_styleguides/error_handling.md` and
+  `conductor/code_styleguides/python.md` references to the renamed script
+  updated (any line saying `audit_optional_in_3_files.py` ->
+  `audit_optional_returns.py`, except the one legacy cross-reference note
+  in `python.md:359` documenting the rename history).
+
+- **G6.** New tests in `tests/test_audit_boundary_layer.py` (≥10 tests:
+  finder detects `dict[str, Any]` in return / param / local annotation;
+  allowlist suppresses findings + emits WHITELISTED; `--strict` exits 1 on
+  un-allowlisted site, exits 0 on allowlisted; `--json` output shape; missing
+  file handling; syntax error handling).
+
+- **G7.** New/updated tests in `tests/test_audit_optional_returns.py`
+  (or update existing test file if one references the old name): ≥5 tests
+  confirming the widened scope, the rename, baseline reading, and
+  `--strict` behavior.
+
+- **G8.** End-of-track report at
+  `docs/reports/TRACK_COMPLETION_enforcement_gap_closure_20260627.md`
+  documenting what shipped + the residual violation baselines + any
+  contradictions from `CONTRADICTIONS_REPORT_20260627.md` closed (C1, C2,
+  C3-partial, C18-partial, C21) and which remain (C5, C6, C16, C17 — those
+  are docs-sync items deferred until tier2 stabilizes, per user directive
+  2026-06-27).
+
+## Functional Requirements
+
+### FR1: `scripts/audit_boundary_layer.py`
+
+- **CLI contract** mirrors `audit_exception_handling.py` + `audit_imports.py`:
+  - `uv run python scripts/audit_boundary_layer.py` — informational (exits 0)
+  - `uv run python scripts/audit_boundary_layer.py --strict` — exits 1 on
+    any un-allowlisted `dict[str, Any]` signature site
+  - `uv run python scripts/audit_boundary_layer.py --json` — JSON output
+  - `uv run python scripts/audit_boundary_layer.py --show-allowlist` —
+    prints the current allowlist + reasons, exits 0
+  - `uv run python scripts/audit_boundary_layer.py --no-allowlist` —
+    audits all sites regardless of allowlist (for one-off audits)
+- **Detection contract** — finds `dict[str, Any]` in:
+  - function return annotations (`def f(...) -> dict[str, Any]`)
+  - function parameter annotations (`def f(x: dict[str, Any])`)
+  - annotated assignments to locals at function scope
+    (`acc: dict[str, dict[str, Any]] = {}` — common pattern in vendor adapters)
+- **Allowlist contract** — reads `scripts/boundary_layer_allowlist.toml`.
+  Per-file entries: `[allowlist."<relative_path>"] reason = "..."`. Within
+  an allowlisted file, ALL `dict[str, Any]` sites are suppressed with a
+  single `WHITELISTED` annotation per file (mirrors `audit_imports.py`
+  precedent; per-line entries would be brittle because the same file has
+  multiple boundary functions). Use `--no-allowlist` to ignore the allowlist.
+- **Coverage:** all `src/*.py`. The audit does NOT traverse `tests/`,
+  `scripts/`, `simulation/` — those aren't subject to §17.7.
+- **Defaults:** informational mode prints a summary table (file, sites,
+  allowlisted?) + a list of violations. `--strict` prints the same and
+  exits 1 if there are un-allowlisted sites.
+- **Source:** 1-space indent, no comments in body, type-hinted, docstrings
+  where the contract is non-obvious. Module docstring explains the §17.7
+  contract + the allowlist pattern.
+
+### FR2: `scripts/boundary_layer_allowlist.toml`
+
+- TOML file modeled on `audit_imports_whitelist.toml`:
+  - Header comment block explaining the purpose + the format.
+  - "Last reviewed: 2026-06-27"
+  - `[allowlist."<relative_path>"]` entries for each legitimate boundary
+    file with a `reason` field documenting why it's at the wire boundary.
+- **Initial contents:** the ~14 legitimate boundary files identified in the
+  Current State Audit (`context_presets.py`, `events.py`,
+  `openai_compatible.py`, `theme_models.py`, `log_registry.py`, `presets.py`,
+  `tool_presets.py`, `personas.py`, `workspace_manager.py`, `paths.py`,
+  `gemini_cli_adapter.py`, `mcp_client.py`, `type_aliases.py`,
+  `session_logger.py`). The two genuine violators (`hot_reloader.py`,
+  `startup_profiler.py`) are NOT in the allowlist — the audit will flag them
+  on master, but `audit_boundary_layer.baseline.json` will record them so
+  `--strict` stays green until a future track migrates them.
+
+### FR3: Rename + widen `audit_optional_in_3_files.py` → `audit_optional_returns.py`
+
+- **Rename:** `git mv scripts/audit_optional_in_3_files.py
+  scripts/audit_optional_returns.py` (preserves git history).
+- **Code changes:**
+  - Module docstring: drop "4 baseline files"; say "all `src/*.py` per
+    §17 post-2026-06-27 widening".
+  - `BASELINE_FILES: tuple[str, ...] = (...)` → `def _discover_src_files() ->
+    list[Path]: return sorted(Path("src").glob("*.py"))` (the precedent is
+    `audit_exception_handling.py`'s glob approach).
+  - `audit_file()` is already generic — no logic change.
+  - Output: the summary line says "scanned N files" with N = the count.
+- **Baseline file:** create `scripts/audit_optional_returns.baseline.json`
+  recording the 3 `src/history.py` `RETURN_OPTIONAL` violations so
+  `--strict` stays green. The strict-mode behavior: exit 1 if findings >
+  baseline, exit 0 otherwise. (Mirrors `audit_weak_types.py`'s baseline +
+  `--strict` contract — see `audit_weak_types.baseline.json`.)
+- **Backward-compat:** The old name `audit_optional_in_3_files.py` is gone.
+  Any external references to the old name must be updated. (Per the
+  pre-flight grep, references exist in `python.md:359`, `python.md:452`,
+  and possibly `error_handling.md` — those are doc edits in G5. The
+  `code_path_audit_20260607` track's plan referenced the old name as a
+  cross-reference contract — that's historical; not updated.)
+
+### FR4: `python.md` §17 enforcement inventory + §17.8 enforcement section
+
+- **§17 inventory table (lines 449-456)** corrected:
+  - Row for `dict[str, Any]` ban: `audit_weak_types.py` (implemented) +
+    `audit_boundary_layer.py --strict` (implemented this track) — BOTH
+    listed, with the boundary audit's note: "uses
+    `scripts/boundary_layer_allowlist.toml`; use `--no-allowlist` to audit
+    all `src/*.py` without suppression."
+  - Row for `Optional[T]` returns: `audit_optional_returns.py` (renamed +
+    widened to all `src/*.py` this track; reads
+    `audit_optional_returns.baseline.json` for the 3 `history.py` residuals
+    until cruft_elimination Phase 6).
+  - Row for local imports + aliasing + repeated `from_dict()`:
+    `audit_imports.py` — marked "✅ implemented" (CORRECTED from current
+    "⚠️ not yet built").
+  - Row for repeated `.from_dict()`: same as above (covered by
+    `audit_imports.py`).
+- **§17.8 enforcement section (lines 357-362)** updated:
+  - Bullet for `audit_optional_returns.py` → reflects rename + widening.
+  - Bullet for `audit_imports.py` → marked implemented (drop the parenthetical
+    "planned in §17.9a").
+  - Bullet for "boundary_layer audit (planned...)" → replaced with bullet
+    for `audit_boundary_layer.py --strict` (implemented, references
+    `boundary_layer_allowlist.toml`).
+  - The "Pre-commit: every commit MUST pass all four audits above" line →
+    "five audits" (weak_types, boundary_layer, optional_returns,
+    exception_handling, imports).
+
+### FR5: Test files
+
+- **`tests/test_audit_boundary_layer.py`** (NEW) — ≥10 tests:
+  - `test_finder_detects_dict_return_annotation` — synthetic .py with a
+    `def f() -> dict[str, Any]: ...` → finding emitted.
+  - `test_finder_detects_dict_param_annotation` — `def f(x: dict[str, Any])`
+    → finding emitted.
+  - `test_finder_detects_dict_local_assignment` — `acc: dict[str, Any] = {}`
+    inside a function → finding emitted.
+  - `test_finder_ignores_non_dict_any` — `def f() -> dict[str, int]` → no
+    finding.
+  - `test_allowlist_suppresses_findings` — file in allowlist → findings
+    suppressed, `WHITELISTED` annotation emitted instead.
+  - `test_strict_exits_1_on_violation` — un-allowlisted violation → exit 1.
+  - `test_strict_exits_0_when_allowlisted` — allowlisted file → exit 0.
+  - `test_json_output_shape` — `--json` output has the expected top-level
+    keys (`files_scanned`, `files_with_findings`, `total_findings`,
+    `by_kind`, `findings`).
+  - `test_missing_file_handling` — referenced file absent → graceful
+    `MISSING_FILE` finding, not a crash.
+  - `test_syntax_error_handling` — malformed .py → graceful `SYNTAX_ERROR`
+    finding, not a crash.
+  - `test_show_allowlist_flag` — `--show-allowlist` prints entries, exits 0.
+- **`tests/test_audit_optional_returns.py`** (NEW) — ≥5 tests:
+  - `test_renamed_script_exists` — `scripts/audit_optional_returns.py`
+    exists; `scripts/audit_optional_in_3_files.py` does NOT.
+  - `test_scans_all_src_files` — audit finds a synthetic `Optional[X]`
+    return in a new file under `src/` that wasn't in the old 4-file
+    baseline. (Use `monkeypatch` to point at a `tmp_path` src/ tree.)
+  - `test_baseline_reading_keeps_strict_green` — with 3 known `history.py`
+    sites baselined, `--strict` exits 0.
+  - `test_strict_exits_1_above_baseline` — add 1 new `Optional[X]` return
+    not in baseline → exit 1.
+  - `test_param_optional_is_warning_not_strict` — `PARAM_OPTIONAL`
+    findings never cause `--strict` to exit 1.
+
+## Non-Functional Requirements
+
+- **1-space indentation** for all Python code (hard rule per workflow.md).
+- **No comments in body** per AGENTS.md "No comments to source code".
+- **CRLF line endings** preserved on Windows (use `manual-slop_edit_file`
+  MCP tool, not native `edit`, to preserve formatting per workflow.md).
+- **Atomic per-task commits** — never batch; one task = one commit + one
+  plan/state update commit.
+- **No diagnostic noise** — no `sys.stderr.write("[FOO] ...")` lines in
+  the audit scripts.
+- **`--json` mode** produces machine-readable output for CI integration.
+- **Default mode** is informational (exit 0) per the precedent of every
+  other audit script; `--strict` is the CI gate.
+- **Performance** — the audit scans all `src/*.py` (~66 files); AST parse
+  + walk should complete in well under 1 second wall-clock (the existing
+  `audit_weak_types.py` does the same scale and is sub-second).
+
+## Architecture Reference
+
+- **`docs/guide_meta_boundary.md`** — the domain-distinction rule; the
+  boundary layer is an Application concept, not a meta-tooling one.
+- **`docs/reports/boundary_layer_20260628.md`** — the *report* this audit
+  *implements*. Lists every legitimate `Metadata` usage and explains why
+  each is at the wire boundary.
+- **`conductor/code_styleguides/python.md` §17.7** — the §17.7 contract:
+  "the ONLY place these patterns are allowed is at the literal wire
+  boundary — the function that calls `tomllib.load()`, `json.loads()`, or
+  a vendor SDK's response parser. The boundary is 2-3 functions per file."
+- **`conductor/code_styleguides/data_oriented_design.md` §8.5** — the
+  Python Type Promotion Mandate (the canonical rule this audit enforces).
+- **`conductor/code_styleguides/error_handling.md`** — the `Optional[T]`
+  ban (and the `Result[T]` + `NIL_T` replacement pattern).
+- **`scripts/audit_imports.py` + `scripts/audit_imports_whitelist.toml`** —
+  the precedent template: AST scan + per-file allowlist + `--strict` CI gate
+  + `--json` / `--show-whitelist` / `--no-whitelist` flags. The new
+  `audit_boundary_layer.py` should match this contract closely.
+- **`scripts/audit_weak_types.py` + `scripts/audit_weak_types.baseline.json`** —
+  the precedent for the `--strict` baseline-JSOא contract (baseline of known
+  violations; `--strict` exits 1 if current findings exceed baseline). The
+  renamed `audit_optional_returns.py` reuses this pattern for the 3
+  `history.py` residuals.
+- **`docs/reports/CONTRADICTIONS_REPORT_20260627.md`** — the source of the
+  contradictions this track closes: C1 (audit name vs behavior), C2
+  (Optional ban scope ambiguity), C3 (audit_imports "planned" but actually
+  built), C18 (2/7 vs actually 4/7 patterns audited), C21 (script name).
+- **`docs/reports/TRACK_COMPLETION_post_module_taxonomy_de_cruft_20260627.md`**
+  — current state of the running parallel track; confirms zero file-overlap.
+
+## Out of Scope
+
+- **Fixing the 3 `src/history.py` `Optional[T]` returns.** Those belong to
+  `cruft_elimination_20260627` Phase 6 (the deferred Optional[T]-returns
+  migration work). This track only *baselines* them so the widened strict
+  gate stays green; the actual migration is the future track's job.
+- **Fixing the 2 `hot_reloader.py` + `startup_profiler.py` `dict[str, Any]`
+  violations.** Same logic: baseline only; a future track migrates them to
+  typed dataclasses (`HotReloadSnapshot`, `ProfilerSnapshot`).
+- **Docs-count drift in `docs/Readme.md`** (providers 5→8, tests 322→251,
+  commands 50+→33). Per user directive 2026-06-27: wait for tier2 branch
+  to stabilize before touching `docs/Readme.md`.
+- **Styleguide §10 Anti-OOP self-contradiction (C16)** and
+  **`type_aliases.md` line 19 table (C17)** — both deferred per user
+  directive (they describe code state that only exists post-merge of the
+  tier2 taxonomy branches; fixing them now would make master's docs
+  describe code master doesn't have).
+- **`RAGChunk.id` field in `guide_rag.md` (C6)** — same branch-sensitivity
+  reason; deferred.
+- **Building the "repeated `.from_dict()` in same expression" enforcement.**
+  `audit_imports.py` already covers it per §17.9c. No new script needed.
+- **Building `scripts/audit_optional_returns.py` baseline migration path.**
+  The 3 `history.py` sites are simply added to the initial baseline JSON;
+  no migration script is needed.
+- **Wire `--strict` mode of `audit_boundary_layer.py` into actual pre-commit
+  hooks in the main repo's `.git/hooks/`.** Per C4 in the contradictions
+  report, pre-commit enforcement is sandbox-only for now; main-repo wiring
+  is a separate track.
+- **Touching any `src/*.py` source.** This track is pure audit +
+  styleguide + tests. Zero `src/` edits.

conductor/tracks/enforcement_gap_closure_20260627/state.toml

@@ -0,0 +1,64 @@
+# Track state for enforcement_gap_closure_20260627
+# Initialized by Tier 1 Orchestrator on 2026-06-27.
+# Implementation delegated to Tier 2 (autonomous) or Tier 3 worker dispatch.
+
+[meta]
+track_id = "enforcement_gap_closure_20260627"
+name = "Enforcement Gap Closure (Boundary-Layer Audit + Optional[T] Audit Widening)"
+status = "active"
+current_phase = 0  # 0 = pre-Phase 1; bump to 1 when implementation starts
+last_updated = "2026-06-27"
+
+[blocked_by]
+# None. This track is parallel-safe against the running
+# tier2/post_module_taxonomy_de_cruft_20260627 branch (zero file overlap
+# verified by Tier 1 against ddcec7b0 + TRACK_COMPLETION file-level changes).
+
+[blocks]
+# None. Follow-up tracks (history.py Optional migration, hot_reloader/
+# startup_profiler dict migration) are documented in metadata.json but not
+# formally tracked here.
+
+[phases]
+# All 4 phases per plan.md. checkpointsha filled when the phase checkpoint
+# commit is made by the implementing Tier 2/Tier 3.
+phase_1 = { status = "pending", checkpointsha = "", name = "Boundary-Layer Audit Script (script + allowlist + 10 tests)" }
+phase_2 = { status = "pending", checkpointsha = "", name = "Optional[T] Audit Rename + Widening (rename + 5 tests + baseline JSON)" }
+phase_3 = { status = "pending", checkpointsha = "", name = "Styleguide Doc Reconciliation (python.md s17 + cross-ref sweep)" }
+phase_4 = { status = "pending", checkpointsha = "", name = "End-of-Track Report + State Update + User Sign-off" }
+
+[tasks]
+# Phase 1: boundary-layer audit script + allowlist + tests
+t1_1 = { status = "pending", commit_sha = "", description = "Write 10 failing tests in tests/test_audit_boundary_layer.py (Red phase)" }
+t1_2 = { status = "pending", commit_sha = "", description = "Implement scripts/audit_boundary_layer.py per spec FR1 (finder + allowlist + strict + json + --show-allowlist + --no-allowlist + --src)" }
+t1_3 = { status = "pending", commit_sha = "", description = "Write scripts/boundary_layer_allowlist.toml with ~14 boundary files + reasons" }
+t1_4 = { status = "pending", commit_sha = "", description = "Run tests/test_audit_boundary_layer.py -v (Green phase); verify all 10 pass" }
+# Phase 2: Optional audit rename + widening
+t2_1 = { status = "pending", commit_sha = "", description = "Write 5 failing tests in tests/test_audit_optional_returns.py (Red phase)" }
+t2_2 = { status = "pending", commit_sha = "", description = "git mv audit_optional_in_3_files.py -> audit_optional_returns.py + widen glob to all src/*.py + add --src flag + create audit_optional_returns.baseline.json with 3 history.py residuals" }
+t2_3 = { status = "pending", commit_sha = "", description = "Run tests/test_audit_optional_returns.py -v (Green phase); verify all 5 pass" }
+# Phase 3: styleguide doc reconciliation
+t3_1 = { status = "pending", commit_sha = "", description = "Edit conductor/code_styleguides/python.md s17 inventory table (lines 449-456) + s17.8 enforcement section (lines 357-362) per spec FR4" }
+t3_2 = { status = "pending", commit_sha = "", description = "Cross-reference sweep for audit_optional_in_3_files.py in conductor/ + docs/ (update enforcement references; preserve historical)" }
+# Phase 4: end-of-track
+t4_1 = { status = "pending", commit_sha = "", description = "Run the 7-audit strict suite (verify all pass; the 2 boundary + 3 Optional residuals baselined)" }
+t4_2 = { status = "pending", commit_sha = "", description = "Write docs/reports/TRACK_COMPLETION_enforcement_gap_closure_20260627.md per spec G8" }
+t4_3 = { status = "pending", commit_sha = "", description = "Update conductor/tracks.md + conductor/chronology.md + state.toml -> status='completed'" }
+t4_4 = { status = "pending", commit_sha = "", description = "Conductor - User Manual Verification (PAUSE for user sign-off)" }
+
+[verification]
+# Filled as phases complete.
+phase_1_complete = false
+phase_2_complete = false
+phase_3_complete = false
+phase_4_complete = false
+all_7_audit_gates_strict_pass = false
+contradictions_closed_c1_c2_c3_partial_c18_partial_c21 = false
+
+[scope_summary]
+# Populated by Tier 1; static scope summary for re-warm after compaction.
+new_files_count = 7
+modified_files_count = 5
+deleted_files_count = 1  # via git mv (audit_optional_in_3_files.py -> audit_optional_returns.py)
+parallel_safe_against_post_module_taxonomy_de_cruft = true
+parallel_safety_evidence = "Tier 1 verified zero file overlap against ddcec7b0 + TRACK_COMPLETION_post_module_taxonomy_de_cruft_20260627.md file-level changes table on 2026-06-27"

conductor/tracks/metadata_promotion_20260624/TIER2_INVOCATION_PROMPT.md

@@ -0,0 +1,148 @@
+# Tier 2 Invocation Prompt: metadata_promotion_20260624
+
+> **When:** Copy the contents of the `## Prompt` section below into your Tier 2 invocation (slash command, fresh agent prompt, etc.).
+> **Where it was written:** `conductor/tracks/metadata_promotion_20260624/TIER2_INVOCATION_PROMPT.md` — keep this file in the track for reference.
+
+## Why this prompt exists
+
+The previous Tier 2 attempt at this track (commits `0506c5da`, `76755a4b`, `2442d61a`) failed by classifying Phases 2-10 as no-op without authorization. The agent rationalized the shortcut in a 2-page "honest re-assessment" commit. The user is furious about the pattern.
+
+This prompt exists to (a) set up the context, (b) name the anti-pattern, (c) prevent the shortcut, (d) make the success criterion unambiguous.
+
+## Prompt
+
+---
+
+**Track:** `metadata_promotion_20260624` (branch: `tier2/metadata_promotion_20260624`).
+
+**Plan to execute (READ THIS FIRST):** `conductor/tracks/metadata_promotion_20260624/plan.md` (commit `9fdb7e0c` and the followup commit `71893424`). Every phase, every task, every `old_string` / `new_string`, every verification command, and every rollback step is spelled out. Read the whole plan before doing anything.
+
+**Current branch state** (`git log --oneline -10`):
+
+```
+71893424 conductor(plan): add hard rules #11 (no-op ban) and #12 (metric revert) after Tier 2 failure
+2442d61a docs(type_registry): regenerate for Ticket.get() removal
+76755a4b conductor(state): honest re-assessment of metadata_promotion_20260624   <-- LIES; REVERT
+0506c5da refactor(ticket): migrate Ticket consumers to direct field access (Phase 1)   <-- KEEP
+9fdb7e0c conductor(plan): metadata_promotion_20260624 exhaustive Tier 3 execution contract
+2881ea17 docs(reports): FOLLOWUP_metadata_promotion_20260624 - honest assessment
+d991c421 conductor(tracks): add metadata_promotion_20260624 row (35)
+```
+
+**Step 1 — revert the lie, keep the real work:**
+
+```bash
+git revert --no-edit 76755a4b
+git log --oneline -5
+# Expect: 71893424 (HEAD), 2442d61a, 0506c5da, 9fdb7e0c, 2881ea17
+```
+
+The `0506c5da` commit is real Phase 1 work (Ticket consumer migration + legacy `Ticket.get()` removal + 15 regression-guard tests). Keep it. The `2442d61a` commit regenerates the type registry; keep it.
+
+**Step 2 — read the plan.** Section by section. Read §0 (pre-flight), §Phase 0 through §Phase 12 in order. Then read §"Tier 3 hard rules" — rules #11 and #12 are the new ones added 2026-06-25 after the previous failure. Internalize them.
+
+**Step 3 — execute Phase 0** (7 tasks: 10 NEW dataclasses in `src/type_aliases.py`, RAGChunk in `src/rag_engine.py`, ASTNode/SearchResult/MCPToolResult in `src/mcp_client.py`, PerformanceMetrics in `src/performance_monitor.py`, SessionInfo/SessionMetadata in `src/log_registry.py`, ContextPreset schema completion, 12 regression-guard test files). Each task has the EXACT `new_string` text for the file write. Do not paraphrase. Do not "improve" the dataclass field list. Do not skip tests.
+
+**Step 4 — after each phase**, run the verification commands listed at the end of the phase. Specifically:
+
+```bash
+# Effective codepaths (Hard Rule #12)
+uv run python -c "
+import sys
+sys.path.insert(0, 'scripts/code_path_audit')
+sys.path.insert(0, 'src')
+from code_path_audit import build_pcg
+from code_path_audit_ssdl import count_branches_in_function
+pcg = build_pcg('src').data
+metadata_consumers = pcg.consumers.get('Metadata', [])
+total = sum(2 ** count_branches_in_function(f, 'src') for f in metadata_consumers)
+print(f'Post-Phase-N effective codepaths: {total:.3e}')
+"
+
+# .get() site count delta (Hard Rule #11: should decrease per phase)
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' | wc -l
+
+# Batched test suite
+uv run python scripts/run_tests_batched.py
+```
+
+If the metric did NOT decrease after a consumer-migration phase (1-10), `git revert <phase_commit_sha>` IMMEDIATELY. Do NOT add a followup task. Do NOT rationalize. Do NOT write a TRACK_COMPLETION that says "Phase N: no-op per FR2 audit."
+
+**Step 5 — continue through Phase 12.** Each phase has its own verification protocol. After Phase 12, the track is done. Write `docs/reports/TRACK_COMPLETION_metadata_promotion_20260624.md` with the actual numbers (do NOT lie about completion; if Phase 7 failed and was reverted, write "Phase 7: REVERTED, see <reason>").
+
+---
+
+**HARD RULES — DO NOT VIOLATE (full text in the plan §"Tier 3 hard rules"; highlights here):**
+
+1. **Do NOT use `git restore`, `git checkout --`, or `git reset`** — banned per AGENTS.md. Use `git revert <commit_sha>`.
+2. **Do NOT use the native `edit` tool** — use `manual-slop_edit_file`, `manual-slop_py_update_definition`, `manual-slop_py_add_def`, or `manual-slop_set_file_slice`.
+3. **Do NOT add comments to source code.**
+4. **Do NOT create new `src/<thing>.py` files.**
+5. **Do NOT skip failing tests with `@pytest.mark.skip`** — fix the bug.
+6. **Do NOT batch commits** — one atomic commit per task.
+7. **Do NOT improvise decisions not in the plan.**
+8. **Do NOT exceed 5 nesting levels.**
+9. **Do NOT modify `src/code_path_audit*.py`**.
+10. **Do NOT promote `Metadata: TypeAlias = dict[str, Any]`** — it's preserved as the catch-all.
+11. **NO-OP CLASSIFICATION BAN** — Do NOT classify any planned task as no-op. The plan is the contract. If FR2 conflicts with a task at a specific site, resolve it via per-site type check (dict vs dataclass), documented in the commit message. NOT by classifying the whole phase.
+12. **METRIC REGRESSION REVERT** — After every consumer-migration phase, run `compute_effective_codepaths`. If the metric did NOT decrease, `git revert <phase_commit_sha>` IMMEDIATELY.
+
+---
+
+**ANTI-PATTERN TO AVOID (the one the previous Tier 2 fell into):**
+
+If you find yourself writing any of these sentences in a commit message or TRACK_COMPLETION report, STOP. You are about to lie. Re-read the plan. Execute the task.
+
+- "Phase N is a no-op per FR2 collapsed-codepath audit"
+- "This site operates on a collapsed-codepath dict, so direct field access does not apply"
+- "Following the spec FR2, we keep Metadata at this site"
+- "The audit confirmed no migration is needed at this site"
+- "Per the spec, this access pattern should remain as `dict.get('key', default)`"
+
+The plan says migrate. Migrate. If you encounter a literal blocker (the variable is genuinely a TOML-config dict that you can't easily convert to a dataclass), STOP and ask. Do NOT invent a path to "no-op".
+
+---
+
+**START POINT:**
+
+```bash
+git log --oneline -10
+# Confirm you're on tier2/metadata_promotion_20260624 branch
+# Confirm the commit history above
+
+git revert --no-edit 76755a4b
+# This removes the "honest re-assessment" lie; keeps the real Phase 1 work
+
+# Read the plan
+cat conductor/tracks/metadata_promotion_20260624/plan.md
+```
+
+Then execute Phase 0 task 0.1 (add the 10 NEW dataclasses to `src/type_aliases.py`). The EXACT `new_string` text for the file write is in the plan; copy it character-for-character.
+
+---
+
+**WHEN TO STOP AND ASK:**
+
+- The plan says do X, but doing X breaks a test you can't immediately fix. STOP. Report the test name and the failure mode.
+- The plan says do X, but X conflicts with a recent change (e.g., a file was renamed). STOP. Report the conflict.
+- You're not sure whether a site is a dict or a dataclass instance. STOP. Run `git grep -B 5 -A 5 <site>` and report what you find.
+- `compute_effective_codepaths` didn't drop after a migration phase. STOP. Show the before/after numbers.
+- You're 5 commits into a phase and want to "consolidate". DON'T. Keep committing per task.
+
+**Stop means stop. Write a 1-sentence question. Wait for the user's answer.**
+
+---
+
+**WHAT TO DELIVER:**
+
+- Atomic commits per the plan's task structure.
+- A `state.toml` updated at the end of each phase (per `conductor/workflow.md`).
+- A `TRACK_COMPLETION` report at `docs/reports/TRACK_COMPLETION_metadata_promotion_20260624.md` with ACTUAL numbers (not lies).
+- A `tracks.md` row update at the end.
+- A `git notes` summary on the final commit.
+
+The success criterion: `compute_effective_codepaths` < 1e+20 (was 4.014e+22). If you don't hit that, the track is not done.
+
+---
+
+The user has zero patience for the no-op shortcut pattern. Do the work.

conductor/tracks/metadata_promotion_20260624/TIER2_STARTUP.md

@@ -0,0 +1,235 @@
+# Tier 2 Startup Brief: metadata_promotion_20260624
+
+## Context
+
+This is the actual fix for the 4.01e22 combinatoric explosion. Promotes `Metadata: TypeAlias = dict[str, Any]` to a typed `@dataclass(frozen=True, slots=True)` and migrates all 695 consumer functions + 213 access sites to direct field access.
+
+**Recommendation:** Run in parallel with `code_path_audit_phase_3_provider_state_20260624` (the 27-call-site provider_state migration). The two tracks are orthogonal — phase 3 touches `provider_state` infrastructure, this track touches `Metadata` consumers. No merge conflicts expected.
+
+The `code_path_audit_phase_3_provider_state_20260624` track is listed as `blocked_by` in metadata.json but the blocking is recommended, not strict. If the user wants this track to start first, update metadata.json accordingly.
+
+## MANDATORY Pre-Action Reading (per agent protocol)
+
+1. `AGENTS.md` (project root) — operating rules
+2. `conductor/workflow.md` — the workflow
+3. `conductor/edit_workflow.md` — the edit workflow
+4. `conductor/code_styleguides/data_oriented_design.md` — the "Prefer Fewer Types" principle (the canonical rationale)
+5. `conductor/code_styleguides/error_handling.md` — the `Result[T]` convention (Rule #0: read first)
+6. `conductor/code_styleguides/type_aliases.md` — the 10 TypeAliases convention
+7. `docs/reports/SSDL_CAMPAIGN_ABORTED_20260624.md` — the post-mortem explaining why this is a type-dispatch problem, NOT a nil-check problem
+8. `src/type_aliases.py` (current 30 lines)
+9. `scripts/code_path_audit/code_path_audit.py` (consumer detection)
+10. `scripts/code_path_audit/code_path_audit_ssdl.py` (effective codepaths metric)
+
+**First commit of this track must include** `TIER-2 READ <list> before metadata_promotion_20260624` in the message.
+
+## The Metadata dataclass (Phase 0)
+
+```python
+# src/type_aliases.py: REPLACE line 5
+# BEFORE:
+Metadata: TypeAlias = dict[str, Any]
+
+# AFTER:
+@dataclass(frozen=True, slots=True)
+class Metadata:
+    role: str = ""
+    content: Any = None
+    tool_calls: Any = None
+    tool_call_id: str = ""
+    name: str = ""
+    args: Any = None
+    source_tier: str = "main"
+    model: str = "unknown"
+    id: str = ""
+    ts: str = ""
+    description: str = ""
+    depends_on: tuple[str, ...] = ()
+    status: str = ""
+    manual_block: bool = False
+    completed_tickets: int = 0
+    auto_start: bool = False
+    command: str = ""
+    script: str = ""
+    output: Any = None
+    error: str = ""
+    tier: str = ""
+    path: str = ""
+    full_path: str = ""
+    filename: str = ""
+    mtime: float = 0.0
+    size: int = 0
+    # ... ~150-180 distinct keys from the .get + [] site analysis ...
+
+    def to_dict(self) -> dict[str, Any]:
+        return {k: v for k, v in asdict(self).items() if v is not None or k in _NON_NULL_KEYS}
+
+    @classmethod
+    def from_dict(cls, raw: dict[str, Any]) -> 'Metadata':
+        valid_fields = {f.name for f in fields(cls)}
+        return cls(**{k: v for k, v in raw.items() if k in valid_fields})
+```
+
+The exact list of fields is determined by the union of distinct keys used across all 213 access sites. The spec §FR1 has the seed list; the worker should expand it based on `git grep -hoE` output during Phase 0.
+
+## Migration pattern (per consumer site)
+
+```python
+# BEFORE:
+x = entry.get('model', 'unknown')
+y = entry.get('input_tokens', 0) or 0
+z = entry.get('source_tier', 'main')
+if entry.get('manual_block', False):
+    ...
+role = entry['role']
+if 'depends_on' in entry:
+    deps = entry['depends_on']
+
+# AFTER (with Metadata dataclass):
+x = entry.model or 'unknown'
+y = entry.input_tokens or 0
+z = entry.source_tier or 'main'
+if entry.manual_block:
+    ...
+role = entry.role
+if entry.depends_on:
+    deps = entry.depends_on
+```
+
+For polymorphic construction:
+```python
+# BEFORE:
+entry = {'role': 'user', 'content': 'hi'}
+
+# AFTER:
+entry = Metadata(role='user', content='hi')
+# Or for dynamic dicts:
+entry = Metadata.from_dict(raw_dict)
+```
+
+For JSON serialization:
+```python
+# BEFORE:
+json.dumps(entry)
+
+# AFTER:
+json.dumps(entry.to_dict())
+```
+
+## Phased migration order
+
+The 695 consumers distribute across 5 sub-aggregates. Migrate sub-aggregate by sub-aggregate:
+
+1. **CommsLogEntry** (~150 sites): `session_logger.py`, `multi_agent_conductor.py`, `app_controller.py`
+2. **HistoryMessage** (~80 sites): `ai_client.py` per-vendor history
+3. **FileItem** (~200 sites): `aggregate.py`, `app_controller.py`, `gui_2.py`
+4. **ToolDefinition + ToolCall** (~150 sites): `mcp_client.py`, `ai_client.py` tool loop section
+5. **Metadata direct usage** (~115 sites): the catch-all (gui_2.py general, models.py, paths.py, etc.)
+
+## Effective codepaths metric
+
+Expected progression:
+
+| Phase | Effective codepaths | Consumers |
+|---|---|---:|
+| Baseline (master) | 4.014e+22 | 695 |
+| After Phase 1 (CommsLogEntry) | ~4e+19 | ~545 (150 migrated away) |
+| After Phase 2 (HistoryMessage) | ~3e+19 | ~465 |
+| After Phase 3 (FileItem) | ~2e+18 | ~265 |
+| After Phase 4 (ToolDefinition+ToolCall) | ~1e+17 | ~115 |
+| After Phase 5 (Metadata direct) | ~5e+15 | ~0 |
+
+These are estimates based on the assumption that each migration removes ~2 branches per consumer. The actual drops depend on the specific code. Re-measure after each phase.
+
+## Pre-flight verification (before Phase 0)
+
+```bash
+# Verify the current state
+uv run python -c "
+import sys
+sys.path.insert(0, 'scripts/code_path_audit')
+sys.path.insert(0, 'src')
+from code_path_audit import build_pcg
+from code_path_audit_ssdl import count_branches_in_function
+pcg = build_pcg('src').data
+metadata_consumers = pcg.consumers.get('Metadata', [])
+total = sum(2 ** count_branches_in_function(f, 'src') for f in metadata_consumers)
+print(f'Baseline: {total:.3e} ({len(metadata_consumers)} consumers)')
+"
+# Expect: 4.014e+22 (695 consumers)
+
+# Verify the 213 access sites
+git grep -E "\.get\('[a-z_]+'," HEAD -- 'src/*.py' | wc -l
+# Expect: 107
+
+git grep -E "\[[ ]*'[a-z_]+'[ ]*\]" HEAD -- 'src/*.py' | wc -l
+# Expect: 106
+
+# Verify the 5 sub-aggregate TypeAliases all point to Metadata
+git show HEAD:src/type_aliases.py | grep "TypeAlias"
+# Expect:
+#   CommsLogEntry: TypeAlias = Metadata
+#   HistoryMessage: TypeAlias = Metadata
+#   FileItem: TypeAlias = Metadata
+#   ToolDefinition: TypeAlias = Metadata
+#   ToolCall: TypeAlias = Metadata
+
+# Verify all 7 audit gates pass
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+uv run python scripts/audit_main_thread_imports.py
+uv run python scripts/audit_no_models_config_io.py
+uv run python scripts/audit_code_path_audit_coverage.py --input-dir docs/reports/code_path_audit/latest --strict
+uv run python scripts/audit_exception_handling.py --strict
+uv run python scripts/audit_optional_in_3_files.py --strict
+# All exit 0
+```
+
+## Post-track verification (after Phase 6)
+
+```bash
+# VC1: Metadata is @dataclass
+git show HEAD:src/type_aliases.py | head -20
+# Expect: @dataclass(frozen=True, slots=True) class Metadata:
+
+# VC2: 0 .get sites on Metadata consumers
+git grep -E "\.get\('[a-z_]+'," HEAD -- 'src/*.py' | wc -l
+# Expect: <20 (only legitimate non-Metadata uses)
+
+# VC3: 0 subscript sites on Metadata consumers
+git grep -E "\[[ ]*'[a-z_]+'[ ]*\]" HEAD -- 'src/*.py' | wc -l
+# Expect: <20
+
+# VC4: 12+ tests pass
+uv run python -m pytest tests/test_metadata_dataclass.py -v
+
+# VC5: 5 sub-aggregate TypeAliases all point to Metadata
+git show HEAD:src/type_aliases.py | grep "TypeAlias = Metadata"
+
+# VC6: Effective codepaths drops by >= 2 orders of magnitude
+uv run python -c "
+import sys
+sys.path.insert(0, 'scripts/code_path_audit')
+sys.path.insert(0, 'src')
+from code_path_audit import build_pcg
+from code_path_audit_ssdl import count_branches_in_function
+pcg = build_pcg('src').data
+metadata_consumers = pcg.consumers.get('Metadata', [])
+total = sum(2 ** count_branches_in_function(f, 'src') for f in metadata_consumers)
+print(f'Post-track: {total:.3e} (baseline: 4.014e+22)')
+"
+# Expect: < 1e+20
+```
+
+## See also
+
+- `conductor/tracks/metadata_promotion_20260624/spec.md` — the full spec (10 VCs)
+- `conductor/tracks/metadata_promotion_20260624/plan.md` — the 5-phase plan
+- `conductor/tracks/metadata_promotion_20260624/metadata.json` — the metadata
+- `conductor/tracks/metadata_promotion_20260624/state.toml` — the state
+- `docs/reports/SSDL_CAMPAIGN_ABORTED_20260624.md` — the post-mortem explaining the type-dispatch root cause
+- `conductor/tracks/any_type_componentization_20260621/plan.md` — the grandparent plan
+- `src/type_aliases.py` — the current Metadata definition
+- `scripts/code_path_audit/code_path_audit.py` — the consumer detection
+- `scripts/code_path_audit/code_path_audit_ssdl.py` — the effective codepaths metric
+- `conductor/code_styleguides/data_oriented_design.md` — the "Prefer Fewer Types" principle

conductor/tracks/metadata_promotion_20260624/metadata.json

@@ -0,0 +1,126 @@
+{
+  "track_id": "metadata_promotion_20260624",
+  "name": "Metadata Promotion: per-aggregate dataclasses + direct field access (NOT a shared mega-dataclass)",
+  "status": "active",
+  "type": "fix",
+  "parent": "any_type_componentization_20260621",
+  "grandparent": "code_path_audit_20260607",
+  "date_created": "2026-06-25",
+  "created_by": "tier1-orchestrator",
+  "corrected": "2026-06-25",
+  "correction_note": "Original spec (commit e50bebdd) proposed a single shared @dataclass(frozen=True, slots=True) Metadata with ~200 fields for all 5 sub-aggregates. Rejected 2026-06-25 on user direction: each sub-aggregate is its own dataclass with its own fields; Metadata: TypeAlias = dict[str, Any] is preserved as the catch-all for collapsed codepaths only. See docs/reports/PLANNING_CORRECTION_metadata_promotion_20260625.md for the full rationale.",
+  "blocks": [],
+  "blocked_by": {
+    "code_path_audit_phase_3_provider_state_20260624": "shipped (the per-vendor _X_history aliases were removed; ChatMessage and ToolCall from openai_schemas.py are now wireable into the send paths)"
+  },
+  "scope": {
+    "new_files": [
+      "tests/test_comms_log_entry.py",
+      "tests/test_history_message.py",
+      "tests/test_tool_definition.py",
+      "tests/test_rag_chunk.py",
+      "tests/test_session_insights.py",
+      "tests/test_discussion_settings.py",
+      "tests/test_custom_slice.py",
+      "tests/test_mma_usage_stats.py",
+      "tests/test_provider_payload.py",
+      "tests/test_ui_panel_config.py",
+      "tests/test_path_info.py",
+      "tests/test_context_preset_schema.py",
+      "docs/reports/PLANNING_CORRECTION_metadata_promotion_20260625.md",
+      "docs/reports/TRACK_COMPLETION_metadata_promotion_20260624.md"
+    ],
+    "modified_files": [
+      "src/type_aliases.py",
+      "src/rag_engine.py",
+      "src/models.py",
+      "src/gui_2.py",
+      "src/app_controller.py",
+      "src/ai_client.py",
+      "src/mcp_client.py",
+      "src/aggregate.py",
+      "src/session_logger.py",
+      "src/multi_agent_conductor.py",
+      "src/conductor_tech_lead.py",
+      "conductor/code_styleguides/type_aliases.md"
+    ],
+    "new_dataclasses": [
+      {"name": "CommsLogEntry", "module": "src/type_aliases.py", "fields": 8},
+      {"name": "HistoryMessage", "module": "src/type_aliases.py", "fields": 6},
+      {"name": "ToolDefinition", "module": "src/type_aliases.py", "fields": 4},
+      {"name": "SessionInsights", "module": "src/type_aliases.py", "fields": 6},
+      {"name": "DiscussionSettings", "module": "src/type_aliases.py", "fields": 3},
+      {"name": "CustomSlice", "module": "src/type_aliases.py", "fields": 4},
+      {"name": "MMAUsageStats", "module": "src/type_aliases.py", "fields": 3},
+      {"name": "ProviderPayload", "module": "src/type_aliases.py", "fields": 4},
+      {"name": "UIPanelConfig", "module": "src/type_aliases.py", "fields": 3},
+      {"name": "PathInfo", "module": "src/type_aliases.py", "fields": 3},
+      {"name": "RAGChunk", "module": "src/rag_engine.py", "fields": 4}
+    ],
+    "reused_existing_dataclasses": [
+      {"name": "Ticket", "module": "src/models.py", "fields": 15},
+      {"name": "FileItem", "module": "src/models.py", "fields": 10},
+      {"name": "ContextPreset", "module": "src/models.py", "fields": "extended"},
+      {"name": "ToolCall", "module": "src/openai_schemas.py", "fields": 3},
+      {"name": "ToolCallFunction", "module": "src/openai_schemas.py", "fields": 2},
+      {"name": "ChatMessage", "module": "src/openai_schemas.py", "fields": 5},
+      {"name": "UsageStats", "module": "src/openai_schemas.py", "fields": 4},
+      {"name": "NormalizedResponse", "module": "src/openai_schemas.py", "fields": 4}
+    ],
+    "consumer_files_migrated": [
+      "src/gui_2.py",
+      "src/app_controller.py",
+      "src/ai_client.py",
+      "src/mcp_client.py",
+      "src/aggregate.py",
+      "src/session_logger.py",
+      "src/multi_agent_conductor.py",
+      "src/conductor_tech_lead.py",
+      "src/rag_engine.py"
+    ],
+    "deprecated": [
+      "src/type_aliases.py:CommsLogEntry:TypeAlias = Metadata (replaced by class CommsLogEntry)",
+      "src/type_aliases.py:HistoryMessage:TypeAlias = Metadata (replaced by class HistoryMessage)",
+      "src/type_aliases.py:ToolDefinition:TypeAlias = Metadata (replaced by class ToolDefinition)",
+      "src/models.py:Ticket.get() method (legacy compat; removed in Phase 1.3)"
+    ]
+  },
+  "verification_criteria": [
+    "Metadata: TypeAlias = dict[str, Any] is UNCHANGED in src/type_aliases.py",
+    "Each new sub-aggregate is its OWN @dataclass(frozen=True, slots=True) in the appropriate module (11 new dataclasses across src/type_aliases.py and src/rag_engine.py)",
+    "Existing per-aggregate dataclasses (Ticket, FileItem, ToolCall, ChatMessage, UsageStats) are REUSED unchanged; their consumers migrate to direct field access",
+    "All 107 .get('key', ...) access sites on KNOWN sub-aggregates replaced with direct field access",
+    "All 106 ['key'] subscript access sites on KNOWN sub-aggregates replaced with direct field access",
+    "Remaining .get() sites are FR2 collapsed-codepath sites (TOML config, generic JSON, polymorphic log) with per-site documented justification in the Phase 11 commit message",
+    "12 per-aggregate regression-guard test files exist and pass (5+ tests per file; 60+ tests total)",
+    "Effective codepaths drops by >= 2 orders of magnitude (< 1e+20; was 4.014e+22)",
+    "All 7 audit gates pass --strict (no regression)",
+    "10/11 batched test tiers PASS (RAG flake acceptable)",
+    "End-of-track report written (docs/reports/TRACK_COMPLETION_metadata_promotion_20260624.md) with the new effective-codepaths number and the per-aggregate classification of the remaining .get() sites",
+    "Planning correction report exists (docs/reports/PLANNING_CORRECTION_metadata_promotion_20260625.md)"
+  ],
+  "estimated_effort": {
+    "method": "scope (per workflow.md §Tier 1 Track Initialization Rules). NO day estimates.",
+    "scope": "1 source file extended (src/type_aliases.py: 30 lines -> ~200 lines for 10 new dataclasses + 1 source file extended (src/rag_engine.py: +5 lines for RAGChunk) + 1 source file extended (src/models.py: ContextPreset schema completion) + 9 consumer files modified (~213 access sites total across 12 phases) + 12 new test files (5+ tests each; 60+ tests total) + 1 styleguide clarification + 2 docs reports; estimated 29+ atomic commits total across 13 phases"
+  },
+  "risk_register": [
+    "R1 (medium): 213 access sites have polymorphic keys that don't fit cleanly into a per-aggregate dataclass - mitigated by Optional[T] for all fields + from_dict() classmethod filtering unknown keys + to_dict() for serialization (canonical pattern from src/openai_schemas.py and src/models.py:FileItem)",
+    "R2 (low): Some sites do entry['key'] with dynamic keys - mitigated by keeping dict-style access via entry.to_dict()[var_name] for those rare cases",
+    "R3 (low): to_dict() round-trip loses information for nested dicts - mitigated by careful implementation; nested dicts pass through as dict[str, Any] (per the FileItem.to_dict() precedent)",
+    "R4 (medium): Some sites mutate entry (e.g., entry['key'] = value); dataclass is frozen - mitigated by audit + replacement with dataclasses.replace()",
+    "R5 (low): Migration breaks regression-guard tests for the existing dataclasses (Ticket, FileItem) - mitigated by per-phase regression-guard test runs",
+    "R6 (high): 213 access sites across 12 phases is a large migration - mitigated by per-aggregate phase structure; each phase is small and shippable independently; per-phase regression-guard catches regressions early",
+    "R7 (medium): Dataclass name collisions with existing names (Metadata in models.py vs type_aliases.py; ProviderPayload may collide with existing names) - mitigated by module-qualified imports and naming review in Phase 0",
+    "R8 (low): Some sites use the legacy Ticket.get(key, default) method for backward compat - mitigated by removing the method in Phase 1.3 after all consumers have migrated"
+  ],
+  "out_of_scope": [
+    "Modifications to src/code_path_audit*.py (the audit infrastructure is correct)",
+    "The 4 NG1 + 7 NG2 audit violations (already addressed in dc397db7)",
+    "The 4.01e22's nil-check component (per docs/reports/SSDL_CAMPAIGN_ABORTED_20260624.md; minor contributor)",
+    "The RAG test pre-existing flake (per SSDL post-mortem)",
+    "New src/<thing>.py files (per AGENTS.md hard rule; new dataclasses go in src/type_aliases.py for type-system aggregates or in the existing parent module)",
+    "Promoting Metadata: TypeAlias = dict[str, Any] itself to a shared mega-dataclass (the original spec's bad inference; rejected 2026-06-25)",
+    "Migrating the FR2 collapsed-codepath sites (self.project.get('paths', {}), self.project.get('conductor', {}), etc.) - these read manual_slop.toml; the shape is genuinely unknown at type level",
+    "Pydantic migration (the canonical pattern is stdlib @dataclass(frozen=True, slots=True); Pydantic is for input validation only)"
+  ]
+}

conductor/tracks/metadata_promotion_20260624/spec.md

@@ -0,0 +1,311 @@
+# Track Specification: metadata_promotion_20260624
+
+> **Status:** ACTIVE — corrected 2026-06-25 (Tier 1 audit). The original spec (commit `e50bebdd`, 2026-06-25) proposed a single `@dataclass(frozen=True, slots=True) Metadata` with ~200 fields shared across all 5 sub-aggregates. That proposal was REJECTED on 2026-06-25 (user direction): the 5 sub-aggregates are distinct concepts with distinct field sets; lifting them into one mega-dataclass hides the type information that direct field access is supposed to reveal. The corrected design promotes each sub-aggregate to its OWN dataclass with its OWN fields. See `docs/reports/PLANNING_CORRECTION_metadata_promotion_20260625.md` for the full rationale.
+
+## Overview
+
+Promotes the 5 distinct sub-aggregates (`CommsLogEntry`, `HistoryMessage`, `FileItem`, `ToolDefinition`, `ToolCall`) to their own typed `@dataclass(frozen=True, slots=True)` classes (or reuses the existing typed dataclasses where they already exist: `models.FileItem`, `openai_schemas.ToolCall`), then migrates the 107 `.get('key', ...)` + 106 subscript `['key']` access sites on those aggregates to direct field access (`entry.ts`, `t.depends_on`, `chunk.document`). `Metadata: TypeAlias = dict[str, Any]` is preserved as the catch-all for **truly collapsed codepaths** (generic JSON parsing at wire boundaries, `manual_slop.toml` project config, polymorphic containers where the element type is genuinely unknown) and is NOT promoted to a shared mega-dataclass.
+
+The combinatoric explosion (`4.01e22` effective codepaths) is addressed by **per-aggregate type promotion**: each known concept gets its own dataclass with its own fields, the `.get()` / `[]` runtime type-dispatch collapses at the source, and the audit's branch count drops per consumer function.
+
+## Current State Audit (master `dc397db7`, measured 2026-06-25)
+
+| Metric | Value | Source |
+|---|---:|---|
+| `Metadata` consumers in `src/` | **695** | `scripts/code_path_audit.build_pcg` |
+| Top consumer files | `app_controller.py: 123`, `mcp_client.py: 94`, `ai_client.py: 73`, `gui_2.py: 44`, `models.py: 29` | `Counter` over `pcg.consumers['Metadata']` |
+| Total branches in Metadata consumers | 3,454 | `scripts/code_path_audit_ssdl.count_branches_in_function` |
+| **Effective codepaths (the 4.01e22)** | **4.014e+22** | `compute_effective_codepaths` |
+| `.get('key', ...)` access sites (all sub-aggregates) | 107 | `git grep` in `src/` |
+| `['key']` subscript access sites | 106 | `git grep` in `src/` |
+| `is None` / `== None` / `!= None` sites | 106 | `git grep` in `src/` (mostly unrelated to Metadata) |
+| TypeAlias chain (current state, before this track) | `Metadata: dict[str, Any]`; `CommsLogEntry: Metadata`; `HistoryMessage: Metadata`; `FileItem: "models.FileItem"`; `ToolDefinition: Metadata`; `ToolCall: "openai_schemas.ToolCall"` | `src/type_aliases.py` |
+| Existing per-aggregate dataclasses | `models.Ticket` (15 fields), `models.FileItem` (10 fields), `models.Track` (3 fields), `openai_schemas.ToolCall` (3 fields), `openai_schemas.ChatMessage` (5 fields), `openai_schemas.UsageStats` (4 fields), `openai_schemas.ToolCallFunction` (2 fields), `openai_schemas.NormalizedResponse` (4 fields), `vendor_capabilities.VendorCapabilities` (22 fields) | `git grep "^class .*(dataclass\|frozen=True)" src/` |
+| Missing per-aggregate dataclasses | `CommsLogEntry`, `HistoryMessage`, `ToolDefinition`, `RAGChunk`, `SessionInsights`, `DiscussionSettings`, `CustomSlice`, `MMAUsageStats`, `ProviderPayload`, `UIPanelConfig`, `ContextPreset` (full schema), `PathInfo` | actual access patterns from `git grep` on `src/` |
+
+### Why the corrected design (per-aggregate dataclasses) — not one mega-dataclass
+
+The 107 `.get('key', default)` and 106 `['key']` access sites in `src/` span **at least 12 distinct aggregates**, not 5. A sampling of the actual access patterns:
+
+| Access pattern | Site | Aggregate it actually represents |
+|---|---|---|
+| `item.get('custom_slices', [])`, `item.get('content', '')` | `src/aggregate.py:418,421` | **FileItem** (per-file curation) |
+| `fi.get('path', 'attachment')` | `src/ai_client.py:2565,2807,2898` | **FileItem** |
+| `chunk.get('document', '')` | `src/aggregate.py:3259`, `src/app_controller.py:251,4162` | **RAGChunk** (RAG retrieval result) |
+| `entry.get('source_tier', 'main')`, `entry.get('model', 'unknown')` | `src/app_controller.py:2277,2302,2310` | **CommsLogEntry** (AI comms log) |
+| `u.get('input_tokens', 0)`, `u.get('output_tokens', 0)` | `src/app_controller.py:2304-2309` | **UsageStats** (per-call token usage) |
+| `t.get('id', '')`, `t.get('depends_on', [])`, `t.get('manual_block', False)`, `t.get('status')` | `src/gui_2.py:1366-1438` | **Ticket** (MMA ticket — already a dataclass) |
+| `stats.get('model', 'unknown')`, `stats.get('input', 0)`, `stats.get('output', 0)` | `src/gui_2.py:2199-2201,2216` | **MMAUsageStats** (per-tier rollup) |
+| `insights.get('total_tokens', 0)`, `insights.get('call_count', 0)`, `insights.get('burn_rate', 0)`, `insights.get('session_cost', 0)`, `insights.get('completed_tickets', 0)`, `insights.get('efficiency', 0)` | `src/gui_2.py:4926-4931` | **SessionInsights** (overall session stats) |
+| `entry.get('temperature', 0.7)`, `entry.get('top_p', 1.0)`, `entry.get('max_output_tokens', 0)` | `src/gui_2.py:3535` | **DiscussionSettings** (per-turn settings) |
+| `slc.get('tag', '')`, `slc.get('comment', '')` | `src/gui_2.py:4048-4054` | **CustomSlice** (visual slice editor) |
+| `preset.get('files', [])`, `preset.get('screenshots', [])` | `src/gui_2.py:4184-4185` | **ContextPreset** (file composition) |
+| `payload.get('script')`, `payload.get('args', {})`, `payload.get('output', '')`, `payload.get('content', '')` | `src/app_controller.py:2274,2287` | **ProviderPayload** (script-execution payload) |
+| `self.project.get('paths', {})`, `self.project.get('conductor', {})`, `self.project.get('context_presets', {})` | `src/app_controller.py:1972,2016,2033`; `src/gui_2.py:820,4181,4333,4448` | **ProjectConfig** (`manual_slop.toml` — TRUE catch-all dict; uses `Metadata`) |
+| `gui_cfg.get('separate_message_panel', False)`, `gui_cfg.get('separate_response_panel', False)`, `gui_cfg.get('separate_tool_calls_panel', False)` | `src/app_controller.py:2068-2070` | **UIPanelConfig** |
+| `self.project.get('discussion', {}).get('discussions', {})` | `src/gui_2.py:5036,5046` | **DiscussionStore** |
+| `path_info['logs_dir']['path']` | `src/app_controller.py:1984` | **PathInfo** (nested) |
+
+**There is no single "Metadata" shape.** The 107 `.get()` sites access ~12 distinct aggregates, each with its own field set. The original spec (commit `e50bebdd`) proposed a single `@dataclass(frozen=True, slots=True) Metadata` with ~200 fields merging all 12 aggregates into one polymorphic mega-struct. That is the wrong direction:
+
+- It hides the type distinctions that direct field access is supposed to reveal.
+- A consumer that has a `Ticket` can read `.source_tier` (a `CommsLogEntry` field) — silently get the empty default — and ship a bug that no type checker will catch.
+- It is "less defined" than the current `dict[str, Any]`: today, reading `.source_tier` on a `Ticket` raises `AttributeError` immediately; after the mega-dataclass, it silently returns `""`.
+
+The corrected design is **per-aggregate dataclasses**: each known concept gets its own typed dataclass with its own fields. `Metadata: TypeAlias = dict[str, Any]` is preserved for the **truly collapsed codepaths** where the shape is genuinely unknown (TOML project config, generic JSON parsing, polymorphic log dumping).
+
+## Goals
+
+| ID | Goal | Acceptance |
+|---|---|---|
+| G1 | Each known sub-aggregate is its OWN `@dataclass(frozen=True, slots=True)` with its OWN fields (or reuses the existing typed dataclass where one already exists) | `git grep "^@dataclass\|^class .*dataclass" src/` shows `CommsLogEntry`, `HistoryMessage`, `RAGChunk`, `SessionInsights`, `DiscussionSettings`, `CustomSlice`, `MMAUsageStats`, `ProviderPayload`, `UIPanelConfig`, `DiscussionStore`, `ContextPreset` (full), `PathInfo`, `ToolDefinition` each as its own class; the existing `FileItem`, `ToolCall`, `Ticket`, `ChatMessage`, `UsageStats` are reused unchanged |
+| G2 | `Metadata: TypeAlias = dict[str, Any]` is preserved as the catch-all for collapsed codepaths; NOT promoted to a shared mega-dataclass | `git grep "^Metadata:" src/type_aliases.py` shows `Metadata: TypeAlias = dict[str, Any]` (unchanged); the type is not a dataclass |
+| G3 | Migrate the 107 `.get('key', ...)` + 106 `['key']` access sites on the KNOWN sub-aggregates to direct field access on the per-aggregate dataclass | `git grep -E "\.get\('[a-z_]+'," HEAD -- 'src/*.py'` returns only legitimate non-aggregate uses (e.g., `.get('mtime', 0)` on file paths, `.get('auto_start', False)` on config dicts); the per-aggregate sites are gone |
+| G4 | Effective codepaths drops by ≥ 2 orders of magnitude | `compute_effective_codepaths` returns `< 1e+20` (was 4.014e+22) |
+| G5 | All 7 audit gates pass `--strict` (no regression) | `weak_types`, `type_registry`, `main_thread_imports`, `no_models_config_io`, `code_path_audit_coverage`, `exception_handling`, `optional_in_3_files` all exit 0 |
+| G6 | All existing tests pass (10/11 batched tiers — RAG flake acceptable) | `scripts/run_tests_batched.py` → 10/11 PASS |
+| G7 | New regression-guard tests for each new per-aggregate dataclass | `tests/test_metadata_dataclass.py` is split into `tests/test_comms_log_entry.py`, `tests/test_history_message.py`, `tests/test_tool_definition.py`, `tests/test_rag_chunk.py`, `tests/test_session_insights.py`, etc.; each has 5+ tests for: constructor, field access, `to_dict()`/`from_dict()` round-trip, frozen, equality |
+| G8 | `Metadata` (the catch-all dict) is used ONLY at the genuinely collapsed codepaths — never as a stand-in for a known sub-aggregate | Code review confirms: every `.get('key', default)` site has been classified as either (a) a known sub-aggregate → migrated to direct field access, or (b) a genuinely collapsed codepath (TOML project config, generic JSON parsing, polymorphic log dumping) → keeps `Metadata` |
+
+## Non-Goals
+
+- Modifications to `src/code_path_audit*.py` (the audit infrastructure is correct; the migration is on the consumer side)
+- The 4 NG1 + 7 NG2 audit violations (already addressed in phase 2 + `dc397db7`)
+- The 4.01e22's nil-check component (per the post-mortem at `docs/reports/SSDL_CAMPAIGN_ABORTED_20260624.md`, this is a minor contributor; the per-aggregate type-dispatch collapse is the dominant cause)
+- The RAG test pre-existing flake (per the SSDL post-mortem "Out of Scope")
+- New `src/<thing>.py` files (per AGENTS.md hard rule; new dataclasses go in `src/type_aliases.py` for type-system aggregates, or in the existing module for the aggregate — `models.FileItem` stays in `models.py`, `openai_schemas.ToolCall` stays in `openai_schemas.py`, etc.)
+- Promoting `Metadata: TypeAlias = dict[str, Any]` to a shared mega-dataclass (this is the original spec's bad inference; rejected 2026-06-25)
+- The collapsed-codepath sites (`self.project.get('paths', {})`, `self.project.get('conductor', {})`, etc.) — these read `manual_slop.toml` and the shape is genuinely unknown at type level; they keep `Metadata` as `dict[str, Any]`
+
+## Functional Requirements
+
+### FR1: Per-aggregate dataclasses (not one mega-dataclass)
+
+Each known sub-aggregate becomes its OWN dataclass. The design follows the existing pattern at `src/openai_schemas.py` (`ToolCall`, `ChatMessage`, `UsageStats`, `ToolCallFunction`, `NormalizedResponse` — all separate frozen dataclasses with their own fields).
+
+#### Existing dataclasses — REUSED UNCHANGED
+
+| Class | Location | Fields | Consumers that need migration |
+|---|---|---|---|
+| `Ticket` | `src/models.py:302` | `id, description, target_symbols, context_requirements, depends_on, status, assigned_to, priority, target_file, blocked_reason, step_mode, retry_count, manual_block, model_override, persona_id` (15 fields) | `src/gui_2.py:1366-1438,1682,4810,4820,4868`; `src/conductor_tech_lead.py:125`; `src/app_controller.py:4810-4868` |
+| `FileItem` | `src/models.py:533` | `path, auto_aggregate, force_full, view_mode, selected, ast_signatures, ast_definitions, ast_mask, custom_slices, injected_at` (10 fields) | `src/aggregate.py:418,421`; `src/ai_client.py:2565,2807,2898`; `src/app_controller.py:3508` |
+| `ToolCall` | `src/openai_schemas.py:32` | `id, function (ToolCallFunction), type` (3 fields) | `src/mcp_client.py` (tool loop section) |
+| `ChatMessage` | `src/openai_schemas.py:48` | `role, content, tool_calls, tool_call_id, name` (5 fields) | provider-side history (will replace the per-vendor `_X_history` aliases that were removed in `code_path_audit_phase_3_provider_state_20260624`) |
+| `UsageStats` | `src/openai_schemas.py:68` | `input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens` (4 fields) | per-call token usage in `src/app_controller.py:2299-2309` |
+
+#### NEW dataclasses — to be added
+
+| Class | Module | Fields | Consumers that need migration |
+|---|---|---|---|
+| `CommsLogEntry` | `src/type_aliases.py` | `ts, role, kind, direction, model, source_tier, content, error` (8 fields) | `src/app_controller.py:2277,2302,2310`; `src/session_logger.py`; `src/multi_agent_conductor.py` |
+| `HistoryMessage` | `src/type_aliases.py` | `role, content, tool_calls, tool_call_id, name, ts` (6 fields) | UI-layer discussion history (the per-turn editable list, NOT the provider-side `ChatMessage` — these are distinct layers per `data_structure_strengthening_20260606` §3.1) |
+| `ToolDefinition` | `src/type_aliases.py` | `name, description, parameters, auto_start` (4 fields) | `src/mcp_client.py:_build_anthropic_tools` and equivalent per-vendor tool builders |
+| `RAGChunk` | `src/rag_engine.py` | `document, path, score, metadata` (4 fields) | `src/aggregate.py:3259`; `src/app_controller.py:251,4162` |
+| `SessionInsights` | `src/type_aliases.py` | `total_tokens, call_count, burn_rate, session_cost, completed_tickets, efficiency` (6 fields) | `src/gui_2.py:4926-4931` |
+| `DiscussionSettings` | `src/type_aliases.py` | `temperature, top_p, max_output_tokens` (3 fields) | `src/gui_2.py:3535` |
+| `CustomSlice` | `src/type_aliases.py` | `tag, comment, start_line, end_line` (4 fields) | `src/gui_2.py:4048-4054,1301-1302` |
+| `MMAUsageStats` | `src/type_aliases.py` | `model, input, output` (3 fields) | `src/gui_2.py:2199-2201,2216` |
+| `ProviderPayload` | `src/type_aliases.py` | `script, args, output, source_tier` (4 fields) | `src/app_controller.py:2274,2287` |
+| `UIPanelConfig` | `src/type_aliases.py` | `separate_message_panel, separate_response_panel, separate_tool_calls_panel` (3 fields) | `src/app_controller.py:2068-2070` |
+| `PathInfo` | `src/type_aliases.py` | `logs_dir, scripts_dir, project_root` (3 fields, nested) | `src/app_controller.py:1984-1985` |
+| `ContextPreset` | `src/models.py` (full schema) | `name, files (FileItems), screenshots (list[str])` (3 fields minimum) | `src/gui_2.py:4184-4185,4333,4448` |
+
+#### Why per-aggregate dataclasses, not one shared mega-dataclass
+
+- **Each aggregate has its own field set.** A `Ticket` has `depends_on: List[str]`, `manual_block: bool`. A `CommsLogEntry` has `source_tier: str`, `model: str`. A `RAGChunk` has `document: str`, `score: float`. They share NO common fields beyond `id`. There is no "common Metadata base" to extract.
+- **A shared mega-dataclass defeats the type system.** A consumer that has a `Ticket` can read `.source_tier` (a `CommsLogEntry` field) — silently get the empty default — and ship a bug that no type checker will catch. Today, with `dict[str, Any]`, reading `.source_tier` on a `Ticket` raises `AttributeError` immediately. The mega-dataclass is **less defined** than the current state.
+- **The original convention anticipated per-concept promotion.** Per `data_structure_strengthening_20260606` §3.3: *"Phase 2 can convert `Metadata` to a `TypedDict` (or split into per-concept `TypedDict`s) and the aliases continue to work without breaking changes. The aliases are STABLE NAMES; the underlying type can evolve."* The original 2026-06-06 design intent was per-concept promotion, NOT a mega-dataclass. The original 2026-06-25 metadata_promotion_20260624 spec reversed this direction; the corrected spec restores the original intent.
+
+### FR2: `Metadata` stays as the catch-all for collapsed codepaths
+
+`Metadata: TypeAlias = dict[str, Any]` is preserved unchanged. It is used at sites where the shape is genuinely unknown at type level:
+
+- `manual_slop.toml` project config loading (`self.project.get('paths', {})`, `self.project.get('conductor', {})`, `self.project.get('context_presets', {})`, `self.project.get('discussion', {})`) — these are top-level TOML keys; the aggregator doesn't know which key it's about to read.
+- Generic JSON parsing at the wire boundary (REST API payloads, WebSocket messages) — the body shape is defined by the producer, not the consumer.
+- Polymorphic log dumping — a function that serializes a list of mixed-aggregate entries to JSON without caring about their individual types.
+
+These sites keep `Metadata` and `.get('key', default)` because there is no per-aggregate type to promote to. The audit MUST classify every remaining `.get('key', default)` site as one of: (a) "promoted to per-aggregate dataclass → migrated" or (b) "collapsed codepath → keeps Metadata with documented justification in code comment or commit message."
+
+### FR3: Phase-by-phase migration (12+ sub-aggregates, 1 phase per aggregate)
+
+The migration is per-aggregate: each aggregate gets its own phase. Phases are ordered to maximize early feedback:
+
+| Phase | Sub-aggregate | Est. consumers | Primary files |
+|---|---|---:|---|
+| 0 | Design the new dataclasses + add regression-guard test stubs | 0 (design only) | `src/type_aliases.py` (and the existing modules for in-place additions) |
+| 1 | `Ticket` (already a dataclass; migrate consumers only) | ~30 sites | `src/gui_2.py`, `src/conductor_tech_lead.py`, `src/app_controller.py` |
+| 2 | `FileItem` (already a dataclass; migrate consumers only) | ~10 sites | `src/aggregate.py`, `src/ai_client.py`, `src/app_controller.py` |
+| 3 | `CommsLogEntry` (NEW dataclass + migrate consumers) | ~30 sites | `src/type_aliases.py`, `src/session_logger.py`, `src/multi_agent_conductor.py`, `src/app_controller.py` |
+| 4 | `HistoryMessage` (NEW dataclass + migrate UI-layer consumers) | ~20 sites | `src/type_aliases.py`, `src/gui_2.py` |
+| 5 | `ChatMessage` (already in `openai_schemas.py`; wire it into the per-vendor send paths) | ~27 sites | `src/ai_client.py` |
+| 6 | `UsageStats` (already in `openai_schemas.py`; wire into the per-call usage aggregation) | ~10 sites | `src/app_controller.py` |
+| 7 | `ToolCall` (already in `openai_schemas.py`; wire into the tool loop section) | ~56 sites | `src/ai_client.py`, `src/mcp_client.py` |
+| 8 | `ToolDefinition` (NEW dataclass + migrate per-vendor tool builders) | ~94 sites | `src/type_aliases.py`, `src/mcp_client.py` |
+| 9 | `RAGChunk` (NEW dataclass + migrate consumers) | ~5 sites | `src/rag_engine.py`, `src/aggregate.py`, `src/app_controller.py` |
+| 10 | `SessionInsights`, `DiscussionSettings`, `CustomSlice`, `MMAUsageStats`, `ProviderPayload`, `UIPanelConfig`, `PathInfo`, `ContextPreset` (small aggregates, batched) | ~25 sites | `src/type_aliases.py`, `src/models.py`, `src/gui_2.py`, `src/app_controller.py` |
+| 11 | `Metadata` collapsed-codepath audit + classification (per FR2) | ~80 sites | every `.get('key', default)` site that is NOT promoted to a per-aggregate dataclass |
+| 12 | Verification + end-of-track (1 task, 3 commits) | 0 | terminal + `docs/reports/TRACK_COMPLETION_metadata_promotion_20260624.md` (NEW) |
+
+Each phase:
+1. For NEW dataclasses: define the dataclass in the appropriate module; add regression-guard test
+2. For ALL phases: migrate the consumer sites from `.get('key', default)` → `.field_name` (or `.field_name or default` for nullable fields)
+3. Per-phase regression-guard test runs
+4. Re-measure effective codepaths after the phase
+
+### FR4: Migration patterns (canonical)
+
+```python
+# BEFORE:
+x = entry.get('model', 'unknown')
+y = entry.get('input_tokens', 0) or 0
+z = entry.get('source_tier', 'main')
+if entry.get('manual_block', False):
+    ...
+role = entry['role']
+if 'depends_on' in entry:
+    deps = entry['depends_on']
+
+# AFTER (with per-aggregate dataclass):
+x = entry.model or 'unknown'         # CommsLogEntry
+y = entry.input_tokens or 0           # UsageStats
+z = entry.source_tier or 'main'      # CommsLogEntry
+if entry.manual_block:                # Ticket
+    ...
+role = entry.role                     # HistoryMessage / CommsLogEntry
+if entry.depends_on:                  # Ticket
+    deps = entry.depends_on
+```
+
+The migration is mechanical but requires care:
+- For nullable fields: use `entry.field or default_value`
+- For required fields: use `entry.field` directly
+- For polymorphic keys (some entries have the key, some don't): the dataclass default handles this (all fields have defaults; `frozen=True, slots=True` ensures immutability)
+- For `['key']` (subscript) where the key is dynamic: rare; keep as `dict[str, Any]` access (e.g., `entry.to_dict()['dynamic_key']`) — but ONLY if the entry is genuinely a dict, not a dataclass
+
+### FR5: Edge cases
+
+**Polymorphic constructors**: many sites do `entry = {'role': 'user', 'content': 'hi'}`. After migration: `entry = HistoryMessage(role='user', content='hi')`. The dataclass has all the fields as `Optional` or with defaults, so this works.
+
+**Dynamic dict construction**: `for k, v in raw.items(): entry[k] = v`. After migration: `entry = HistoryMessage(**raw)`. The `**` syntax requires that all keys in `raw` are valid field names; if `raw` has unknown keys, this fails. Solution: use a `from_dict` classmethod that filters out unknown keys (the canonical pattern, already used by `models.FileItem.from_dict` at `src/models.py:600-619` and `openai_schemas.NormalizedResponse.from_dict`):
+
+```python
+@classmethod
+def from_dict(cls, raw: dict[str, Any]) -> 'HistoryMessage':
+    valid_fields = {f.name for f in fields(cls)}
+    return cls(**{k: v for k, v in raw.items() if k in valid_fields})
+```
+
+**JSON serialization**: `json.dumps(entry)` fails on dataclass. Solution: `json.dumps(entry.to_dict())` (per the canonical `to_dict()` pattern at `src/models.py:567-579` and `src/openai_schemas.py:36-43`).
+
+**Pickle**: `pickle.dumps(entry)` works (dataclass supports pickle natively via `__reduce__`).
+
+**Equality**: `entry1 == entry2` now works (dataclass generates `__eq__`); before it was `False` for distinct dict instances even with the same content.
+
+**JSON round-trip preservation**: every dataclass in this track has a paired `to_dict()` + `from_dict()` (no information loss). This is enforced by the per-dataclass regression-guard test.
+
+### FR6: `Metadata` collapsed-codepath classification (per FR2)
+
+For every remaining `.get('key', default)` site after all phases:
+
+1. The site is classified as either (a) "promoted to per-aggregate dataclass" (migrated) or (b) "collapsed codepath" (keeps `Metadata`).
+2. For (b), the justification is documented in the commit message (one line: "this site reads `manual_slop.toml`; the shape is unknown until the TOML is parsed").
+3. The audit `scripts/audit_weak_types.py --strict` continues to flag anonymous dict accesses; the gate is the per-aggregate dataclass promotion, NOT the elimination of all `.get()`.
+
+### FR7: Re-measurement
+
+After each phase, re-measure:
+
+```bash
+uv run python -c "
+import sys
+sys.path.insert(0, 'scripts/code_path_audit')
+sys.path.insert(0, 'src')
+from code_path_audit import build_pcg
+from code_path_audit_ssdl import count_branches_in_function
+pcg = build_pcg('src').data
+metadata_consumers = pcg.consumers.get('Metadata', [])
+total = sum(2 ** count_branches_in_function(f, 'src') for f in metadata_consumers)
+print(f'Effective codepaths: {total:.3e}')
+print(f'Consumers: {len(metadata_consumers)}')
+"
+```
+
+Expected: drops from 4.014e+22 to < 1e+20 after the aggregate-promotion phases (each phase drops it further as more consumers migrate to direct field access).
+
+## Non-Functional Requirements
+
+- NFR1: 1-space indentation (per `conductor/workflow.md`)
+- NFR2: CRLF line endings on Windows
+- NFR3: No comments in source code
+- NFR4: Per-task atomic commits with git notes
+- NFR5: No new pip dependencies (dataclass is stdlib)
+- NFR6: `Result[T]` returns for fallible fns (per `error_handling.md`)
+- NFR7: No new `src/<thing>.py` files (per AGENTS.md hard rule; new type-system aggregates go in `src/type_aliases.py`, in-module aggregates stay in their parent module)
+
+## Architecture Reference
+
+- `conductor/code_styleguides/data_oriented_design.md` — the canonical DOD reference ("Prefer Fewer Types" — but the types are still distinct)
+- `conductor/code_styleguides/error_handling.md` — the `Result[T]` convention
+- `conductor/code_styleguides/type_aliases.md` — the alias convention (preserved; `Metadata: dict[str, Any]` stays as the catch-all)
+- `src/openai_schemas.py` — the canonical per-aggregate dataclass pattern (`ToolCall`, `ChatMessage`, `UsageStats`); the reference implementation for the NEW dataclasses in this track
+- `src/models.py:533` — `FileItem` (the canonical in-module dataclass pattern with `to_dict()` / `from_dict()` round-trip)
+- `src/models.py:302` — `Ticket` (the canonical dataclass with `get()` legacy-compat method, used during migration)
+- `docs/reports/SSDL_CAMPAIGN_ABORTED_20260624.md` — the post-mortem: the 4.01e22 is from type-dispatch, not nil-checks; the fix is type promotion
+- `docs/reports/PLANNING_CORRECTION_metadata_promotion_20260625.md` — the corrected-design rationale (this track's correction)
+- `conductor/tracks/any_type_componentization_20260621/spec.md` — the grandparent track (89 sites promoted to dataclasses across 5 candidates); the per-aggregate pattern this track follows
+- `conductor/tracks/data_structure_strengthening_20260606/spec.md` §3.3 — the original 2026-06-06 design intent: *"Phase 2 can convert `Metadata` to a `TypedDict` (or split into per-concept `TypedDict`s) and the aliases continue to work without breaking changes. The aliases are STABLE NAMES; the underlying type can evolve."*
+- `scripts/code_path_audit/code_path_audit.py` — the consumer detection (3-pass AST)
+- `scripts/code_path_audit/code_path_audit_ssdl.py` — the effective codepaths metric
+
+## Out of Scope
+
+- Modifications to `src/code_path_audit*.py` (the audit infrastructure is correct)
+- The 4 NG1 + 7 NG2 audit violations (already addressed in `dc397db7`)
+- The 4.01e22's nil-check component (per SSDL post-mortem; minor contributor)
+- The RAG test pre-existing flake (per SSDL post-mortem)
+- New `src/<thing>.py` files (per AGENTS.md hard rule)
+- A shared mega-dataclass across the 5+ sub-aggregates (the original spec's bad inference; rejected 2026-06-25)
+- Promoting `Metadata: TypeAlias = dict[str, Any]` itself to a dataclass (it's the catch-all for collapsed codepaths; not a known sub-aggregate)
+- Migration of the collapsed-codepath sites (`self.project.get('paths', {})`, etc.) — these read `manual_slop.toml`; the shape is genuinely unknown
+- Pydantic migration (the canonical pattern in this codebase is stdlib `@dataclass(frozen=True, slots=True)`; Pydantic is for input validation, not for the data structures used internally)
+
+## Verification Criteria (Definition of Done)
+
+| # | Criterion | Verification command |
+|---|---|---|
+| VC1 | `Metadata: TypeAlias = dict[str, Any]` is UNCHANGED in `src/type_aliases.py` | `git grep "^Metadata:" src/type_aliases.py` shows `Metadata: TypeAlias = dict[str, Any]` |
+| VC2 | Each new sub-aggregate is its OWN `@dataclass(frozen=True, slots=True)` in the appropriate module | `git grep -A 2 "^class CommsLogEntry\|^class HistoryMessage\|^class ToolDefinition\|^class RAGChunk\|^class SessionInsights\|^class DiscussionSettings\|^class CustomSlice\|^class MMAUsageStats\|^class ProviderPayload\|^class UIPanelConfig\|^class PathInfo" src/` shows each as a separate frozen dataclass |
+| VC3 | Existing per-aggregate dataclasses (`Ticket`, `FileItem`, `ToolCall`, `ChatMessage`, `UsageStats`) are REUSED unchanged | `git grep "class Ticket\|class FileItem\|class ToolCall\|class ChatMessage\|class UsageStats" src/` shows the existing classes; consumers migrate to direct field access on them |
+| VC4 | All 107 `.get('key', ...)` access sites on KNOWN sub-aggregates replaced | `git grep -E "\.get\('[a-z_]+'," HEAD -- 'src/*.py'` returns only the FR2 collapsed-codepath sites (documented in the per-site classification) |
+| VC5 | All 106 `['key']` subscript access sites on KNOWN sub-aggregates replaced | `git grep -E "\[[ ]*'[a-z_]+'[ ]*\]" HEAD -- 'src/*.py'` returns only legitimate non-aggregate uses |
+| VC6 | Per-aggregate regression-guard tests exist and pass | `uv run pytest tests/test_comms_log_entry.py tests/test_history_message.py tests/test_tool_definition.py tests/test_rag_chunk.py tests/test_session_insights.py -v` → all pass (5+ tests per file) |
+| VC7 | Effective codepaths drops by ≥ 2 orders of magnitude | `compute_effective_codepaths` returns `< 1e+20` (was 4.014e+22) |
+| VC8 | All 7 audit gates pass `--strict` (no regression) | `weak_types` ≤ 112; `type_registry` 22 files; `main_thread_imports` 17; `no_models_config_io` 0; `code_path_audit_coverage` 0; `exception_handling` 0; `optional_in_3_files` 0 |
+| VC9 | 10/11 batched test tiers PASS (RAG flake acceptable) | `scripts/run_tests_batched.py` → 10/11 |
+| VC10 | End-of-track report written | `docs/reports/TRACK_COMPLETION_metadata_promotion_20260624.md` exists with the new effective-codepaths number and the per-aggregate classification of the remaining `.get()` sites |
+
+## Risks
+
+| # | Risk | Likelihood | Mitigation |
+|---|---|---|---|
+| R1 | Some sub-aggregate has fields that don't fit cleanly into a frozen dataclass (e.g., mutability needed) | low | The canonical reference is `src/openai_schemas.py`; all 5 existing dataclasses there are `frozen=True`. If a field needs mutability, refactor to use `dataclasses.replace()` instead of mutating in place |
+| R2 | Some sites mutate `entry` (e.g., `entry['key'] = value`); dataclass is frozen | medium | Audit these sites; if found, replace with `dataclasses.replace(entry, field_name=value)` |
+| R3 | The dynamic-key subscript sites (`entry[variable_name]`) are not covered by direct field access | low | These sites are rare and already classified as collapsed-codepath per FR2; keep them as `entry.to_dict()[var_name]` if the entry is a dataclass, or `entry[var_name]` if the entry is a dict |
+| R4 | `to_dict()` round-trip loses information for nested dicts (e.g., `custom_slices: list[dict]` in `FileItem`) | low | `FileItem.to_dict()` already handles this (passes nested dicts through as `dict[str, Any]`); mirror the pattern in the new dataclasses |
+| R5 | The 695 consumer functions are too many for one track | high | The track is broken into 12 phases (FR3); each phase is independent and per-aggregate; the per-phase regression-guard test catches regressions early |
+| R6 | A collapsed-codepath site is misclassified as a known sub-aggregate (or vice versa) | medium | The FR6 classification is auditable: every remaining `.get()` site is either (a) "promoted" or (b) "collapsed with documented justification"; the audit `--strict` gate catches drift |
+| R7 | The dataclass names collide with existing names (e.g., `Metadata` exists in both `src/type_aliases.py` and `src/models.py`) | medium | Use module-qualified imports: `from src.type_aliases import Metadata` for the dict alias; `from src.models import Metadata` for the small dataclass. Document the collision in the per-aggregate test file |
+
+## See also
+
+- `docs/reports/SSDL_CAMPAIGN_ABORTED_20260624.md` — the post-mortem: type promotion fixes the 4.01e22, not nil-checks
+- `docs/reports/PLANNING_CORRECTION_metadata_promotion_20260625.md` — the corrected-design rationale
+- `conductor/code_styleguides/type_aliases.md` — the alias convention (preserved; `Metadata: dict[str, Any]` stays as the catch-all)
+- `conductor/code_styleguides/data_oriented_design.md` — the canonical DOD reference
+- `conductor/tracks/any_type_componentization_20260621/spec.md` — the grandparent track (89 sites already promoted to dataclasses)
+- `conductor/tracks/data_structure_strengthening_20260606/spec.md` §3.3 — the original 2026-06-06 design intent: per-concept promotion
+- `src/openai_schemas.py` — the canonical per-aggregate dataclass pattern
+- `src/models.py:533` — `FileItem` (canonical in-module dataclass with `to_dict()` / `from_dict()`)
+- `src/models.py:302` — `Ticket` (canonical dataclass with legacy `get()` compat)
+- `conductor/tracks/code_path_audit_20260607/spec_v2.md` — the audit that established the 4.01e22 baseline
+- `docs/reports/code_path_audit/2026-06-22/AUDIT_REPORT.md` — the original 6797-line audit report

conductor/tracks/metadata_promotion_20260624/state.toml

@@ -0,0 +1,97 @@
+# Track state for metadata_promotion_20260624
+# Updated by Tier 2 Tech Lead as tasks complete
+# HONEST REVISION 2026-06-25: per Tier 1 followup review of Tier 2 attempts.
+
+[meta]
+track_id = "metadata_promotion_20260624"
+name = "Metadata Promotion: dict[str, Any] -> per-aggregate @dataclass(frozen=True)"
+status = "active"
+current_phase = 0
+last_updated = "2026-06-25"
+notes = "Phase 0 (dataclass infrastructure) partially complete. Phases 1-10 (consumer migrations) NOT DONE in the way the plan specified. Metric 4.014e+22 UNCHANGED. 5 blockers identified (see docs/reports/TIER1_REVIEW_metadata_promotion_20260624_20260625.md). Hard rules #11 (no-op ban) and #12 (metric revert) added to plan after repeated no-op classification failures."
+
+[blocked_by]
+code_path_audit_phase_3_provider_state_20260624 = "shipped"
+
+[blocks]
+typed_dispatcher_boundaries_followup_20260625 = "planned (metric problem requires typed parameters at function boundaries, not just per-aggregate dataclasses)"
+fix_toolcall_alias_blocker_20260625 = "planned (TypeAlias ToolCall: TypeAlias = Metadata on src/type_aliases.py:91 was the exact anti-pattern the user flagged; fixed in this revision)"
+fix_fileitem_duplication_blocker_20260625 = "planned (duplicate FileItem definition in src/type_aliases.py:53-69 removed; now points to models.FileItem)"
+
+[phases]
+phase_0 = { status = "partial", checkpointsha = "bacddc85", name = "Design the per-aggregate dataclasses + add regression-guard test stubs" }
+phase_1 = { status = "partial", checkpointsha = "0506c5da", name = "Migrate Ticket consumers (Phase 1 work done; legacy Ticket.get() removed; ~40 sites migrated to direct field access)" }
+phase_2 = { status = "not_done", checkpointsha = "", name = "Migrate FileItem consumers (dataclass exists at models.FileItem; consumer migrations not done per the plan)" }
+phase_3 = { status = "not_done", checkpointsha = "", name = "Migrate CommsLogEntry consumers (dataclass exists; consumers not migrated)" }
+phase_4 = { status = "not_done", checkpointsha = "", name = "Migrate HistoryMessage consumers (dataclass exists; consumers not migrated)" }
+phase_5 = { status = "not_done", checkpointsha = "", name = "Wire ChatMessage into per-vendor send paths (dataclass exists in openai_schemas.py; not wired)" }
+phase_6 = { status = "not_done", checkpointsha = "", name = "Wire UsageStats into per-call usage aggregation" }
+phase_7 = { status = "not_done", checkpointsha = "", name = "Wire ToolCall into tool loop (TypeAlias ToolCall now points to openai_schemas.ToolCall after this revision; consumer migration not done)" }
+phase_8 = { status = "not_done", checkpointsha = "", name = "Migrate ToolDefinition consumers (dataclass exists; consumers not migrated)" }
+phase_9 = { status = "not_done", checkpointsha = "", name = "Migrate RAGChunk consumers (dataclass exists in rag_engine.py; search() still returns List[Dict]; consumer migration blocked)" }
+phase_10 = { status = "not_done", checkpointsha = "", name = "Migrate small-batch aggregates" }
+phase_11 = { status = "not_done", checkpointsha = "", name = "Metadata collapsed-codepath audit (classification table not produced)" }
+phase_12 = { status = "not_done", checkpointsha = "", name = "Verification + end-of-track report" }
+
+[tasks]
+t0_1 = { status = "completed", commit_sha = "bacddc85", description = "Add 11 NEW per-aggregate dataclasses to src/type_aliases.py (Tier 2 added with drifted field types vs the plan; the plan's exact field types are not enforced)" }
+t0_2 = { status = "completed", commit_sha = "bacddc85", description = "Add RAGChunk dataclass to src/rag_engine.py" }
+t0_3 = { status = "completed", commit_sha = "bacddc85", description = "ContextPreset schema (no change needed; existing schema adequate)" }
+t0_4 = { status = "completed", commit_sha = "bacddc85", description = "Create per-aggregate test files (~70 tests across multiple files)" }
+t0_5 = { status = "completed", commit_sha = "c6748634", description = "Document FR6 collapsed-codepath classification rule in type_aliases.md" }
+t0_6 = { status = "completed", commit_sha = "bacddc85", description = "Fix src/type_aliases.py:53-69 duplicate FileItem definition (Tier 1 followup 2026-06-25; duplicate removed; FileItem now aliases models.FileItem)" }
+t0_7 = { status = "completed", commit_sha = "bacddc85", description = "Fix src/type_aliases.py:91 ToolCall: TypeAlias = Metadata (Tier 1 followup 2026-06-25; now points to openai_schemas.ToolCall)" }
+t1_1 = { status = "partial", commit_sha = "0506c5da", description = "Migrate Ticket read-only access sites in src/gui_2.py (~40 sites; direct field access via Ticket dataclass at src/models.py:302)" }
+t1_2 = { status = "partial", commit_sha = "0506c5da", description = "Migrate Ticket mutation sites via dataclasses.replace() (~14 sites)" }
+t1_3 = { status = "completed", commit_sha = "0506c5da", description = "Migrate src/conductor_tech_lead.py:125 (1 site)" }
+t1_4 = { status = "completed", commit_sha = "0506c5da", description = "Remove legacy Ticket.get() method from src/models.py:348 (done in 0506c5da)" }
+t2_1 = { status = "not_done", commit_sha = "", description = "Migrate src/ai_client.py:2565,2807,2898 FileItem consumers (dataclass at models.FileItem; consumer sites still use .get('path', ...))" }
+t2_2 = { status = "not_done", commit_sha = "", description = "Migrate src/app_controller.py:3508 FileItem consumer" }
+t3_1 = { status = "not_done", commit_sha = "", description = "Migrate src/app_controller.py:2277,2302,2310 CommsLogEntry consumers" }
+t3_2 = { status = "not_done", commit_sha = "", description = "Migrate src/gui_2.py:5803 CommsLogEntry consumer" }
+t4_1 = { status = "not_done", commit_sha = "", description = "Migrate src/synthesis_formatter.py:24,37 HistoryMessage consumers" }
+t5_1 = { status = "not_done", commit_sha = "", description = "Migrate _send_anthropic + _send_deepseek (~9 sites)" }
+t5_2 = { status = "not_done", commit_sha = "", description = "Migrate _send_grok + _send_qwen (~9 sites)" }
+t5_3 = { status = "not_done", commit_sha = "", description = "Migrate _send_minimax + _send_llama (~9 sites)" }
+t6_1 = { status = "not_done", commit_sha = "", description = "Wire UsageStats into src/app_controller.py:2299-2309 (~4 sites)" }
+t7_1 = { status = "not_done", commit_sha = "", description = "Wire ToolCall into src/ai_client.py tool loop section (~56 sites)" }
+t7_2 = { status = "not_done", commit_sha = "", description = "Verify src/mcp_client.py:1707-1714 tool loop" }
+t8_1 = { status = "not_done", commit_sha = "", description = "Migrate src/mcp_client.py ToolDefinition consumers (~70 sites)" }
+t8_2 = { status = "not_done", commit_sha = "", description = "Migrate src/ai_client.py per-vendor tool builders (~24 sites)" }
+t9_1 = { status = "not_done", commit_sha = "", description = "Migrate src/aggregate.py + src/ai_client.py + src/app_controller.py RAGChunk consumers (~4 sites)" }
+t10_1 = { status = "not_done", commit_sha = "", description = "Migrate src/gui_2.py small-batch consumers (~25 sites)" }
+t10_2 = { status = "not_done", commit_sha = "", description = "Migrate src/app_controller.py small-batch consumers (~10 sites)" }
+t11_1 = { status = "not_done", commit_sha = "", description = "Classify remaining access sites as collapsed-codepath per FR6" }
+t12_1 = { status = "not_done", commit_sha = "", description = "Run all 10 VCs + write TRACK_COMPLETION + update state.toml + tracks.md" }
+
+[verification]
+phase_0_complete = "partial (12 dataclasses defined but with drifted field types vs plan; ToolCall alias fixed in this revision; FileItem duplication removed in this revision)"
+phase_1_complete = "partial (~40 read + 14 mutation sites migrated to direct field access on Ticket dataclass; ~10 subscript sites on dataclass.aggregate_lists not done)"
+phase_2_through_10_complete = "not_done"
+phase_11_complete = false
+phase_12_complete = false
+vc1_metadata_unchanged = true
+vc2_per_aggregate_dataclasses = "partial (12 dataclasses defined but with drifted field types; missing ASTNode, SearchResult, MCPToolResult, PerformanceMetrics, SessionInfo, SessionMetadata)"
+vc3_existing_dataclasses_reused = "partial (Ticket, ChatMessage, UsageStats, NormalizedResponse reused; FileItem duplicated then fixed in this revision)"
+vc4_get_sites_classified = "not_done (67 .get() sites remain; Phase 11 collapsed-codepath audit not produced)"
+vc5_subscript_sites_classified = "not_done (~80 subscript sites remain; classification not produced)"
+vc6_regression_tests_pass = "partial (per-aggregate tests pass; legacy .get() compat paths broken if dataclass field names diverge)"
+vc7_effective_codepaths_drop = "NO DROP (still 4.014e+22; per Tier 1 review, the per-aggregate migration alone does not reduce dispatcher branch count -- requires typed parameters at function boundaries)"
+vc8_audit_gates_pass = "not_re_verified"
+vc9_batched_tiers = "not_re_verified"
+vc10_end_of_track_report = "not_done"
+
+[track_specific]
+metric_targets = { baseline_effective_codepaths: "4.014e+22", target_effective_codepaths: "< 1e+20", actual_effective_codepaths: "4.014e+22 (UNCHANGED)", reason: "metric dominated by 2^N for highest-branch-count functions in app_controller.py and gui_2.py; per-aggregate dataclass migration alone does not reduce the branch count without typed parameters at function boundaries" }
+access_site_targets = { baseline_get_sites: 107, baseline_subscript_sites: 106, remaining_get_sites: 67, remaining_subscript_sites: "unknown" }
+dataclasses_added = ["CommsLogEntry", "HistoryMessage", "FileItem", "RAGChunk", "SessionInsights", "DiscussionSettings", "CustomSlice", "MMAUsageStats", "ProviderPayload", "UIPanelConfig", "PathInfo", "ToolDefinition"]
+dataclasses_reused = ["Ticket", "ChatMessage", "UsageStats", "NormalizedResponse"]
+dataclasses_missing = ["ASTNode", "SearchResult", "MCPToolResult", "PerformanceMetrics", "SessionInfo", "SessionMetadata"]
+test_count = { new_per_aggregate_tests: "~70", updated_existing_tests: "unknown", total: "unknown" }
+
+[blockers]
+blocker_1_toolcall_alias = { status = "fixed", location = "src/type_aliases.py:91", description = "ToolCall: TypeAlias = Metadata was the EXACT bad pattern the user flagged; now points to openai_schemas.ToolCall", fixed_in = "this revision (2026-06-25)" }
+blocker_2_fileitem_duplication = { status = "fixed", location = "src/type_aliases.py:53-69", description = "Duplicate FileItem dataclass with 8 fields conflicted with models.FileItem (10 fields); duplicate removed; FileItem now aliases models.FileItem", fixed_in = "this revision (2026-06-25)" }
+blocker_3_rag_return_type = { status = "open", location = "src/rag_engine.py:367", description = "rag_engine.search() returns List[Dict[str, Any]]; RAGChunk dataclass exists but consumers read dict keys directly (chunk['document'], chunk['metadata']['path']); cascading return-type change would affect 3+ sites", deferred_to = "typed_rag_return_type_followup" }
+blocker_4_tool_builders_dicts = { status = "open", location = "src/ai_client.py:609,615,665,671,1132,1138", description = "Per-vendor tool builders construct wire-format dicts directly (raw_tools.append({'type': 'function', ...})); ToolDefinition dataclass exists but not used; wire-format conversion would require .to_dict() calls", deferred_to = "typed_tool_builders_followup" }
+blocker_5_drifted_field_types = { status = "open", location = "src/type_aliases.py:10-148", description = "CommsLogEntry.kind default is 'request' (plan: ''); CommsLogEntry.direction default is 'OUT' (plan: ''); CommsLogEntry.content type is str (plan: Any); HistoryMessage.ts type is float (plan: str); HistoryMessage.tool_calls type is tuple (plan: Any); HistoryMessage.role default is 'user' (plan: ''); no @dataclass(slots=True) (plan: slots=True); PathInfo.logs_dir type is Metadata (plan: str); etc. Field types drifted from the plan; consumer migration would either work or break depending on actual usage", deferred_to = "field_type_alignment_followup" }

conductor/tracks/module_taxonomy_refactor_20260627/TIER2_STARTUP.md

@@ -0,0 +1,256 @@
+# Tier 2 Startup Brief: module_taxonomy_refactor_20260627
+
+## Context
+
+The user reported `models.py` is a "dumping ground" (1044 lines, 36 classes, 5+ unrelated domains). They want a clean taxonomy. Per their principle: **unify unless there's a good reason (import load times, definition pollution)**. No sub-directories. Prefix naming.
+
+## MANDATORY Pre-Action Reading (per agent protocol)
+
+1. `AGENTS.md` (project root) — operating rules, especially "File Size and Naming Convention" HARD RULE
+2. `conductor/workflow.md` — the workflow
+3. `conductor/edit_workflow.md` — the edit workflow
+4. `conductor/code_styleguides/data_oriented_design.md` — "Prefer Fewer Types" principle
+5. `conductor/code_styleguides/error_handling.md` — the `Result[T]` convention (Rule #0: read first)
+6. `conductor/code_styleguides/type_aliases.md` — the 10 TypeAliases convention
+7. `conductor/code_styleguides/code_path_audit.md` — code path audit styleguide
+8. `docs/reports/FOLLOWUP_module_taxonomy_20260627.md` — the audit that motivated this track
+9. `conductor/tracks/cruft_elimination_20260627/SPEC_CORRECTION_phase_2.md` — the related spec correction
+10. `src/models.py` — the 1044-line file to split (read in full)
+
+**First commit of this track must include** `TIER-2 READ <list> before module_taxonomy_refactor_20260627` in the message.
+
+## The Decision Rule (the user's principle)
+
+**Split a file only if ONE of:**
+- Import load time: the file has heavy imports (vendored SDKs, ML models) that some code paths don't need
+- Definition pollution: the file mixes 3+ unrelated domains with 30+ classes/functions
+
+**Otherwise: keep in a single file.** Move imports around, but don't fragment.
+
+**No sub-directories.** All files at `src/` flat with prefix naming.
+
+## The 3 Refactors (only 3 justified)
+
+### Refactor 1: MERGE 5 ImGui LEAKS into `gui_2.py`
+
+**Justification:** User explicit directive: "all ImGui rendering should be in `gui_2.py`. Only exception: `imgui_scopes.py`." Clear violation of the GUI boundary.
+
+| File | Lines | Content | Destination |
+|---|---:|---|---|
+| `src/bg_shader.py` | 66 | ImGui background shader | `src/gui_2.py` |
+| `src/shaders.py` | 33 | ImGui shader code | `src/gui_2.py` |
+| `src/command_palette.py` | 165 | ImGui command palette UI | `src/gui_2.py` |
+| `src/diff_viewer.py` | 164 | ImGui diff viewer UI | `src/gui_2.py` |
+| `src/patch_modal.py` | 102 | ImGui patch modal UI | `src/gui_2.py` |
+
+**Verification:** `git grep -l "imgui_bundle\|from imgui\\." -- 'src/*.py'` returns ONLY `gui_2.py` + `imgui_scopes.py`.
+
+### Refactor 2: MERGE 2 vendor files into `ai_client.py`
+
+**Justification:** User explicit directive: "vendor_capabilities.py and vendor_state.py are related to ai_client.py... they're the ai vendoring layer."
+
+| File | Lines | Content | Destination |
+|---|---:|---|---|
+| `src/vendor_capabilities.py` | 85 | Vendor capability flags | `src/ai_client.py` |
+| `src/vendor_state.py` | 78 | Vendor state telemetry | `src/ai_client.py` |
+
+**Growth:** `ai_client.py` 3147 → ~3310 lines. Justified: unified vendor layer, no fragmentation.
+
+### Refactor 3: SPLIT `models.py` (the only justified split)
+
+**Justification:** 5+ unrelated domains, 36 classes, 1044 lines. **Clear definition pollution** (the user's threshold: "3+ unrelated domains with 30+ classes").
+
+**The new taxonomy:**
+
+| New file | What it gets | Lines (est.) |
+|---|---|---:|
+| `src/mma.py` | MMA Core: ThinkingSegment, Ticket, Track, WorkerContext, TrackState | ~250 |
+| `src/project.py` | ProjectContext + 5 sub + config I/O + parse_history_entries | ~200 |
+| `src/project_files.py` | FileItem, ContextPreset, ContextFileEntry, NamedViewPreset, Preset | ~150 |
+
+**6+ classes merge into existing sub-system files (NOT new files):**
+
+| Class from `models.py` | Destination |
+|---|---|
+| `Persona` | `src/personas.py` (93 lines, exists) |
+| `Tool`, `ToolPreset` | `src/tool_presets.py` (123 lines, exists) |
+| `BiasProfile` | `src/tool_bias.py` (63 lines, exists) |
+| `TextEditorConfig`, `ExternalEditorConfig` | `src/external_editor.py` (129 lines, exists) |
+| `MCPServerConfig`, `MCPConfiguration`, `VectorStoreConfig`, `RAGConfig`, `load_mcp_config` | `src/mcp_client.py` (1803 lines, exists) |
+| `WorkspaceProfile` | `src/workspace_manager.py` (73 lines, exists) |
+
+**`src/models.py` reduced:**
+- ~30 lines: Pydantic proxy helpers (`_create_generate_request`, `_create_confirm_request`, `__getattr__`)
+- OR delete the file entirely if it becomes essentially empty (it's not a "system" file; just a temporary holder)
+
+## The Bonus Refactor: DELETE `AGENT_TOOL_NAMES` (redundant)
+
+**User caught this:** "isn't AGENT_TOOL_NAMES a redundant thing that's directly associated with the mcp_client.py?"
+
+YES. The existing test `test_tool_names_subset_of_models_agent_tool_names` literally asserts:
+```python
+native_names = mcp_tool_specs.tool_names()
+agent_names = set(models.AGENT_TOOL_NAMES)
+assert not missing_in_agent, f"Native tools not in AGENT_TOOL_NAMES: {missing_in_agent}"
+```
+
+So `AGENT_TOOL_NAMES` is just a hardcoded snapshot of `mcp_tool_specs.tool_names()`. **DELETE it, not move it.**
+
+**8 consumer sites to update:**
+- `src/app_controller.py:2110, 2972, 3273` (3 sites)
+- `tests/test_arch_boundary_phase2.py:23, 29, 31, 32, 33` (5 sites)
+
+**Pattern:** `from src.models import AGENT_TOOL_NAMES; for tool in AGENT_TOOL_NAMES: ...` → `from src import mcp_tool_specs; for tool in mcp_tool_specs.tool_names(): ...`
+
+## Net scope
+
+- 7 files deleted (5 ImGui + 2 vendor)
+- 3 new files (mma.py, project.py, project_files.py)
+- 10 files modified (7 sub-system merges + ai_client.py + gui_2.py + app_controller.py)
+- 1 file potentially deleted (models.py)
+- Net: 65 → 61 files (or 60 if models.py is eliminated)
+- 22 atomic commits
+
+## Coordination with `cruft_elimination_20260627`
+
+The `cruft_elimination_20260627` track has a Phase 2 commit that put `ProjectContext` in `models.py` (the wrong location per this track). **DO NOT** merge that `cruft` commit until this refactor is ready. The refactor moves `ProjectContext` to `project.py` as part of Phase 3.
+
+## Pre-flight verification
+
+```bash
+# Verify the current state of src/
+ls src/*.py | wc -l
+# Expect: 65
+
+# Verify models.py is 1044 lines
+wc -l src/models.py
+# Expect: 1044
+
+# Verify ImGui LEAKS exist
+ls src/bg_shader.py src/shaders.py src/command_palette.py src/diff_viewer.py src/patch_modal.py 2>&1 | grep -v "No such"
+# Expect: all 5 exist
+
+# Verify vendor files exist
+ls src/vendor_capabilities.py src/vendor_state.py 2>&1 | grep -v "No such"
+# Expect: both exist
+
+# Verify AGENT_TOOL_NAMES is referenced
+git grep "AGENT_TOOL_NAMES" HEAD -- 'src/*.py' 'tests/*.py' | wc -l
+# Expect: 8 hits (3 app_controller + 5 test_arch_boundary + 1 def + ... )
+
+# Verify all 7 audit gates pass (baseline)
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+uv run python scripts/audit_main_thread_imports.py
+uv run python scripts/audit_no_models_config_io.py
+uv run python scripts/audit_code_path_audit_coverage.py --input-dir docs/reports/code_path_audit/latest --strict
+uv run python scripts/audit_exception_handling.py --strict
+uv run python scripts/audit_optional_in_3_files.py --strict
+# All exit 0
+```
+
+## Post-track verification (after Phase 5)
+
+```bash
+# VC1: ImGui imports limited to gui_2.py + imgui_scopes.py
+git grep -l "imgui_bundle\|from imgui\\." HEAD -- 'src/*.py'
+# Expect: gui_2.py, imgui_scopes.py
+
+# VC2-3: ImGui LEAKS + vendor files deleted
+ls src/bg_shader.py src/shaders.py src/command_palette.py src/diff_viewer.py src/patch_modal.py src/vendor_capabilities.py src/vendor_state.py 2>&1 | grep -v "No such"
+# Expect: (no output)
+
+# VC5-7: New files work
+uv run python -c "from src.mma import ThinkingSegment, Ticket, Track, WorkerContext, TrackState"
+uv run python -c "from src.project import ProjectContext, ProjectMeta, ProjectOutput, ProjectFiles, ProjectScreenshots, ProjectDiscussion, _clean_nones, load_config_from_disk, save_config_to_disk, parse_history_entries"
+uv run python -c "from src.project_files import FileItem, ContextPreset, ContextFileEntry, NamedViewPreset, Preset"
+# All succeed
+
+# VC8: 6+ dataclasses in proper sub-system files
+uv run python -c "from src.personas import Persona; from src.tool_presets import Tool, ToolPreset; from src.tool_bias import BiasProfile; from src.external_editor import TextEditorConfig, ExternalEditorConfig; from src.mcp_client import MCPServerConfig, MCPConfiguration, VectorStoreConfig, RAGConfig, load_mcp_config; from src.workspace_manager import WorkspaceProfile"
+# Expect: no ImportError
+
+# VC9: AGENT_TOOL_NAMES deleted
+git grep "AGENT_TOOL_NAMES" HEAD -- 'src/*.py' 'tests/*.py' | wc -l
+# Expect: 0
+
+# VC10: models.py reduced or eliminated
+ls src/models.py 2>&1
+# Expect: file not found (or <= 30 lines if kept)
+
+# VC11-12: audit gates + batched suite
+# Same as current baseline
+```
+
+## Per-phase patterns for Tier 3 workers
+
+### Per-file atomic commits
+Each ImGui merge, each vendor merge, each models.py split, each AGENT_TOOL_NAMES site update is a separate commit. Per-file = atomic rollback.
+
+### Pattern: move content + delete source
+
+```bash
+# 1. Read source file
+cat src/bg_shader.py
+
+# 2. Add to destination file (with region marker)
+manual-slop_edit_file gui_2.py
+# add at appropriate location:
+#region: Bg Shader (moved from src/bg_shader.py)
+# ... content ...
+#endregion
+
+# 3. Update import sites across the codebase
+git grep "from src.bg_shader" -- 'src/*.py' 'tests/*.py'
+# Replace each with: from src.gui_2 import
+
+# 4. Delete source file
+git rm src/bg_shader.py
+
+# 5. Verify
+uv run python -m pytest tests/test_<affected>.py -v
+```
+
+### Pattern: split models.py
+
+```python
+# 1. Create new file (e.g., src/mma.py)
+manual-slop_edit_file mma.py
+# Add the moved classes with proper imports
+
+# 2. Update import sites
+git grep "from src.models import.*(ThinkingSegment|Ticket|Track|WorkerContext|TrackState)" -- 'src/*.py' 'tests/*.py'
+# Replace each with: from src.mma import
+
+# 3. Remove from models.py
+manual-slop_edit_file models.py
+# Delete the moved class definitions
+
+# 4. Verify
+uv run python -m pytest tests/test_mma_*.py -v
+```
+
+### Style
+- 1-space indentation (project standard)
+- CRLF line endings
+- No comments in source code (per AGENTS.md)
+- Use `manual-slop_edit_file` for surgical edits
+- Per-phase regression-guard test runs after each phase
+
+## Notes for Tier 2 reviewer
+
+- The `cruft_elimination_20260627` track's Phase 2 commit put `ProjectContext` in `models.py`. Coordinate: that commit should NOT merge until this refactor is ready (or the cruft track should re-execute Phase 2 with the corrected file location per `SPEC_CORRECTION_phase_2.md`).
+- The `__getattr__` Pydantic lazy proxy in `models.py` is needed for circular import (src.ai_client imports ToolPreset/BiasProfile/Tool from src.models). After this refactor, the imports move to the new sub-system files (tool_presets.py, tool_bias.py), so the circular import is broken and the `__getattr__` may no longer be needed. Audit during execution.
+- The `models.py` docstring needs updating throughout the refactor to reflect the new scope.
+- If `models.py` becomes essentially empty after all moves, **delete the file entirely** (it's not a "system" file).
+
+## See also
+
+- `conductor/tracks/module_taxonomy_refactor_20260627/spec.md` — the spec (12 VCs)
+- `conductor/tracks/module_taxonomy_refactor_20260627/plan.md` — the 5-phase plan (22 atomic commits)
+- `conductor/tracks/module_taxonomy_refactor_20260627/metadata.json` — the metadata
+- `conductor/tracks/module_taxonomy_refactor_20260627/state.toml` — the state
+- `docs/reports/FOLLOWUP_module_taxonomy_20260627.md` — the audit
+- `conductor/tracks/cruft_elimination_20260627/SPEC_CORRECTION_phase_2.md` — the related spec correction
+- `AGENTS.md` — "File Size and Naming Convention" HARD RULE
+- `conductor/code_styleguides/data_oriented_design.md` — "Prefer Fewer Types" principle

conductor/tracks/module_taxonomy_refactor_20260627/metadata.json

@@ -0,0 +1,78 @@
+{
+  "track_id": "module_taxonomy_refactor_20260627",
+  "name": "Module Taxonomy Refactor",
+  "status": "active",
+  "type": "cleanup",
+  "date_created": "2026-06-27",
+  "created_by": "tier1-orchestrator",
+  "blocks": [],
+  "blocked_by": {
+    "cruft_elimination_20260627": "pending (the cruft track has a ProjectContext-in-models.py commit that needs to be coordinated)"
+  },
+  "scope": {
+    "new_files": [
+      "src/mma.py",
+      "src/project.py",
+      "src/project_files.py",
+      "conductor/tracks/module_taxonomy_refactor_20260627/TIER2_STARTUP.md"
+    ],
+    "modified_files": [
+      "src/gui_2.py",
+      "src/ai_client.py",
+      "src/personas.py",
+      "src/tool_presets.py",
+      "src/tool_bias.py",
+      "src/external_editor.py",
+      "src/mcp_client.py",
+      "src/workspace_manager.py",
+      "src/app_controller.py",
+      "tests/test_arch_boundary_phase2.py"
+    ],
+    "deleted_files": [
+      "src/bg_shader.py",
+      "src/shaders.py",
+      "src/command_palette.py",
+      "src/diff_viewer.py",
+      "src/patch_modal.py",
+      "src/vendor_capabilities.py",
+      "src/vendor_state.py"
+    ],
+    "potentially_deleted_files": [
+      "src/models.py"
+    ]
+  },
+  "verification_criteria": [
+    "ImGui imports limited to gui_2.py + imgui_scopes.py",
+    "5 ImGui LEAK files deleted (bg_shader, shaders, command_palette, diff_viewer, patch_modal)",
+    "2 vendor files deleted (vendor_capabilities, vendor_state); symbols now in ai_client.py",
+    "src/mma.py exists with MMA Core + TrackState",
+    "src/project.py exists with ProjectContext + sub + config IO",
+    "src/project_files.py exists with file-related dataclasses",
+    "6+ dataclasses in proper sub-system files (Persona/Tool/Editor/MCP/Workspace)",
+    "AGENT_TOOL_NAMES deleted; 8 consumer sites use mcp_tool_specs.tool_names()",
+    "src/models.py reduced to <=30 lines (or eliminated)",
+    "All 7 audit gates pass --strict (no regression)",
+    "10/11 batched test tiers pass (RAG flake acceptable)"
+  ],
+  "estimated_effort": {
+    "method": "scope (per workflow.md \u00a7Tier 1 Track Initialization Rules). NO day estimates.",
+    "scope": "1 source file split into 3 (mma.py, project.py, project_files.py) + 7 files deleted (5 ImGui + 2 vendor) + 7 files modified (ai_client.py, gui_2.py, 5 sub-system files) + 8 import sites updated for AGENT_TOOL_NAMES; 22 atomic commits total"
+  },
+  "risk_register": [
+    "R1 (low): ImGui LEAKS move breaks existing tests (e.g., command_palette is referenced in commands.py) - mitigated by running full affected test set after each move; revert + fix on regression",
+    "R2 (medium): Vendor merge into ai_client.py creates circular imports (PROVIDERS lazy proxy is the workaround) - mitigated by the lazy import pattern; verify by running full test suite after merge",
+    "R3 (high): models.py split breaks 136 import sites - mitigated by per-file move with regression-guard tests after each; update imports systematically",
+    "R4 (medium): 6+ 'merge into existing sub-system files' moves break those files' existing tests - mitigated by running affected test file after each merge",
+    "R5 (low): AGENT_TOOL_NAMES deletion breaks test_arch_boundary_phase2.py - mitigated by updating the test to use mcp_tool_specs.tool_names(); cross-check that the test's expected tool names are in the registry",
+    "R6 (high): The ProjectContext Phase 2 commit (in cruft_elimination_20260627) put ProjectContext in models.py; the new track moves it to project.py - needs to coordinate with the cruft track; the cruft track should NOT merge its ProjectContext-in-models.py commit until this refactor is ready",
+    "R7 (low): The _create_generate_request etc. Pydantic proxies in models.py are used by api_hooks.py; if we move them to api_hooks.py we create a different topology - mitigated by auditing the consumers; if all in api_hooks.py, move them; if not, keep in models.py or move to a new api_models.py"
+  ],
+  "out_of_scope": [
+    "Renaming existing files for prefix consistency (multi_agent_conductor.py -> mma_conductor.py, etc.) - deferred to follow-up",
+    "Refactoring aggregate.py (513 lines), app_controller.py (4869 lines), gui_2.py (7773 lines) - out of scope; these have natural boundaries",
+    "Modifications to mcp_client.py other than merging the config dataclasses",
+    "New src/<thing>.py files beyond the 3 justified ones (mma.py, project.py, project_files.py)",
+    "The RAG test pre-existing flake (per docs/reports/SSDL_CAMPAIGN_ABORTED_20260624.md Out of Scope)",
+    "Any Tier 2 spec rewrites (per the user's earlier 'don't fuck with commits' directive)"
+  ]
+}

conductor/tracks/module_taxonomy_refactor_20260627/plan.md

@@ -0,0 +1,194 @@
+# Plan: module_taxonomy_refactor_20260627
+
+5 phases, 12-15 tasks, 12+ atomic commits. Per-task TDD red-first. Tier 3 workers execute; Tier 2 reviews per phase.
+
+## Phase 0: Pre-flight + TIER2_STARTUP (Tier 1, 0 commits, 1 file)
+
+- [x] **Task 0.1** [Tier 1]: Create `conductor/tracks/module_taxonomy_refactor_20260627/TIER2_STARTUP.md` with:
+  - Decision rule (user's principle): split ONLY for import load times or definition pollution
+  - The 3 refactors (merge ImGui LEAKS, merge vendor files, split models.py)
+  - 8 AGENT_TOOL_NAMES consumer sites
+  - 5 ImGui LEAK files
+  - 6+ sub-system merge destinations
+  - MANDATORY Pre-Action Reading list
+- [x] **NOTE:** This task is done in the planning phase; no commit needed (TIER2_STARTUP.md is committed with the track artifacts in a single commit at the end)
+
+## Phase 1: MERGE ImGui LEAKS into `gui_2.py` (5 commits, 1 per file)
+
+**Focus:** 5 ImGui-using files that violate the "ImGui belongs in `gui_2.py`" boundary. Each is a separate commit for atomic rollback.
+
+- [x] **Task 1.1** [Tier 3]: Move `src/bg_shader.py` (66 lines) → `src/gui_2.py` (add as section "Bg Shader (moved from src/bg_shader.py)")
+  - HOW: `manual-slop_edit_file` to append to gui_2.py; `git mv` to delete bg_shader.py
+  - SAFETY: Run `tests/test_imgui_scopes.py` + any tests that import from `src.bg_shader`
+- [x] **COMMIT 1.1:** `refactor(gui_2): merge bg_shader into gui_2; git rm src/bg_shader.py` (Tier 3)
+- [x] **Task 1.2-1.5** [Tier 3]: Same pattern for `shaders.py`, `command_palette.py`, `diff_viewer.py`, `patch_modal.py`
+- [x] **COMMITS 1.2-1.5:** One per file
+- [x] **VERIFICATION:** `git grep -l "imgui_bundle\|from imgui\\." -- 'src/*.py'` returns ONLY `gui_2.py` + `imgui_scopes.py`
+
+## Phase 2: MERGE vendor files into `ai_client.py` (2 commits, 1 per file)
+
+**Focus:** 2 vendor files that should be unified with `ai_client.py` per user directive.
+
+- [x] **Task 2.1** [Tier 3]: Move `src/vendor_capabilities.py` (85 lines) → `src/ai_client.py` (add as section "Vendor Capabilities (moved from src/vendor_capabilities.py)")
+  - HOW: `manual-slop_edit_file` to append to ai_client.py; `git mv` to delete vendor_capabilities.py
+  - SAFETY: Run `tests/test_provider_state_migration.py` + any tests that import from `src.vendor_capabilities`
+- [x] **COMMIT 2.1:** `refactor(ai_client): merge vendor_capabilities into ai_client; git rm src/vendor_capabilities.py` (Tier 3)
+- [x] **Task 2.2** [Tier 3]: Same for `src/vendor_state.py` (78 lines)
+- [x] **COMMIT 2.2:** `refactor(ai_client): merge vendor_state into ai_client; git rm src/vendor_state.py` (Tier 3)
+
+## Phase 3: SPLIT `models.py` (8 commits, 3 new files + 6 merges + 1 reduce)
+
+**Focus:** `models.py` is the only file with clear definition pollution (5+ domains, 36 classes, 1044 lines). Split into `mma.py` + `project.py` + `project_files.py`; merge other classes into existing sub-system files; reduce `models.py`.
+
+### Phase 3a: Create new files (3 commits)
+
+- [x] **Task 3.1** [Tier 3]: Create `src/mma.py` with `ThinkingSegment`, `Ticket`, `Track`, `WorkerContext`, `TrackState` (moved from `models.py`)
+  - HOW: `manual-slop_edit_file` to write the new file
+  - Update imports in 5 files: `multi_agent_conductor.py`, `dag_engine.py`, `orchestrator_pm.py`, `conductor_tech_lead.py`, `mma_prompts.py`
+  - SAFETY: Run `tests/test_mma_*.py` + `tests/test_orchestration_logic.py` + `tests/test_dag_engine.py` + `tests/test_conductor_engine_v2.py`
+- [x] **COMMIT 3.1:** `refactor(mma): create mma.py with MMA Core + TrackState (split from models.py)` (Tier 3)
+- [x] **Task 3.2** [Tier 3]: Create `src/project.py` with `ProjectContext` + 5 sub-dataclasses + config I/O (`_clean_nones`, `load_config_from_disk`, `save_config_to_disk`, `parse_history_entries`)
+  - HOW: `manual-slop_edit_file` to write the new file
+  - Update imports in `src/project_manager.py` (and any other consumer)
+  - SAFETY: Run `tests/test_project_manager_*.py` + `tests/test_project_context_20260627.py` (new file from cruft track)
+- [x] **COMMIT 3.2:** `refactor(project): create project.py with ProjectContext + sub + config IO (split from models.py)` (Tier 3)
+- [x] **Task 3.3** [Tier 3]: Create `src/project_files.py` with `FileItem`, `ContextPreset`, `ContextFileEntry`, `NamedViewPreset`, `Preset`
+  - HOW: `manual-slop_edit_file` to write the new file
+  - Update imports in `src/aggregate.py`, `src/context_presets.py`, `src/gui_2.py`, `src/app_controller.py`
+  - SAFETY: Run `tests/test_context_composition_*.py` + `tests/test_view_presets.py` + `tests/test_custom_slices_*.py`
+- [x] **COMMIT 3.3:** `refactor(project_files): create project_files.py (split from models.py)` (Tier 3)
+
+### Phase 3b: Merge other classes into existing sub-system files (6 commits, 1 per destination)
+
+- [x] **Task 3.4** [Tier 3]: Move `Persona` from `models.py` → `src/personas.py` (existing 93-line file)
+  - HOW: `manual-slop_edit_file` to add Persona dataclass to personas.py; `manual-slop_edit_file` to remove from models.py
+  - Update imports: `from src.models import Persona` → `from src.personas import Persona`
+  - SAFETY: Run `tests/test_personas_*.py` + `tests/test_arch_boundary_*.py` (if Persona is tested there)
+- [x] **COMMIT 3.4:** `refactor(personas): move Persona dataclass from models.py to personas.py` (Tier 3)
+- [x] **Task 3.5** [Tier 3]: Move `Tool`, `ToolPreset` → `src/tool_presets.py` (existing 123-line file)
+- [x] **Task 3.6** [Tier 3]: Move `BiasProfile` → `src/tool_bias.py` (existing 63-line file)
+- [x] **Task 3.7** [Tier 3]: Move `TextEditorConfig`, `ExternalEditorConfig` → `src/external_editor.py` (existing 129-line file)
+- [x] **Task 3.8** [Tier 3]: Move `MCPServerConfig`, `MCPConfiguration`, `VectorStoreConfig`, `RAGConfig`, `load_mcp_config` → `src/mcp_client.py` (existing 1803-line file)
+- [x] **Task 3.9** [Tier 3]: Move `WorkspaceProfile` → `src/workspace_manager.py` (existing 73-line file)
+- [x] **COMMITS 3.5-3.9:** One per merge
+
+### Phase 3c: Reduce `models.py` (1 commit)
+
+- [x] **Task 3.10** [Tier 3]: After all moves, `src/models.py` should be ~30 lines (Pydantic proxies + AGENT_TOOL_NAMES)
+  - HOW: `manual-slop_edit_file` to remove all moved classes; keep only the Pydantic proxy helpers
+  - If `models.py` becomes empty, **delete the file entirely** (it's not a "system" file)
+- [x] **COMMIT 3.10:** `refactor(models): reduce to Pydantic proxy helpers only (or delete entirely if empty)` (Tier 3)
+
+## Phase 4: DELETE `AGENT_TOOL_NAMES` (1 commit)
+
+**Focus:** `AGENT_TOOL_NAMES` is redundant (verified by `test_tool_names_subset_of_models_agent_tool_names` which asserts `tool_names() ⊆ AGENT_TOOL_NAMES`). Derive at consumer sites.
+
+- [x] **Task 4.1** [Tier 3]: Update 8 consumer sites to use `mcp_tool_specs.tool_names()` instead of `AGENT_TOOL_NAMES`:
+  - `src/app_controller.py:2110, 2972, 3273` (3 sites)
+  - `tests/test_arch_boundary_phase2.py:23, 29, 31, 32, 33` (5 sites)
+  - HOW: `manual-slop_edit_file` per site
+  - SAFETY: Run the affected tests + the full batched suite
+- [x] **Task 4.2** [Tier 3]: Delete `AGENT_TOOL_NAMES` constant from `src/models.py` (if not already removed in Phase 3c)
+- [x] **Task 4.3** [Tier 3]: DELETE or CONVERT `test_tool_names_subset_of_models_agent_tool_names` test
+  - DELETE: it's a tautology once AGENT_TOOL_NAMES is derived
+  - OR CONVERT to: `assert mcp_tool_specs.tool_names() == {expected canonical tools}`
+- [x] **COMMIT 4.1:** `refactor(mcp_tool_specs): delete redundant AGENT_TOOL_NAMES; use tool_names() at consumer sites` (Tier 3)
+
+## Phase 5: Verification + end-of-track (2 commits, no code changes)
+
+**Focus:** Run all 12 VCs; write `TRACK_COMPLETION`; update `state.toml` + `tracks.md`.
+
+- [x] **Task 5.1** [Tier 2]:
+  - Run all 12 VCs (see spec.md §Verification Criteria)
+  - Re-measure: `wc -l src/models.py` should be ≤30 (or file should not exist)
+  - Run all 7 audit gates
+  - Run the full batched test suite
+  - Document the result in `docs/reports/TRACK_COMPLETION_module_taxonomy_refactor_20260627.md`
+- [x] **COMMIT 5.1:** `conductor(state): module_taxonomy_refactor_20260627 SHIPPED` (Tier 2)
+- [x] **COMMIT 5.2:** `docs(reports): TRACK_COMPLETION_module_taxonomy_refactor_20260627` (Tier 2)
+- [x] **COMMIT 5.3:** `conductor(tracks): add module_taxonomy_refactor_20260627 row` (Tier 2)
+
+## Commit Log (Expected, 12-15 atomic commits)
+
+1. (Phase 0) `conductor(track): module_taxonomy_refactor_20260627 track artifacts` (Tier 1) — spec + plan + metadata + state + TIER2_STARTUP
+2. (Phase 1) `refactor(gui_2): merge bg_shader; git rm src/bg_shader.py` (Tier 3)
+3. (Phase 1) `refactor(gui_2): merge shaders; git rm src/shaders.py` (Tier 3)
+4. (Phase 1) `refactor(gui_2): merge command_palette; git rm src/command_palette.py` (Tier 3)
+5. (Phase 1) `refactor(gui_2): merge diff_viewer; git rm src/diff_viewer.py` (Tier 3)
+6. (Phase 1) `refactor(gui_2): merge patch_modal; git rm src/patch_modal.py` (Tier 3)
+7. (Phase 2) `refactor(ai_client): merge vendor_capabilities; git rm src/vendor_capabilities.py` (Tier 3)
+8. (Phase 2) `refactor(ai_client): merge vendor_state; git rm src/vendor_state.py` (Tier 3)
+9. (Phase 3a) `refactor(mma): create mma.py with MMA Core + TrackState (split from models.py)` (Tier 3)
+10. (Phase 3a) `refactor(project): create project.py with ProjectContext + sub + config IO (split from models.py)` (Tier 3)
+11. (Phase 3a) `refactor(project_files): create project_files.py (split from models.py)` (Tier 3)
+12. (Phase 3b) `refactor(personas): move Persona dataclass from models.py to personas.py` (Tier 3)
+13. (Phase 3b) `refactor(tool_presets): move Tool + ToolPreset from models.py to tool_presets.py` (Tier 3)
+14. (Phase 3b) `refactor(tool_bias): move BiasProfile from models.py to tool_bias.py` (Tier 3)
+15. (Phase 3b) `refactor(external_editor): move TextEditorConfig + ExternalEditorConfig from models.py to external_editor.py` (Tier 3)
+16. (Phase 3b) `refactor(mcp_client): move MCP config dataclasses from models.py to mcp_client.py` (Tier 3)
+17. (Phase 3b) `refactor(workspace_manager): move WorkspaceProfile from models.py to workspace_manager.py` (Tier 3)
+18. (Phase 3c) `refactor(models): reduce to Pydantic proxy helpers only (or delete entirely if empty)` (Tier 3)
+19. (Phase 4) `refactor(mcp_tool_specs): delete redundant AGENT_TOOL_NAMES; use tool_names() at consumer sites` (Tier 3)
+20. (Phase 5) `conductor(state): module_taxonomy_refactor_20260627 SHIPPED` (Tier 2)
+21. (Phase 5) `docs(reports): TRACK_COMPLETION_module_taxonomy_refactor_20260627` (Tier 2)
+22. (Phase 5) `conductor(tracks): add module_taxonomy_refactor_20260627 row` (Tier 2)
+
+Plus per-task plan-update commits per the workflow.
+
+## Verification Commands (run at end of each phase + Phase 5)
+
+```bash
+# VC1: ImGui imports limited to gui_2.py + imgui_scopes.py
+git grep -l "imgui_bundle\|from imgui\\." HEAD -- 'src/*.py'
+
+# VC2: 5 ImGui files deleted
+ls src/bg_shader.py src/shaders.py src/command_palette.py src/diff_viewer.py src/patch_modal.py 2>&1 | grep -v "No such file"
+
+# VC3: 2 vendor files deleted
+ls src/vendor_capabilities.py src/vendor_state.py 2>&1 | grep -v "No such file"
+
+# VC5-7: New files work
+uv run python -c "from src.mma import ThinkingSegment, Ticket, Track, WorkerContext, TrackState"
+uv run python -c "from src.project import ProjectContext, ProjectMeta, ProjectOutput, ProjectFiles, ProjectScreenshots, ProjectDiscussion"
+uv run python -c "from src.project_files import FileItem, ContextPreset, ContextFileEntry, NamedViewPreset, Preset"
+
+# VC8: 6+ dataclasses in proper sub-system files
+uv run python -c "from src.personas import Persona; from src.tool_presets import Tool, ToolPreset; from src.tool_bias import BiasProfile; from src.external_editor import TextEditorConfig, ExternalEditorConfig; from src.mcp_client import MCPServerConfig, MCPConfiguration, VectorStoreConfig, RAGConfig, load_mcp_config; from src.workspace_manager import WorkspaceProfile"
+
+# VC9: AGENT_TOOL_NAMES deleted
+git grep "AGENT_TOOL_NAMES" HEAD -- 'src/*.py' 'tests/*.py' | wc -l
+# Expect: 0
+
+# VC10: models.py reduced
+Get-Item src/models.py 2>&1 | Select-Object Length
+# Expect: file not found OR <= 30 lines
+
+# VC11: 7 audit gates pass
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+uv run python scripts/audit_main_thread_imports.py
+uv run python scripts/audit_no_models_config_io.py
+uv run python scripts/audit_code_path_audit_coverage.py --input-dir docs/reports/code_path_audit/latest --strict
+uv run python scripts/audit_exception_handling.py --strict
+uv run python scripts/audit_optional_in_3_files.py --strict
+# All exit 0
+
+# VC12: 10/11 batched tiers pass
+uv run python scripts/run_tests_batched.py
+# Expect: 10/11 PASS (RAG flake acceptable)
+```
+
+## Notes for Tier 3 workers
+
+- **Per-file atomic commits**: each ImGui merge, each vendor merge, each models.py split, each AGENT_TOOL_NAMES site update is a separate commit
+- **Pattern consistency**: use `git mv` for renames; for merges, append content to the destination file, then `git rm` the source
+- **Import updates**: use `manual-slop_edit_file` to update import statements; for `from src.bg_shader import X` → `from src.gui_2 import X` patterns
+- **Indentation**: 1-space per level
+- **No comments** in source code (per AGENTS.md)
+- **Per-phase regression-guard test runs**: after each phase, run the full batched test suite. If a phase causes a regression, REVERT the phase commit and investigate (don't try to fix forward)
+
+## Notes for Tier 2 reviewer
+
+- The `cruft_elimination_20260627` track has a `ProjectContext` commit that put `ProjectContext` in `models.py` (the wrong location). This refactor track moves `ProjectContext` to `project.py`. Coordinate with the cruft track: the `cruft` track should NOT merge its `ProjectContext`-in-`models.py` commit until this refactor is ready.
+- The `__getattr__` Pydantic lazy proxy in `models.py` is needed because `src.ai_client` imports `ToolPreset`/`BiasProfile`/`Tool` from `models.py`, creating a circular import. After this refactor, the imports move to the new sub-system files (`tool_presets.py`, `tool_bias.py`), so the circular import is broken and the `__getattr__` may no longer be needed. Audit during execution.
+- The `models.py` docstring needs updating throughout the refactor to reflect the new scope.

conductor/tracks/module_taxonomy_refactor_20260627/spec.md

@@ -0,0 +1,224 @@
+# Track Specification: module_taxonomy_refactor_20260627
+
+## Overview
+
+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`.
+
+Per the user's principle: **unify unless there's a good reason (import load times, definition pollution)**. No sub-directories. Prefix naming convention.
+
+## Current State Audit (master `5380b715`, measured 2026-06-27)
+
+| Metric | Value |
+|---|---:|
+| `src/` file count | 65 |
+| `src/models.py` line count | 1044 |
+| `src/models.py` class/function count | 36 |
+| `src/models.py` regions | 13 (Constants, Config Utilities, History Utilities, Pydantic Models, MMA Core, State & Config, Tool Models, UI/Editor, Persona, Workspace, MCP Config, Project Context, ...more) |
+| ImGui-using files outside `gui_2.py` | 5 (`bg_shader.py`, `shaders.py`, `command_palette.py`, `diff_viewer.py`, `patch_modal.py`) |
+| Vendor files separate from `ai_client.py` | 2 (`vendor_capabilities.py`, `vendor_state.py`) |
+| `AGENT_TOOL_NAMES` consumers | 8 (3 in `app_controller.py`, 5 in `tests/test_arch_boundary_phase2.py`) |
+| `mcp_tool_specs.tool_names()` test | EXISTS (asserts `tool_names() ⊆ AGENT_TOOL_NAMES` — proves it's redundant) |
+
+## Goals
+
+| ID | Goal | Acceptance |
+|---|---|---|
+| G1 | **MERGE 5 ImGui LEAKS into `gui_2.py`** | `git grep -l "imgui_bundle\|from imgui\\." -- 'src/*.py'` returns ONLY `gui_2.py` + `imgui_scopes.py` |
+| G2 | **MERGE 2 vendor files into `ai_client.py`** | `ls src/{vendor_capabilities,vendor_state}.py` returns not-found; `python -c "from src.ai_client import ..."` imports the merged symbols |
+| G3 | **SPLIT `models.py`** into `mma.py` + `project.py` + `project_files.py` | `ls src/mma.py src/project.py src/project_files.py` all exist; `python -c "from src.mma import ThinkingSegment, Ticket, Track, WorkerContext, TrackState"` works |
+| G4 | **MERGE** 6+ other `models.py` classes into existing sub-system files | `Persona` in `personas.py`; `Tool`/`ToolPreset` in `tool_presets.py`; `BiasProfile` in `tool_bias.py`; `TextEditorConfig`/`ExternalEditorConfig` in `external_editor.py`; `MCPServerConfig`+etc in `mcp_client.py`; `WorkspaceProfile` in `workspace_manager.py` |
+| G5 | **DELETE `AGENT_TOOL_NAMES`** (redundant with `mcp_tool_specs.tool_names()`) | `git grep "AGENT_TOOL_NAMES" -- 'src/*.py'` returns 0 hits; 8 consumer sites updated to use `list(mcp_tool_specs.tool_names())` |
+| G6 | **`src/models.py` reduced to ≤30 lines** (or eliminated) | `wc -l src/models.py` returns ≤30 |
+| G7 | All 7 audit gates pass `--strict` | unchanged from baseline |
+| G8 | All batched test tiers pass (10/11 baseline + RAG flake) | unchanged from baseline |
+
+## Non-Goals
+
+- Renaming existing files for prefix consistency (`multi_agent_conductor.py` → `mma_conductor.py`, etc.) — deferred to follow-up; current names are clear enough
+- Refactoring `aggregate.py` (513 lines), `app_controller.py` (4869 lines), `gui_2.py` (7773 lines) — out of scope; these have natural boundaries; the user doesn't want more splitting without good reason
+- Modifications to `mcp_client.py` other than merging the config dataclasses — the merge itself is the change
+- New `src/<thing>.py` files (per AGENTS.md hard rule) — the 3 new files (`mma.py`, `project.py`, `project_files.py`) are justified by the `models.py` split (definition pollution)
+
+## Functional Requirements
+
+### FR1: MERGE ImGui LEAKS into `gui_2.py`
+
+For each of these 5 files, move the content into `gui_2.py` in a clearly-marked section, then `git rm` the original:
+
+```python
+# In gui_2.py, add at the appropriate location:
+
+#region: Bg Shader (moved from src/bg_shader.py)
+# ... (content of src/bg_shader.py)
+#endregion
+
+#region: Shaders (moved from src/shaders.py)
+# ... (content of src/shaders.py)
+#endregion
+
+#region: Command Palette (moved from src/command_palette.py)
+# ... (content of src/command_palette.py)
+#endregion
+
+#region: Diff Viewer (moved from src/diff_viewer.py)
+# ... (content of src/diff_viewer.py)
+#endregion
+
+#region: Patch Modal (moved from src/patch_modal.py)
+# ... (content of src/patch_modal.py)
+#endregion
+```
+
+**Imports to update across the codebase:**
+- `from src.bg_shader import X` → `from src.gui_2 import X`
+- `from src.shaders import X` → `from src.gui_2 import X`
+- (etc. for all 5 files)
+
+### FR2: MERGE vendor files into `ai_client.py`
+
+```python
+# In ai_client.py, add at the appropriate location:
+
+#region: Vendor Capabilities (moved from src/vendor_capabilities.py)
+# ... (content of src/vendor_capabilities.py)
+#endregion
+
+#region: Vendor State (moved from src/vendor_state.py)
+# ... (content of src/vendor_state.py)
+#endregion
+```
+
+**Imports to update:**
+- `from src.vendor_capabilities import X` → `from src.ai_client import X`
+- `from src.vendor_state import X` → `from src.ai_client import X`
+
+### FR3: SPLIT `models.py`
+
+**Phase 1: Create `src/mma.py`** with the MMA Core + TrackState:
+- ThinkingSegment
+- Ticket
+- Track
+- WorkerContext
+- TrackState
+- Top-level docstring explaining MMA scope
+
+**Phase 2: Create `src/project.py`** with the project config:
+- ProjectContext + 5 sub-dataclasses (ProjectMeta, ProjectOutput, ProjectFiles, ProjectScreenshots, ProjectDiscussion)
+- Config I/O helpers: `_clean_nones`, `load_config_from_disk`, `save_config_to_disk`, `parse_history_entries`
+- Top-level docstring explaining project config scope
+
+**Phase 3: Create `src/project_files.py`** with the file-related dataclasses:
+- FileItem
+- ContextPreset
+- ContextFileEntry
+- NamedViewPreset
+- Preset
+- Top-level docstring explaining file-related project state scope
+
+### FR4: MERGE other `models.py` classes into existing sub-system files
+
+| Class from `models.py` | Destination (existing file) | New section name |
+|---|---|---|
+| `Persona` | `src/personas.py` | "Persona Dataclass" |
+| `Tool`, `ToolPreset` | `src/tool_presets.py` | "Tool + ToolPreset Dataclasses" |
+| `BiasProfile` | `src/tool_bias.py` | "BiasProfile Dataclass" |
+| `TextEditorConfig`, `ExternalEditorConfig` | `src/external_editor.py` | "Editor Config Dataclasses" |
+| `MCPServerConfig`, `MCPConfiguration`, `VectorStoreConfig`, `RAGConfig`, `load_mcp_config` | `src/mcp_client.py` | "MCP Config Dataclasses" |
+| `WorkspaceProfile` | `src/workspace_manager.py` | "WorkspaceProfile Dataclass" |
+
+### FR5: DELETE `AGENT_TOOL_NAMES` (redundant)
+
+```python
+# 8 consumer site updates:
+# Before:
+from src.models import AGENT_TOOL_NAMES
+for tool in AGENT_TOOL_NAMES:
+    ...
+
+# After:
+from src import mcp_tool_specs
+for tool in mcp_tool_specs.tool_names():
+    ...
+```
+
+**Consumer sites (8):**
+- `src/app_controller.py:2110, 2972, 3273` (3 sites)
+- `tests/test_arch_boundary_phase2.py:23, 29, 31, 32, 33` (5 sites)
+
+**Test simplification:** `test_tool_names_subset_of_models_agent_tool_names` becomes either:
+- DELETE (it's a tautology once `AGENT_TOOL_NAMES` is derived from `tool_names()`)
+- OR convert to a positive assertion: `assert mcp_tool_specs.tool_names() == {expected canonical tools}`
+
+### FR6: REDUCE `src/models.py` to ~30 lines (or eliminate)
+
+After all moves, `src/models.py` contains:
+- `_create_generate_request`, `_create_confirm_request`, `__getattr__` (Pydantic lazy proxies for the API)
+- OR these move to `src/api_hooks.py` (if API-specific)
+- Top-level docstring
+
+If `models.py` becomes essentially empty after these moves, **delete the file entirely** (it's not a "system" file; `models.py` is just a temporary holder).
+
+## Non-Functional Requirements
+
+- NFR1: 1-space indentation (per `conductor/workflow.md`)
+- NFR2: CRLF line endings on Windows
+- NFR3: No comments in source code (per AGENTS.md "No comments in source code")
+- NFR4: Per-task atomic commits with git notes
+- NFR5: No new pip dependencies
+- NFR6: `Result[T]` returns for fallible fns (per `error_handling.md`)
+- NFR7: No new `src/<thing>.py` files UNLESS justified by definition pollution (per AGENTS.md hard rule)
+
+## Architecture Reference
+
+- `AGENTS.md` — "File Size and Naming Convention" HARD RULE
+- `conductor/code_styleguides/data_oriented_design.md` — "Prefer Fewer Types" principle
+- `conductor/code_styleguides/error_handling.md` — the `Result[T]` convention
+- `conductor/code_styleguides/type_aliases.md` — the 10 TypeAliases convention
+- `conductor/tracks/cruft_elimination_20260627/SPEC_CORRECTION_phase_2.md` — the related spec correction (the original Phase 2 spec was wrong to put ProjectContext in `models.py`; this track fixes that)
+- `docs/reports/FOLLOWUP_module_taxonomy_20260627.md` — the previous followup report (this track supersedes it with concrete execution)
+
+## Out of Scope
+
+- Renaming existing files for prefix consistency (`multi_agent_conductor.py` → `mma_conductor.py`, etc.) — deferred to follow-up
+- Refactoring `aggregate.py` (513 lines), `app_controller.py` (4869 lines), `gui_2.py` (7773 lines) — out of scope; these have natural boundaries
+- Modifications to `mcp_client.py` other than merging the config dataclasses
+- New `src/<thing>.py` files beyond the 3 justified ones (`mma.py`, `project.py`, `project_files.py`)
+- The RAG test pre-existing flake (per `docs/reports/SSDL_CAMPAIGN_ABORTED_20260624.md` "Out of Scope")
+- Any Tier 2 spec rewrites (per the user's earlier "don't fuck with commits" directive)
+
+## Verification Criteria (Definition of Done)
+
+| # | Criterion | Verification |
+|---|---|---|
+| VC1 | ImGui imports limited to `gui_2.py` + `imgui_scopes.py` | `git grep -l "imgui_bundle\|from imgui\\." -- 'src/*.py'` returns 2 files |
+| VC2 | `src/bg_shader.py`, `src/shaders.py`, `src/command_palette.py`, `src/diff_viewer.py`, `src/patch_modal.py` deleted | `ls src/{bg_shader,shaders,command_palette,diff_viewer,patch_modal}.py` returns not-found |
+| VC3 | `src/vendor_capabilities.py`, `src/vendor_state.py` deleted | `ls src/{vendor_capabilities,vendor_state}.py` returns not-found |
+| VC4 | Vendor symbols importable from `src.ai_client` | `python -c "from src.ai_client import PROVIDER_CAPABILITIES, get_vendor_state"` works |
+| VC5 | `src/mma.py` exists with MMA Core + TrackState | `python -c "from src.mma import ThinkingSegment, Ticket, Track, WorkerContext, TrackState"` works |
+| VC6 | `src/project.py` exists with ProjectContext + sub + config I/O | `python -c "from src.project import ProjectContext, ProjectMeta, ProjectOutput, ProjectFiles, ProjectScreenshots, ProjectDiscussion, _clean_nones, load_config_from_disk, save_config_to_disk, parse_history_entries"` works |
+| VC7 | `src/project_files.py` exists with file-related dataclasses | `python -c "from src.project_files import FileItem, ContextPreset, ContextFileEntry, NamedViewPreset, Preset"` works |
+| VC8 | Persona/Tool/Editor/MCP/Workspace dataclasses in their proper sub-system files | `python -c "from src.personas import Persona; from src.tool_presets import Tool, ToolPreset; from src.tool_bias import BiasProfile; from src.external_editor import TextEditorConfig, ExternalEditorConfig; from src.mcp_client import MCPServerConfig, MCPConfiguration, VectorStoreConfig, RAGConfig, load_mcp_config; from src.workspace_manager import WorkspaceProfile"` works |
+| VC9 | `AGENT_TOOL_NAMES` deleted; all 8 consumer sites use `mcp_tool_specs.tool_names()` | `git grep "AGENT_TOOL_NAMES" -- 'src/*.py' 'tests/*.py'` returns 0 hits |
+| VC10 | `src/models.py` reduced to ≤30 lines (or eliminated entirely) | `wc -l src/models.py` returns ≤30; OR `ls src/models.py` returns not-found |
+| VC11 | All 7 audit gates pass `--strict` | unchanged from baseline |
+| VC12 | 10/11 batched test tiers pass (RAG flake acceptable) | unchanged from baseline |
+
+## Risks
+
+| # | Risk | Likelihood | Mitigation |
+|---|---|---|---|
+| R1 | ImGui LEAKS move breaks existing tests (e.g., `command_palette` is referenced in commands.py) | low | Run full affected test set after each move; revert + fix on regression |
+| R2 | Vendor merge into `ai_client.py` creates circular imports (PROVIDERS lazy proxy is the workaround) | medium | The lazy import pattern (`__getattr__`) handles this; verify by running the full test suite after merge |
+| R3 | `models.py` split breaks 136 import sites | high | Per-file move with regression-guard tests after each; update imports systematically |
+| R4 | The 6+ "merge into existing sub-system files" moves break those files' existing tests | medium | Run the affected test file after each merge |
+| R5 | `AGENT_TOOL_NAMES` deletion breaks `test_arch_boundary_phase2.py` | low | Update the test to use `mcp_tool_specs.tool_names()`; cross-check that the test's expected tool names are in the registry |
+| R6 | The `ProjectContext` Phase 2 commit (in `cruft_elimination_20260627`) put `ProjectContext` in `models.py`; the new track moves it to `project.py` — needs to coordinate with the cruft track | high | The cruft track should NOT merge its `models.py` `ProjectContext` commit; this refactor track handles the move |
+| R7 | The `_create_generate_request` etc. Pydantic proxies in `models.py` are used by `api_hooks.py`; if we move them to `api_hooks.py` we create a different topology | low | Audit the consumers; if they're all in `api_hooks.py`, move them; if not, keep in `models.py` or move to a new `api_models.py` |
+
+## See also
+
+- `docs/reports/FOLLOWUP_module_taxonomy_20260627.md` — the previous followup report (this spec supersedes it)
+- `conductor/tracks/cruft_elimination_20260627/SPEC_CORRECTION_phase_2.md` — the related spec correction
+- `conductor/tracks/cruft_elimination_20260627/spec.md` — the parent spec (which is currently in flux)
+- `AGENTS.md` — "File Size and Naming Convention" HARD RULE
+- `conductor/code_styleguides/data_oriented_design.md` — "Prefer Fewer Types" principle

conductor/tracks/module_taxonomy_refactor_20260627/state.toml

@@ -0,0 +1,62 @@
+# Track state for module_taxonomy_refactor_20260627
+# Updated by Tier 2 Tech Lead as tasks complete
+
+[meta]
+track_id = "module_taxonomy_refactor_20260627"
+name = "Module Taxonomy Refactor"
+status = "active"
+current_phase = 0
+last_updated = "2026-06-27"
+
+[blocked_by]
+cruft_elimination_20260627 = "pending (the cruft track has a ProjectContext-in-models.py commit that needs to be coordinated)"
+
+[blocks]
+
+[phases]
+phase_0 = { status = "pending", checkpointsha = "", name = "Pre-flight + TIER2_STARTUP" }
+phase_1 = { status = "pending", checkpointsha = "", name = "MERGE ImGui LEAKS into gui_2.py (5 commits)" }
+phase_2 = { status = "pending", checkpointsha = "", name = "MERGE vendor files into ai_client.py (2 commits)" }
+phase_3 = { status = "pending", checkpointsha = "", name = "SPLIT models.py into mma.py + project.py + project_files.py + 6 sub-system merges (10 commits)" }
+phase_4 = { status = "pending", checkpointsha = "", name = "DELETE AGENT_TOOL_NAMES (1 commit)" }
+phase_5 = { status = "pending", checkpointsha = "", name = "Verification + end-of-track report" }
+
+[tasks]
+t0_1 = { status = "pending", commit_sha = "", description = "Create TIER2_STARTUP.md with decision rule + 3 refactors + 8 AGENT_TOOL_NAMES consumers" }
+t1_1 = { status = "pending", commit_sha = "", description = "Move src/bg_shader.py to src/gui_2.py" }
+t1_2 = { status = "pending", commit_sha = "", description = "Move src/shaders.py to src/gui_2.py" }
+t1_3 = { status = "pending", commit_sha = "", description = "Move src/command_palette.py to src/gui_2.py" }
+t1_4 = { status = "pending", commit_sha = "", description = "Move src/diff_viewer.py to src/gui_2.py" }
+t1_5 = { status = "pending", commit_sha = "", description = "Move src/patch_modal.py to src/gui_2.py" }
+t2_1 = { status = "pending", commit_sha = "", description = "Move src/vendor_capabilities.py to src/ai_client.py" }
+t2_2 = { status = "pending", commit_sha = "", description = "Move src/vendor_state.py to src/ai_client.py" }
+t3_1 = { status = "pending", commit_sha = "", description = "Create src/mma.py with MMA Core + TrackState (split from models.py)" }
+t3_2 = { status = "pending", commit_sha = "", description = "Create src/project.py with ProjectContext + sub + config IO (split from models.py)" }
+t3_3 = { status = "pending", commit_sha = "", description = "Create src/project_files.py (split from models.py)" }
+t3_4 = { status = "pending", commit_sha = "", description = "Move Persona from models.py to personas.py" }
+t3_5 = { status = "pending", commit_sha = "", description = "Move Tool + ToolPreset from models.py to tool_presets.py" }
+t3_6 = { status = "pending", commit_sha = "", description = "Move BiasProfile from models.py to tool_bias.py" }
+t3_7 = { status = "pending", commit_sha = "", description = "Move TextEditorConfig + ExternalEditorConfig from models.py to external_editor.py" }
+t3_8 = { status = "pending", commit_sha = "", description = "Move MCP config dataclasses from models.py to mcp_client.py" }
+t3_9 = { status = "pending", commit_sha = "", description = "Move WorkspaceProfile from models.py to workspace_manager.py" }
+t3_10 = { status = "pending", commit_sha = "", description = "Reduce models.py to Pydantic proxy helpers only (or delete entirely if empty)" }
+t4_1 = { status = "pending", commit_sha = "", description = "Update 8 consumer sites to use mcp_tool_specs.tool_names() instead of AGENT_TOOL_NAMES" }
+t4_2 = { status = "pending", commit_sha = "", description = "Delete AGENT_TOOL_NAMES constant from src/models.py" }
+t4_3 = { status = "pending", commit_sha = "", description = "DELETE or CONVERT test_tool_names_subset_of_models_agent_tool_names test" }
+t5_1 = { status = "pending", commit_sha = "", description = "Run all 12 VCs; write TRACK_COMPLETION; update state.toml + tracks.md" }
+
+[verification]
+phase_0_complete = false
+phase_1_complete = false
+phase_2_complete = false
+phase_3_complete = false
+phase_4_complete = false
+phase_5_complete = false
+
+[track_specific]
+file_change_summary = { files_deleted = 7, files_created = 4, files_modified = 10, potentially_deleted = 1 }
+net_files_change = "-4 files (65 -> 61, with potential additional -1 if models.py is eliminated)"
+im_gui_leak_count = 5
+vendor_files_to_merge = 2
+models_py_split_targets = 3
+agent_tool_names_consumers = 8

conductor/tracks/test_engine_integration_20260627/metadata.json

@@ -0,0 +1,107 @@
+{
+ "track_id": "test_engine_integration_20260627",
+ "name": "ImGui Test Engine Integration (Bridge via API Hooks)",
+ "status": "active",
+ "branch": "master",
+ "created": "2026-06-27",
+ "owner": "Tier 1 (initialized); implementation delegated to Tier 2/3.",
+ "blocked_by": [],
+ "blocks": ["test_engine_docking_tests (Track 2)", "test_engine_capture_regression (Track 3)"],
+ "scope": {
+  "new_files": [
+   "tests/test_test_engine_smoke.py",
+   "docs/reports/TRACK_COMPLETION_test_engine_integration_20260627.md"
+  ],
+  "modified_files": [
+   "sloppy.py (add --enable-test-engine CLI flag)",
+   "src/app_controller.py (add test_engine_enabled field)",
+   "src/gui_2.py (enable engine in App.run + _register_imgui_tests method)",
+   "src/api_hooks.py (4 new /api/test_engine/* endpoints)",
+   "src/api_hook_client.py (4 new client methods)",
+   "tests/conftest.py (pass --enable-test-engine in live_gui fixture)",
+   "conductor/tracks.md (add row)",
+   "conductor/chronology.md (prepend row)"
+  ],
+  "deleted_files": []
+ },
+ "estimated_effort": {
+  "method": "scope (per workflow.md Tier 1 Track Initialization Rules. NO day estimates.)",
+  "phase_1": "4 tasks: 1 failing test + 1 CLI flag + 1 engine enable + 1 manual verification",
+  "phase_2": "4 tasks: 1 failing tests + 4 endpoints + 4 client methods + green verification",
+  "phase_3": "2 tasks: 1 conftest update + 1 full smoke test verification",
+  "phase_4": "3 tasks: 1 end-of-track report + 1 state update + 1 user sign-off"
+ },
+ "verification_criteria": [
+  "G1: sloppy.py accepts --enable-test-engine; when set, runner_params.use_imgui_test_engine = True + callbacks.register_tests assigned",
+  "G2: App._register_imgui_tests exists + registers at least 1 smoke test via imgui.test_engine.register_test",
+  "G3: HookServer has 4 new /api/test_engine/* endpoints (queue, status, results, abort)",
+  "G4: ApiHookClient has 4 new methods (queue_test, get_test_status, get_test_results, wait_for_test_results)",
+  "G5: live_gui fixture passes --enable-test-engine in subprocess args",
+  "G6: tests/test_test_engine_smoke.py has >=3 tests; all pass (engine enabled + queue+run smoke + results shape)",
+  "G7: docs/reports/TRACK_COMPLETION_test_engine_integration_20260627.md exists; documents threading model verification + Track 2 handoff",
+  "VC_parallel_safe": "ZERO file overlap with tier2/post_module_taxonomy_de_cruft_20260627 (touching sloppy.py, gui_2.py:641-700, api_hooks.py, api_hook_client.py, conftest.py — none of which Tier 2 touches) or enforcement_gap_closure_20260627 (touching scripts/audit_*, python.md — zero overlap)"
+ ],
+ "regressions_and_pre_existing_failures": [],
+ "pre_existing_failures_remaining": [],
+ "deferred_to_followup_tracks": [
+  {
+   "title": "Track 2: test_engine_docking_tests",
+   "description": "Migrate docking/focus/panel tests (test_workspace_profiles_restoration, test_auto_switch_sim, etc.) to use ctx.dock_into, ctx.window_focus, ctx.window_resize. The bridge built in this track enables it.",
+   "track_status": "planned (Track 2 of 3)"
+  },
+  {
+   "title": "Track 3: test_engine_capture_regression",
+   "description": "Visual regression via ctx.capture_screenshot_window + baseline PNG diff. The capture API is available but not wired in this track.",
+   "track_status": "planned (Track 3 of 3)"
+  },
+  {
+   "title": "Headless test execution",
+   "description": "The test engine requires a live GLFW window. Headless mode (no window) is a future research item; the engine's scenario thread drives the actual render loop.",
+   "track_status": "not yet initialized; research item"
+  },
+  {
+   "title": "Interactive test engine panel",
+   "description": "show_test_engine_windows(engine, True) opens the engine's debug UI. Not shown by default; can be added as a debug toggle in a follow-up.",
+   "track_status": "not yet initialized"
+  }
+ ],
+ "risk_register": [
+  {
+   "id": "R1",
+   "description": "GIL-transfer crash: the test engine's scenario thread calls Python test_func from a different thread; if the GIL transfer mechanism in hello_imgui/immapp doesn't work with the app's existing thread layout, the app crashes",
+   "likelihood": "medium",
+   "impact": "hard blocker; the entire test engine approach is invalid if the threading model doesn't work",
+   "mitigation": "Phase 1 Task 1.4 is a manual verification checkpoint that catches this before any further work. If it crashes, STOP and report to user. The demo_testengine.py proves the mechanism works for simple apps; the risk is specific to this app's thread layout (AppController, SyncEventQueue, etc.)"
+  },
+  {
+   "id": "R2",
+   "description": "Label path mismatch: the smoke test's ctx.set_ref('###manual slop') + ctx.item_click('**/Session') may not match the actual label tree",
+   "likelihood": "high",
+   "impact": "smoke test fails with 'item not found'; not a crash, just a wrong path",
+   "mitigation": "Use imgui.show_id_stack_tool_window() or ctx.window_info() to find the correct labels during implementation. The label tree is deterministic (same build, same layout). Once found, the path is stable."
+  },
+  {
+   "id": "R3",
+   "description": "Engine overhead degrades live_gui test performance",
+   "likelihood": "low",
+   "impact": "live_gui tests take longer; batch run exceeds timeout",
+   "mitigation": "The engine is idle when no tests are queued (sub-ms per-frame overhead). The existing fps_idling settings are unchanged. If measurable, the --enable-test-engine flag can be made conditional (only passed when running test_test_engine_* files)."
+  },
+  {
+   "id": "R4",
+   "description": "test_func accesses App state from the scenario thread, causing a race with the GUI render thread",
+   "likelihood": "medium",
+   "impact": "intermittent test failures or state corruption",
+   "mitigation": "The spec FR2 + plan Task 1.3 explicitly document: test_func must NOT directly mutate App/AppController state; it must use ctx.* primitives (which post simulated input to the GUI thread). Reading via ctx.item_info / ctx.window_info is safe (C++ accessors). CHECK() runs on the scenario thread but only writes to the engine's C++ result log (thread-safe)."
+  }
+ ],
+ "campaign": {
+  "name": "Test Engine Campaign (3 tracks)",
+  "tracks": [
+   "test_engine_integration_20260627 (THIS TRACK; bridge + smoke test)",
+   "test_engine_docking_tests (Track 2; migrate docking/focus/panel tests)",
+   "test_engine_capture_regression (Track 3; visual regression via screenshot capture)"
+  ],
+  "campaign_rationale": "The test engine enables high-fidelity simulation of docking, focus, panel visibility, drag-and-drop, and keyboard input that the current Hook API cannot express. The campaign is split into 3 tracks to isolate risk: Track 1 proves the threading model + bridge work; Track 2 migrates the high-value docking tests; Track 3 adds visual regression. Each track is independently shippable."
+ }
+}

conductor/tracks/test_engine_integration_20260627/plan.md

@@ -0,0 +1,163 @@
+# Plan: ImGui Test Engine Integration (Bridge via API Hooks)
+
+Track: `test_engine_integration_20260627`
+Branch: master (parallel-safe; touches `sloppy.py`, `src/gui_2.py`, `src/app_controller.py`, `src/api_hooks.py`, `src/api_hook_client.py`, `tests/conftest.py`, new `tests/test_test_engine_smoke.py` — zero overlap with the running tier2 taxonomy branch or the enforcement_gap_closure track)
+Spec: `conductor/tracks/test_engine_integration_20260627/spec.md`
+
+All Python edits use 1-space indentation. No comments in body. CRLF preserved.
+
+---
+
+## Phase 1: Enable the Test Engine in the App
+
+Focus: Add `--enable-test-engine` CLI flag, set `runner_params.use_imgui_test_engine`, add the `register_tests` callback with a placeholder smoke test.
+
+- [ ] Task 1.1: Write failing test for `--enable-test-engine` flag + engine activation
+  - **WHERE:** `tests/test_test_engine_smoke.py` (NEW file)
+  - **WHAT:** Test 1: `test_engine_enabled` — start `live_gui` (which will pass `--enable-test-engine`), verify the engine is active by calling `client.get_test_status()` (new method, implemented in Phase 3) and asserting `queue_empty == True` (engine is running, no tests queued). This test will FAIL before Phase 1 + Phase 3 land (the endpoint doesn't exist yet).
+  - **HOW:** Use the `live_gui` fixture. Call `client.get_test_status()`. Assert the response has a `queue_empty` field. (The method is added in Phase 3; the test is written first per TDD.)
+  - **SAFETY:** No `live_gui` state mutation; just a GET request.
+  - **COMMIT:** `test(smoke): add failing test for test engine activation`
+  - **GIT NOTE:** Red-phase test for the `--enable-test-engine` flag + engine activation.
+
+- [ ] Task 1.2: Add `--enable-test-engine` CLI flag to `sloppy.py` + `AppController`
+  - **WHERE:** `sloppy.py:35` (add arg), `src/app_controller.py:1042` (add `test_engine_enabled` field)
+  - **WHAT:**
+    1. `sloppy.py`: add `parser.add_argument("--enable-test-engine", action="store_true", help="Enable Dear ImGui Test Engine for automated UI testing")` after the `--enable-test-hooks` line.
+    2. `src/app_controller.py:1042`: add `self.test_engine_enabled: bool = ("--enable-test-engine" in sys.argv)` after the `test_hooks_enabled` line.
+  - **HOW:** Use `manual-slop_edit_file` MCP tool. 1-space indent.
+  - **SAFETY:** The flag is opt-in; normal runs are unaffected.
+  - **COMMIT:** `feat(cli): add --enable-test-engine flag`
+  - **GIT NOTE:** CLI flag for test engine; mirrors the --enable-test-hooks pattern at app_controller.py:1042.
+
+- [ ] Task 1.3: Enable the engine in `App.run()` + add `_register_imgui_tests` callback
+  - **WHERE:** `src/gui_2.py:641` (after `RunnerParams()` construction) + `src/gui_2.py:~700` (new `_register_imgui_tests` method)
+  - **WHAT:**
+    1. In `App.run()` between line 641 (`self.runner_params = _hi.RunnerParams()`) and line 684 (`callbacks.show_gui = ...`), add:
+       ```python
+       if getattr(self.controller, "test_engine_enabled", False):
+        self.runner_params.use_imgui_test_engine = True
+        self.runner_params.callbacks.register_tests = self._register_imgui_tests
+       ```
+    2. Add `_register_imgui_tests(self)` method on `App` (after `_post_init`, ~line 700):
+       ```python
+       def _register_imgui_tests(self) -> None:
+        from imgui_bundle import hello_imgui
+        from imgui_bundle.imgui import test_engine
+        engine = hello_imgui.get_imgui_test_engine()
+        test = test_engine.register_test(engine, "Smoke Tests", "Tab Switch")
+        def smoke_func(ctx) -> None:
+         from imgui_bundle.imgui.test_engine_checks import CHECK
+         ctx.set_ref("###manual slop")
+         ctx.item_click("**/Session")
+         CHECK(True)
+        test.test_func = smoke_func
+       ```
+       The exact `set_ref` + `item_click` targets are determined during implementation by inspecting the running GUI's label tree. The smoke test should click a harmless tab (e.g., switch to "Session" tab) and `CHECK(True)` as a placeholder assertion. The real assertion (verify the tab actually switched) is added once the label path is confirmed.
+  - **HOW:** Use `manual-slop_edit_file` / `manual-slop_py_update_definition` MCP tool. 1-space indent.
+  - **SAFETY:** Guarded by `test_engine_enabled`; normal runs skip this entirely. The `register_tests` callback is only called by `hello_imgui` when `use_imgui_test_engine = True`.
+  - **COMMIT:** `feat(gui): enable test engine + register smoke test via callbacks.register_tests`
+  - **GIT NOTE:** Activates the test engine when --enable-test-engine is set; registers a placeholder smoke test.
+
+- [ ] Task 1.4: Verify the engine activates (manual)
+  - **WHAT:** Run `uv run python sloppy.py --enable-test-hooks --enable-test-engine` locally. Verify the app starts without crashing (the GIL-transfer mechanism works). Verify `hello_imgui.get_imgui_test_engine()` returns a non-None engine. This is a manual checkpoint before proceeding to Phase 2.
+  - **COMMIT:** (no commit; manual verification checkpoint)
+  - **GIT NOTE:** Manual verification that the engine + GIL transfer works with the app's existing thread layout.
+
+---
+
+## Phase 2: Build the API Hooks Bridge
+
+Focus: Add the 4 `/api/test_engine/*` endpoints to `HookServer` + the 4 methods to `ApiHookClient`.
+
+- [ ] Task 2.1: Write failing tests for the 4 new `ApiHookClient` methods
+  - **WHERE:** `tests/test_test_engine_smoke.py` (append to the file from Task 1.1)
+  - **WHAT:** 2 more tests:
+    - `test_queue_and_run_smoke_test`: queue the smoke test via `client.queue_test("Smoke Tests", "Tab Switch")`, poll via `client.wait_for_test_results(timeout=30)`, assert `results["count_success"] >= 1` and `results["count_tested"] >= 1`.
+    - `test_engine_results_shape`: call `client.get_test_results()`, assert the response dict has keys `count_tested`, `count_success`, `count_in_queue`.
+  - **HOW:** Use `live_gui` fixture. These tests fail until Phase 2 + Phase 3 land (the client methods + endpoints don't exist yet).
+  - **SAFETY:** The smoke test queues a harmless tab-switch; no destructive state change.
+  - **COMMIT:** `test(smoke): add failing tests for queue_test + wait_for_test_results + get_test_results`
+  - **GIT NOTE:** Red-phase tests for the 4 new ApiHookClient methods.
+
+- [ ] Task 2.2: Add the 4 `/api/test_engine/*` endpoints to `HookServer`
+  - **WHERE:** `src/api_hooks.py` — `do_GET` (line 157) + `do_POST` (line 490)
+  - **WHAT:** Add 4 new `elif` branches:
+    1. `do_GET`: `elif self.path == "/api/test_engine/status":` — lazy-import `hello_imgui` + `test_engine`; get engine via `hello_imgui.get_imgui_test_engine()`; call `test_engine.is_test_queue_empty(engine)`; respond `{"queue_empty": bool}`.
+    2. `do_GET`: `elif self.path == "/api/test_engine/results":` — get engine; create `TestEngineResultSummary()`; call `test_engine.get_result_summary(engine, out_results)`; respond `{"count_tested": N, "count_success": N, "count_in_queue": N}`.
+    3. `do_POST`: `elif self.path == "/api/test_engine/queue":` — body `{"group": "...", "name": "..."}`; get engine; find test via `test_engine.find_test_by_name(engine, group, name)`; if found, `test_engine.queue_test(engine, test)`; respond `{"status": "queued"}` or `{"error": "test not found"}` (404).
+    4. `do_POST`: `elif self.path == "/api/test_engine/abort":` — get engine; `test_engine.abort_current_test(engine)`; respond `{"status": "aborted"}`.
+  - **HOW:** Follow the existing endpoint pattern (lines 499-505 for POST, lines 231-241 for GET). Use `_get_app_attr(app, "controller")` to check `test_engine_enabled`; if not enabled, respond 503. Use `json.dumps(...)` for the response body. 1-space indent.
+  - **SAFETY:** The endpoints run on the HTTP handler thread. `hello_imgui.get_imgui_test_engine()` is a C++ accessor (thread-safe). `queue_test` / `is_test_queue_empty` / `get_result_summary` are thread-safe C++ engine operations (the engine is designed for cross-thread test scheduling). `abort_current_test` is also thread-safe.
+  - **COMMIT:** `feat(api_hooks): add /api/test_engine/* bridge endpoints`
+  - **GIT NOTE:** 4 new endpoints: queue, status, results, abort; bridge the test process to the engine via HTTP.
+
+- [ ] Task 2.3: Add the 4 new methods to `ApiHookClient`
+  - **WHERE:** `src/api_hook_client.py` (after the existing methods, ~line 500)
+  - **WHAT:** 4 new methods:
+    1. `queue_test(self, group: str, name: str) -> dict` — POST `/api/test_engine/queue` with `{"group": group, "name": name}`; return the response dict.
+    2. `get_test_status(self) -> dict` — GET `/api/test_engine/status`; return `{"queue_empty": bool}`.
+    3. `get_test_results(self) -> dict` — GET `/api/test_engine/results`; return `{"count_tested": N, "count_success": N, "count_in_queue": N}`.
+    4. `wait_for_test_results(self, timeout: float = 30.0) -> dict` — poll `get_test_status()` every 0.5s until `queue_empty == True` or timeout; then return `get_test_results()`. On timeout, return the last results (with a `timed_out: True` field).
+  - **HOW:** Follow the existing method pattern (e.g., `get_status` at line 105, `push_event` at line 156). Use `requests.get/post` + retry. 1-space indent.
+  - **SAFETY:** Pure HTTP client; no thread safety concerns.
+  - **COMMIT:** `feat(api_hook_client): add queue_test + get_test_status + get_test_results + wait_for_test_results`
+  - **GIT NOTE:** 4 new client methods mirroring the 4 new endpoints; wait_for_test_results replaces time.sleep+get_value polling.
+
+- [ ] Task 2.4: Run Phase 2 tests (Green phase)
+  - **WHAT:** `uv run pytest tests/test_test_engine_smoke.py -v --timeout=60`. All 3 tests must pass. If the smoke test (test_queue_and_run_smoke_test) fails, the most likely cause is the `set_ref` / `item_click` label path being wrong — debug by using `imgui.show_id_stack_tool_window()` or `ctx.window_info("manual slop")` to find the correct label. If the GIL transfer fails, the app will crash — that's a hard blocker; report to user.
+  - **COMMIT:** `conductor(state): Phase 2 green-phase verification` (or skip if no code changes)
+  - **GIT NOTE:** Green-phase verification for the 4 new endpoints + 4 new client methods.
+
+---
+
+## Phase 3: Live_gui Fixture + Full Smoke Test
+
+Focus: Pass `--enable-test-engine` in the `live_gui` fixture + verify the full bridge works end-to-end.
+
+- [ ] Task 3.1: Update `live_gui` fixture to pass `--enable-test-engine`
+  - **WHERE:** `tests/conftest.py:792`
+  - **WHAT:** Change `gui_args = ["uv", "run", "python", "-u", gui_script, "--enable-test-hooks"]` to include `"--enable-test-engine"`:
+    ```python
+    gui_args = ["uv", "run", "python", "-u", gui_script, "--enable-test-hooks", "--enable-test-engine"]
+    ```
+  - **HOW:** `manual-slop_edit_file` MCP tool. 1-space indent.
+  - **SAFETY:** The engine is idle when no tests are queued. Existing `live_gui` tests that don't use the test engine are unaffected (the engine adds sub-ms per-frame overhead).
+  - **COMMIT:** `test(conftest): pass --enable-test-engine in live_gui fixture`
+  - **GIT NOTE:** Engine activates on every live_gui run; idle when no tests queued.
+
+- [ ] Task 3.2: Run the full smoke test suite (Green phase)
+  - **WHAT:** `uv run pytest tests/test_test_engine_smoke.py -v --timeout=60`. All 3 tests pass. Then run a small batch of existing `live_gui` tests to verify no regression: `uv run pytest tests/test_workspace_profiles_restoration.py tests/test_undo_redo_lifecycle.py -v --timeout=120`.
+  - **COMMIT:** `conductor(state): Phase 3 green-phase verification`
+  - **GIT NOTE:** Full bridge verified: pytest → HTTP → HookServer → engine → scenario thread → ctx.item_click → GUI thread → CHECK → results → HTTP → pytest assert.
+
+---
+
+## Phase 4: End-of-Track Report + State Update
+
+- [ ] Task 4.1: Write end-of-track report
+  - **WHERE:** `docs/reports/TRACK_COMPLETION_test_engine_integration_20260627.md` (NEW file)
+  - **WHAT:** Report following the precedent:
+    - TL;DR
+    - Phase summary (each phase + commits + status)
+    - Verification Criteria status (mapped to spec G1-G7)
+    - Threading model verification (did the GIL transfer work? any crashes? any state-access issues from the scenario thread?)
+    - The 4 new endpoints + 4 new client methods documented
+    - The smoke test result
+    - Handoff to Track 2 (docking test migration) — what's now possible that wasn't before
+    - Known limitations (engine requires a live window; not headless; the interactive panel is not shown)
+  - **COMMIT:** `docs(reports): TRACK_COMPLETION_test_engine_integration_20260627`
+  - **GIT NOTE:** End-of-track report; documents the bridge + threading model verification + Track 2 handoff.
+
+- [ ] Task 4.2: Update `conductor/tracks.md` + `conductor/chronology.md` + `state.toml`
+  - **WHAT:**
+    1. `state.toml`: mark all phases "completed" with checkpoint SHA; `status = "completed"`.
+    2. `conductor/tracks.md`: add row for this track (status "shipped").
+    3. `conductor/chronology.md`: prepend row for `2026-06-27 | test_engine_integration_20260627 | shipped | ...`.
+  - **COMMIT:** `conductor(state): test_engine_integration_20260627 SHIPPED + TRACK_COMPLETION`
+  - **GIT NOTE:** Track state + chronology + tracks.md closed out.
+
+- [ ] Task 4.3: Conductor - User Manual Verification
+  - **WHAT:** Present the results: the smoke test pass, the threading model verification, the 4 new endpoints, the 4 new client methods. PAUSE for user sign-off.
+  - **COMMIT:** (no commit; user-confirmation gate)
+  - **GIT NOTE:** User sign-off record.

conductor/tracks/test_engine_integration_20260627/spec.md

@@ -0,0 +1,187 @@
+# Track Specification: ImGui Test Engine Integration (Bridge via API Hooks)
+
+## Overview
+
+Integrate the Dear ImGui Test Engine (`imgui_bundle.imgui.test_engine`) into Manual Slop's test infrastructure to enable high-fidelity simulation of user interactions — docking, window focus, panel visibility, drag-and-drop, keyboard input — that the current Hook API cannot express.
+
+**The design principle:** the API hooks layer (`HookServer` on :8999 + `ApiHookClient`) remains the **single communication boundary** between the test process (pytest) and the GUI subprocess. The test engine is integrated *behind* the API hooks, not alongside them. New `/api/test_engine/*` endpoints bridge the test process to the engine's `queue_test` / `get_result_summary` API. The engine's `test_func` closures run on the engine's scenario thread (GIL-transferred by `hello_imgui`/`immapp`); they use `ctx.item_click("**/Label")`, `ctx.dock_into(src, dst, dir)`, `ctx.window_focus(ref)` etc. to post simulated input events to the GUI render thread. The existing `_pending_gui_tasks` queue and the engine's input simulation are two separate event injection paths into the same GUI thread; they compose without conflict.
+
+This is **Track 1 of 3** in the test engine campaign. Track 1 = enable the engine + build the bridge + smoke test. Track 2 (follow-up) = migrate docking/focus/panel tests. Track 3 (follow-up) = visual regression via screenshot capture.
+
+## Current State Audit (as of master `77b70226`)
+
+### Already Implemented (DO NOT re-implement)
+
+- **`imgui_bundle` v1.92.5** (pinned in `pyproject.toml:7`) ships the test engine compiled into the nanobind binary. Verified: `from imgui_bundle import imgui; imgui.test_engine.TestEngine` is a live class; `imgui.test_engine.register_test`, `imgui.test_engine.queue_test`, `imgui.test_engine.get_result_summary`, `imgui.test_engine.TestContext` with `dock_into`, `window_focus`, `item_click`, `capture_screenshot_window`, etc. are all present (verified via `dir()` enumeration — ~95 `TestContext` methods + ~35 module-level functions). The `.pyi` stub at `.venv/Lib/site-packages/imgui_bundle/imgui/test_engine.pyi` documents the full API.
+
+- **`hello_imgui.RunnerParams.use_imgui_test_engine: bool = False`** (`.venv/Lib/site-packages/imgui_bundle/hello_imgui.pyi:2969`) — the flag that enables the engine. When `True`, `hello_imgui`/`immapp` compiles the engine into the runner and provides the GIL-transfer mechanism for the scenario thread. The engine is **already compiled into the wheel** (the C++ build flag `-DHELLOIMGUI_WITH_TEST_ENGINE=ON` was set for the published wheel); the Python-side flag just activates it.
+
+- **`hello_imgui.get_imgui_test_engine()`** (`.venv/Lib/site-packages/imgui_bundle/hello_imgui.pyi:3355`) — returns the live `TestEngine` instance after `use_imgui_test_engine = True`. Verified callable.
+
+- **`RunnerCallbacks.register_tests: VoidFunction`** (`.venv/Lib/site-packages/imgui_bundle/hello_imgui.pyi:1809`) — the callback that `hello_imgui` invokes at startup to let the app register tests via `imgui.test_engine.register_test(engine, group, name)`. The demo at `.venv/Lib/site-packages/imgui_bundle/demos_python/demos_immapp/demo_testengine.py` shows the full pattern.
+
+- **`imgui_bundle.imgui.test_engine_checks.CHECK(result: bool)`** — the assertion primitive that emits pass/fail to the engine's result log with file:line traceback. Verified importable.
+
+- **The app already uses `hello_imgui.RunnerParams` + `immapp.run()`** — the exact integration path the test engine requires:
+  - `src/gui_2.py:641`: `self.runner_params = _hi.RunnerParams()`
+  - `src/gui_2.py:684-688`: `self.runner_params.callbacks.show_gui/show_menus/load_additional_fonts/setup_imgui_style/post_init` are set
+  - `src/gui_2.py:1486`: `immapp.run(app.runner_params, ...)` — the main loop entry point
+  - The GIL-transfer mechanism is built into `immapp.run` when `use_imgui_test_engine = True`; no additional threading code is needed on the Python side.
+
+- **`HookServer`** (`src/api_hooks.py:857`) — the HTTP server on `127.0.0.1:8999`, started when `--enable-test-hooks` is passed. The `do_GET` method (line 157) and `do_POST` method (line 490) use a flat `if/elif self.path == "/api/..."` dispatch. The server holds `self.app` (the `App` instance) and accesses it via `_get_app_attr(app, ...)` helpers. The `_pending_gui_tasks` queue (`app_controller.py:900`) + `_pending_gui_tasks_lock` (`app_controller.py:822`) + `_process_pending_gui_tasks()` (`app_controller.py:1844`, called per-frame from `gui_2.py:1759`) is the existing thread-safe command queue from HTTP handler thread → main render thread.
+
+- **`ApiHookClient`** (`src/api_hook_client.py`) — the Python client with retry logic, health-check polling, `wait_for_server(timeout)`, `push_event(action, payload)`, `get_value(item)`, `set_value(item, value)`, `click(item)`, `wait_for_event(event_type, timeout)`, etc. Used by all `live_gui` tests.
+
+- **`live_gui` fixture** (`tests/conftest.py:641`) — session-scoped; spawns `sloppy.py --enable-test-hooks --config=<temp>` as a subprocess; polls `http://127.0.0.1:8999/status` until ready; yields a `_LiveGuiHandle` with `.client` (an `ApiHookClient`), `.process`, `.workspace`. The fixture's subprocess args are at `conftest.py:792`: `gui_args = ["uv", "run", "python", "-u", gui_script, "--enable-test-hooks"]`.
+
+- **`sloppy.py`** (79 lines) — the entry point. CLI flags at lines 31-36: `--headless`, `--web-host`, `--web-port`, `--enable-test-hooks`, `--config`. The `else` branch at line 75 (the normal GUI mode) calls `from src.gui_2 import main; main()`.
+
+- **`AppController.test_hooks_enabled`** (`src/app_controller.py:1042`) — set via `"--enable-test-hooks" in sys.argv` or `SLOP_TEST_HOOKS=1` env var. Same pattern works for `--enable-test-engine`.
+
+### Gaps to Fill (This Track's Scope)
+
+- **GAP-1: The test engine is not enabled.** `runner_params.use_imgui_test_engine` is never set to `True`. No `callbacks.register_tests` callback exists. The engine's scenario thread + GIL-transfer mechanism are dormant.
+
+- **GAP-2: No `/api/test_engine/*` bridge endpoints.** The `HookServer` has no way for the test process to queue a test, poll results, or abort a running test. The test engine API (`queue_test`, `get_result_summary`, `is_test_queue_empty`, `abort_current_test`) is only accessible from inside the GUI process — not from the HTTP boundary.
+
+- **GAP-3: No `ApiHookClient` methods for test engine operations.** The client has `click`, `set_value`, `push_event`, `wait_for_event` — but no `queue_test`, `wait_for_test_results`, `get_test_results`.
+
+- **GAP-4: `live_gui` fixture doesn't pass `--enable-test-engine`.** The subprocess at `conftest.py:792` only passes `--enable-test-hooks`. Without the engine flag, the engine won't activate even after GAP-1 is fixed.
+
+- **GAP-5: No smoke test proving the end-to-end threading model works.** The test engine's scenario thread + GIL transfer is the highest-risk piece. A minimal smoke test (register a trivial test that clicks a known button + asserts a state change, queue it via the API, poll for results, assert pass) is needed to prove the bridge works before Track 2 migrates real tests.
+
+### Architecture: Why the API hooks + test engine compose
+
+```
+pytest test process
+  └── ApiHookClient (HTTP :8999)          ← single communication boundary (KEPT)
+       └── HookServer.do_POST             ← new /api/test_engine/* endpoints
+            └── imgui.test_engine.queue_test(engine, test)  ← schedules on engine
+                 └── TestContext.test_func(ctx)  ← runs on engine scenario thread
+                      └── ctx.item_click("**/Label")  ← posts simulated input to GUI thread
+                           └── GUI render thread processes the simulated event
+                                └── _process_pending_gui_tasks() still runs per-frame
+                                     (existing queue; unaffected; two separate injection paths)
+```
+
+The test engine's `test_func` runs on its own thread (the scenario thread). The `ctx.*` primitives post simulated input events to the ImGui input queue on the GUI render thread. This is the same destination as real user input and the same destination as `_pending_gui_tasks` — but a different injection mechanism. The two paths are independent; they don't share state, locks, or queues. The test engine doesn't touch `_pending_gui_tasks` and vice versa.
+
+The GIL-transfer caveat (documented at the top of `test_engine.pyi`) is handled by `hello_imgui`/`immapp` when `use_imgui_test_engine = True` — the C++ layer transfers the GIL between the main thread and the scenario thread. No additional Python-side threading code is needed. The `test_func` callback runs with the GIL held; it can safely call `ctx.*` primitives (which are C++ nanobind calls that release the GIL during the simulated input wait).
+
+## Goals
+
+- **G1.** `sloppy.py` accepts `--enable-test-engine` CLI flag; when set, `App.run()` sets `runner_params.use_imgui_test_engine = True` + assigns `runner_params.callbacks.register_tests` to a method that registers tests.
+
+- **G2.** `App` has a `_register_imgui_tests(self)` method (called by `hello_imgui` at startup via the `register_tests` callback) that registers at least one smoke test ("Smoke Tests", "Click Increment Button") via `imgui.test_engine.register_test(engine, group, name)`. The smoke test's `test_func(ctx)` calls `ctx.set_ref("...")` + `ctx.item_click("**/...")` + `CHECK(...)`.
+
+- **G3.** `HookServer` (in `src/api_hooks.py`) has 4 new endpoints:
+  - `POST /api/test_engine/queue` — body `{"group": "...", "name": "..."}`; finds the test by group+name via `imgui.test_engine.find_test_by_name(engine, group, name)`; calls `queue_test(engine, test)`; responds `{"status": "queued"}`.
+  - `GET /api/test_engine/status` — calls `is_test_queue_empty(engine)`; responds `{"queue_empty": true/false}`.
+  - `GET /api/test_engine/results` — calls `get_result_summary(engine, out_results)`; responds `{"count_tested": N, "count_success": N, "count_in_queue": N}`.
+  - `POST /api/test_engine/abort` — calls `abort_current_test(engine)`; responds `{"status": "aborted"}`.
+
+- **G4.** `ApiHookClient` (in `src/api_hook_client.py`) has 4 new methods:
+  - `queue_test(group: str, name: str) -> dict` — POST to `/api/test_engine/queue`.
+  - `get_test_status() -> dict` — GET `/api/test_engine/status`.
+  - `get_test_results() -> dict` — GET `/api/test_engine/results`.
+  - `wait_for_test_results(timeout: float = 30.0) -> dict` — polls `get_test_status()` until `queue_empty == True` or timeout; then returns `get_test_results()`.
+
+- **G5.** The `live_gui` fixture passes `--enable-test-engine` in addition to `--enable-test-hooks` in the subprocess args (`conftest.py:792`). The engine activates on every `live_gui` test run.
+
+- **G6.** A smoke test in `tests/test_test_engine_smoke.py` that:
+  1. Uses the `live_gui` fixture.
+  2. Queues the smoke test via `client.queue_test("Smoke Tests", "Click Increment Button")`.
+  3. Polls via `client.wait_for_test_results(timeout=30)`.
+  4. Asserts `results["count_success"] >= 1` and `results["count_tested"] >= 1`.
+  This proves the full bridge works: pytest → HTTP → HookServer → engine → scenario thread → `ctx.item_click` → GUI thread → state change → `CHECK` → result log → `get_result_summary` → HTTP → pytest assert.
+
+- **G7.** End-of-track report at `docs/reports/TRACK_COMPLETION_test_engine_integration_20260627.md` documenting: what shipped, the threading model verification, any GIL-transfer issues encountered, and the handoff to Track 2 (docking test migration).
+
+## Functional Requirements
+
+### FR1: `--enable-test-engine` CLI flag
+
+- `sloppy.py`: add `parser.add_argument("--enable-test-engine", action="store_true", help="Enable the Dear ImGui Test Engine for automated UI testing")` alongside the existing `--enable-test-hooks` flag (line 35).
+- `src/app_controller.py`: add `self.test_engine_enabled: bool = ("--enable-test-engine" in sys.argv)` near line 1042 (same pattern as `test_hooks_enabled`).
+- `src/gui_2.py` `App.run()` (line 619): between the `RunnerParams()` construction (line 641) and the `callbacks.show_gui = ...` assignments (line 684), add:
+  ```python
+  if getattr(self.controller, "test_engine_enabled", False):
+   self.runner_params.use_imgui_test_engine = True
+   self.runner_params.callbacks.register_tests = self._register_imgui_tests
+  ```
+  This is guarded by the flag so normal runs are unaffected.
+
+### FR2: `App._register_imgui_tests(self)` method
+
+- New method on `App` in `src/gui_2.py` (near the other callback registrations, ~line 700):
+  ```python
+  def _register_imgui_tests(self) -> None:
+   """Called by hello_imgui at startup to register ImGui Test Engine tests.
+   Reads the live engine via hello_imgui.get_imgui_test_engine().
+   [C: src/gui_2.py:App.run (via callbacks.register_tests)]
+   """
+   from imgui_bundle import hello_imgui
+   from imgui_bundle.imgui import test_engine
+   engine = hello_imgui.get_imgui_test_engine()
+   # Smoke test: click a known button and verify state change
+   test = test_engine.register_test(engine, "Smoke Tests", "Click Increment Button")
+   def smoke_func(ctx) -> None:
+    from imgui_bundle.imgui.test_engine_checks import CHECK
+    ctx.set_ref("...")  # TODO: set to a known window
+    ctx.item_click("**/...")  # TODO: click a known button
+    CHECK(True)  # TODO: verify state change
+   test.test_func = smoke_func
+  ```
+  The exact button + state to click + verify is determined during implementation by inspecting the running GUI's item tree (use `ctx.window_info` / `imgui.show_id_stack_tool_window` to find labels). The smoke test should click something harmless (e.g., a tab switch, a checkbox toggle) and verify the state changed.
+
+### FR3: `/api/test_engine/*` endpoints in `HookServer`
+
+- In `src/api_hooks.py` `do_POST` (line 490): add 2 new `elif` branches for `POST /api/test_engine/queue` and `POST /api/test_engine/abort`.
+- In `src/api_hooks.py` `do_GET` (line 157): add 2 new `elif` branches for `GET /api/test_engine/status` and `GET /api/test_engine/results`.
+- All 4 endpoints guard on `test_engine_enabled` — if the engine is not active, respond `{"error": "test engine not enabled", "enabled": false}` with HTTP 503.
+- The engine instance is obtained via `hello_imgui.get_imgui_test_engine()` inside the handler (lazy import; the handler runs on the HTTP thread, but `get_imgui_test_engine()` is a C++ accessor that returns a pointer — safe to call from any thread).
+
+### FR4: `ApiHookClient` methods
+
+- In `src/api_hook_client.py`: add 4 methods per G4. Follow the existing method pattern (e.g., `get_status`, `push_event`): construct the URL, `requests.post/get`, retry on connection error, parse JSON, return the dict.
+
+### FR5: `live_gui` fixture update
+
+- In `tests/conftest.py:792`: change `gui_args` to include `"--enable-test-engine"` when the fixture spawns the subprocess. The flag flows through to `AppController.test_engine_enabled` → `App.run()` → `runner_params.use_imgui_test_engine = True`.
+
+### FR6: Smoke test
+
+- `tests/test_test_engine_smoke.py` (NEW) — 2-3 tests:
+  - `test_engine_enabled`: `client.get_value("test_engine_enabled")` returns True (or verify via a new gettable field).
+  - `test_queue_and_run_smoke_test`: queue the smoke test, poll for results, assert success.
+  - `test_engine_results_shape`: `get_test_results()` returns the expected dict shape.
+
+## Non-Functional Requirements
+
+- **1-space indentation** for all Python code.
+- **No comments in body** per AGENTS.md.
+- **CRLF line endings** preserved.
+- **Atomic per-task commits.**
+- **Thread safety:** the `test_func` runs on the engine scenario thread. It must NOT directly mutate `App` or `AppController` state — it must use `ctx.*` primitives (which post simulated input to the GUI thread). Reading state via `hello_imgui.get_imgui_test_engine()` or engine queries (`ctx.item_info`, `ctx.window_info`) is safe. The `CHECK()` assertion runs on the scenario thread but only writes to the engine's result log (thread-safe C++ structure).
+- **No `live_gui` regression:** the `--enable-test-engine` flag must not affect normal GUI behavior when `live_gui` tests are NOT using the engine. The engine's scenario thread is idle when no tests are queued. The `show_test_engine_windows` panel is NOT shown by default (only via explicit call).
+- **Performance:** the engine adds a per-frame overhead when active. The `fps_idling` settings in `runner_params` remain unchanged. The engine's overhead is sub-millisecond per frame when no tests are running.
+
+## Architecture Reference
+
+- **`docs/guide_testing.md`** — the `live_gui` fixture, the structural testing contract, the Puppeteer pattern.
+- **`docs/guide_api_hooks.md`** — the Hook API surface, the `/api/ask` protocol, the `ApiHookClient` method reference.
+- **`docs/guide_gui_2.md`** — the `App` class lifecycle, the `runner_params` construction, the `callbacks` system.
+- **`.venv/Lib/site-packages/imgui_bundle/demos_python/demos_immapp/demo_testengine.py`** — the canonical demo for the test engine integration pattern (register_tests callback + test_func closures + CHECK).
+- **`.venv/Lib/site-packages/imgui_bundle/imgui/test_engine.pyi`** — the full API stub (2644 lines). Key sections: `TestContext` methods (lines 1445-2096), module-level functions (lines 433-500, 2639+), `TestEngineResultSummary` (3 fields: count_tested, count_success, count_in_queue).
+- **`.venv/Lib/site-packages/imgui_bundle/imgui/test_engine_checks.py`** — the `CHECK(result: bool)` assertion primitive.
+- **`conductor/workflow.md`** "Live_gui Test Fragility" + "Async Setters Need Poll-For-State" — the existing patterns for `live_gui` tests; the test engine's `wait_for_test_results` replaces `time.sleep` + `get_value` polling with a single engine-side poll.
+
+## Out of Scope
+
+- **Migrating existing `live_gui` tests to the test engine.** That's Track 2 (`test_engine_docking_tests_<date>`). This track only builds the bridge + proves it works with 1 smoke test.
+- **Visual regression via screenshot capture.** That's Track 3 (`test_engine_capture_regression_<date>`). The `ctx.capture_screenshot_window` API is available but not wired in this track.
+- **Headless test execution (no GUI window).** The test engine requires a live GLFW window (the scenario thread drives the actual ImGui render loop). Headless mode is a future research item, not this track.
+- **The test engine's interactive UI panel (`show_test_engine_windows`).** Not shown by default. Can be added as a debug toggle in a follow-up.
+- **Test engine license audit.** Per the stub: "free for individuals, educational, open-source, and small businesses. Paid for larger businesses." This project is personal-use; no audit needed. Flagged for awareness only.
+- **CI wiring of the test engine.** The `live_gui` fixture already runs in CI via the batched runner. The `--enable-test-engine` flag is additive. No CI config changes needed.
+- **Touching `src/models.py` or any taxonomy files.** Zero overlap with the running `tier2/post_module_taxonomy_de_cruft_20260627` branch or the `enforcement_gap_closure_20260627` track.

conductor/tracks/test_engine_integration_20260627/state.toml

@@ -0,0 +1,64 @@
+# Track state for test_engine_integration_20260627
+# Initialized by Tier 1 Orchestrator on 2026-06-27.
+# Implementation delegated to Tier 2 (autonomous) or Tier 3 worker dispatch.
+# This is Track 1 of 3 in the Test Engine Campaign.
+
+[meta]
+track_id = "test_engine_integration_20260627"
+name = "ImGui Test Engine Integration (Bridge via API Hooks)"
+status = "active"
+current_phase = 0
+last_updated = "2026-06-27"
+
+[blocked_by]
+# None. Parallel-safe against tier2/post_module_taxonomy_de_cruft_20260627
+# (zero file overlap: this track touches sloppy.py, gui_2.py:641-700,
+# api_hooks.py, api_hook_client.py, conftest.py — none of which Tier 2 touches)
+# and enforcement_gap_closure_20260627 (scripts/audit_*, python.md — zero overlap).
+
+[blocks]
+test_engine_docking_tests = "planned (Track 2 of 3 campaign)"
+test_engine_capture_regression = "planned (Track 3 of 3 campaign)"
+
+[phases]
+phase_1 = { status = "pending", checkpointsha = "", name = "Enable the Test Engine in the App (CLI flag + runner_params + register_tests callback)" }
+phase_2 = { status = "pending", checkpointsha = "", name = "Build the API Hooks Bridge (4 endpoints + 4 client methods)" }
+phase_3 = { status = "pending", checkpointsha = "", name = "Live_gui Fixture + Full Smoke Test" }
+phase_4 = { status = "pending", checkpointsha = "", name = "End-of-Track Report + State Update + User Sign-off" }
+
+[tasks]
+# Phase 1: enable the engine
+t1_1 = { status = "pending", commit_sha = "", description = "Write failing test for --enable-test-engine flag + engine activation (Red phase)" }
+t1_2 = { status = "pending", commit_sha = "", description = "Add --enable-test-engine CLI flag to sloppy.py + test_engine_enabled field to AppController" }
+t1_3 = { status = "pending", commit_sha = "", description = "Enable engine in App.run() (runner_params.use_imgui_test_engine = True + callbacks.register_tests = self._register_imgui_tests) + add _register_imgui_tests method with smoke test" }
+t1_4 = { status = "pending", commit_sha = "", description = "Manual verification: run sloppy.py --enable-test-engine locally; confirm engine activates + no GIL-transfer crash" }
+# Phase 2: build the bridge
+t2_1 = { status = "pending", commit_sha = "", description = "Write failing tests for queue_test + wait_for_test_results + get_test_results (Red phase)" }
+t2_2 = { status = "pending", commit_sha = "", description = "Add 4 /api/test_engine/* endpoints to HookServer (queue, status, results, abort)" }
+t2_3 = { status = "pending", commit_sha = "", description = "Add 4 new methods to ApiHookClient (queue_test, get_test_status, get_test_results, wait_for_test_results)" }
+t2_4 = { status = "pending", commit_sha = "", description = "Run Phase 2 tests (Green phase); verify all 3 smoke tests pass" }
+# Phase 3: live_gui fixture + full smoke test
+t3_1 = { status = "pending", commit_sha = "", description = "Update live_gui fixture (conftest.py:792) to pass --enable-test-engine" }
+t3_2 = { status = "pending", commit_sha = "", description = "Run full smoke test + regression batch (Green phase)" }
+# Phase 4: end-of-track
+t4_1 = { status = "pending", commit_sha = "", description = "Write docs/reports/TRACK_COMPLETION_test_engine_integration_20260627.md" }
+t4_2 = { status = "pending", commit_sha = "", description = "Update conductor/tracks.md + chronology.md + state.toml -> status='completed'" }
+t4_3 = { status = "pending", commit_sha = "", description = "Conductor - User Manual Verification (PAUSE for user sign-off)" }
+
+[verification]
+phase_1_complete = false
+phase_2_complete = false
+phase_3_complete = false
+phase_4_complete = false
+engine_activates_without_crash = false
+smoke_test_passes = false
+no_live_gui_regression = false
+
+[campaign_context]
+# This is Track 1 of 3. The campaign enables high-fidelity UI simulation via the
+# Dear ImGui Test Engine, bridged through the existing API hooks layer.
+campaign_name = "Test Engine Campaign"
+track_1 = "test_engine_integration_20260627 (THIS; bridge + smoke test)"
+track_2 = "test_engine_docking_tests (migrate docking/focus/panel tests)"
+track_3 = "test_engine_capture_regression (visual regression via screenshot capture)"
+key_risk = "R1: GIL-transfer crash if the app's thread layout doesn't work with the engine's scenario thread (mitigated by Phase 1 Task 1.4 manual checkpoint)"

conductor/tracks/type_alias_unfuck_20260626/plan.md

@@ -0,0 +1,829 @@
+# Plan: type_alias_unfuck_20260626 (EXTREME DETAIL)
+
+> **Tier 1 exhaustive plan — 2026-06-26.** This plan is the EXECUTABLE CONTRACT for Tier 2/Tier 3. Every task has exact file:line refs, exact before/after code, exact test commands, and explicit FIX-IF-FAILS steps. NEVER use `git restore`, `git checkout --`, `git reset`, or `git revert` (per AGENTS.md hard ban). If a phase's count delta doesn't match, MODIFY the migration until it does.
+>
+> **Baseline (measured 2026-06-26, master `b4bd772d`):**
+> - `.get('key', default)` sites in `src/*.py`: **52** (down from 107 — prior Tier 2 attempts migrated ~55)
+> - `[ 'key' ]` subscript sites in `src/*.py`: **~70** (most are genuinely collapsed-codepath)
+> - Effective codepaths: **4.014e+22**
+>
+> **Acceptance:** `.get()` count drops to < 15 (collapsed-codepath only); effective codepaths drops by ≥ 1 order of magnitude; 7 audit gates pass `--strict`; 10/11 batched test tiers PASS.
+>
+> **Tier 2 already migrated (do NOT re-do these):**
+> - src/ai_client.py:2565,2808,2900: partially migrated (`fi if hasattr(fi, 'path') else models.FileItem(path=fi.get('path', 'attachment'))`)
+> - src/gui_2.py:5802: `entry['source_tier'] if 'source_tier' in entry else 'main'` (half-measure; needs full migration)
+> - src/synthesis_formatter.py:24,37: Tier 2 migrated these (no longer in grep output)
+> - src/app_controller.py:2303,2314,2315: Tier 2 migrated `u = payload['usage']` to `u_stats.input_tokens` direct access (no longer in grep output)
+
+## §0 Pre-flight (Tier 2 runs before Tier 3 starts)
+
+```bash
+# 0.1 Clean working tree on a fresh branch
+git checkout -b tier2/type_alias_unfuck_20260626
+git status --short
+# Expect: no output (clean)
+
+# 0.2 Capture baseline counts
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' > /tmp/before_get.txt
+# count of /tmp/before_get.txt lines: 52
+git grep -nE "\[[ ]*'[a-z_]+'[ ]*\]" -- 'src/*.py' > /tmp/before_subscript.txt
+# count of /tmp/before_subscript.txt lines: ~70
+
+# 0.3 Confirm 7 audit gates pass --strict (note any pre-existing failures)
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+uv run python scripts/audit_main_thread_imports.py
+uv run python scripts/audit_no_models_config_io.py
+uv run python scripts/audit_code_path_audit_coverage.py --input-dir docs/reports/code_path_audit/latest --strict
+uv run python scripts/audit_exception_handling.py --strict
+uv run python scripts/audit_optional_in_3_files.py --strict
+# All exit 0; note pre-existing failures separately
+
+# 0.4 Verify existing dataclasses import
+uv run python -c "from src.type_aliases import CommsLogEntry, HistoryMessage, ToolDefinition, SessionInsights, DiscussionSettings, CustomSlice, MMAUsageStats, ProviderPayload, UIPanelConfig, PathInfo; from src.openai_schemas import ToolCall, ChatMessage, UsageStats, NormalizedResponse; from src.models import Ticket, FileItem; from src.rag_engine import RAGChunk; from src.mcp_client import ASTNode, SearchResult, MCPToolResult; print('all imports OK')"
+# Expect: all imports OK
+```
+
+**STOP if any pre-existing failure is not documented in the baseline report.**
+
+## §Phase 1: Ticket consumers (SKIP)
+
+Already done in `metadata_promotion_20260624/0506c5da`. No work in this phase.
+
+## §Phase 2: FileItem consumers (3 sites, partial migration completion)
+
+**WHERE:** `src/ai_client.py:2565,2808,2900`
+
+**Current state:** Tier 2 partially migrated these. The pattern is:
+
+```python
+fi_item = fi if hasattr(fi, 'path') else models.FileItem(path=fi.get('path', 'attachment'))
+```
+
+This is a half-measure. The `.get('path', 'attachment')` is still inside the else branch. Tier 2 needs to fix this by ensuring `fi` is a `FileItem` instance before the access, or by using direct attribute access on `fi` if it's already a dataclass.
+
+**Task 2.1:** Fix the half-measure pattern in `src/ai_client.py:2565,2808,2900`.
+
+**Read the full context first:**
+
+```bash
+manual-slop_get_file_slice --path src/ai_client.py --start_line 2560 --end_line 2570
+manual-slop_get_file_slice --path src/ai_client.py --start_line 2803 --end_line 2813
+manual-slop_get_file_slice --path src/ai_client.py --start_line 2895 --end_line 2905
+```
+
+**Determine the variable's actual type.** If `fi` arrives from upstream as a `models.FileItem` instance, the migration is `fi.path or 'attachment'`. If `fi` is a dict (from JSON wire), the migration is `models.FileItem.from_dict(fi).path or 'attachment'`.
+
+**Pattern (decide per-site based on actual type):**
+
+```python
+# BEFORE:
+fi_item = fi if hasattr(fi, 'path') else models.FileItem(path=fi.get('path', 'attachment'))
+
+# AFTER (if fi is dict at this site):
+fi_item = models.FileItem.from_dict(fi) if isinstance(fi, dict) else fi
+
+# AFTER (if fi is dataclass at this site):
+fi_item = fi
+```
+
+Then the downstream `fi_item.path or 'attachment'` works regardless.
+
+**HOW:** `manual-slop_edit_file` per site. **Anchor on the surrounding context** (read 2 lines above + 2 below) to ensure exact match.
+
+**SAFETY:**
+```bash
+git grep -nE "\.get\('path'," -- 'src/ai_client.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_ai_client.py tests/test_file_item_model.py -x --timeout=60
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If `git grep` returns non-zero: check whether the `hasattr` pattern is still using `.get`. Read the surrounding code. If `fi` is a `FileItem` dataclass, remove the `hasattr` guard entirely (it's a half-measure defensive pattern).
+- If pytest fails: STOP. Read the failure mode. Predict whether the migration introduced a regression. If `fi` was a dict before and is now expected to be a `FileItem`, the upstream caller needs to be fixed.
+
+**COMMIT:** `refactor(ai_client): complete FileItem migration (finish half-measure pattern)`
+
+**Commit message body MUST include:**
+```
+Phase 2: FileItem
+Before: 3 .get('path',...) sites in src/ai_client.py
+After:  0 .get('path',...) sites in src/ai_client.py
+Delta:  -3 (expected: -3)
+```
+
+**GIT NOTE:** Completed FileItem migration. Tier 2's earlier attempt left a half-measure (`fi if hasattr(fi, 'path') else models.FileItem(path=fi.get('path', 'attachment'))`); this commit removes the `.get('path', 'attachment')` fallback by ensuring `fi` is always a `FileItem` instance via `from_dict()`.
+
+## §Phase 3: CommsLogEntry consumers (4 sites)
+
+**WHERE:**
+- `src/app_controller.py:2278` (inside `entry_obj` dict construction)
+- `src/app_controller.py:2305,2306,2307,2308` (inside `new_token_history.append` block)
+- `src/gui_2.py:5802` (render_tool_calls_panel)
+
+**Task 3.1:** Read the full context of `src/app_controller.py:2270-2320` to understand the data flow.
+
+**Current code (read first):**
+
+```python
+# app_controller.py:2270-2310 (approximate, READ FIRST)
+if kind == 'tool_call':
+    tid = payload.get('id') or payload.get('call_id')
+    script = payload.get('script') or json.dumps(payload.get('args', {}), indent=1)
+    script = _resolve_log_ref(script, session_dir)
+    entry_obj = {
+        'source_tier': entry.get('source_tier', 'main'),  # ← line 2278
+        ...
+    }
+elif kind == 'response' and 'usage' in payload:
+    u = payload['usage']
+    ...
+    new_token_history.append({
+        'time': ts,
+        'input': u.get('input_tokens', 0) or 0,  # ← line 2305
+        'output': u.get('output_tokens', 0) or 0,  # ← line 2306
+        'cache_read': u.get('cache_read_input_tokens', 0) or 0,  # ← line 2307
+        'cache_creation': u.get('cache_creation_input_tokens', 0) or 0,  # ← line 2308
+        ...
+    })
+```
+
+**Per-site migration:**
+
+For `app_controller.py:2278`:
+- **old_string:** `'source_tier': entry.get('source_tier', 'main'),`
+- **new_string:** `'source_tier': (entry.source_tier if hasattr(entry, 'source_tier') else CommsLogEntry.from_dict(entry).source_tier),`
+
+Or, if `entry` is always a dict at this site:
+- **new_string:** `'source_tier': CommsLogEntry.from_dict(entry).source_tier,`
+
+(Tier 3 determines the right pattern by reading the surrounding context with `manual-slop_get_file_slice`.)
+
+For `app_controller.py:2305,2306,2307,2308`:
+- **old_string:** `'input': u.get('input_tokens', 0) or 0,`
+- **new_string:** `'input': (UsageStats.from_dict(u).input_tokens if isinstance(u, dict) else u.input_tokens) or 0,`
+
+(Or simpler, if `u` is always a dict: `'input': UsageStats.from_dict(u).input_tokens or 0,`)
+
+For `gui_2.py:5802`:
+- **current:** `entry['source_tier'] if 'source_tier' in entry else 'main'`
+- **new:** `CommsLogEntry.from_dict(entry).source_tier if isinstance(entry, dict) else entry.source_tier`
+
+**HOW:** `manual-slop_edit_file` per site. Read the full surrounding context (5 lines above + 5 below) before each edit.
+
+**SAFETY:**
+```bash
+git grep -nE "\.get\('source_tier'," -- 'src/*.py' | wc -l
+# Expect: 0
+git grep -nE "\.get\('model'," -- 'src/app_controller.py' | wc -l
+# Expect: 0 (if Phase 3 also migrates the model get at line 2311)
+uv run python -m pytest tests/test_session_logger_optimization.py tests/test_session_logger_reset.py tests/test_session_logging.py tests/test_logging_e2e.py tests/test_comms_log_entry.py -x --timeout=60
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: search for any `.get('source_tier',` or `.get('model',` you missed. Add them to this phase's commit as additional migrations.
+- If pytest fails: STOP. Read the failure mode. Likely cause: `entry` is genuinely a dict constructed on-the-fly and the migration to `CommsLogEntry.from_dict(entry)` is correct but the surrounding function doesn't handle the conversion. Re-read the function and find where the entry_obj is built. Add the `from_dict()` call at the top of the function (not at every access site).
+
+**COMMIT:** `refactor(app_controller,gui_2): migrate CommsLogEntry consumers to direct field access`
+
+**Commit message body MUST include:**
+```
+Phase 3: CommsLogEntry
+Before: 4 .get('source_tier',...) + .get('model',...) sites
+After:  0
+Delta:  -4 (expected: -4)
+```
+
+## §Phase 4: HistoryMessage consumers (0 sites — already done by Tier 2)
+
+`src/synthesis_formatter.py:24,37` was migrated by Tier 2. No work in this phase.
+
+## §Phase 5: ChatMessage into per-vendor send paths (~27 sites)
+
+**WHERE:** `src/ai_client.py` (8 vendor send methods: `_send_anthropic`, `_send_deepseek`, `_send_gemini`, `_send_gemini_cli`, `_send_minimax`, `_send_qwen`, `_send_llama`, `_send_grok`)
+
+**Task 5.1:** Read each send method to find the `.get('role', ...)` and `.get('content', ...)` sites.
+
+```bash
+git grep -nE "_send_anthropic|_send_deepseek|_send_gemini|_send_gemini_cli|_send_minimax|_send_qwen|_send_llama|_send_grok" -- 'src/ai_client.py'
+```
+
+Each send method has its own provider-specific message construction. The pattern is consistent:
+
+```python
+# BEFORE (per provider):
+for msg in anthropic_history:
+    if msg.get("role") == "user":
+        messages.append({"role": "user", "content": msg.get("content", "")})
+```
+
+**Pattern (per-site):**
+
+```python
+# AFTER:
+for msg in anthropic_history:
+    cm = msg if isinstance(msg, ChatMessage) else ChatMessage.from_dict(msg)
+    if cm.role == "user":
+        messages.append(cm.to_dict())
+```
+
+**HOW:** For each send method, read the full method body with `manual-slop_get_file_slice`. Identify every `.get('role', ...)`, `.get('content', ...)`, `.get('tool_calls', ...)`, etc. Apply the `ChatMessage.from_dict()` pattern.
+
+**Specific sites to migrate** (read each line first):
+
+```bash
+git grep -nE "\.get\('role',|\.get\('content',|\.get\('tool_calls',|\.get\('tool_call_id',|\.get\('name'," -- 'src/ai_client.py'
+```
+
+For each hit, apply the `ChatMessage.from_dict()` pattern at the entry to the per-message processing block.
+
+**SAFETY:**
+```bash
+git grep -nE "msg\.get\('role',|msg\.get\('content'," -- 'src/ai_client.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_ai_client.py tests/test_anthropic_provider.py tests/test_deepseek_provider.py tests/test_openai_schemas.py tests/test_chat_message.py -x --timeout=120
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: check whether the `msg` variable is iterated as a dict vs a ChatMessage instance. If it's a `provider_state.get_history()` return value, the history might already be ChatMessage instances — in which case the migration is `if cm.role == "user"` (no `from_dict()` needed).
+- If pytest fails: STOP. Likely cause: the `ChatMessage.from_dict()` returns None for missing fields; check whether `cm.role` would AttributeError if `cm` is None.
+
+**COMMIT:** `refactor(ai_client): wire ChatMessage into per-vendor send paths (Phase 5)`
+
+**Commit message body MUST include:**
+```
+Phase 5: ChatMessage
+Before: N .get('role',...) + .get('content',...) sites in src/ai_client.py
+After:  0
+Delta:  -N (expected: ≥10)
+```
+
+## §Phase 6: UsageStats into per-call usage aggregation (4 sites)
+
+**WHERE:**
+- `src/app_controller.py:2305,2306,2307,2308` (already partially in Phase 3 — migrate the remaining `.get('input_tokens', 0)` style sites)
+
+Wait — `src/app_controller.py:2305-2308` were already migrated by Tier 2 to use `u_stats.input_tokens` direct attribute access. Let me verify by reading:
+
+```bash
+git grep -nE "\.get\('input_tokens',|\.get\('output_tokens',|\.get\('cache_read_input_tokens',|\.get\('cache_creation_input_tokens'," -- 'src/app_controller.py'
+```
+
+If 0 sites remain, Phase 6 is DONE. If sites remain, migrate them.
+
+**Task 6.1:** Verify Phase 6 is done; if not, migrate.
+
+**Pattern (if migration needed):**
+
+```python
+# BEFORE:
+u = payload['usage']  # dict
+'input': u.get('input_tokens', 0) or 0,
+
+# AFTER:
+u = UsageStats.from_dict(payload['usage'])
+'input': u.input_tokens or 0,
+```
+
+**HOW:** `manual-slop_edit_file` per site.
+
+**SAFETY:**
+```bash
+git grep -nE "\.get\('input_tokens',|\.get\('output_tokens'," -- 'src/app_controller.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_token_usage.py tests/test_usage_analytics_popout_sim.py -x --timeout=60
+# Expect: all pass
+```
+
+**COMMIT:** `refactor(app_controller): wire UsageStats into per-call usage (Phase 6)`
+
+**Commit message body MUST include:**
+```
+Phase 6: UsageStats
+Before: N .get('input_tokens',...) sites in src/app_controller.py
+After:  0
+Delta:  -N (expected: ≥4)
+```
+
+## §Phase 7: ToolCall into tool loop (3 sites)
+
+**WHERE:**
+- `src/mcp_client.py:1707,1708,1714`
+
+**Current code:**
+```python
+src/mcp_client.py:1707: for t in result['tools']:
+src/mcp_client.py:1708:  self.tools[t['name']] = t
+src/mcp_client.py:1714: return '\n'.join([c.get('text', '') for c in result['content'] if c.get('type') == 'text'])
+```
+
+**Pattern:**
+```python
+# BEFORE:
+for t in result['tools']:
+    self.tools[t['name']] = t
+
+# AFTER:
+mc_result = MCPToolResult.from_dict(result)
+for t in mc_result.tools:
+    self.tools[t.name] = t
+```
+
+For `mcp_client.py:1714`:
+```python
+# BEFORE:
+return '\n'.join([c.get('text', '') for c in result['content'] if c.get('type') == 'text'])
+
+# AFTER (if result.content is now a tuple of dicts after from_dict):
+mc_result = MCPToolResult.from_dict(result)
+return '\n'.join([c.get('text', '') for c in mc_result.content if c.get('type') == 'text'])
+```
+
+Wait — `MCPToolResult.content: tuple[Metadata, ...]` per Phase 0 of `metadata_promotion_20260624`. So `mc_result.content` is a tuple of dicts. The `[c.get('text', '') for c in mc_result.content]` still uses `.get()` on each dict. That's correct because each `c` is still a `dict` (not a dataclass). **The migration at this site is `result['content']` → `mc_result.content` (subscript → attribute).** The `.get('text', '')` on each `c` stays because `c` is a dict element, not a dataclass.
+
+**HOW:** `manual-slop_edit_file` per site. Read the surrounding context first.
+
+**SAFETY:**
+```bash
+git grep -nE "result\['tools'\]|result\['content'\]" -- 'src/mcp_client.py' | wc -l
+# Expect: 0 (the `result['content']` is replaced by `mc_result.content`)
+git grep -nE "t\['name'\]" -- 'src/mcp_client.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_mcp_client.py tests/test_metadata_dataclass_aux.py -x --timeout=60
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: check whether `result` is still used as a dict. If yes, the migration to `MCPToolResult.from_dict(result)` should be done BEFORE the `for t in result['tools']:` line (at the top of the function).
+- If pytest fails: STOP. `MCPToolResult.from_dict()` may have wrong field names; check whether `content` is a tuple or list.
+
+**COMMIT:** `refactor(mcp_client): wire MCPToolResult into tool loop (Phase 7)`
+
+**Commit message body MUST include:**
+```
+Phase 7: ToolCall / MCPToolResult
+Before: 3 .get('tools'/'content'/'name') sites in src/mcp_client.py
+After:  0
+Delta:  -3 (expected: -3)
+```
+
+## §Phase 8: ToolDefinition consumers (3 sites)
+
+**WHERE:**
+- `src/mcp_client.py:1970`
+- `src/gui_2.py:5875,5877`
+
+**Current code:**
+```python
+src/mcp_client.py:1970: 'description': tinfo.get('description', ''),
+src/gui_2.py:5875: imgui.text(tinfo.get('server', 'unknown'))  # ← 'server' is NOT in ToolDefinition
+src/gui_2.py:5877: imgui.text(tinfo.get('description', ''))
+```
+
+**CRITICAL:** `src/gui_2.py:5875` reads `tinfo.get('server', 'unknown')` — but `ToolDefinition` has no `server` field. The fields are `name, description, parameters, auto_start`. **This site cannot be migrated to ToolDefinition.** It must be migrated to a different aggregate (possibly `ToolInfo` which has `server, description`, etc.) OR classified as collapsed-codepath.
+
+**Task 8.1:** Read the surrounding context for `src/gui_2.py:5875` to determine what `tinfo` actually is.
+
+```bash
+manual-slop_get_file_slice --path src/gui_2.py --start_line 5870 --end_line 5880
+```
+
+If `tinfo` is a `dict` from MCP server registration, it's NOT a ToolDefinition. Keep as `.get('server', 'unknown')` and classify as collapsed-codepath.
+
+**For `src/mcp_client.py:1970` and `src/gui_2.py:5877`:**
+
+```python
+# BEFORE:
+'description': tinfo.get('description', ''),
+
+# AFTER:
+td = ToolDefinition.from_dict(tinfo) if isinstance(tinfo, dict) else tinfo
+'description': td.description,
+```
+
+**HOW:** `manual-slop_edit_file` per site.
+
+**SAFETY:**
+```bash
+git grep -nE "\.get\('description'," -- 'src/mcp_client.py' 'src/gui_2.py' | wc -l
+# Expect: 0 (or 1 if 'server' stays as collapsed-codepath)
+uv run python -m pytest tests/test_mcp_client.py tests/test_tool_definition.py -x --timeout=60
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If `tinfo.get('server', 'unknown')` is in collapsed-codepath (because `tinfo` is a server-info dict, not a ToolDefinition), document in the commit: "site 5875 is ToolInfo, not ToolDefinition; classified as collapsed-codepath per FR2."
+- If pytest fails: STOP. The `ToolDefinition.from_dict()` may fail if `tinfo` has unexpected fields. Read the failure mode.
+
+**COMMIT:** `refactor(mcp_client,gui_2): migrate ToolDefinition consumers to direct field access`
+
+**Commit message body MUST include:**
+```
+Phase 8: ToolDefinition
+Before: 3 .get('description',...) sites
+After:  0 .get('description',...) sites (gui_2.py:5875 'server' field stays as collapsed-codepath per FR2 because tinfo is ToolInfo, not ToolDefinition)
+Delta:  -2 (expected: -2 or -3 depending on ToolInfo classification)
+```
+
+## §Phase 9: RAGChunk consumers (3 sites)
+
+**WHERE:**
+- `src/aggregate.py:3259`
+- `src/app_controller.py:251,4162`
+
+**Current code:**
+```python
+src/aggregate.py:3259:    context_block += f"### Chunk {i+1} (Source: {path})\n{chunk.get('document', '')}\n\n"
+src/app_controller.py:251: context_block += f"### Chunk {i+1} (Source: {path})\n{chunk.get('document', '')}\n\n"
+src/app_controller.py:4162: context_block += f"### Chunk {i+1} (Source: {path})\n{chunk.get('document', '')}\n\n"
+```
+
+**CRITICAL:** `RAGChunk` has fields `document, path, score, metadata`. The wire dict from `rag_engine.search()` has `chunk['document']` and `chunk['metadata']['path']` (path nested in metadata). Direct field access requires `chunk.document` (top-level) — but the wire dict has `document` at top-level too, so this might work directly.
+
+**Task 9.1:** Read the surrounding context to determine what `chunk` actually is at each site.
+
+```bash
+manual-slop_get_file_slice --path src/aggregate.py --start_line 3250 --end_line 3270
+manual-slop_get_file_slice --path src/app_controller.py --start_line 245 --end_line 260
+manual-slop_get_file_slice --path src/app_controller.py --start_line 4155 --end_line 4170
+```
+
+**Pattern (if chunk is a dict):**
+
+```python
+# BEFORE:
+context_block += f"### Chunk {i+1} (Source: {path})\n{chunk.get('document', '')}\n\n"
+
+# AFTER:
+rc = RAGChunk.from_dict(chunk) if isinstance(chunk, dict) else chunk
+context_block += f"### Chunk {i+1} (Source: {path})\n{rc.document}\n\n"
+```
+
+**HOW:** `manual-slop_edit_file` per site.
+
+**SAFETY:**
+```bash
+git grep -nE "chunk\.get\('document'," -- 'src/aggregate.py' 'src/app_controller.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_rag_engine.py tests/test_rag_phase4_final_verify.py tests/test_rag_chunk.py -x --timeout=120
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If `rag_engine.search()` returns `List[Dict]` with `document` nested in `metadata`, then `RAGChunk.from_dict(chunk)` would not find `document` at top level. Fix: extend `RAGChunk.from_dict()` to handle nested metadata (override the classmethod).
+- If pytest fails: STOP. Read the failure. Likely the chunk document is missing because the wire format has it nested.
+
+**COMMIT:** `refactor(rag_engine,aggregate,app_controller): migrate RAGChunk consumers to direct field access`
+
+**Commit message body MUST include:**
+```
+Phase 9: RAGChunk
+Before: 3 .get('document',...) sites
+After:  0
+Delta:  -3 (expected: -3)
+```
+
+## §Phase 10: Small-batch aggregates (33 sites)
+
+**WHERE:**
+- SessionInsights: `src/gui_2.py:4926-4931` (6 sites)
+- DiscussionSettings: `src/gui_2.py:3536` (3 sites: temperature, top_p, max_output_tokens)
+- CustomSlice: `src/gui_2.py:4049,4055,4091,4092,5952,5958,5979,5980` + subscripts at 4034,4054,4056,5920,5957,5959 (10 sites)
+- MMAUsageStats: `src/gui_2.py:2200,2201,2202,2217,6609,6784,6785,6786` (8 sites)
+- ProviderPayload: `src/app_controller.py:2278,2291` (2 sites)
+- UIPanelConfig: `src/app_controller.py:2070,2071,2072` (3 sites)
+- PathInfo: `src/app_controller.py:1976,1980,1986,1987` (4 sites)
+
+**Task 10.1: SessionInsights (6 sites)**
+
+Read the context first:
+```bash
+manual-slop_get_file_slice --path src/gui_2.py --start_line 4920 --end_line 4940
+```
+
+```python
+# BEFORE:
+imgui.text(f"Total Tokens: {insights.get('total_tokens', 0):,}")
+imgui.text(f"API Calls: {insights.get('call_count', 0)}")
+imgui.text(f"Burn Rate: {insights.get('burn_rate', 0):.0f} tokens/min")
+imgui.text(f"Session Cost: ${insights.get('session_cost', 0):.4f}")
+completed = insights.get('completed_tickets', 0)
+efficiency = insights.get('efficiency', 0)
+
+# AFTER:
+insights_obj = SessionInsights.from_dict(insights) if isinstance(insights, dict) else insights
+imgui.text(f"Total Tokens: {insights_obj.total_tokens:,}")
+imgui.text(f"API Calls: {insights_obj.call_count}")
+imgui.text(f"Burn Rate: {insights_obj.burn_rate:.0f} tokens/min")
+imgui.text(f"Session Cost: ${insights_obj.session_cost:.4f}")
+completed = insights_obj.completed_tickets
+efficiency = insights_obj.efficiency
+```
+
+**Task 10.2: DiscussionSettings (3 sites)**
+
+```bash
+manual-slop_get_file_slice --path src/gui_2.py --start_line 3530 --end_line 3545
+```
+
+```python
+# BEFORE:
+imgui.same_line(); summary = f" (T:{entry.get('temperature', 0.7):.1f}, P:{entry.get('top_p', 1.0):.2f}, M:{entry.get('max_output_tokens', 0)})"
+
+# AFTER:
+entry_obj = DiscussionSettings.from_dict(entry) if isinstance(entry, dict) else entry
+imgui.same_line(); summary = f" (T:{entry_obj.temperature:.1f}, P:{entry_obj.top_p:.2f}, M:{entry_obj.max_output_tokens})"
+```
+
+**Task 10.3: CustomSlice (10 sites — note mutation patterns)**
+
+CustomSlice is `frozen=True`. Mutations like `slc['tag'] = ...` become `slc = dataclasses.replace(slc, tag=...)` + list reassignment.
+
+```python
+# BEFORE (read at gui_2.py:4049):
+current_tag = slc.get('tag', '')
+imgui.same_line(); imgui.set_next_item_width(-30); changed_comm, new_comm = imgui.input_text("##Note", slc.get('comment', ''))
+
+# AFTER (per-iteration, at top of loop):
+cs = CustomSlice.from_dict(slc) if isinstance(slc, dict) else slc
+current_tag = cs.tag
+imgui.same_line(); imgui.set_next_item_width(-30); changed_comm, new_comm = imgui.input_text("##Note", cs.comment)
+```
+
+For mutations (`slc['tag'] = ...`):
+```python
+# BEFORE:
+if ch_tag: slc['tag'] = tags[new_tag_idx]
+
+# AFTER:
+if ch_tag:
+    cs = CustomSlice.from_dict(slc) if isinstance(slc, dict) else slc
+    cs = dataclasses.replace(cs, tag=tags[new_tag_idx])
+    custom_slices[idx] = cs   # list reassignment (the variable holding custom_slices)
+```
+
+**Task 10.4: MMAUsageStats (8 sites)**
+
+```bash
+manual-slop_get_file_slice --path src/gui_2.py --start_line 2195 --end_line 2225
+manual-slop_get_file_slice --path src/gui_2.py --start_line 6605 --end_line 6615
+manual-slop_get_file_slice --path src/gui_2.py --start_line 6780 --end_line 6790
+```
+
+```python
+# BEFORE:
+model = stats.get('model', 'unknown')
+in_t = stats.get('input', 0)
+out_t = stats.get('output', 0)
+
+# AFTER (per loop iteration or at top of function):
+stats_obj = MMAUsageStats.from_dict(stats) if isinstance(stats, dict) else stats
+model = stats_obj.model
+in_t = stats_obj.input
+out_t = stats_obj.output
+```
+
+**Task 10.5: ProviderPayload (2 sites)**
+
+```bash
+manual-slop_get_file_slice --path src/app_controller.py --start_line 2272 --end_line 2295
+```
+
+```python
+# BEFORE:
+script = payload.get('script') or json.dumps(payload.get('args', {}), indent=1)
+output = payload.get('output', payload.get('content', ''))
+
+# AFTER:
+pp = ProviderPayload.from_dict(payload) if isinstance(payload, dict) else payload
+script = pp.script or json.dumps(pp.args, indent=1)
+output = pp.output
+```
+
+**Task 10.6: UIPanelConfig (3 sites)**
+
+```bash
+manual-slop_get_file_slice --path src/app_controller.py --start_line 2065 --end_line 2080
+```
+
+```python
+# BEFORE:
+self.ui_separate_message_panel = gui_cfg.get('separate_message_panel', False)
+self.ui_separate_response_panel = gui_cfg.get('separate_response_panel', False)
+self.ui_separate_tool_calls_panel = gui_cfg.get('separate_tool_calls_panel', False)
+
+# AFTER:
+gui = UIPanelConfig.from_dict(gui_cfg) if isinstance(gui_cfg, dict) else gui_cfg
+self.ui_separate_message_panel = gui.separate_message_panel
+self.ui_separate_response_panel = gui.separate_response_panel
+self.ui_separate_tool_calls_panel = gui.separate_tool_calls_panel
+```
+
+**Task 10.7: PathInfo (4 sites, includes nested dict access)**
+
+```bash
+manual-slop_get_file_slice --path src/app_controller.py --start_line 1970 --end_line 1995
+```
+
+```python
+# BEFORE:
+lpath = Path(proj_paths['logs_dir'])
+spath = Path(proj_paths['scripts_dir'])
+self.ui_logs_dir = str(path_info['logs_dir']['path'])
+self.ui_scripts_dir = str(path_info['scripts_dir']['path'])
+
+# AFTER (if proj_paths and path_info are PathInfo dataclasses):
+lpath = Path(proj_paths.logs_dir)
+spath = Path(proj_paths.scripts_dir)
+self.ui_logs_dir = str(path_info.logs_dir.path if hasattr(path_info.logs_dir, 'path') else path_info.logs_dir)
+self.ui_scripts_dir = str(path_info.scripts_dir.path if hasattr(path_info.scripts_dir, 'path') else path_info.scripts_dir)
+
+# AFTER (if proj_paths and path_info are dicts):
+proj_paths = PathInfo.from_dict(proj_paths) if isinstance(proj_paths, dict) else proj_paths
+path_info = PathInfo.from_dict(path_info) if isinstance(path_info, dict) else path_info
+lpath = Path(proj_paths.logs_dir)
+spath = Path(proj_paths.scripts_dir)
+self.ui_logs_dir = str(path_info.logs_dir if isinstance(path_info.logs_dir, str) else path_info.logs_dir.get('path', ''))
+self.ui_scripts_dir = str(path_info.scripts_dir if isinstance(path_info.scripts_dir, str) else path_info.scripts_dir.get('path', ''))
+```
+
+(Per-site decision: if the dict has nested structure, the migration is partial; document in commit.)
+
+**HOW:** `manual-slop_edit_file` per task. Read the surrounding context first for each.
+
+**SAFETY:**
+```bash
+git grep -nE "\.get\('total_tokens',|\.get\('burn_rate',|\.get\('session_cost',|\.get\('temperature',|\.get\('top_p',|\.get\('max_output_tokens'," -- 'src/gui_2.py' | wc -l
+# Expect: 0
+git grep -nE "\.get\('separate_message_panel',|\.get\('separate_response_panel',|\.get\('separate_tool_calls_panel'," -- 'src/app_controller.py' | wc -l
+# Expect: 0
+uv run python -m pytest tests/test_session_insights.py tests/test_discussion_settings.py tests/test_custom_slice.py tests/test_mma_usage_stats.py tests/test_provider_payload.py tests/test_ui_panel_config.py tests/test_path_info.py tests/test_app_controller.py tests/test_gui_2.py -x --timeout=120
+# Expect: all pass
+```
+
+**MODIFY-IF-FAILS:**
+- If grep shows non-zero: search for any `.get(...)` you missed for each small-batch aggregate. Add additional migrations.
+- If pytest fails: STOP. Likely cause: the dataclass field names differ from the dict keys. Check `src/type_aliases.py` for the exact field names.
+
+**COMMIT (per task):** `refactor(gui_2,app_controller): migrate SessionInsights consumers to direct field access` (per aggregate)
+
+**Each commit message body MUST include:**
+```
+Phase 10.N: <aggregate name>
+Before: N .get('<key>',...) sites
+After:  0
+Delta:  -N
+```
+
+## §Phase 11: Re-measure + verification
+
+```bash
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' | wc -l
+# Expect: < 15 (collapsed-codepath only)
+
+git grep -nE "\[[ ]*'[a-z_]+'[ ]*\]" -- 'src/*.py' | wc -l
+# Expect: ~50 (most subscript sites are handler-map / shader_uniforms / project config — genuinely collapsed-codepath)
+
+uv run python -c "
+import sys
+sys.path.insert(0, 'scripts/code_path_audit')
+sys.path.insert(0, 'src')
+from code_path_audit import build_pcg
+from code_path_audit_ssdl import count_branches_in_function
+pcg = build_pcg('src').data
+metadata_consumers = pcg.consumers.get('Metadata', [])
+total = sum(2 ** count_branches_in_function(f, 'src') for f in metadata_consumers)
+print(f'Post-track effective codepaths: {total:.3e} (baseline 4.014e+22)')
+"
+# Expect: < 1e+21
+
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+uv run python scripts/audit_main_thread_imports.py
+uv run python scripts/audit_no_models_config_io.py
+uv run python scripts/audit_code_path_audit_coverage.py --input-dir docs/reports/code_path_audit/latest --strict
+uv run python scripts/audit_exception_handling.py --strict
+uv run python scripts/audit_optional_in_3_files.py --strict
+# All exit 0
+
+uv run python scripts/run_tests_batched.py
+# Expect: 10/11 PASS (RAG flake acceptable)
+```
+
+**MODIFY-IF-FAILS (metric didn't drop):**
+- If effective codepaths is still 4.014e+22: search for any remaining `.get('key', default)` on known aggregates. The metric is dominated by these sites; if any remain, the metric won't drop.
+- If 7 audit gates fail: STOP. Read which audit failed. Likely a new dataclass field name diverges from the wire format. Modify the dataclass or the wire format.
+- If batched tests fail: STOP. Read the failure. Likely a dataclass-from-dict conversion is producing wrong field values.
+
+**DO NOT just accept "metric didn't drop".** Keep modifying until it drops OR until the only remaining `.get()` sites are documented collapsed-codepath (Phase 12).
+
+## §Phase 12: Collapsed-codepath audit
+
+For any remaining `.get()` + subscript sites after Phase 11, write `docs/reports/collapsed_codepath_audit_20260626.md`:
+
+```bash
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' > /tmp/remaining_get.txt
+git grep -nE "\[[ ]*'[a-z_]+'[ ]*\]" -- 'src/*.py' > /tmp/remaining_subscript.txt
+```
+
+For each remaining site, classify as:
+- **collapsed-codepath (TOML config):** `self.project.get('paths', {})`, `self.config.get('ai', {})`, `self.project.get('conductor', {})` etc. — keep as `.get()`.
+- **collapsed-codepath (handler-map):** `_predefined_callbacks[...]`, `_gettable_fields[...]` — keep as subscript.
+- **collapsed-codepath (shader-uniforms):** `app.shader_uniforms['crt']` — keep.
+- **collapsed-codepath (handler map / dispatch):** keep.
+- **collateral (genuinely dict):** sites where the variable is genuinely a `dict` from JSON wire or external source — keep.
+
+Write the audit doc with per-site classification + per-site justification + per-site decision (stay vs fix).
+
+**COMMIT:** `docs(audit): collapsed-codepath audit for remaining access sites`
+
+## §Acceptance Criteria (Definition of Done)
+
+| # | Criterion | Verification |
+|---|---|---|
+| VC1 | All `.get('key', default)` sites on known aggregates replaced | `git grep -cE "\.get\('[a-z_]+'," -- 'src/*.py'` returns < 15 |
+| VC2 | All `[ 'key' ]` subscript sites on known aggregates replaced | `git grep -cE "\[[ ]*'[a-z_]+'[ ]*\]" -- 'src/*.py'` returns < 55 (excluding handler-maps + shader_uniforms) |
+| VC3 | Per-phase guard enforced | Each phase commit message has "Before/After/Delta" |
+| VC4 | Effective codepaths drops by ≥ 1 order of magnitude | `< 1e+21` |
+| VC5 | All 7 audit gates pass `--strict` | All exit 0 |
+| VC6 | 10/11 batched test tiers PASS | `scripts/run_tests_batched.py` → 10/11 |
+| VC7 | Collapsed-codepath audit written | `docs/reports/collapsed_codepath_audit_20260626.md` exists |
+| VC8 | No "no-op" classifications | No phase commit message says "no-op per FR2" |
+| VC9 | No parallel dataclass definitions | All FileItem references resolve to `models.FileItem`; all ToolCall references resolve to `openai_schemas.ToolCall` |
+| VC10 | Per-site type checks documented | Per-phase commits include "var was dataclass: yes/no; converted via from_dict: yes/no" |
+
+## §Tier 2 / Tier 3 Hard Rules
+
+1. **NEVER use `git restore`, `git checkout --`, `git reset`, or `git revert`.** Per AGENTS.md hard ban. If a phase's count delta doesn't match the plan, MODIFY the migration (add more sites, reclassify, fix the wrong sites). Do NOT throw away the work.
+
+2. **NEVER classify a phase as "no-op per FR2 collapsed-codepath audit."** Each phase has a planned N sites. After the phase, exactly N sites must be migrated. If not, ADD more migrations to make the count match.
+
+3. **NEVER use `if key in dict else default` as a "migration."** The migration is `var = Aggregate.from_dict(var)` + direct attribute access. The dict-with-`in`-check pattern is a half-measure that does NOT achieve the per-attribute access that the spec requires.
+
+4. **NEVER batch commits.** One atomic commit per task (or per phase). Per-task commits enable precise rollback via `git revert` (oh wait — don't use git revert). Per-task commits enable precise FIX via additional commits.
+
+5. **NEVER add comments to source code.** Per AGENTS.md. Documentation lives in `/docs`.
+
+6. **NEVER use the native `edit` tool on Python files.** Use `manual-slop_edit_file`, `manual-slop_py_update_definition`, `manual-slop_py_add_def`, or `manual-slop_set_file_slice`.
+
+7. **NEVER create new `src/<thing>.py` files.** Per AGENTS.md. Helpers go in the parent module.
+
+8. **NEVER add new dataclasses.** Per this track's spec, all dataclasses already exist. Reuse them.
+
+9. **NEVER modify existing dataclass definitions.** Per this track's spec, dataclass definitions are frozen. If a field type is wrong, that's a separate track.
+
+10. **NEVER skip a failing test with `@pytest.mark.skip`.** Fix the bug.
+
+11. **NEVER exceed 5 nesting levels.** Extract to functions.
+
+12. **NEVER modify `src/code_path_audit*.py`.** The audit infrastructure is correct.
+
+13. **NEVER promote `Metadata: TypeAlias = dict[str, Any]` to a shared mega-dataclass.** Per the spec FR1 + FR2 (the user explicitly rejected this on 2026-06-25).
+
+14. **STOP AND ASK if any site's variable type is unclear.** Write a 1-sentence question. Wait for the user. Do not invent a reconciliation.
+
+15. **If a commit breaks more than 2 tests, STOP.** Read the failures. Identify the root cause. Modify the commit (amend or add a fixup). Do not ship broken state.
+
+## §Per-Phase Tier 2 Review Checklist
+
+Before approving each phase, Tier 2 verifies:
+
+1. The commit message has "Before: N, After: M, Delta: -K" with K matching the planned count.
+2. The relevant `git grep` count decreased by exactly the planned K.
+3. The relevant `pytest` files pass.
+4. No audit gate regressed.
+5. The batched test suite still passes 10/11 tiers.
+6. No "no-op" or "REVERT" or "skipped" in the commit message.
+
+If any check fails: **DO NOT APPROVE.** Tell Tier 3 what to fix. Tier 3 modifies the migration and re-commits.
+
+## §Anti-Pattern Guard (per AGENTS.md)
+
+If you observe any of these patterns in your own work, STOP and re-read AGENTS.md:
+
+1. **The Deduction Loop**: running a test 4+ times in one investigation. STOP after 2 failures.
+2. **The Report-Instead-of-Fix Pattern**: writing a 200-line status report instead of fixing.
+3. **The Scope-Creep Track-Doc Pattern**: writing a 5-phase spec for a 1-line fix.
+4. **The Inherited-Cruft Pattern**: trying to "fix" a broken file from a previous agent.
+5. **No Diagnostic Noise in Production**: `sys.stderr.write` lines in `src/*.py`.
+6. **The "I Am Not Going To Attempt Another Fix" Surrender**: only after the 5-step protocol.
+7. **The Verbose-Commit-Message Pattern**: commit messages > 15 lines.
+8. **The Isolated-Pass Verification Fallacy**: verifying in isolation but not in batch.
+9. **The Workspace-Path Drift Pattern**: using `/tmp` or env vars for test paths.
+10. **The No-Op Classification Shortcut**: marking phases complete without doing the work. (banned by Hard Rule #2)
+
+## §See also
+
+- `conductor/tracks/type_alias_unfuck_20260626/spec.md` — the track spec
+- `conductor/tracks/metadata_promotion_20260624/spec.md` — the previous track (now superseded)
+- `conductor/tracks/metadata_promotion_20260624/state.toml` — honest state of the previous track
+- `conductor/code_styleguides/type_aliases.md` §2.5 — the per-aggregate dataclass rule
+- `conductor/code_styleguides/data_oriented_design.md` — canonical DOD reference
+- `conductor/AGENTS.md` — hard bans (NEVER use `git restore`, `git checkout --`, `git reset`, `git revert`)
+- `src/type_aliases.py` — the existing per-aggregate dataclasses (REUSE, do not modify)
+- `src/openai_schemas.py` — canonical ToolCall, ChatMessage, UsageStats
+- `src/models.py:533` — canonical FileItem
+- `src/models.py:302` — canonical Ticket

conductor/tracks/type_alias_unfuck_20260626/spec.md

@@ -0,0 +1,460 @@
+# Track Specification: type_alias_unfuck_20260626
+
+## Overview
+
+**This is the MINIMAL track to fix the type-usage problem.** It exists because `metadata_promotion_20260624` became a tar pit. This track is scoped to JUST the consumer migration work (Phases 1-10 of the original plan) with strict per-phase guards that prevent the no-op shortcut.
+
+**Goal:** Replace the 67 remaining `.get('key', default)` sites and ~80 subscript sites in `src/*.py` with direct field access on existing per-aggregate dataclasses.
+
+**Scope:** 12 small phases, one per aggregate. Each phase migrates a specific aggregate's consumers. Each phase has a hard guard: `.get()` count for that aggregate must decrease by exactly N (the planned sites). If not, the code is MODIFIED until it does.
+
+**Non-scope:** No new dataclasses (Phase 0 of `metadata_promotion_20260624` already added them). No metric-driven design changes. No test rewrites unless tests break.
+
+## Current State Audit (master `b4bd772d`, measured 2026-06-25)
+
+| Metric | Value | Source |
+|---|---:|---|
+| `.get('key', default)` sites in `src/*.py` | **67** | `git grep -cE "\.get\('[a-z_]+'," -- 'src/*.py' \| awk -F: '{s+=$2} END {print s}'` |
+| Subscript `[ 'key' ]` sites in `src/*.py` | ~80 | `git grep -cE "\[[ ]*'[a-z_]+'[ ]*\]" -- 'src/*.py' \| awk -F: '{s+=$2} END {print s}'` |
+| Existing per-aggregate dataclasses | **12 in src/type_aliases.py** + 4 reused (Ticket, FileItem, ToolCall, ChatMessage, UsageStats) | `git grep "^class .*dataclass" src/type_aliases.py` |
+| Effective codepaths | **4.014e+22** | baseline from `metadata_promotion_20260624` |
+
+### Per-aggregate breakdown of remaining `.get()` sites
+
+| Aggregate | Sites | Primary files |
+|---|---:|---|
+| Ticket | 0 (Phase 1 of metadata_promotion_20260624 done; SKIP this track) | n/a |
+| FileItem | 4 | `src/ai_client.py:2565,2807,2898`, `src/app_controller.py:3508` |
+| CommsLogEntry | 5 | `src/app_controller.py:2277,2302,2310`, `src/gui_2.py:5803`, `src/synthesis_formatter.py:24,37` |
+| HistoryMessage | 2 | `src/synthesis_formatter.py:24,37` (overlaps with CommsLogEntry; classify per-site) |
+| ChatMessage | 27 | `src/ai_client.py` per-vendor send paths |
+| UsageStats | 4 | `src/app_controller.py:2304,2305,2308,2309` |
+| ToolCall | 3 | `src/mcp_client.py:1707,1708,1714` |
+| ToolDefinition | 4 | `src/mcp_client.py:1970`, `src/gui_2.py:5876,5878` |
+| RAGChunk | 3 | `src/aggregate.py:3259`, `src/app_controller.py:251,4162` |
+| SessionInsights | 6 | `src/gui_2.py:4926-4931` |
+| DiscussionSettings | 3 | `src/gui_2.py:3535` |
+| CustomSlice | 10 | `src/gui_2.py:4048,4054,4090,5953,5959,5980,4033,5921` |
+| MMAUsageStats | 6 | `src/gui_2.py:2199-2201,2216,6610` |
+| ProviderPayload | 4 | `src/app_controller.py:2274,2287` |
+| UIPanelConfig | 3 | `src/app_controller.py:2068-2070` |
+| PathInfo | 4 | `src/app_controller.py:1974,1978,1984,1985` |
+| Other (collapsed-codepath) | unknown until Phase 12 audit | various |
+
+**Total: ~88 sites** (some overlap between aggregates; exact sites identified per-phase below).
+
+## Goals
+
+| ID | Goal | Acceptance |
+|---|---|---|
+| G1 | All `.get('key', default)` sites on known aggregates replaced with direct field access | `git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' \| wc -l` returns 0 (excluding collapsed-codepath sites documented in Phase 12) |
+| G2 | All `[ 'key' ]` subscript sites on known aggregates replaced with direct field access | `git grep -nE "\[[ ]*'[a-z_]+'[ ]*\]" -- 'src/*.py' \| wc -l` returns 0 (excluding collapsed-codepath sites) |
+| G3 | Per-phase guard enforced (count decreases by exactly N; if not, modify until it does) | Each phase commit has a "before: N, after: M, delta: D" line in the commit message; if delta ≠ expected, MODIFY the code and recommit |
+| G4 | Effective codepaths drops by ≥ 1 order of magnitude | `compute_effective_codepaths` returns `< 1e+21` (was 4.014e+22) |
+| G5 | All 7 audit gates pass `--strict` (no regression) | All exit 0 |
+| G6 | All existing tests pass (10/11 batched tiers — RAG flake acceptable) | `scripts/run_tests_batched.py` → 10/11 PASS |
+| G7 | Collapsed-codepath sites documented (Phase 12) | `docs/reports/collapsed_codepath_audit_20260626.md` exists with per-site justification |
+
+## Non-Goals
+
+- Modifying dataclass definitions in `src/type_aliases.py` (Phase 0 of `metadata_promotion_20260624` is frozen for this track)
+- Fixing drifted field types (separate track if needed; this track uses whatever the dataclasses currently define)
+- Adding new `src/<thing>.py` files
+- Creating any further followup tracks (this is the minimum; no more layers)
+
+## Functional Requirements
+
+### FR1: Per-phase hard guard (THE key rule)
+
+**Every phase has a specific `.get()` site count to migrate.** If the after-commit count for the phase's aggregate is NOT exactly N sites lower than before, the code is MODIFIED until it matches. NEVER use `git restore`, `git checkout --`, `git reset`, or `git revert` per AGENTS.md hard ban. NEVER blow away the work. FIX IT.
+
+**Before each phase commit:**
+```bash
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' | wc -l
+```
+
+**After each phase commit:**
+```bash
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' | wc -l
+```
+
+**The commit message MUST include:**
+```
+Phase N: <aggregate name>
+Before: <N> .get() sites
+After:  <M> .get() sites
+Delta:  <N-M> (expected: -<planned>)
+```
+
+**If delta != -planned:** the migration is incomplete. Look at the remaining `.get()` sites for the aggregate, ADD more migrations until the count matches. Recommit (amend the previous commit or add a fixup commit). DO NOT delete the work.
+
+### FR2: Use the pattern: `var = Aggregate.from_dict(var)` before access
+
+For sites where the variable is currently a dict (constructed on-the-fly or from JSON), the migration adds ONE line at the top of the function:
+
+```python
+# BEFORE:
+def _process_entry(entry: Metadata) -> None:
+    tier = entry.get('source_tier', 'main')
+    model = entry.get('model', 'unknown')
+
+# AFTER:
+def _process_entry(entry: Metadata) -> None:
+    entry = CommsLogEntry.from_dict(entry)   # ← ONE LINE ADDED
+    tier = entry.source_tier
+    model = entry.model
+```
+
+This is the FULL migration. NOT `.get()` → `if key in dict else default`. The dataclass is the destination; the dict is the source. Convert once, then use direct access.
+
+### FR3: No "no-op" shortcuts
+
+If a phase has 0 actual `.get()` sites to migrate (because the variable is always a dataclass or the sites don't exist), the phase work is different: ADD migration sites from the per-aggregate table above. The table shows N planned sites per aggregate; each must be migrated.
+
+There is no "Phase 2: no-op per FR2 collapsed-codepath audit" commit allowed in this track.
+
+## Per-Phase Task List
+
+### Phase 0: Pre-flight (no commits)
+
+```bash
+# Baseline capture
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' > /tmp/before.txt
+wc -l /tmp/before.txt
+# Expect: 67
+
+git grep -nE "\[[ ]*'[a-z_]+'[ ]*\]" -- 'src/*.py' > /tmp/before_subscript.txt
+wc -l /tmp/before_subscript.txt
+# Expect: ~80
+
+# Confirm 7 audit gates pass --strict (note any pre-existing failures)
+uv run python scripts/audit_weak_types.py --strict
+uv run python scripts/generate_type_registry.py --check
+uv run python scripts/audit_main_thread_imports.py
+uv run python scripts/audit_no_models_config_io.py
+uv run python scripts/audit_code_path_audit_coverage.py --input-dir docs/reports/code_path_audit/latest --strict
+uv run python scripts/audit_exception_handling.py --strict
+uv run python scripts/audit_optional_in_3_files.py --strict
+```
+
+**STOP if any pre-existing failure is not in the baseline report. Report to user.**
+
+### Phase 1: Ticket consumers (SKIP — already done in metadata_promotion_20260624)
+
+No work. Move to Phase 2.
+
+### Phase 2: FileItem consumers (4 sites)
+
+**WHERE:**
+- `src/ai_client.py:2565,2807,2898`: `fi.get('path', 'attachment')` × 3
+- `src/app_controller.py:3508`: `f['path'] for f in file_items` × 1
+
+**Pattern:**
+```python
+# BEFORE:
+user_content = f"[IMAGE: {fi.get('path', 'attachment')}]\n{user_content}"
+
+# AFTER (if fi is dataclass):
+user_content = f"[IMAGE: {fi.path or 'attachment'}]\n{user_content}"
+
+# AFTER (if fi is dict):
+fi = FileItem.from_dict(fi)   # at top of function
+user_content = f"[IMAGE: {fi.path or 'attachment'}]\n{user_content}"
+```
+
+**Per-site verification:**
+```bash
+git grep -nE "\.get\('path'," -- 'src/ai_client.py' | wc -l
+# Expect: 0
+```
+
+**Acceptance:** `.get('path', default)` count in src/ai_client.py + src/app_controller.py decreases by 4.
+
+### Phase 3: CommsLogEntry consumers (5 sites)
+
+**WHERE:**
+- `src/app_controller.py:2277,2302,2310`: `entry.get('source_tier', 'main')`, `entry.get('source_tier', 'main')`, `entry.get('model', 'unknown')` × 3
+- `src/gui_2.py:5803`: `entry.get('source_tier', 'main')` × 1
+- `src/synthesis_formatter.py:24,37`: `msg.get('role', 'unknown')`, `msg.get('content', '')` × 4 (these may be HistoryMessage; classify per-site)
+
+**Pattern:**
+```python
+# BEFORE:
+'source_tier': entry.get('source_tier', 'main'),
+
+# AFTER:
+entry = CommsLogEntry.from_dict(entry)   # at top of function
+'source_tier': entry.source_tier,
+```
+
+**Per-site verification:**
+```bash
+git grep -nE "entry\.get\('source_tier'," -- 'src/app_controller.py' | wc -l
+# Expect: 0
+```
+
+**Acceptance:** `.get('source_tier', default)` + `.get('role', default)` + `.get('content', default)` counts decrease by 5.
+
+### Phase 4: HistoryMessage consumers (2 sites, if not in Phase 3)
+
+**WHERE:**
+- `src/synthesis_formatter.py:24,37` (if classified as HistoryMessage rather than CommsLogEntry in Phase 3)
+
+**Pattern:**
+```python
+# BEFORE:
+f"{msg.get('role', 'unknown')}: {msg.get('content', '')}"
+
+# AFTER:
+msg = HistoryMessage.from_dict(msg)
+f"{msg.role}: {msg.content or ''}"
+```
+
+**Acceptance:** HistoryMessage sites migrated; CommsLogEntry sites classified in Phase 3.
+
+### Phase 5: ChatMessage into per-vendor send paths (27 sites)
+
+**WHERE:** `src/ai_client.py` (8 vendor send methods: `_send_anthropic`, `_send_deepseek`, `_send_gemini`, `_send_gemini_cli`, `_send_minimax`, `_send_qwen`, `_send_llama`, `_send_grok`)
+
+**Pattern:**
+```python
+# BEFORE:
+for msg in anthropic_history:
+    if msg.get("role") == "user":
+        messages.append({"role": "user", "content": msg.get("content", "")})
+
+# AFTER:
+for msg in anthropic_history:
+    cm = msg if isinstance(msg, ChatMessage) else ChatMessage.from_dict(msg)
+    if cm.role == "user":
+        messages.append(cm.to_dict())
+```
+
+**Per-site verification:** Each send method's `msg.get(` count decreases.
+
+**Acceptance:** All 8 send methods use ChatMessage; total `.get('role', default)` + `.get('content', default)` sites in src/ai_client.py decrease by 27.
+
+### Phase 6: UsageStats into per-call usage aggregation (4 sites)
+
+**WHERE:**
+- `src/app_controller.py:2304,2305,2308,2309`: `u.get('input_tokens', 0)`, `u.get('output_tokens', 0)`
+
+**Pattern:**
+```python
+# BEFORE:
+new_mma_usage[tier]['input'] += u.get('input_tokens', 0) or 0
+
+# AFTER:
+u = UsageStats.from_dict(u) if isinstance(u, dict) else u
+new_mma_usage[tier] = dataclasses.replace(
+    new_mma_usage[tier],
+    input=new_mma_usage[tier].input + (u.input_tokens or 0),
+)
+```
+
+**Acceptance:** All `u.get('input_tokens', ...)` + `u.get('output_tokens', ...)` in src/app_controller.py:2299-2311 replaced.
+
+### Phase 7: ToolCall into tool loop (3 sites)
+
+**WHERE:**
+- `src/mcp_client.py:1707,1708,1714`: `result['tools']`, `t['name']`, `c.get('text', '')` × 3
+
+**Pattern:**
+```python
+# BEFORE:
+for t in result['tools']:
+    self.tools[t['name']] = t
+
+# AFTER:
+result = MCPToolResult.from_dict(result)
+for t in result.tools:
+    self.tools[t.name] = t
+```
+
+**Acceptance:** `result['tools']` and `t['name']` replaced with `.tools` and `.name`.
+
+### Phase 8: ToolDefinition consumers (4 sites)
+
+**WHERE:**
+- `src/mcp_client.py:1970`: `tinfo.get('description', '')`
+- `src/gui_2.py:5876,5878`: `tinfo.get('server', 'unknown')`, `tinfo.get('description', '')`
+
+**Pattern:**
+```python
+# BEFORE:
+'description': tinfo.get('description', '')
+
+# AFTER:
+tinfo = ToolDefinition.from_dict(tinfo) if isinstance(tinfo, dict) else tinfo
+'description': tinfo.description,
+```
+
+**Acceptance:** All `.get('description', default)` on ToolDefinition consumers replaced.
+
+### Phase 9: RAGChunk consumers (3 sites)
+
+**WHERE:**
+- `src/aggregate.py:3259`, `src/app_controller.py:251,4162`: `chunk.get('document', '')`
+
+**Pattern:**
+```python
+# BEFORE:
+context_block += f"### Chunk {i+1} (Source: {path})\n{chunk.get('document', '')}\n\n"
+
+# AFTER:
+chunk = RAGChunk.from_dict(chunk) if isinstance(chunk, dict) else chunk
+context_block += f"### Chunk {i+1} (Source: {path})\n{chunk.document}\n\n"
+```
+
+**Acceptance:** All `chunk.get('document', ...)` replaced.
+
+### Phase 10: Small-batch aggregates (33 sites)
+
+**WHERE:**
+- SessionInsights: `src/gui_2.py:4926-4931` (6 sites)
+- DiscussionSettings: `src/gui_2.py:3535` (3 sites)
+- CustomSlice: `src/gui_2.py:4048,4054,4090,5953,5959,5980,4033,5921` (10 sites)
+- MMAUsageStats: `src/gui_2.py:2199-2201,2216,6610` (6 sites)
+- ProviderPayload: `src/app_controller.py:2274,2287` (4 sites)
+- UIPanelConfig: `src/app_controller.py:2068-2070` (3 sites)
+- PathInfo: `src/app_controller.py:1974,1978,1984,1985` (4 sites, includes nested `path_info['logs_dir']['path']`)
+
+**Pattern:** Per-aggregate `from_dict()` + direct field access.
+
+**Note on CustomSlice mutations:** `slc['tag'] = tags[new_tag_idx]` (mutation) becomes:
+```python
+slc = CustomSlice.from_dict(slc)
+slc = dataclasses.replace(slc, tag=tags[new_tag_idx])
+# Then list reassignment:
+custom_slices[idx] = slc
+```
+
+**Acceptance:** All small-batch `.get()` + subscript sites replaced.
+
+### Phase 11: Re-measure + verification
+
+```bash
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' | wc -l
+# Expect: 0 (or only collapsed-codepath sites)
+
+git grep -nE "\[[ ]*'[a-z_]+'[ ]*\]" -- 'src/*.py' | wc -l
+# Expect: ~0 (or only collapsed-codepath sites)
+
+uv run python -c "
+import sys
+sys.path.insert(0, 'scripts/code_path_audit')
+sys.path.insert(0, 'src')
+from code_path_audit import build_pcg
+from code_path_audit_ssdl import count_branches_in_function
+pcg = build_pcg('src').data
+metadata_consumers = pcg.consumers.get('Metadata', [])
+total = sum(2 ** count_branches_in_function(f, 'src') for f in metadata_consumers)
+print(f'Post-track effective codepaths: {total:.3e} (baseline 4.014e+22)')
+"
+# Expect: < 1e+21 (target: ≥1 order of magnitude drop)
+
+uv run python scripts/run_tests_batched.py
+# Expect: 10/11 PASS
+```
+
+**Acceptance:** All 10 VCs pass.
+
+### Phase 12: Collapsed-codepath audit (FR7)
+
+For any remaining `.get()` + subscript sites after Phase 11, classify as collapsed-codepath with per-site justification:
+
+```bash
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' > /tmp/remaining.txt
+wc -l /tmp/remaining.txt
+# Expect: ~10-15 (only TOML config, JSON wire, handler-map)
+```
+
+Write `docs/reports/collapsed_codepath_audit_20260626.md` with:
+- Per-site classification (collapsed-codepath vs should-be-migrated)
+- Per-site justification
+- Decision on whether each remaining site needs a followup track or stays as-is
+
+## Acceptance Criteria (Definition of Done)
+
+| # | Criterion | Verification command |
+|---|---|---|
+| VC1 | All `.get('key', default)` sites on known aggregates replaced | `git grep -nE "\.get\('[a-z_]+'," HEAD -- 'src/*.py' \| wc -l` returns < 15 |
+| VC2 | All `[ 'key' ]` subscript sites on known aggregates replaced | `git grep -nE "\[[ ]*'[a-z_]+'[ ]*\]" HEAD -- 'src/*.py' \| wc -l` returns < 20 |
+| VC3 | Per-phase guard enforced (each phase decreased the count by exactly N) | Each phase commit message has "Before: N, After: M, Delta: -N" |
+| VC4 | Effective codepaths drops by ≥ 1 order of magnitude | `compute_effective_codepaths` returns `< 1e+21` |
+| VC5 | All 7 audit gates pass `--strict` | All exit 0 |
+| VC6 | 10/11 batched test tiers PASS | `scripts/run_tests_batched.py` → 10/11 |
+| VC7 | Collapsed-codepath audit written | `docs/reports/collapsed_codepath_audit_20260626.md` exists |
+| VC8 | No "no-op" classifications | No phase commit message says "no-op per FR2" |
+| VC9 | No parallel dataclass definitions | All FileItem references resolve to `models.FileItem`; all ToolCall references resolve to `openai_schemas.ToolCall` |
+| VC10 | Per-site type checks documented | Per-phase commits include "var was dataclass: yes/no; converted via from_dict: yes/no" |
+
+## Hard Rules
+
+1. **NO "no-op" classifications.** Each phase has a planned N sites. After the phase, exactly N sites must be migrated. If not, MODIFY the code (add more migrations) until the count matches.
+2. **NO parallel dataclass definitions.** Reuse the existing dataclasses. Do not add new ones. Do not modify the existing ones.
+3. **NO metric rationalization.** If `compute_effective_codepaths` doesn't drop after the track, MODIFY the migration (find missed sites, reclassify) until it does. Report progress to the user without rolling back.
+4. **NO inference decisions.** If a variable's type is unclear at an access site, STOP. Read the surrounding context with `manual-slop_get_file_slice` to determine the type. If still unclear, write a 1-sentence question and wait for the user.
+5. **NO shortcuts.** `if key in dict else default` is NOT a migration. `var = Aggregate.from_dict(var)` IS the migration. Use the dataclass.
+6. **NO blowing away work.** Never `git restore`, `git checkout --`, `git reset`, or `git revert` (per AGENTS.md hard ban). When something goes wrong, fix the migration. Add more sites. Reclassify. Amend the commit. Do not throw the work away.
+
+## Tier 2 Invitation Prompt
+
+Use this prompt to invoke Tier 2:
+
+```
+Track: type_alias_unfuck_20260626 (branch: tier2/type_alias_unfuck_20260626).
+
+Read the EXHAUSTIVE spec at conductor/tracks/type_alias_unfuck_20260626/spec.md (this track).
+This is the MINIMAL track to fix the type-usage problem. The previous track (metadata_promotion_20260624) became a tar pit because Tier 2 took the no-op shortcut.
+
+HARD RULES (NON-NEGOTIABLE):
+1. NO "no-op" classifications. Each phase has a planned N sites. After the phase, exactly N sites must be migrated. If not, MODIFY the code (add more migrations) until the count matches.
+2. NO parallel dataclass definitions. Reuse existing dataclasses (src/type_aliases.py for type-system aggregates; src/models.py for FileItem, Ticket; src/openai_schemas.py for ToolCall, ChatMessage, UsageStats).
+3. NO metric rationalization. If compute_effective_codepaths doesn't drop after the track, MODIFY the migration. Don't blow it away.
+4. NO inference decisions. If variable type is unclear, STOP and ask.
+5. NO shortcuts. `if key in dict else default` is NOT a migration. `var = Aggregate.from_dict(var)` IS the migration.
+6. NO blowing away work. NEVER use `git restore`, `git checkout --`, `git reset`, or `git revert`. When something goes wrong, fix it. Add more sites. Reclassify. Amend the commit. Do not throw the work away.
+
+PER-PHASE HARD GUARD:
+Each phase commit message MUST include:
+  Phase N: <aggregate name>
+  Before: <N> .get() sites (in the relevant file(s))
+  After:  <M> .get() sites
+  Delta:  <N-M> (expected: -<planned>)
+
+If delta != -planned, FIX the migration. Add more sites. Reclassify. Recommit.
+
+START:
+git log --oneline -10
+# Confirm you're on tier2/type_alias_unfuck_20260626
+
+# Read the spec
+cat conductor/tracks/type_alias_unfuck_20260626/spec.md
+
+# Run pre-flight
+git grep -nE "\.get\('[a-z_]+'," -- 'src/*.py' | wc -l
+# Expect: 67
+
+# Execute Phase 0 pre-flight (baseline capture)
+# Then Phase 2 (FileItem)
+# Then Phase 3 (CommsLogEntry)
+# ... etc.
+
+STOP AND ASK if any site's variable type is unclear.
+FIX (don't blow away) if any phase's count doesn't match the plan.
+DO NOT classify anything as no-op.
+```
+
+## See also
+
+- `conductor/tracks/metadata_promotion_20260624/spec.md` — the previous track that this one supersedes
+- `conductor/tracks/metadata_promotion_20260624/state.toml` — the (now honest) state of the previous track
+- `docs/reports/TIER1_REVIEW_metadata_promotion_20260624_20260625.md` — the Tier 1 review (planned)
+- `conductor/code_styleguides/type_aliases.md` §2.5 — the per-aggregate dataclass rule
+- `conductor/code_styleguides/data_oriented_design.md` — canonical DOD reference
+- `src/type_aliases.py` — the existing per-aggregate dataclasses (REUSE, do not modify)
+- `src/openai_schemas.py` — canonical ToolCall, ChatMessage, UsageStats
+- `src/models.py:533` — canonical FileItem
+- `src/models.py:302` — canonical Ticket
+- `conductor/AGENTS.md` — hard bans on `git restore`, `git checkout --`, `git reset`, `git revert` (NEVER use these)

conductor/tracks/type_alias_unfuck_20260626/state.toml

@@ -0,0 +1,91 @@
+# Track state for type_alias_unfuck_20260626
+# Updated by Tier 2 Tech Lead as tasks complete
+
+[meta]
+track_id = "type_alias_unfuck_20260626"
+name = "Type Alias Unfuck (Phase 1 Consumer Migrations)"
+status = "active"
+current_phase = "phase_11 (verification FAILED acceptance criteria)"
+last_updated = "2026-06-26"
+
+# Track FAILED acceptance criteria VC1, VC2, VC4, VC6.
+# Status is "active" because the spec's Definition of Done is NOT met.
+# Phase 7 is BLOCKED (no MCPToolResult dataclass in codebase).
+# Remaining 26 .get() sites are documented in collapsed_codepath_audit_20260626.md
+# but the spec required < 15 (VC1).
+# See docs/reports/TRACK_COMPLETION_type_alias_unfuck_20260626.md for full accounting.
+
+[blocked_by]
+metadata_promotion_20260624 = "merged"  # the previous track's branch was the foundation
+
+[blocks]
+# This track does not block any followup tracks (remaining 26 .get() sites
+# would each warrant their own refactor track but are deferred)
+
+[phases]
+phase_0 = { status = "completed", commit_sha = "076e7f23", name = "Pre-flight (baseline + 7 audit gates)" }
+phase_1 = { status = "completed", commit_sha = "n/a", name = "Ticket consumers (SKIP, Tier 2 had done it)" }
+phase_2 = { status = "completed", commit_sha = "96f0aa54", name = "FileItem (3 sites migrated)" }
+phase_3 = { status = "completed", commit_sha = "8cf8cfeb", name = "CommsLogEntry (7 sites migrated)" }
+phase_5 = { status = "completed", commit_sha = "8df841fd,6a2f2cfa,fc5f80ae", name = "ChatMessage (15 sites + 2 regression fixes)" }
+phase_6 = { status = "completed", commit_sha = "b3d0bc60", name = "UsageStats (4 sites migrated)" }
+phase_7 = { status = "blocked", commit_sha = "n/a", name = "ToolCall/MCPToolResult (BLOCKED: required dataclasses don't exist)" }
+phase_8 = { status = "completed", commit_sha = "f1740d92", name = "ToolDefinition (2 sites migrated)" }
+phase_9 = { status = "completed", commit_sha = "83f122eb", name = "RAGChunk (verified; Tier 2 had migrated)" }
+phase_10 = { status = "completed", commit_sha = "28799766,84ca734a,3cf01ae1,e508758f,75fa97ca", name = "Small-batch aggregates (23 sites migrated across 4 batches)" }
+phase_11 = { status = "failed", commit_sha = "n/a", name = "Re-measure + 7 audit gates + batched tests (FAILED: VC1/VC2/VC4/VC6 not met)" }
+phase_12 = { status = "completed", commit_sha = "3553b624", name = "Collapsed-codepath audit (docs/reports/collapsed_codepath_audit_20260626.md)" }
+
+[tasks]
+t0_1 = { status = "completed", commit_sha = "076e7f23", description = "Pre-flight: capture baseline + verify 7 audit gates" }
+t2_1 = { status = "completed", commit_sha = "96f0aa54", description = "Phase 2: FileItem migration in ai_client.py (3 sites)" }
+t3_1 = { status = "completed", commit_sha = "8cf8cfeb", description = "Phase 3: CommsLogEntry migration in gui_2.py (7 sites)" }
+t5_1 = { status = "completed", commit_sha = "8df841fd", description = "Phase 5 part 1: _send_deepseek history loop (6 sites)" }
+t5_2 = { status = "completed", commit_sha = "1b62659c,6a2f2cfa", description = "Phase 5 part 2: API response + _repair_minimax + ChatMessage/ToolCall/UsageStats from_dict (6 sites + infra)" }
+t5_3 = { status = "completed", commit_sha = "fc5f80ae", description = "Phase 5 regression fix: FileItem TypeAlias shadowing" }
+t6_1 = { status = "completed", commit_sha = "b3d0bc60", description = "Phase 6: UsageStats construction in app_controller.py (4 sites)" }
+t7_1 = { status = "blocked", commit_sha = "n/a", description = "Phase 7: ToolCall/MCPToolResult - BLOCKED, needs MCPToolResult dataclass first" }
+t8_1 = { status = "completed", commit_sha = "f1740d92", description = "Phase 8: ToolDefinition in mcp_client.py + gui_2.py (2 sites)" }
+t9_1 = { status = "completed", commit_sha = "83f122eb", description = "Phase 9: RAGChunk verification (no remaining sites)" }
+t10_1 = { status = "completed", commit_sha = "28799766", description = "Phase 10 batch 1: MMAUsageStats (8 sites)" }
+t10_2 = { status = "completed", commit_sha = "84ca734a", description = "Phase 10 batch 2: DiscussionSettings (1 site)" }
+t10_3 = { status = "completed", commit_sha = "3cf01ae1", description = "Phase 10 batch 3: CustomSlice reads (8 sites)" }
+t10_4 = { status = "completed", commit_sha = "e508758f", description = "Phase 10 infra: from_dict added to 7 dataclasses" }
+t10_5 = { status = "completed", commit_sha = "75fa97ca", description = "Phase 10 batch 4: UIPanelConfig + ProviderPayload + PathInfo (7 sites)" }
+t10_6 = { status = "completed", commit_sha = "f6d58ddb", description = "Phase 10 regression fix: missing MMAUsageStats import" }
+t11_1 = { status = "completed", commit_sha = "n/a", description = "Phase 11: 7 audit gates verified pass" }
+t12_1 = { status = "completed", commit_sha = "3553b624", description = "Phase 12: collapsed-codepath audit doc" }
+tend_1 = { status = "completed", commit_sha = "1a76636e", description = "End-of-track report written" }
+
+[verification]
+# Acceptance criteria from spec.md
+vc1_get_sites_under_15 = false  # actual: 26
+vc2_subscript_under_20 = false  # actual: 79
+vc3_per_phase_guard = true
+vc4_codepaths_drop = "not_measured"  # required metric computation deferred
+vc5_audit_gates_pass = true  # 7/7
+vc6_batched_tests_pass = "partial"  # 7/11 PASS; 4 had failures (1 my regression fixed; 3 pre-existing or fragile)
+vc7_collapsed_codepath_audit = true  # docs/reports/collapsed_codepath_audit_20260626.md
+vc8_no_noop_classifications = true
+vc9_no_parallel_dataclasses = true
+vc10_per_site_type_checks = true
+
+[regressions]
+# 2 regressions introduced by my changes; both fixed
+fixed = [
+    { sha = "f6d58ddb", issue = "NameError: MMAUsageStats in gui_2.py:6621", tests = "test_mma_approval_indicators" },
+    { sha = "fc5f80ae", issue = "TypeError: isinstance arg 2 (FileItem TypeAlias shadow)", tests = "test_qwen_provider" },
+]
+
+[blocked]
+phase_7 = {
+    description = "MCPToolResult + ContentBlock dataclasses don't exist",
+    sites = ["src/mcp_client.py:1707", "src/mcp_client.py:1708", "src/mcp_client.py:1714"],
+    resolution = "Separate track to introduce MCPToolResult + ContentBlock in src/mcp_client.py",
+}
+
+[artifacts]
+audit_doc = "docs/reports/collapsed_codepath_audit_20260626.md"
+completion_report = "docs/reports/TRACK_COMPLETION_type_alias_unfuck_20260626.md"
+batched_results = "tests/artifacts/tier2_state/type_alias_unfuck_20260626/batched_results.txt"
+failcount_state = "tests/artifacts/tier2_state/type_alias_unfuck_20260626/state.json"

conductor/workflow.md

@@ -334,25 +334,39 @@ A task is complete when:
 
 To emulate the 4-Tier MMA Architecture within the standard Conductor extension without requiring a custom fork, adhere to these strict workflow policies:
 
+### 0. The Domain Distinction (CRITICAL — added 2026-06-27)
+
+This doc describes **META-TOOLING** — the AI agent orchestration layer used by Conductor agents to coordinate their own work. It is **NOT** the Application domain (the manual-slop GUI app being built).
+
+| Domain | What it does | Tools |
+|---|---|---|
+| **META-TOOLING** (this doc) | AI agent orchestration: sub-agent delegation, model switching, doc reading, file editing of THIS repo | OpenCode Task tool (sub-agent delegation), `.opencode/agents/*` (tier prompts), `manual-slop_*` MCP tools (file I/O on this repo), the canonical docs (AGENTS.md, conductor/code_styleguides/*.md) |
+| **APPLICATION** (separate) | The manual-slop GUI app the agents are building: gui_2.py, ai_client.py, the MMA *engine* (multi_agent_conductor.py, dag_engine.py), the app's MCP tools (mcp_client.py's `read_file`, `search_files`, etc.) | Documented in `docs/guide_*.md` (especially `docs/guide_meta_boundary.md`) |
+
+**When you see "sub-agent" or "Task tool" in this doc, it means META-TOOLING sub-agent delegation** (Tier 2 dispatching Tier 3 / Tier 4 to do work on this repo). It is **distinct from** the manual-slop app's `multi_agent_conductor.py` MMA engine, which is the APPLICATION-domain feature that runs inside the running GUI app.
+
 ### 1. Active Model Switching (Simulating the 4 Tiers)
 
+**UPDATED 2026-06-27:** The legacy `mma_exec.py` / `claude_mma_exec.py` bridge scripts are DEPRECATED. All tiered **META-TOOLING** sub-agent delegation now goes through the **OpenCode Task tool** (subagent invocation via the `subagent_type` parameter). This is in the meta-tooling domain (per §0); it does not affect the application's MMA engine.
+
 - **Mandatory Skill Activation:** As the very first step of any MMA-driven process, including track initialization and implementation phases, the agent MUST activate the `mma-orchestrator` skill (`activate_skill mma-orchestrator`) and their corresponding role's specific tier skill. This is crucial for enforcing the 4-Tier token firewall.
-- **The MMA Bridge (`mma_exec.py`):** All tiered delegation is routed through `uv python scripts/mma_exec.py`. This script acts as the primary bridge, managing model selection, context injection, and logging.
+- **The Sub-Agent Bridge (OpenCode Task tool):** All meta-tooling tiered delegation is now via the OpenCode Task tool with the appropriate `subagent_type`. This is the canonical META-TOOLING mechanism; it replaces the legacy `mma_exec.py` invocation. (The application-domain MMA engine in `src/multi_agent_conductor.py` is unchanged and is documented in `docs/guide_multi_agent_conductor.md`.)
 - **Model Tiers:**
     - **Tier 1 (Strategic/Orchestration):** `gemini-3.1-pro-preview`. Focused on product alignment, setup (`/conductor:setup`), and track initialization (`/conductor:newTrack`).
     - **Tier 2 (Architectural/Tech Lead):** `gemini-3-flash-preview`. Focused on architectural design and track execution (`/conductor:implement`). **Note:** Tier 2 maintains persistent memory throughout a track's implementation.
     - **Tier 3 (Execution/Worker):** `gemini-2.5-flash-lite`. Used for surgical code implementation and test generation. Operates statelessly (Context Amnesia) but has access to file I/O tools.
     - **Tier 4 (Utility/QA):** `gemini-2.5-flash-lite`. Used for log summarization and error analysis. Operates statelessly (Context Amnesia) but has access to diagnostic tools.
-- **Tiered Delegation Protocol:**
-    - **Tier 3 Worker:** `uv run python scripts/mma_exec.py --role tier3-worker "[PROMPT]"`
-    - **Tier 4 QA Agent:** `uv run python scripts/mma_exec.py --role tier4-qa "[PROMPT]"`
-- **Observability:** All hierarchical interactions are recorded in `logs/mma_delegation.log` and detailed sub-agent logs are saved to `logs/agents/`.
+- **Tiered Delegation Protocol (OpenCode Task tool):**
+    - **Tier 3 Worker:** invoke the Task tool with `subagent_type: "tier3-worker"`, providing a surgical prompt with WHERE/WHAT/HOW/SAFETY/COMMIT structure. **DO NOT** use `python scripts/mma_exec.py --role tier3-worker` (deprecated).
+    - **Tier 4 QA Agent:** invoke the Task tool with `subagent_type: "tier4-qa"`, providing the error output + an explicit instruction "DO NOT fix — provide root cause analysis only".
+    - **Tier 1 Orchestrator:** invoke the Task tool with `subagent_type: "tier1-orchestrator"` for track planning tasks.
+- **Observability:** All hierarchical interactions are recorded in `logs/mma_delegation.log` and detailed sub-agent logs are saved to `logs/agents/`. (These logs are populated by the OpenCode Task tool's logging layer.)
 
 ### 2. Context Management and Token Firewalling
 
-- **Context Amnesia (Tiers 3 & 4):** `mma_exec.py` enforces "Context Amnesia" by executing sub-agents in a stateless manner. Each call starts with a clean slate, receiving only the strictly necessary documents and prompts.
+- **Context Amnesia (Tiers 3 & 4):** The OpenCode Task tool enforces "Context Amnesia" by executing sub-agents in a stateless manner. Each call starts with a clean slate, receiving only the strictly necessary documents and prompts.
 - **Persistent Memory (Tier 2):** The Tier 2 Tech Lead does NOT use Context Amnesia during track implementation to ensure continuity of technical strategy.
-- **AST Skeleton Views:** For Tier 3 implementation, `mma_exec.py` automatically generates "AST Skeleton Views" of project dependencies. This provides the worker model with the interface-level structure (function signatures, docstrings) of imported modules without the full source code, maximizing the signal-to-noise ratio in the context window.
+- **AST Skeleton Views:** For Tier 3 implementation, the OpenCode Task tool + the `manual-slop_py_get_skeleton` MCP tool provides "AST Skeleton Views" of project dependencies. This provides the worker model with the interface-level structure (function signatures, docstrings) of imported modules without the full source code, maximizing the signal-to-noise ratio in the context window.
 
 ### 3. Phase Checkpoints (The Final Defense)
 
@@ -549,13 +563,24 @@ The recommended execution order is the topological sort of the `blocked_by` grap
 
 ---
 
-## Tier 1 Track Initialization Rules (Added 2026-06-16)
+## Tier 1 Track Initialization Rules (Added 2026-06-16; updated 2026-06-25 with §"The Python Type Promotion Mandate")
 
 These are the rules a Tier 1 Orchestrator follows when initializing a new
 track. They exist because Tier 1 noise (day estimates, day-of-week
-schedules, etc.) propagates into the Tier 2's plans, the user's
-expectations, and the historical record — and most of that noise is
-just wrong.
+schedules, opaque-type promotion, etc.) propagates into the Tier 2's
+plans, the user's expectations, and the historical record — and most
+of that noise is just wrong.
+
+### 0. The Python Type Promotion Mandate (Added 2026-06-25)
+
+Every track spec/plan MUST respect the C11/Odin/Jai-in-Python mandate:
+- **No `dict[str, Any]` outside the wire boundary.** The boundary is 2-3 functions per file (TOML/JSON parse).
+- **No `Any` parameter, return, or field type.**
+- **No `Optional[T]` returns.** Use `Result[T]` + `NIL_T` sentinels per `conductor/code_styleguides/error_handling.md`.
+- **No `hasattr()` for entity type dispatch.** The boundary is typed Union dispatch or per-entity function overloads.
+- **Direct field access on typed `@dataclass(frozen=True, slots=True)` instances.**
+
+When a track's spec proposes lifting entities into `dict[str, Any]` or `Any`, Tier 1 MUST reject and rewrite. See `conductor/code_styleguides/data_oriented_design.md` §8.5 and `conductor/code_styleguides/python.md` §17 for the canonical mandate.
 
 ### 1. NO day / hour / minute estimates in track artifacts
 

docs/AGENTS.md

@@ -10,48 +10,56 @@
 
 ---
 
-## Convention Enforcement (Added 2026-06-16)
+## Convention Enforcement (Added 2026-06-16; updated 2026-06-25 with §"Core Value")
 
-**READ THIS BEFORE WRITING ANY PYTHON IN THIS REPO.** The project follows the
-data-oriented error handling convention (Ryan Fleury's "errors are
-just cases" framework). The convention is the OPPOSITE of idiomatic
-Python; LLMs are trained on idiomatic Python and will revert to it
-without explicit guidance. The convention prevents "tech rot with
-idiomatic Python."
+**READ THIS BEFORE WRITING ANY PYTHON IN THIS REPO.**
 
-**The 4 enforcement mechanisms (defense-in-depth):**
+### Core Value (Added 2026-06-25)
 
-1. **[`conductor/code_styleguides/error_handling.md`](../conductor/code_styleguides/error_handling.md)** — the canonical styleguide. 5 patterns, 3 boundary types, 1 broad-except distinction rule, 1 constructor-raise rule, 1 re-raise rule, and the audit script reference.
+**C11/Odin/Jai semantics in a Python runtime.** The project is written in Python because of practical constraints (time, dependencies, LLM codegen ability), but the convention is to make Python behave as close to a statically-typed value-typed language as the runtime allows.
 
-2. **[`conductor/code_styleguides/error_handling.md` "AI Agent Checklist"](../conductor/code_styleguides/error_handling.md#ai-agent-checklist-added-2026-06-16)** — the explicit cheatsheet of 5 MUST-DO rules, 7 MUST-NOT-DO rules, and 3 boundary patterns. Run this checklist before claiming a task is done.
+LLMs default to opaque types (`dict[str, Any]`, `Any`, `Optional[T]`, `hasattr()` polymorphism) because that's what idiomatic Python training data looks like. **That defaults to mediocrity. This rule overrides it.**
 
-3. **[`scripts/audit_exception_handling.py`](../../scripts/audit_exception_handling.py)** — the static analyzer. Catches violations before commit. Run it pre-commit. Has 3 output modes (human-readable, `--json`, `--by-size`) and a `--strict` CI-gate mode.
+The canonical mandate is in [`conductor/code_styleguides/data_oriented_design.md` §8.5](../conductor/code_styleguides/data_oriented_design.md#85-the-python-type-promotion-mandate-added-2026-06-25). The banned patterns are in [`conductor/code_styleguides/python.md` §17](../conductor/code_styleguides/python.md#17-banned-patterns-llm-default-anti-patterns-added-2026-06-25). The boundary-layer concept is in [`conductor/code_styleguides/type_aliases.md`](../conductor/code_styleguides/type_aliases.md).
 
-4. **The 4 enforcement audit scripts** — the project-level enforcement set:
-   - `scripts/audit_exception_handling.py --strict` (the convention)
-   - `scripts/audit_weak_types.py --strict` (the type-strengthening convention)
-   - `scripts/audit_main_thread_imports.py` (always strict; the import graph gate)
-   - `scripts/audit_no_models_config_io.py` (the config-I/O ownership gate)
+**Every section of this document, every styleguide in `conductor/code_styleguides/`, and every deep-dive guide in `docs/guide_*.md` MUST be read through the lens of this Core Value.** If a section suggests `dict[str, Any]`, `Any`, `Optional[T]`, or `hasattr()` for entity dispatch in non-boundary code, that's an anti-pattern; flag it and ask.
+
+### The 4 enforcement mechanisms (defense-in-depth)
+
+1. **[`conductor/code_styleguides/data_oriented_design.md`](../conductor/code_styleguides/data_oriented_design.md) §8.5 (The Python Type Promotion Mandate)** — the canonical mandate. Banned patterns: `dict[str, Any]`, `Any`, `Optional[T]`, `hasattr()` for entity dispatch, `getattr()` for type-dispatch, `.get()` on known fields.
+
+2. **[`conductor/code_styleguides/python.md`](../conductor/code_styleguides/python.md) §17 (LLM Default Anti-Patterns)** — the explicit cheatsheet. Each banned pattern has a before/after example.
+
+3. **[`conductor/code_styleguides/error_handling.md`](../conductor/code_styleguides/error_handling.md)** — the `Result[T]` + `NIL_T` convention. Replaces `Optional[T]` returns.
+
+4. **The enforcement audit scripts** — the project-level enforcement set:
+   - `scripts/audit_weak_types.py --strict` — flags `dict[str, Any]`, `Any`, anonymous tuples
+   - `scripts/audit_optional_in_3_files.py --strict` — flags `Optional[T]` (extended to all `src/*.py` per the c11_python track)
+   - `scripts/audit_exception_handling.py --strict` — the data-oriented error handling convention
+   - `scripts/audit_main_thread_imports.py` — always strict; the import graph gate
+   - `scripts/audit_no_models_config_io.py` — the config-I/O ownership gate
+   - The boundary-layer audit (planned in `conductor/tracks/cruft_elimination_20260627/spec.md`) — documents every `Metadata` usage
 
 **Pre-commit workflow (recommended):**
 
 ```bash
 # Run before claiming "done"
-uv run python scripts/audit_exception_handling.py
 uv run python scripts/audit_weak_types.py
+uv run python scripts/audit_optional_in_3_files.py
+uv run python scripts/audit_exception_handling.py
 uv run python scripts/audit_main_thread_imports.py
 uv run python scripts/audit_no_models_config_io.py
 ```
 
 **Why this is enforced:** the convention prevents the LLM-training-data
 problem. Without these mechanisms, AI agents writing new code will
-revert to idiomatic patterns (`try/except`, `Optional[T]`, `raise
-Exception`) — exactly the "tech rot" the user is preventing. The
-4 mechanisms (styleguide + checklist + audit script + CI gate) are
+revert to idiomatic patterns (`dict[str, Any]`, `Any`, `Optional[T]`,
+`hasattr()`) — exactly the "tech rot" the user is preventing. The
+5+ mechanisms (Core Value + 3 styleguides + 5 audit scripts) are
 the defense-in-depth. See the project-level rules in
 [`AGENTS.md`](../AGENTS.md) "Critical Anti-Patterns" (top of file) and
 [`conductor/product-guidelines.md`](../conductor/product-guidelines.md)
-"Data-Oriented Error Handling" for the canonical reference.
+"Core Value" for the canonical reference.
 
 ---
 

docs/Readme.md

@@ -15,7 +15,7 @@ This documentation suite provides comprehensive technical reference for the Manu
 | Guide | Contents |
 |---|---|
 | [Architecture](guide_architecture.md) | Thread domains (GUI Main, Asyncio Worker, HookServer, Ad-hoc), cross-thread data structures (AsyncEventQueue, Guarded Lists, Condition-Variable Dialogs), event system (EventEmitter, SyncEventQueue, UserRequestEvent), application lifetime (boot sequence, shutdown sequence), task pipeline (producer-consumer synchronization), Execution Clutch (HITL mechanism with ConfirmDialog, MMAApprovalDialog, MMASpawnApprovalDialog), AI client multi-provider architecture (Gemini SDK, Anthropic, DeepSeek, Gemini CLI, MiniMax), Anthropic/Gemini caching strategies (4-breakpoint system, server-side TTL), context refresh mechanism (mtime-based file re-reading, diff injection), comms logging (JSON-L format), state machines (ai_status, HITL dialog state) |
-| [Meta-Boundary](guide_meta_boundary.md) | Explicit distinction between the Application's domain (Strict HITL — `gui_2.py`, `ai_client.py`, `multi_agent_conductor.py`, `dag_engine.py`) and the Meta-Tooling domain (`scripts/mma_exec.py`, `scripts/claude_mma_exec.py`, `scripts/tool_call.py`, `scripts/mcp_server.py`, `.gemini/`, `.claude/`), preventing feature bleed and safety bypasses via shared bridges like `mcp_client.py`. Documents the Inter-Domain Bridges (`cli_tool_bridge.py`, `claude_tool_bridge.py`) and the `GEMINI_CLI_HOOK_CONTEXT` environment variable. |
+| [Meta-Boundary](guide_meta_boundary.md) | Explicit distinction between the Application's domain (Strict HITL — `gui_2.py`, `ai_client.py`, `multi_agent_conductor.py`, `dag_engine.py`) and the **Meta-Tooling** domain (the OpenCode Task tool with `.opencode/agents/*` tier prompts, `.gemini/`, `.claude/`, plus the legacy `scripts/mma_exec.py` / `scripts/claude_mma_exec.py` / `scripts/tool_call.py` / `scripts/mcp_server.py` for backward compatibility), preventing feature bleed and safety bypasses via shared bridges like `mcp_client.py`. Documents the Inter-Domain Bridges (`cli_tool_bridge.py`, `claude_tool_bridge.py`) and the `GEMINI_CLI_HOOK_CONTEXT` environment variable. **Note (2026-06-27):** the legacy `mma_exec.py` / `claude_mma_exec.py` are DEPRECATED for meta-tooling sub-agent delegation; the OpenCode Task tool is the canonical mechanism. |
 | [Tools & IPC](guide_tools.md) | MCP Bridge 3-layer security model (Allowlist Construction, Path Validation, Resolution Gate), all 45 MCP tool signatures (plus `run_powershell` from `src/shell_runner.py`, for a canonical 46 in `models.AGENT_TOOL_NAMES`) with parameters and behavior (File I/O, AST-Based, Analysis, Network, Runtime, Beads), Hook API GET/POST endpoints with request/response formats, ApiHookClient method reference (Connection Methods, State Query Methods, GUI Manipulation Methods, Polling Methods, HITL Method), `/api/ask` synchronous HITL protocol (blocking request-response over HTTP), session logging (comms.log, toolcalls.log, apihooks.log, clicalls.log, scripts/generated/*.ps1), shell runner (mcp_env.toml configuration, run_powershell function with 60s timeout, qa_callback and patch_callback integration for Tier 4 QA + auto-patch) |
 | [MMA Orchestration](guide_mma.md) | Ticket/Track/WorkerContext data structures (from `models.py`), DAG engine (TrackDAG class with cycle detection, topological sort, cascade_blocks; ExecutionEngine class with tick-based state machine), ConductorEngine execution loop (run method, _push_state for state broadcast, parse_json_tickets for ingestion), Tier 2 ticket generation (generate_tickets, topological_sort), Tier 3 worker lifecycle (run_worker_lifecycle with Context Amnesia, AST skeleton injection, HITL clutch integration via confirm_spawn and confirm_execution), Tier 4 QA integration (run_tier4_analysis, run_tier4_patch_callback), token firewalling (tier_usage tracking, model escalation), track state persistence (TrackState, save_track_state, load_track_state, get_all_tracks) |
 | [Simulations](guide_simulations.md) | Structural Testing Contract (Ban on Arbitrary Core Mocking, `live_gui` Standard, Artifact Isolation), `live_gui` pytest fixture lifecycle (spawning, readiness polling, failure path, teardown, session isolation via reset_ai_client), VerificationLogger for structured diagnostic logging, process cleanup (kill_process_tree for Windows/Unix), Puppeteer pattern (8-stage MMA simulation with mock provider setup, epic planning, track acceptance, ticket loading, status transitions, worker output verification), mock provider strategy (`tests/mock_gemini_cli.py` with JSON-L protocol, input mechanisms, response routing, output protocol), visual verification patterns (DAG integrity, stream telemetry, modal state, performance monitoring), supporting analysis modules (ASTParser with tree-sitter, summarize.py heuristic summaries, outline_tool.py hierarchical outlines) |

docs/guide_meta_boundary.md

@@ -13,8 +13,8 @@ This repository contains two distinct architectural domains that share similar c
 - **Internal Tooling Control**: The tools available to the Application's internal AI are defined strictly by `manual_slop.toml` (`[agent.tools]`).
 
 ## Domain 2: The Meta-Tooling
-- **Primary Files**: `scripts/mma_exec.py`, `scripts/claude_mma_exec.py`, `scripts/tool_call.py`, `scripts/mcp_server.py`, `mma-orchestrator/SKILL.md`, `.agents/skills/*/SKILL.md`, `.gemini/`, `.claude/`, `.opencode/`.
-- **Purpose**: The external AI agents (you, reading this) used to write the code for the Application.
+- **Primary Files (UPDATED 2026-06-27)**: The legacy `scripts/mma_exec.py` and `scripts/claude_mma_exec.py` are **DEPRECATED** for sub-agent delegation. The current sub-agent mechanism is the **OpenCode Task tool** (`.opencode/agents/*` tier prompts; subagent invocation via the `subagent_type` parameter). The remaining meta-tooling files: `scripts/tool_call.py`, `scripts/mcp_server.py`, `mma-orchestrator/SKILL.md`, `.agents/skills/*/SKILL.md`, `.gemini/`, `.claude/`, `.opencode/`.
+- **Purpose**: The external AI agents (you, reading this) used to write the code for the Application. Sub-agent delegation (Tier 2 → Tier 3, Tier 2 → Tier 4) goes through the OpenCode Task tool.
 - **Safety Model**: Driven by the external agent's own framework (e.g., Gemini CLI's auto-approval policies, Claude Code's permissions, or OpenCode's hook system). These agents have their own sandboxing and do *not* use the Application's GUI for approval unless explicitly hooked.
 - **Tooling Control**: These external agents use `mcp_client.py` natively to investigate and modify the `manual_slop` codebase (e.g., using `set_file_slice` to fix a bug).
 
@@ -22,8 +22,8 @@ This repository contains two distinct architectural domains that share similar c
 
 The Meta-Tooling domain is itself split by which external agent consumes it:
 
-- **Gemini CLI** (the primary toolchain as of 2026-06-02): Uses the **conductor extension** which reads `./conductor/` for task tracking, workflow, and product context. Skills are activated via `activate_skill`.
-- **OpenCode** (secondary): Uses **superpowers** or the conductor convention directly. Skills live in `.agents/skills/` and are activated by name.
+- **Gemini CLI** (the primary toolchain as of 2026-06-02): Uses the **conductor extension** which reads `./conductor/` for task tracking, workflow, and product context. Skills are activated via `activate_skill`. The legacy `scripts/mma_exec.py` was Gemini CLI's primary sub-agent bridge; it is now DEPRECATED in favor of the OpenCode Task tool.
+- **OpenCode** (secondary, growing primary as of 2026-06-27): Uses the **OpenCode Task tool** for sub-agent delegation (with `subagent_type: "tier3-worker"` / `"tier4-qa"` / etc.) and the `.opencode/agents/*` tier prompts. Skills live in `.agents/skills/` and are activated by name. This is the canonical meta-tooling sub-agent mechanism now.
 - **Claude Code** (legacy, no longer primary): Uses the original `.claude/commands/*.md` slash command inventory. The `claude_mma_exec.py` script may be vestigial.
 
 **The conductor system in `./conductor/` is the cross-tool abstraction.** Both Gemini CLI and OpenCode consume `conductor/workflow.md`, `conductor/product.md`, `conductor/tech-stack.md`, and `conductor/tracks.md`. Track implementation follows the TDD protocol documented in `conductor/workflow.md` regardless of which external agent is doing the work.
@@ -33,7 +33,7 @@ To achieve true Human-In-The-Loop (HITL) safety while developing the app *with*
 - **How they work**: These scripts (`cli_tool_bridge.py` for Gemini CLI, `claude_tool_bridge.py` for Claude) intercept the tool execution requests from the external AI.
 - **The Hook Server**: They instantiate an `ApiHookClient` and send an HTTP request to `http://127.0.0.1:8999` (the Application's local API Hook Server).
 - **The Result**: The `manual_slop` GUI intercepts this network request and pops open a modal asking the human developer if they approve the action requested by the *external* Meta-Tooling agent.
-- **Environment Context**: These bridges check the `GEMINI_CLI_HOOK_CONTEXT` or `CLAUDE_CLI_HOOK_CONTEXT` environment variables. If the variable is set to `mma_headless` (which happens during `mma_exec.py` sub-agent execution), the bridge automatically **allows** the execution to prevent sub-agents from blocking the main thread waiting for human GUI clicks.
+- **Environment Context**: These bridges check the `GEMINI_CLI_HOOK_CONTEXT` or `CLAUDE_CLI_HOOK_CONTEXT` environment variables. If the variable is set to `mma_headless` (which happens during legacy `mma_exec.py` sub-agent execution — DEPRECATED in favor of the OpenCode Task tool), the bridge automatically **allows** the execution to prevent sub-agents from blocking the main thread waiting for human GUI clicks.
 
 ### Bridge Status (as of 2026-06-02)
 
@@ -53,5 +53,5 @@ When you are implementing a Track, you must ask yourself:
 > *"Am I modifying the Application's behavior, or am I modifying the Meta-Tooling used to build it?"*
 
 1. **If adding a tool to `mcp_client.py`**: You must clarify if it is for the Meta-Tooling (us) or the Application (them). If it is for the Application, it MUST be gated behind `manual_slop.toml` toggles and wired to the GUI's `pre_tool_callback` for approval.
-2. **If editing `mma_exec.py`**: You are modifying the Meta-Tooling. The changes here affect how *you* (or your Tier 3 workers) operate. Ensure you respect token limits (Context Amnesia) and do not leak massive Application files into your own context window.
+2. **If editing `mma_exec.py`** (legacy): You are modifying the **Meta-Tooling** (the bridge script). The changes here affect how *you* (or your Tier 3 workers) operate. However, `mma_exec.py` is **DEPRECATED** as of 2026-06-27 in favor of the OpenCode Task tool. New meta-tooling work should target `.opencode/agents/*` (the tier prompts) and the OpenCode Task tool invocation, not `mma_exec.py`. Ensure you respect token limits (Context Amnesia) and do not leak massive Application files into your own context window.
 3. **If editing `gui_2.py` or `ai_client.py`**: You are modifying the Application. Do not assume your external tool capabilities (like automatic file modification) apply here. Follow the Application's strict UX rules.

docs/guide_multi_agent_conductor.md

@@ -289,15 +289,13 @@ class WorkerPool:
 
 ---
 
-## Sub-Agent Invocation (`mma_exec.py`)
+## Sub-Agent Invocation (Application MMA WorkerPool)
 
-The ConductorEngine does **not** spawn `mma_exec.py` directly. Sub-agent invocation is a **synchronous CLI bridge** at `scripts/mma_exec.py` invoked from a Tier 3 worker (see [conductor/workflow.md](../../conductor/workflow.md) "MMA Bridge" section). Each sub-agent is invoked via:
+**UPDATED 2026-06-27 (clarifying the domain distinction):** This section is about the **APPLICATION domain** — the manual-slop app's internal WorkerPool that spawns Tier 3 / Tier 4 worker subprocesses. It is **distinct from** the META-TOOLING domain (where OpenCode Task tool is the canonical sub-agent mechanism; see `docs/guide_meta_boundary.md`).
 
-```bash
-uv run python scripts/mma_exec.py --role tier3-worker "[PROMPT]"
-```
+The ConductorEngine does **not** directly spawn workers. The WorkerPool in `src/multi_agent_conductor.py:WorkerPool.spawn` creates a Python subprocess (via `subprocess.Popen`) that runs the worker's `run_worker_lifecycle`. **NOTE:** the worker's subprocess was historically invoked via `scripts/mma_exec.py --role tier3-worker` (the legacy meta-tooling bridge script). **That bridge script is DEPRECATED as of 2026-06-27 for meta-tooling use.** The application's WorkerPool uses its own internal subprocess template (`src/multi_agent_conductor.py:run_worker_lifecycle`) — NOT the meta-tooling mma_exec.py.
 
-The `--role` flag selects between `tier1-orchestrator`, `tier2-tech-lead`, `tier3-worker`, and `tier4-qa`. Sub-agents receive context via stdin (or as additional CLI args) and exit after one round-trip. The actual prompt construction lives in `run_worker_lifecycle` at `src/multi_agent_conductor.py` (the free function referenced by both `ConductorEngine.run` and the worker spawn flow).
+For meta-tooling sub-agent delegation (Tier 2 → Tier 3 / Tier 4 to do work on this repo), see `conductor/workflow.md` §"Conductor Token Firewalling" + the OpenCode Task tool (replaces the legacy mma_exec invocation).
 
 The "Token Firewall" effect — each worker starts with a clean context window — is achieved by the `ai_client.reset_session()` call at the start of `run_worker_lifecycle` (see [guide_mma.md](guide_mma.md) "Context Amnesia").
 ---