- t2_2, t2_3, t2_4, t2_5: completed
- phase_2: completed (checkpoint: ddd600f4)
- phase_2_complete: true
Total migrations: 5+6+7+12 = 30 sites (spec said 32; the audit count was
later refined to 30 INTERNAL_BROAD_CATCH sites - the spec's count was
from an earlier audit run before heuristics were refined).
Refs: 6333e0e6, 345dee34, ae62a3f5, ddd600f4
Task 2.1: Created tests/test_app_controller_result.py with 5 Result-pattern tests.
2 pass, 3 fail as migration targets. Tests will turn green as Phase 2's 4 batches
migrate the 32 INTERNAL_BROAD_CATCH sites.
Refs: 142d0474
Phase 1 = Setup + Fix the regression. 4 atomic commits (Tasks 1.3 + 1.4 + 1.5/1.6):
- 26e57577: fix(app_controller) _offload_entry_payload unwraps Result
- 4b07e934: test(app_controller) 2 new tests for the unwrap path
- 7b823fd0: conductor(state) Phase 1 complete
The regression in _offload_entry_payload (TypeError on Result path) is fixed
and locked in by 2 new unit tests. test_execution_sim_live still fails in
this sandbox due to no Gemini API access, but the offload bug is no longer
the blocker (it was fixed; the test would fail for a different reason even
without the offload bug). 885 unit tests pass; no regressions.
Refs: 7b823fd0
- t1_3, t1_4, t1_5: completed
- phase_1: completed
- regression_1_fixed: true (the offload Result unwrap bug is fixed)
- batched_suite_no_new_regressions: true (tier-1: 885 passed, was 883, +2 from new tests)
test_execution_sim_live still fails in this sandbox due to no Gemini API
access. The offload regression is fixed (the test would have failed
unrelated to the offload even before my fix). The fix is verified via
the 2 new unit tests in tests/test_app_controller_offloading.py.
Task 1.4: 2 new tests in tests/test_app_controller_offloading.py cover the
Result unwrap happy path and the error path with logging.debug assertion.
Refs: 4b07e934
Adds 2 tests to tests/test_app_controller_offloading.py covering the
fix from commit 26e57577:
1. test_offload_entry_payload_tool_call_unwraps_result
- Confirms _on_comms_entry with kind=tool_call produces a [REF:script_NNNN.ps1]
reference in payload['script'] and the offloaded file exists with the
original script content. This is the canonical happy path that exercises
the unwrap ref_result.ok + ref_result.data branch.
2. test_offload_entry_payload_preserves_script_on_log_tool_call_error
- Mocks session_logger.log_tool_call to return Result(errors=[...]) and
asserts that payload['script'] is preserved unchanged AND a debug log
is emitted via caplog. This is the failure-path that exercises the
ref_result.errors branch with logging.debug per Heuristic #19.
Both tests use the existing tmp_session_dir and app_controller fixtures
from test_app_controller_offloading.py. The Result / ErrorInfo / ErrorKind
imports are added to the test file's import block.
Refs: 26e57577 (Task 1.3 fix)
Refs: spec.md FR5
Task 1.3: src/app_controller.py _offload_entry_payload now unwraps the Result
returned by session_logger.log_tool_call. The half-migrated function returned
Result[data=str | None] but the call site did Path(ref_path).name, raising
TypeError on every tool_call event.
Refs: 26e57577
Regression fix: session_logger.log_tool_call was partially migrated to return
Result[data=str(ps1_path) | None] but the call site in _offload_entry_payload
still did Path(ref_path).name on the Result object, raising TypeError.
The fix wraps the call to log_tool_call in an isinstance(ref_result, Result)
guard and unwraps .ok / .data to produce the [REF:filename] reference. On
errors, a logging.debug is emitted (per Heuristic #19) and the payload is
preserved unchanged.
Also adds import logging to the module top and rom src.result_types
import Result, ErrorInfo, ErrorKind to support the convention's 'AND over OR'
pattern at this call site.
The log_tool_output call site is unchanged because log_tool_output still
returns Optional[str] (not Result); applying the unwrap pattern there would
crash. The spec's illustrative code treated both functions as Result-based,
but only log_tool_call was actually half-migrated.
Refs: conductor/tracks/result_migration_app_controller_20260618 (FR5)
Refs: tests/test_app_controller_offloading.py:test_offload_entry_payload_tool_call_unwraps_result
Refs: tests/test_app_controller_offloading.py:test_offload_entry_payload_preserves_script_on_log_tool_call_error
ed