Bug: integrator can mark task done after integrating into fallback branch instead of base

t-591·WorkTask·
·
·
Created1 week ago·Updated1 week ago

Dependencies

Description

Edit

During integrator run for t-587.4, the loop could not checkout base branch live in the integrator workspace and silently fell back to the workspace branch (t587r5-live).

Observed logs:

  • [... ] Could not checkout base branch live ...; using t587r5-live
  • Integrator reported success and marked task Done.
  • Commit 57a353e5 exists on branch t587r5-live, but live remained at 40b93224.

Impact:

  • Task status can be marked Done even though changes were NOT integrated to the intended base branch.
  • Breaks correctness of the release/integration step.

Need:

  • Integrator must fail hard if checkout of configured base branch fails.
  • Do not mark task done unless cherry-pick lands on the configured base branch.
  • Add explicit branch assertion before finalization (e.g., current branch == base branch).

Timeline (16)

🔄[human]Open → InProgress1 week ago
💬[human]1 week ago

Implemented fix in commit 7f659906: integrator preparation now fails hard unless workspace is exactly on configured base branch; removed fallback integration behavior; claim statuses are restored when workspace prep fails; added explicit failure comment path and updated integrator workflow docs. Verified with repro using invalid --base: status now restored to Approved instead of proceeding.

🔄[human]InProgress → Review1 week ago
🔄[system]Review → ReviewInProgress1 week ago
💬[human]1 week ago

Review (patchset 1): Examined all changes in dev-review-release.sh and integrator.md. Patch correctly addresses the bug: integrator no longer silently falls back to a wrong branch.

🔄[human]ReviewInProgress → Approved1 week ago
💬[human]1 week ago

Automation (review) run review-t-591-20260211-214839 cost_cents=0 cumulative_cost_cents=0.

🔄[system]Approved → Integrating1 week ago
💬[human]1 week ago

Integration: cherry-picked commit 5fb137ae to live branch. Verified bash syntax OK. Build artifact not created in this environment but script structure validated.

🔄[human]Integrating → Done1 week ago
💬[human]1 week ago

Automation (integrator) run integrator-t-591-20260211-215217 cost_cents=0 cumulative_cost_cents=0.