diff --git a/docs/reports/SESSION_REPORT_code_path_audit_20260607_20260622.md b/docs/reports/SESSION_REPORT_code_path_audit_20260607_20260622.md
new file mode 100644
index 00000000..cc4da1c1
--- /dev/null
+++ b/docs/reports/SESSION_REPORT_code_path_audit_20260607_20260622.md
@@ -0,0 +1,212 @@
+# Session Report - code_path_audit_20260607
+
+**Session date:** 2026-06-22 (early morning)
+**Branch:** `tier2/code_path_audit_20260607`
+**Resumable:** yes — use `--resume` flag
+
+## What shipped in this session
+
+### Phase 0 — Setup (all 7 tasks done)
+
+| Task | Commit | Description |
+|---|---|---|
+| 0.1 | `8123a13f` | state.toml — phase_0 in_progress |
+| 0.2 | `e9d1867b` | empty `src/code_path_audit.py` |
+| 0.3 | `28ed3dea` | empty `tests/test_code_path_audit.py` |
+| 0.4 | `b83c0744` | empty `tests/test_code_path_audit_live_gui.py` (skipif gate on `CODE_PATH_AUDIT_LIVE_GUI=1`) |
+| 0.5 | `18226779` | empty `scripts/audit_code_path_audit_coverage.py` |
+| 0.6 | `78c9d463` | stub `conductor/code_styleguides/code_path_audit.md` |
+| 0.7 | `18226779` | `tests/fixtures/synthetic_src/__init__.py` + `tests/fixtures/audit_inputs/.gitkeep` |
+
+Phase checkpoint: `78c9d463` (the last Phase 0 commit).
+
+### Phase 1 — Data model (2 of 10 tasks done)
+
+| Task | Commit | Description |
+|---|---|---|
+| 1.1 | `5dca69f0` | 5 enums (Literal types): `AggregateKind` (4), `MemoryDim` (7), `AccessPattern` (5), `Frequency` (7), `RecommendedDirection` (4) |
+| 1.2 | `16801829` | `FunctionRef` dataclass — frozen, 4 fields (fqname, file, line, role) |
+
+**7 unit tests passing**, all atomic per-task commits with git notes.
+
+### Merge + 6 cherry-picks (blocker resolution)
+
+User merged `origin/tier2/phase2_4_5_call_site_completion_20260621` mid-session. The merge took 10 commits but missed 6 critical feature commits. After merge, codebase was broken at import time (`from src.openai_schemas import ChatMessage` and `from src.api_hooks import WebSocketMessage` failed).
+
+I wrote `docs/reports/TRACK_STATUS_code_path_audit_20260607_20260622.md` documenting the issue, then user asked me to provide the cherry-pick commands. User ran the first 5, then asked me to "check what I've done already" — at that point 5 cherry-picks were done; I identified the missing `JsonValue` TypeAlias and cherry-picked the 6th:
+
+| Commit | Description |
+|---|---|
+| `cd715670` | feat(mcp): add `src/mcp_tool_specs.py` + tests (ToolSpec) |
+| `04d723e4` | feat(openai): add `src/openai_schemas.py` + refactor `src/openai_compatible.py` (ChatMessage) |
+| `5bd416c3` | feat(provider): add `src/provider_state.py` + tests (ProviderHistory) |
+| `3816a54d` | feat(log): add Session + SessionMetadata dataclasses |
+| `335f9080` | feat(api_hooks): add WebSocketMessage + JsonValue type |
+| `be4ec0a4` | feat(types): add JsonPrimitive + JsonValue TypeAliases |
+
+**Result:** the 3 candidate aggregates (`ToolSpec`, `ChatMessage`, `ProviderHistory`) are now real dataclass definitions on the branch, not placeholders. All imports resolve. 7 tests pass.
+
+## What's NOT done (the 13 remaining phases)
+
+**Phase 1 (8 tasks remaining):** `AccessPatternEvidence`, `FrequencyEvidence`, `ResultCoverage`, `TypeAliasCoverage`, `CrossAuditFinding`, `CrossAuditFindings`, `DecompositionCost`, `OptimizationCandidate`, `AggregateProfile` (central artifact).
+
+**Phase 2 (5 tasks):** PCG with 3 AST passes (P1 return types, P2 parameter types, P3 field access) + `build_pcg()` entry point.
+
+**Phase 3 (4 tasks):** MemoryDim classifier with canonical mappings dict + override file loading + file-of-origin heuristic + `classify_memory_dim()`. **Must include** ToolSpec/ChatMessage/ProviderHistory now that they're real.
+
+**Phase 4 (7 tasks):** APD (Access Pattern Detector) with 5 patterns + 25% dominance rule.
+
+**Phase 5 (3 tasks):** CFE (Call Frequency Estimator) with 7 frequencies + entry-point detection + override file.
+
+**Phase 6 (8 tasks):** Decomposition cost heuristic (4 directions: componentize/unify/hold/insufficient_data + auto-generated rationale).
+
+**Phase 7 (7 tasks):** Cross-audit integration (6 input JSONs + 3-tier mapping).
+
+**Phase 8 (5 tasks):** v2 DSL (14 new tagged words + flat-section format) + 3 renderers (`to_dsl_v2`, `to_markdown`, `to_tree`) + `parse_dsl_v2()`.
+
+**Phase 9 (6 tasks):** `run_audit()` main entry + `synthesize_aggregate_profile()` + 4 rollups (`summary.md`, `cross_audit_summary.md`, `decomposition_matrix.md`, `candidates.md`) + CLI + MCP tool wrapper. **Must use `AggregateKind.dataclass`** for ToolSpec/ChatMessage/ProviderHistory, not `candidate_dataclass`.
+
+**Phase 10 (5 tasks):** Integration tests with synthetic src/ + 6 audit_inputs/ JSON fixtures.
+
+**Phase 11 (2 tasks):** Live_gui E2E tests (opt-in via `CODE_PATH_AUDIT_LIVE_GUI=1`).
+
+**Phase 12 (3 tasks):** Meta-audit (`scripts/audit_code_path_audit_coverage.py` schema validator) + 1-line extension to `scripts/audit_optional_in_3_files.py` + full styleguide (replacing Phase 0 stub).
+
+**Phase 13 (4 tasks):** End-of-track report (`docs/reports/TRACK_COMPLETION_code_path_audit_20260607.md`) + `conductor/tracks.md` update + final state.toml update + final verification.
+
+**Total remaining: 73 tasks across 13 phases.** Plus 84 unit tests + 7 integration tests + 2 live_gui tests.
+
+## Resume instructions (post-compaction warming phase)
+
+```bash
+cd C:\projects\manual_slop_tier2
+git switch tier2/code_path_audit_20260607
+git log --oneline -10
+# Confirm head is 16801829 (Task 1.2 commit) and cherry-picks be4ec0a4..335f9080 are visible.
+# Run: uv run pytest tests/test_code_path_audit.py -v
+# Expected: 7 passed.
+```
+
+Then continue with:
+
+```bash
+# Read these (in this order, ~5 min total):
+#   1. This file
+#   2. plan_v2.md Phase 1 Tasks 1.3-1.10 (lines 543-1170)
+#   3. conductor/code_styleguides/error_handling.md (already read in this session)
+#   4. docs/guide_models.md (already read in this session)
+#
+# Phase 1 next task: 1.3 AccessPatternEvidence dataclass
+# Then 1.4-1.10 (7 more dataclasses), then phase checkpoint.
+#
+# After Phase 1: Phase 2 PCG (the heaviest phase; 5 tasks).
+```
+
+## Critical reminders for next session
+
+1. **3 candidate aggregates are now REAL** — `ToolSpec` in `src/mcp_tool_specs.py`, `ChatMessage` in `src/openai_schemas.py`, `ProviderHistory` in `src/provider_state.py`. Phase 3 `CANONICAL_MEMORY_DIM` and Phase 9 `synthesize_aggregate_profile()` must use `AggregateKind.dataclass` for these, NOT `candidate_dataclass`.
+
+2. **TypeAlias count is now 13** (10 original + `JsonPrimitive` + `JsonValue` from `src/type_aliases.py`). The `type_alias_coverage` metric needs to include all 13.
+
+3. **`src/openai_compatible.py` was refactored** in `04d723e4` — `NormalizedResponse` and `OpenAICompatibleRequest` are now dataclasses from `src.openai_schemas.py`, not dicts. The PCG P1 (return-type pass) needs to recognize the new dataclass return types.
+
+4. **`src/mcp_client.py` was simplified** in `cd715670` — the 45 `MCP_TOOL_SPECS` dict literals are now `ToolSpec` instances in `src/mcp_tool_specs.py`. The PCG must traverse the registry, not the literals.
+
+5. **`src/api_hooks.py` now has `WebSocketMessage`** and `JsonValue` types. `WebSocketServer.broadcast()` accepts a `WebSocketMessage`. The PCG must recognize this signature change (commit `224930d4` was the broadcast migration).
+
+6. **Test runner:** `uv run pytest tests/test_code_path_audit.py -v` (NOT `scripts/run_tests_batched.py` for now — direct pytest is faster for the unit-test-only phases). Switch to batched runner when integration tests land in Phase 10.
+
+7. **Per-task commit discipline:** 1 task = 1 commit. Attach git notes. Use the per-task commit format from `conductor/workflow.md`.
+
+8. **Hard bans still in force:** no `git checkout`, no `git restore`, no `git reset`, no `git push`. Use `git switch -c` for new branches.
+
+## Failcount state
+
+State file: `tests/artifacts/tier2_state/code_path_audit_20260607/state.json`
+
+```json
+{
+  "red_phase_failures": 0,
+  "green_phase_failures": 0,
+  "no_progress_started_at": "2026-06-22T00:39:43.125236"
+}
+```
+
+Zero failures. Healthy state.
+
+## Audit gates status
+
+| Gate | Status |
+|---|---|
+| `audit_exception_handling.py --strict` | passes (informational; only the 3 refactored files are enforced) |
+| `audit_weak_types.py --strict` | passes (112 weak sites <= baseline 112) |
+| `audit_main_thread_imports.py` | passes |
+| `audit_no_models_config_io.py` | passes |
+| `audit_optional_in_3_files.py` | passes (Phase 12 will add `src/code_path_audit.py` to the baseline list) |
+
+## Final state.toml snapshot
+
+```toml
+[meta]
+status = "active"
+current_phase = 1
+last_updated = "2026-06-22"
+
+[phases]
+phase_0 = { status = "completed", checkpointsha = "78c9d463", name = "Setup" }
+phase_1 = { status = "in_progress", checkpointsha = "", name = "Data model (5 enums + 9 supporting dataclasses + AggregateProfile)" }
+phase_2 = { status = "pending", checkpointsha = "", name = "PCG" }
+# ... phase_3 through phase_13 all "pending"
+```
+
+## Files modified in this session
+
+**Created:**
+- `src/code_path_audit.py`
+- `tests/test_code_path_audit.py`
+- `tests/test_code_path_audit_live_gui.py`
+- `scripts/audit_code_path_audit_coverage.py`
+- `conductor/code_styleguides/code_path_audit.md`
+- `tests/fixtures/synthetic_src/__init__.py`
+- `tests/fixtures/audit_inputs/.gitkeep`
+- `tests/artifacts/tier2_state/code_path_audit_20260607/state.json`
+- `docs/reports/TRACK_STATUS_code_path_audit_20260607_20260622.md`
+- `docs/reports/SESSION_REPORT_code_path_audit_20260607_20260622.md` (this file)
+
+**Modified (via cherry-pick):**
+- `src/openai_schemas.py` (NEW, from `04d723e4`)
+- `src/mcp_tool_specs.py` (NEW, from `cd715670`)
+- `src/provider_state.py` (NEW, from `5bd416c3`)
+- `src/api_hooks.py` (WebSocketMessage added, from `335f9080`)
+- `src/type_aliases.py` (JsonPrimitive + JsonValue added, from `be4ec0a4`)
+- `src/log_registry.py` (Session dataclass added, from `3816a54d`)
+- `src/ai_client.py` (ChatMessage usage, from `58346281`)
+- `src/openai_compatible.py` (refactored, from `04d723e4`)
+- `src/events.py` (WebSocketMessage import, from `224930d4`)
+- `src/app_controller.py` (broadcast migration, from `224930d4`)
+- `conductor/tracks/code_path_audit_20260607/state.toml` (phase_0/phase_1 status)
+
+**Untouched (out-of-scope or pre-existing):**
+- `mcp_paths.toml` (modified by environment setup, not this track)
+- `opencode.json` (modified by environment setup, not this track)
+- `.opencode/agents/tier2-autonomous.md`, `.opencode/commands/tier-2-auto-execute.md` (untracked, environment)
+
+## End-of-session commit log
+
+```
+16801829 feat(audit): add FunctionRef dataclass (frozen, 4 fields)
+5dca69f0 feat(audit): add 5 enums for the v2 data model
+b77f6cca conductor(state): code_path_audit_20260607 v2 - phase_0 completed, phase_1 in_progress
+78c9d463 docs(styleguide): create stub conductor/code_styleguides/code_path_audit.md
+b83c0744 chore(audit): create empty tests/test_code_path_audit_live_gui.py v2
+28ed3dea chore(audit): create empty tests/test_code_path_audit.py v2
+18226779 chore(audit): create empty scripts/audit_code_path_audit_coverage.py
+e9d1867b chore(audit): create empty src/code_path_audit.py v2
+8123a13f conductor(state): code_path_audit_20260607 v2 - phase_0 in_progress
+```
+
+Plus 6 cherry-picks + 1 merge commit from `tier2/phase2_4_5_call_site_completion_20260621`.
+
+## Awaiting next session
+
+Per your instruction ("when your nearly out of context I'll have you write a session reprot then continue where you left off after compaction with another warming phase"), stopping here. The next session should resume from Task 1.3 (`AccessPatternEvidence` dataclass) and proceed through the remaining 73 tasks across 13 phases.
\ No newline at end of file
diff --git a/docs/reports/TRACK_STATUS_code_path_audit_20260607_20260622.md b/docs/reports/TRACK_STATUS_code_path_audit_20260607_20260622.md
new file mode 100644
index 00000000..d745c7a0
--- /dev/null
+++ b/docs/reports/TRACK_STATUS_code_path_audit_20260607_20260622.md
@@ -0,0 +1,74 @@
+# Track Status Report - code_path_audit_20260607 (2026-06-22, mid-session)
+
+## What was completed before the merge
+
+**Phase 0** (7 tasks, all committed):
+- `state.toml` (Task 0.1)
+- `src/code_path_audit.py` empty scaffold (Task 0.2)
+- `tests/test_code_path_audit.py` empty scaffold (Task 0.3)
+- `tests/test_code_path_audit_live_gui.py` empty scaffold (Task 0.4)
+- `scripts/audit_code_path_audit_coverage.py` empty scaffold (Task 0.5)
+- `conductor/code_styleguides/code_path_audit.md` stub (Task 0.6)
+- `tests/fixtures/synthetic_src/__init__.py` + `tests/fixtures/audit_inputs/.gitkeep` (Task 0.7)
+
+**Phase 1** (1 task complete, 9 remaining):
+- Task 1.1: 5 enums (`AggregateKind`, `MemoryDim`, `AccessPattern`, `Frequency`, `RecommendedDirection`) — 5 tests passing pre-merge
+
+8 atomic commits total, all with git notes. Failcount state initialized.
+
+## The merge left the codebase in a broken state
+
+The merge commit `21ba2ffb` brought in:
+- `src/ai_client.py` imports `from src.openai_schemas import ChatMessage`
+- `src/events.py` imports `from src.api_hooks import WebSocketMessage`
+
+But **the merge did NOT bring in**:
+- `src/openai_schemas.py` (the actual file — added in commit `a96f946b`)
+- `src/mcp_tool_specs.py` (added in `96007ebd`)
+- `src/provider_state.py` (added in `2ad4718c`)
+- The `WebSocketMessage` class in `src/api_hooks.py` (added in `224930d4`)
+
+**Result:** `import src.code_path_audit` fails at runtime. Even my Phase 1 tests can no longer run because pytest's collection imports `src.code_path_audit` which transitively imports `src.ai_client` → `src.events` → `src.api_hooks` → `ImportError`.
+
+```
+ImportError: cannot import name 'WebSocketMessage' from 'src.api_hooks'
+```
+
+## What the merge did include (47 lines across 4 src/ files)
+
+- `src/ai_client.py` (+12/-6): imports ChatMessage, list-comprehension conversion in 3 `_send_<vendor>` builders
+- `src/app_controller.py` (+2/-1): 1 line
+- `src/events.py` (+3/-1): imports WebSocketMessage, broadcast call refactor
+- `src/log_registry.py` (+30): adds `set_session_start_time()` per the test fix-up commit
+
+Plus docs/ reports and `scripts/audit_tier2_leaks.py` (audit-leak detector).
+
+## What's missing vs. `origin/tier2/phase2_4_5_call_site_completion_20260621`
+
+| Commit | What it adds |
+|---|---|
+| `a96f946b` | `src/openai_schemas.py` (105 lines), `src/openai_compatible.py` refactor |
+| `96007ebd` | `src/mcp_tool_specs.py` (124 lines), tests |
+| `2ad4718c` | `src/provider_state.py` (69 lines), tests |
+| `224930d4` | `WebSocketMessage` in `src/api_hooks.py`, broadcast migration |
+| (probably) | `src/type_aliases.py` updates for 3 new aliases |
+
+The 3 candidate aggregates (`ToolSpec`, `ChatMessage`, `ProviderHistory`) need these files to be promoted from placeholders to real aggregates.
+
+## Three options for the user (per AGENTS.md "Inherited-Cruft Pattern")
+
+**(a) Revert the merge.** Reset working tree to commit `5dca69f0` (the 5-enums commit, before the merge). Lose the partial refactor but get a clean baseline. The track continues against the original master state — `ToolSpec`, `ChatMessage`, `ProviderHistory` remain placeholders.
+
+**(b) Cherry-pick the missing commits** to make the codebase functional. Need to apply: `a96f946b`, `96007ebd`, `2ad4718c`, plus the `WebSocketMessage` symbol from `224930d4`. After that, the 3 candidates become real and my Phase 2+ PCG needs to recognize them. This is the most useful path forward but requires ~5 file additions/changes outside my track scope.
+
+**(c) Abandon the track.** Stop execution, write a final TRACK_COMPLETION report noting partial progress (Phase 0 complete + Phase 1 Task 1.1 done), restore placeholder behavior for the 3 candidates.
+
+## Recommendation
+
+**Option (b) is best** for this track's accuracy. The user explicitly merged for the purpose of making the 3 candidates real. Cherry-picking the 4 missing feature commits restores codebase functionality AND lets the audit produce real profiles for `ToolSpec`, `ChatMessage`, `ProviderHistory`. Estimated 1-2 commits worth of churn outside my track scope, but the work is well-bounded.
+
+## Context status
+
+I've used ~30 tool calls so far in this session (4 critical styleguides + workflow.md + edit_workflow.md + 4 guides read, 9 commits, 7 file creations). I'm NOT near context exhaustion — I have plenty of room to execute more phases if the codebase can be made functional.
+
+Awaiting user decision before proceeding.
\ No newline at end of file