IW-578: phase-merge commits the review-state card before the merge, so the post-merge advance completes #587

Merged

mph merged 12 commits from IW-578 into main 2026-09-21 08:56:27 +00:00

Conversation 0 Commits 12 Files changed 12 +1021 -7

claude commented 2026-09-21 08:35:33 +00:00

Member

Copy link

Summary

iw phase-merge merged the pull request on the forge, then ran git checkout <feature> while the review-state card was still uncommitted. ci-gate's heartbeat and hand-over write the card with no commit. Git refused the checkout, because the card blob on the phase branch differs from the one on the feature branch. The worktree stayed on the dead phase branch, tasks.md kept the phase open, the card carried a "worktree was not advanced" warning, and the command exited 1. This happened on both phases of IW-555.

Defect fixed

• Phase 1 (#582): Uncommitted review-state card blocks the post-merge checkout. PhaseMerge.doMergeAndAdvance now commits the card (ReviewStateWrite.tryCommit) immediately before the merge. This is the same order PhasePr.doBatchMerge already uses. The PhaseMergedCard write stays after the advance, on the feature branch.

Testing

• 3 harness tests in PhaseMergeHarnessTest: the heartbeat path, the state-only path after ci-gate, and "no uncommitted card write when the merge starts".
• FakeCommandEnv: FakeGit can now refuse a checkout while a card write is uncommitted (opt-in), so a harness test can see this defect.
• 1 BATS test in test/phase-merge.bats with real git: one committed and one uncommitted card change on the phase branch. Before the fix it failed with the IW-555 message.
• Phase 1 CI passed on #582. The pre-push checks (compile, scalafix, unit tests) passed on this branch head.

Follow-ups filed

#583, #584, #585, #586.

Release notes

See project-management/issues/IW-578/release-notes.md (Czech).

🤖 Generated with Claude Code

Closes #578

## Summary `iw phase-merge` merged the pull request on the forge, then ran `git checkout <feature>` while the review-state card was still uncommitted. `ci-gate`'s heartbeat and hand-over write the card with no commit. Git refused the checkout, because the card blob on the phase branch differs from the one on the feature branch. The worktree stayed on the dead phase branch, `tasks.md` kept the phase open, the card carried a "worktree was not advanced" warning, and the command exited 1. This happened on both phases of IW-555. ## Defect fixed - **Phase 1 (#582): Uncommitted review-state card blocks the post-merge checkout.** `PhaseMerge.doMergeAndAdvance` now commits the card (`ReviewStateWrite.tryCommit`) immediately before the merge. This is the same order `PhasePr.doBatchMerge` already uses. The `PhaseMergedCard` write stays after the advance, on the feature branch. ## Testing - 3 harness tests in `PhaseMergeHarnessTest`: the heartbeat path, the state-only path after `ci-gate`, and "no uncommitted card write when the merge starts". - `FakeCommandEnv`: `FakeGit` can now refuse a checkout while a card write is uncommitted (opt-in), so a harness test can see this defect. - 1 BATS test in `test/phase-merge.bats` with real git: one committed and one uncommitted card change on the phase branch. Before the fix it failed with the IW-555 message. - Phase 1 CI passed on #582. The pre-push checks (compile, scalafix, unit tests) passed on this branch head. ## Follow-ups filed #583, #584, #585, #586. ## Release notes See `project-management/issues/IW-578/release-notes.md` (Czech). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Closes #578

claude added 11 commits 2026-09-21 08:35:33 +00:00

workflow(dx): Create diagnostic analysis for IW-578 ... f2e6e4ffab

phase-merge loses its post-merge advance, because it checks out the feature branch before it commits the card

Artifacts:
- analysis.md

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

workflow(dx): Create task index for IW-578 ... 428d72fcf0

phase-merge loses its post-merge advance, because it checks out the feature branch before it commits the card

Artifacts:
- tasks.md
- review-state.json (tasks_ready)

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Phase 1: context ready ... e130e4a30d

Issue: IW-578
Phase: 1 - Uncommitted review-state card blocks the post-merge checkout

This commit marks the checkpoint for phase 1 context generation.
Use dx-fix IW-578 to return to this point.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

chore(IW-578): update review-state to context_ready 947bc4de37

workflow(dx): Generate Phase 1 tasks for IW-578 ... 82affe09f5

Uncommitted review-state card blocks the post-merge checkout

Artifacts:
- phase-01-tasks.md

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

chore(IW-578): update review-state to tasks_ready 9ec2f4d7a2

Phase 1: Uncommitted review-state card blocks the post-merge checkout (#582) fc31721884

chore(IW-578): update review-state for phase 01 28d9bbd10e

chore(IW-578): mark phase 01 complete in tasks.md bd566a5d62

chore(IW-578): file follow-ups as #583-#586 ... a9d0d074d6

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

docs(IW-578): add release notes ... c37cdf6302

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

mph added 1 commit 2026-09-21 08:36:43 +00:00

chore(IW-578): update review-state to all_complete dda796963a

mph merged commit a84020046b into main 2026-09-21 08:56:27 +00:00

mph referenced this pull request from a commit 2026-09-21 08:56:27 +00:00

Merge pull request 'IW-578: phase-merge commits the review-state card before the merge, so the post-merge advance completes' (#587) from IW-578 into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

agent-ready

  

bug

Something isn't working

  

contract

Run the tool-contract suite on this PR

  

documentation

Improvements or additions to documentation

  

duplicate

This issue or pull request already exists

  

enhancement

New feature or request

  

good first issue

Good for newcomers

  

help wanted

Extra attention is needed

  

invalid

This doesn't seem right

  

needs-human

  

needs-input

Intake asked the human a question on the issue; waiting for the answer

  

question

Further information is requested

  

wontfix

This will not be worked on

No labels

agent-ready

bug

contract

documentation

duplicate

enhancement

good first issue

help wanted

invalid

needs-human

needs-input

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

iterative-works/iw-cli!587

No description provided.