Phase 11 (REJECT Phase 10's sliming). The full Result[T] migration for
the 21 slimed sites has been completed:
- 5 full Result migrations in warmup.py (on_complete, _record_success,
_record_failure, _log_canary, _log_summary now return Result[T])
- 2 helper extracts: startup_profiler._log_phase_output and
file_cache._get_mtime_safe (Result-returning helpers)
- 14 sites documented as already compliant (Result/BOUNDARY_CONVERSION/
Heuristic #19 - not sliming, valid existing pattern)
- 1 known limitation: warmup._warmup_one L185 (indirect Result return
via delegation; convention followed; audit has known limitation)
5 LAUNDERING HEURISTICS (#22-#26) REVERTED in commit 37872544.
Heuristic A (Result-returning recovery) ADDED in commit 3c839c91.
Test count corrected: Phase 10 wrongly claimed '10 tiers'; the 11th tier
is tier-1-unit-comms. Phase 11 ran ALL 11 tiers and 10 PASS; tier-3
fails on the pre-existing test_execution_sim_live flake (unrelated).
Updated:
- conductor/tracks/result_migration_small_files_20260617/state.toml
- conductor/tracks/result_migration_small_files_20260617/metadata.json
- conductor/tracks.md (sub-track 6d-2 row)
- conductor/tracks/result_migration_20260616/spec.md (umbrella)
- docs/reports/RESULT_MIGRATION_SMALL_FILES_20260617.md (Phase 11 addendum)
- docs/reports/TRACK_COMPLETION_result_migration_small_files_20260617.md
(Phase 11 addendum with corrected test count)
Phase 11 is the actual completion. Phase 10 was rejected for sliming.
Phase 11.3.5. The original try/except (OSError, ValueError): mtime = 0.0
in get_cached_tree is now extracted to a Result-returning helper.
The helper returns Result[float]; the caller uses .data (0.0 fallback) and
can inspect .errors. The convention requires Result[T] for try/except sites
that can fail; the helper satisfies this requirement.
Audit post-migration:
- _get_mtime_safe L48 = INTERNAL_COMPLIANT (Heuristic A) ✓
- get_cached_tree L92 = no try/except for mtime (extracted)
Tests: 24/24 pass (test_ast_parser, test_file_cache_no_top_level_tree_sitter).
Phase 11.3.2. CONTEXT-MANAGER EXCEPTION.
The plan claimed 'StartupProfiler.phase() is NOT a context manager;
tier-2's claim is factually wrong.' This is incorrect. phase() IS a
context manager:
- Decorated with @contextmanager (src/startup_profiler.py:26)
- Used in 13 'with startup_profiler.phase(...)' call sites in
src/gui_2.py (lines 308, 311, 327, 338, 343, 627, 629, 631, 669,
672, 711, 729, 739)
It cannot return Result[None] because:
- @contextmanager requires the function to yield (not return)
- The except body is inside a finally block (which cannot return)
Best partial migration: extract _log_phase_output helper that returns
Result[None]; phase() calls it and ignores the Result (we're in a
finally block).
Audit post-migration:
- _log_phase_output L28 = INTERNAL_COMPLIANT (Heuristic A) ✓
- phase() L54 try/finally = INTERNAL_COMPLIANT (canonical cleanup) ✓
Tests: 12/12 pass (test_audit_allowlist_2d, test_gui_startup_smoke,
test_headless_service, test_startup_profiler, test_warmup_canaries).
This site is documented in the per-site report as a CONTEXT-MANAGER
EXCEPTION. The Heuristic #19 (catch+log) classification remains valid;
the partial migration adds explicit Result-returning helpers where
possible without breaking the context manager pattern.
Phase 11.2. Adds the LEGITIMATE heuristic that recognizes the canonical
data-oriented pattern: \ ry: ...; except: return Result(data=...,
errors=[...])\ is the convention's canonical recovery pattern.
Detection:
- New _returns_result(stmts) helper on ExceptionVisitor
- New step 0 in _classify_except (BEFORE BOUNDARY_CONVERSION check)
- Classifies as INTERNAL_COMPLIANT with a hint that names the pattern
The function-name-not-ending-in-_result is documented as a smell
(rename to xxx_result for canonical naming), but the pattern itself
is compliant.
Tests:
- 2 new tests in test_audit_exception_handling_heuristics.py:
- test_result_returning_recovery_in_non_result_named_function_is_compliant
- test_result_returning_recovery_in_result_named_function_is_compliant
- Both pass; the 2 REJECTED tests (#22, #23) remain xfailed.
Per conductor/tracks/result_migration_small_files_20260617/plan.md
section 11.2.
After migrating ContextPresetManager.load_all to return Result[Dict],
the caller in app_controller.load_context_preset needs to extract
.data from the Result before checking 'name not in presets'.
Updates:
- src/app_controller.py:load_context_preset - check result.ok and
extract result.data before iterating; raise RuntimeError if
result.ok is False (consistent with the convention).
- tests/test_context_presets_manager.py:test_manager_load_all -
extract result.data before assertions.
Tests verified:
- tests/test_context_presets_manager.py (4 tests) PASS
- tests/test_project_switch_persona_preset.py::
test_load_context_preset_missing_raises_keyerror PASS (KeyError
raised correctly when preset not found)
- tests/test_phase6_engine.py (3 tests) PASS
ed