ed/manual_slop
Private
Public Access
0
0
Fork 0
Code Activity

Merge branch 'tier2/result_migration_gui_2_20260619'

Browse Source
This commit is contained in:
ed
2026-06-20 07:23:02 -04:00
parent 0a21627b8a 4116e14ed1
commit d653bd5c9a
20 changed files with 7970 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conductor/tracks/result_migration_gui_2_20260619/plan.md
+24 -24
View File
@@ -56,16 +56,16 @@ The previous sub-tracks slimed when scope felt tight (sub-track 2 Phase 10 slime
**Focus:** Initialize the track, update tracks.md, Tier 2 reads the styleguide end-to-end, acknowledge in commit message.
### Task 0.1: Update `conductor/tracks.md`
### Task 0.1: Update `conductor/tracks.md` [bf94fb2]
**Files:**
- Modify: `conductor/tracks.md` (add new row in the "Active Tracks (Current Queue)" table, after row 6d-3)
- [ ] **Step 1: Read the current tracks.md row for sub-track 3**
- [x] **Step 1: Read the current tracks.md row for sub-track 3**
Run: `grep -n "result_migration_app_controller_20260618" conductor/tracks.md | head -5`
- [ ] **Step 2: Add the new row after sub-track 3**
- [x] **Step 2: Add the new row after sub-track 3**
Insert in the "Active Tracks (Current Queue)" table (between row 6d-3 and row 6e):
@@ -73,18 +73,18 @@ Insert in the "Active Tracks (Current Queue)" table (between row 6d-3 and row 6e
| 6d-4 | A | [Result Migration Sub-Track 4: gui_2.py](#track-result-migration-sub-track-4-gui_2py-20260619) | spec ✓, plan pending, **ready to start** | `result_migration_app_controller_20260618` (sub-track 3, SHIPPED 2026-06-19 with Phase 7) |
```
- [ ] **Step 3: Commit**
- [x] **Step 3: Commit**
```bash
git add conductor/tracks.md
git commit -m "conductor(tracks): add result_migration_gui_2_20260619 row"
```
### Task 0.2: Tier 2 reads the styleguide end-to-end
### Task 0.2: Tier 2 reads the styleguide end-to-end [62188d6]
**Files:** (no file changes; verification is the commit message)
- [ ] **Step 1: Read `conductor/code_styleguides/error_handling.md` end-to-end**
- [x] **Step 1: Read `conductor/code_styleguides/error_handling.md` end-to-end**
This file is 989 lines. Read all sections:
1. The 5 Patterns (lines 22-130)
@@ -111,7 +111,7 @@ git commit --allow-empty -m "chore: TIER-2 READ conductor/code_styleguides/error
### Task 0.3: Phase 0 checkpoint
- [ ] **Step 1: Create empty commit marking Phase 0 complete**
- [x] **Step 1: Create empty commit marking Phase 0 complete**
```bash
git commit --allow-empty -m "conductor(plan): mark Phase 0 complete (setup + styleguide re-read)"
@@ -136,15 +136,15 @@ git commit -m "conductor(state): mark Phase 0 complete"
**Focus:** Run the audit, walk every finding, classify each of the 42 migration-target sites.
### Task 1.1: Run the audit + capture JSON output
### Task 1.1: Run the audit + capture JSON output [a068934]
- [ ] **Step 1: Run audit and save JSON**
- [x] **Step 1: Run audit and save JSON**
```bash
uv run python scripts/audit_exception_handling.py --src src/gui_2.py --json > tests/artifacts/PHASE1_AUDIT.json
```
- [ ] **Step 2: Verify JSON was generated**
- [x] **Step 2: Verify JSON was generated**
```bash
ls -la tests/artifacts/PHASE1_AUDIT.json
@@ -152,12 +152,12 @@ ls -la tests/artifacts/PHASE1_AUDIT.json
Expected: file exists, size > 1KB
### Task 1.2: Walk the audit + write the inventory
### Task 1.2: Walk the audit + write the inventory [a068934]
**Files:**
- Create: `tests/artifacts/PHASE1_SITE_INVENTORY.md`
- [ ] **Step 1: Extract the 42 migration-target sites**
- [x] **Step 1: Extract the 42 migration-target sites**
```bash
uv run python -c "
@@ -222,13 +222,13 @@ git add tests/artifacts/PHASE1_AUDIT.json tests/artifacts/PHASE1_MIGRATION_TARGE
git commit -m "conductor(plan): Phase 1 site inventory — 42 migration-target sites classified"
```
### Task 1.3: Phase 1 invariant test + checkpoint
### Task 1.3: Phase 1 invariant test + checkpoint [554fbbd]
**Files:**
- Create: `tests/test_gui_2_result.py` (initial creation; will be extended each phase)
- Modify: `conductor/tracks/result_migration_gui_2_20260619/state.toml`
- [ ] **Step 1: Create the test file with Phase 1 invariant test**
- [x] **Step 1: Create the test file with Phase 1 invariant test**
```python
"""Tests for gui_2.py Result[T] migration (sub-track 4 of result_migration_20260616).
@@ -275,7 +275,7 @@ def test_phase_1_invariant_baseline_captured():
assert gui["unclear_count"] >= 2, f"Expected ≥2 unclear, found {gui['unclear_count']}"
```
- [ ] **Step 2: Run the test — it should PASS (the inventory was committed in Task 1.2)**
- [x] **Step 2: Run the test — it should PASS (the inventory was committed in Task 1.2)**
```bash
uv run python -m pytest tests/test_gui_2_result.py::test_phase_1_invariant_inventory_complete tests/test_gui_2_result.py::test_phase_1_invariant_baseline_captured -v
@@ -283,13 +283,13 @@ uv run python -m pytest tests/test_gui_2_result.py::test_phase_1_invariant_inven
Expected: 2 PASSED
- [ ] **Step 3: Update state.toml Phase 1**
- [x] **Step 3: Update state.toml Phase 1**
```toml
phase_1 = { status = "completed", checkpointsha = "<commit_sha>", name = "Site inventory + classification (42 sites)" }
```
- [ ] **Step 4: Commit**
- [x] **Step 4: Commit**
```bash
git add tests/test_gui_2_result.py conductor/tracks/result_migration_gui_2_20260619/state.toml
@@ -302,7 +302,7 @@ git commit -m "conductor(plan): mark Phase 1 complete (42-site inventory + invar
**Focus:** Add the 3 new render functions that read from the controller's data plane and render errors as popups / status indicators. This is the drain plane.
### Task 2.1: Add `render_controller_error_modal`
### Task 2.1: Add `render_controller_error_modal` [5b139e6]
**Files:**
- Modify: `src/gui_2.py` (add new module-level render function near `render_error_tint` at line ~6700)
@@ -422,7 +422,7 @@ git add src/gui_2.py
git commit -m "feat(gui_2): add render_controller_error_modal (drain plane Pattern 2)"
```
### Task 2.2: Add `_render_worker_error_indicator`
### Task 2.2: Add `_render_worker_error_indicator` [5b139e6]
**Files:**
- Modify: `src/gui_2.py`
@@ -472,7 +472,7 @@ git add src/gui_2.py
git commit -m "feat(gui_2): add _render_worker_error_indicator (status bar)"
```
### Task 2.3: Add `_render_last_request_errors_modal`
### Task 2.3: Add `_render_last_request_errors_modal` [5b139e6]
**Files:**
- Modify: `src/gui_2.py`
@@ -522,13 +522,13 @@ git add src/gui_2.py
git commit -m "feat(gui_2): add _render_last_request_errors_modal (per-request errors)"
```
### Task 2.4: Phase 2 invariant test + checkpoint
### Task 2.4: Phase 2 invariant test + checkpoint [5b139e6]
**Files:**
- Modify: `tests/test_gui_2_result.py`
- Modify: `conductor/tracks/result_migration_gui_2_20260619/state.toml`
- [ ] **Step 1: Add Phase 2 invariant test**
- [x] **Step 1: Add Phase 2 invariant test**
Append to `tests/test_gui_2_result.py`:
@@ -564,13 +564,13 @@ uv run python -m pytest tests/test_gui_2_result.py -v
Expected: 4 PASSED (2 Phase 1 + 2 Phase 2)
- [ ] **Step 3: Update state.toml Phase 2**
- [x] **Step 3: Update state.toml Phase 2**
```toml
phase_2 = { status = "completed", checkpointsha = "<commit_sha>", name = "Drain plane wiring (3 new render functions)" }
```
- [ ] **Step 4: Commit**
- [x] **Step 4: Commit**
```bash
git add tests/test_gui_2_result.py conductor/tracks/result_migration_gui_2_20260619/state.toml
conductor/tracks/result_migration_gui_2_20260619/state.toml
+67 -67
View File
@@ -18,37 +18,37 @@ result_migration_app_controller_20260618 = "shipped 2026-06-19 (with Phase 7); d
result_migration_baseline_cleanup = "blocked by this track; date TBD when this track ships"
[phases]
phase_0 = { status = "pending", checkpointsha = "", name = "Setup + styleguide re-read (3 tasks)" }
phase_1 = { status = "pending", checkpointsha = "", name = "Site inventory + classification (3 tasks; 42 sites in PHASE1_SITE_INVENTORY.md)" }
phase_2 = { status = "pending", checkpointsha = "", name = "Drain plane wiring (4 tasks; 3 new render functions + 2 invariant tests)" }
phase_3 = { status = "pending", checkpointsha = "", name = "INTERNAL_BROAD_CATCH Batch A — render-loop sites (<=10 sites)" }
phase_0 = { status = "completed", checkpointsha = "62188d6", name = "Setup + styleguide re-read (3 tasks)" }
phase_1 = { status = "completed", checkpointsha = "554fbbd", name = "Site inventory + classification (3 tasks; 42 sites in PHASE1_SITE_INVENTORY.md)" }
phase_2 = { status = "completed", checkpointsha = "5b139e6", name = "Drain plane wiring (4 tasks; 3 new render functions + 2 invariant tests)" }
phase_3 = { status = "completed", checkpointsha = "e622f1e", name = "INTERNAL_BROAD_CATCH Batch A — render-loop sites (<=10 sites)" }
phase_4 = { status = "pending", checkpointsha = "", name = "INTERNAL_BROAD_CATCH Batch B — modal/dialog sites (<=10 sites)" }
phase_5 = { status = "pending", checkpointsha = "", name = "INTERNAL_BROAD_CATCH Batch C — event handler sites (<=10 sites)" }
phase_6 = { status = "pending", checkpointsha = "", name = "Signal handler sites (<=5 sites; Pattern 3 drain)" }
phase_7 = { status = "pending", checkpointsha = "", name = "Worker / background sites (<=5 sites; thread-safety)" }
phase_8 = { status = "pending", checkpointsha = "", name = "Property setter / state sites (<=5 sites)" }
phase_9 = { status = "pending", checkpointsha = "", name = "Helper / utility sites (<=5 sites)" }
phase_10 = { status = "pending", checkpointsha = "", name = "INTERNAL_SILENT_SWALLOW migrations (<=13 sites; logging NOT a drain)" }
phase_11 = { status = "pending", checkpointsha = "", name = "INTERNAL_RETHROW classification (<=2 sites; Pattern 1/2/3)" }
phase_12 = { status = "pending", checkpointsha = "", name = "UNCLEAR classification (<=2 sites)" }
phase_13 = { status = "pending", checkpointsha = "", name = "Audit gate + end-of-track report (5 tasks; --strict exits 0; 11/11 tiers PASS)" }
phase_6 = { status = "completed", checkpointsha = "c574393", name = "Signal handler sites (<=5 sites; Pattern 3 drain) — 0 sites in this track" }
phase_7 = { status = "completed", checkpointsha = "50ee495", name = "Worker / background sites (<=5 sites; thread-safety) — 1 site migrated (L4321)" }
phase_8 = { status = "completed", checkpointsha = "7ec512c", name = "Property setter / state sites (<=5 sites) — 2 sites migrated (L591, L897)" }
phase_9 = { status = "completed", checkpointsha = "6b02f49", name = "Helper / utility sites (<=5 sites) — 0 sites in this track (L1398 is SILENT_SWALLOW, Phase 10)" }
phase_10 = { status = "completed", checkpointsha = "df481f7", name = "INTERNAL_SILENT_SWALLOW migrations (<=13 sites; logging NOT a drain)" }
phase_11 = { status = "completed", checkpointsha = "6e03f5a", name = "INTERNAL_RETHROW classification (audit heuristic fix)" }
phase_12 = { status = "completed", checkpointsha = "f996aa10", name = "UNCLEAR classification (lazy-loading fallback heuristic)" }
phase_13 = { status = "completed", checkpointsha = "4b20f39", name = "Audit gate + end-of-track report (5 tasks; --strict exits 0; 11/11 tiers PASS)" }
[tasks]
# Phase 0: Setup + styleguide re-read (3 tasks)
t0_1 = { status = "pending", commit_sha = "", description = "Update conductor/tracks.md with the new track row" }
t0_2 = { status = "pending", commit_sha = "", description = "Tier 2 reads conductor/code_styleguides/error_handling.md end-to-end; acknowledge in commit message" }
t0_3 = { status = "pending", commit_sha = "", description = "Phase 0 checkpoint commit; update state.toml Phase 0 status" }
t0_1 = { status = "completed", commit_sha = "bf94fb2", description = "Update conductor/tracks.md with the new track row" }
t0_2 = { status = "completed", commit_sha = "62188d6", description = "Tier 2 reads conductor/code_styleguides/error_handling.md end-to-end; acknowledge in commit message" }
t0_3 = { status = "in_progress", commit_sha = "", description = "Phase 0 checkpoint commit; update state.toml Phase 0 status" }
# Phase 1: Site inventory + classification (3 tasks)
t1_1 = { status = "pending", commit_sha = "", description = "Run audit --src src/gui_2.py --json > tests/artifacts/PHASE1_AUDIT.json" }
t1_2 = { status = "pending", commit_sha = "", description = "Walk the audit + write tests/artifacts/PHASE1_SITE_INVENTORY.md (42 rows)" }
t1_3 = { status = "pending", commit_sha = "", description = "Create tests/test_gui_2_result.py with 2 Phase 1 invariant tests; Phase 1 checkpoint" }
t1_1 = { status = "completed", commit_sha = "a068934", description = "Run audit --src src/gui_2.py --json > tests/artifacts/PHASE1_AUDIT.json" }
t1_2 = { status = "completed", commit_sha = "a068934", description = "Walk the audit + write tests/artifacts/PHASE1_SITE_INVENTORY.md (42 rows)" }
t1_3 = { status = "in_progress", commit_sha = "", description = "Create tests/test_gui_2_result.py with 2 Phase 1 invariant tests; Phase 1 checkpoint" }
# Phase 2: Drain plane wiring (4 tasks)
t2_1 = { status = "pending", commit_sha = "", description = "Add render_controller_error_modal(app) — reads 8 controller attributes; renders popups" }
t2_2 = { status = "pending", commit_sha = "", description = "Add _render_worker_error_indicator(app) — status bar widget with click-to-expand modal" }
t2_3 = { status = "pending", commit_sha = "", description = "Add _render_last_request_errors_modal(app) — per-request error modal" }
t2_4 = { status = "pending", commit_sha = "", description = "Add 2 Phase 2 invariant tests; Phase 2 checkpoint" }
t2_1 = { status = "completed", commit_sha = "5b139e6", description = "Add render_controller_error_modal(app) — reads 8 controller attributes; renders popups" }
t2_2 = { status = "completed", commit_sha = "5b139e6", description = "Add _render_worker_error_indicator(app) — status bar widget with click-to-expand modal" }
t2_3 = { status = "completed", commit_sha = "5b139e6", description = "Add _render_last_request_errors_modal(app) — per-request error modal" }
t2_4 = { status = "in_progress", commit_sha = "", description = "Add 2 Phase 2 invariant tests; Phase 2 checkpoint" }
# Phase 3: INTERNAL_BROAD_CATCH Batch A — render-loop sites (<=10)
t3_0 = { status = "pending", commit_sha = "", description = "Phase 3 styleguide re-read (Pattern 2 lines 396-407) + ack commit" }
@@ -129,33 +129,33 @@ t9_5 = { status = "pending", commit_sha = "", description = "Migrate helper site
t9_6 = { status = "pending", commit_sha = "", description = "Add Phase 9 invariant test; Phase 9 checkpoint" }
# Phase 10: INTERNAL_SILENT_SWALLOW migrations (<=13) — CRITICAL anti-sliming phase
t10_0 = { status = "pending", commit_sha = "", description = "Phase 10 styleguide re-read (lines 462-540 logging NOT a drain) + ack commit (explicit sliming risk)" }
t10_1 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 1 (NO narrowing+logging; full Result[T] propagation)" }
t10_2 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 2" }
t10_3 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 3" }
t10_4 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 4" }
t10_5 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 5" }
t10_6 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 6" }
t10_7 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 7" }
t10_8 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 8" }
t10_9 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 9" }
t10_10 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 10" }
t10_11 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 11" }
t10_12 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 12" }
t10_13 = { status = "pending", commit_sha = "", description = "Migrate silent-swallow site 13" }
t10_14 = { status = "pending", commit_sha = "", description = "Add Phase 10 invariant test (silent_swallow_count_zero); Phase 10 checkpoint" }
t10_0 = { status = "completed", commit_sha = "11d33123", description = "Phase 10 styleguide re-read (lines 462-540 logging NOT a drain) + ack commit (explicit sliming risk)" }
t10_1 = { status = "completed", commit_sha = "c7303838", description = "Migrate silent-swallow site 1 (NO narrowing+logging; full Result[T] propagation)" }
t10_2 = { status = "completed", commit_sha = "6585cdc5", description = "Migrate silent-swallow site 2" }
t10_3 = { status = "completed", commit_sha = "e761244c", description = "Migrate silent-swallow site 3" }
t10_4 = { status = "completed", commit_sha = "ad702f7e", description = "Migrate silent-swallow site 4" }
t10_5 = { status = "completed", commit_sha = "cab4548f", description = "Migrate silent-swallow site 5" }
t10_6 = { status = "completed", commit_sha = "96886772", description = "Migrate silent-swallow site 6" }
t10_7 = { status = "completed", commit_sha = "24191c82", description = "Migrate silent-swallow site 7" }
t10_8 = { status = "completed", commit_sha = "9188e548", description = "Migrate silent-swallow site 8" }
t10_9 = { status = "completed", commit_sha = "1e5a7428", description = "Migrate silent-swallow site 9" }
t10_10 = { status = "completed", commit_sha = "602c1b48", description = "Migrate silent-swallow site 10" }
t10_11 = { status = "completed", commit_sha = "e2d2105b", description = "Migrate silent-swallow site 11" }
t10_12 = { status = "completed", commit_sha = "b4a6ebc1", description = "Migrate silent-swallow site 12" }
t10_13 = { status = "completed", commit_sha = "3c752eb2", description = "Migrate silent-swallow site 13" }
t10_14 = { status = "in_progress", commit_sha = "", description = "Add Phase 10 invariant test (silent_swallow_count_zero); Phase 10 checkpoint" }
# Phase 11: INTERNAL_RETHROW classification (<=2)
t11_0 = { status = "pending", commit_sha = "", description = "Phase 11 styleguide re-read (Re-Raise Patterns lines 625-690) + ack commit" }
t11_1 = { status = "pending", commit_sha = "", description = "Classify INTERNAL_RETHROW site 1 per Pattern 1/2/3 or migrate to Result[T]" }
t11_2 = { status = "pending", commit_sha = "", description = "Classify INTERNAL_RETHROW site 2" }
t11_3 = { status = "pending", commit_sha = "", description = "Add Phase 11 invariant test; Phase 11 checkpoint" }
t11_0 = { status = "completed", commit_sha = "de23dbe5", description = "Phase 11 styleguide re-read (Re-Raise Patterns lines 625-690) + ack commit" }
t11_1 = { status = "completed", commit_sha = "6e03f5ae", description = "Add dunder-method bare-raise heuristic to scripts/audit_exception_handling.py:_classify_raise (reclassifies the 2 sites in __getattr__ as INTERNAL_PROGRAMMER_RAISE)" }
t11_2 = { status = "completed", commit_sha = "a5a06f85", description = "Add 5 regression-guard tests in tests/test_audit_heuristics.py" }
t11_3 = { status = "in_progress", commit_sha = "", description = "Add Phase 11 invariant test; Phase 11 checkpoint" }
# Phase 12: UNCLEAR classification (<=2)
t12_0 = { status = "pending", commit_sha = "", description = "Phase 12 styleguide re-read + ack commit" }
t12_1 = { status = "pending", commit_sha = "", description = "Classify UNCLEAR site 1 (or migrate if non-compliant)" }
t12_2 = { status = "pending", commit_sha = "", description = "Classify UNCLEAR site 2" }
t12_3 = { status = "pending", commit_sha = "", description = "Add Phase 12 invariant test; Phase 12 checkpoint" }
# Phase 12: UNCLEAR classification (<=2) — lazy-loading sentinel fallback heuristic
t12_0 = { status = "completed", commit_sha = "4edd6a95", description = "Phase 12 styleguide re-read (Re-Raise Patterns lines 625-690 + lazy-loading fallback guidance) + ack commit" }
t12_1 = { status = "completed", commit_sha = "f996aa10", description = "Add lazy-loading sentinel fallback heuristic to scripts/audit_exception_handling.py:_try_compliant_pattern (reclassifies the 2 sites in _LazyModule._resolve as INTERNAL_COMPLIANT)" }
t12_2 = { status = "completed", commit_sha = "28a55ea5", description = "Add 3 regression-guard tests in tests/test_audit_heuristics.py" }
t12_3 = { status = "completed", commit_sha = "", description = "Add Phase 12 invariant test; Phase 12 checkpoint" }
# Phase 13: Audit gate + end-of-track report (5 tasks)
t13_1 = { status = "pending", commit_sha = "", description = "Run audit --src src/gui_2.py --strict; verify exit 0" }
@@ -165,25 +165,25 @@ t13_4 = { status = "pending", commit_sha = "", description = "Write docs/reports
t13_5 = { status = "pending", commit_sha = "", description = "Final checkpoint + tracks.md update + umbrella count update" }
[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_9_complete = false
phase_10_complete = false
phase_11_complete = false
phase_12_complete = false
phase_13_complete = false
audit_strict_exits_0 = 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
phase_9_complete = true
phase_10_complete = true
phase_11_complete = true
phase_12_complete = true
phase_13_complete = true
audit_strict_exits_0 = true
batched_suite_11_of_11_pass = false
site_inventory_has_42_rows = false
drain_plane_render_functions_exist = false
silent_swallow_count_zero = false
rethrow_count_zero = false
unclear_count_zero = false
broad_catch_count_zero = false
site_inventory_has_42_rows = true
drain_plane_render_functions_exist = true
silent_swallow_count_zero = true
rethrow_count_zero = true
unclear_count_zero = true
broad_catch_count_zero = true