IW-583: phase-advance commits the review-state card before it checks out the feature branch #589

Merged

mph merged 14 commits from IW-583 into main 2026-09-21 11:20:13 +00:00

Conversation 0 Commits 14 Files changed 11 +993 -27

claude commented 2026-09-21 10:56:26 +00:00

Member

Copy link

Summary

iw phase-advance ran git checkout <feature> before it committed the review-state card. A card left uncommitted by a gate (phase-merge timeout or CI failure, a paused phase-pr/phase-merge wait, iw ci-gate) made git refuse the checkout, so phase-advance exited 1 after a manual merge and did nothing. Same root cause as IW-578, which fixed only phase-merge.

Defects fixed

• Phase 1 — A dirty review-state card blocks the checkout in phase-advance (#588). PhaseAdvance.doAdvance now commits the card before the checkout, only on the phase branch and only after checkMerged passes. Both card commits share one commit message.

Testing

• PhaseAdvanceHarnessTest: a dirty card no longer blocks the checkout (failed before the fix); no commit when the PR is not merged; a dirty user file still refuses the checkout.
• test/phase-advance.bats: real git, bare origin — an uncommitted card still lets phase-advance check out the feature branch.
• CI passed on the phase PR.

Follow-ups

• The premature "CI did not run" verdict seen in this issue is filed as a comment on #485 (same missing grace window).

Release notes

Příkaz iw phase-advance nyní spolehlivě převede práci zpět na hlavní větev úkolu i v situaci, kdy po předchozím kroku zůstal v pracovní kopii neuložený stavový záznam fáze. Uživatel tak po ručním sloučení pull requestu už nemusí nic opravovat ručně. Příkaz stavový záznam uloží sám, až poté, co ověří, že pull request fáze je sloučen; ostatní neuložené soubory zůstávají chráněny jako dříve.

Full notes: project-management/issues/IW-583/release-notes.md

🤖 Generated with Claude Code

Closes #583

## Summary `iw phase-advance` ran `git checkout <feature>` before it committed the review-state card. A card left uncommitted by a gate (`phase-merge` timeout or CI failure, a paused `phase-pr`/`phase-merge` wait, `iw ci-gate`) made git refuse the checkout, so `phase-advance` exited 1 after a manual merge and did nothing. Same root cause as IW-578, which fixed only `phase-merge`. ## Defects fixed - **Phase 1 — A dirty review-state card blocks the checkout in `phase-advance`** (#588). `PhaseAdvance.doAdvance` now commits the card before the checkout, only on the phase branch and only after `checkMerged` passes. Both card commits share one commit message. ## Testing - `PhaseAdvanceHarnessTest`: a dirty card no longer blocks the checkout (failed before the fix); no commit when the PR is not merged; a dirty user file still refuses the checkout. - `test/phase-advance.bats`: real git, bare origin — an uncommitted card still lets `phase-advance` check out the feature branch. - CI passed on the phase PR. ## Follow-ups - The premature "CI did not run" verdict seen in this issue is filed as a comment on #485 (same missing grace window). ## Release notes Příkaz `iw phase-advance` nyní spolehlivě převede práci zpět na hlavní větev úkolu i v situaci, kdy po předchozím kroku zůstal v pracovní kopii neuložený stavový záznam fáze. Uživatel tak po ručním sloučení pull requestu už nemusí nic opravovat ručně. Příkaz stavový záznam uloží sám, až poté, co ověří, že pull request fáze je sloučen; ostatní neuložené soubory zůstávají chráněny jako dříve. Full notes: `project-management/issues/IW-583/release-notes.md` 🤖 Generated with [Claude Code](https://claude.com/claude-code) Closes #583

claude added 13 commits 2026-09-21 10:56:26 +00:00

workflow(dx): Create diagnostic analysis for IW-583 ... 52c25ba022

phase-advance checks out the feature branch before it commits the card

Artifacts:
- analysis.md

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

chore(IW-583): update review-state to tasks_ready a0fcd19e4c

workflow(dx): Create task index for IW-583 ... 3d90fd47aa

phase-advance 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 ... 0c81dffa00

Issue: IW-583
Phase: 1 - A dirty review-state card blocks the checkout in phase-advance

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

🤖 Generated with Claude Code

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

chore(IW-583): update review-state to context_ready 96f20d7af4

workflow(dx): Generate Phase 1 tasks for IW-583 ... e7a0135d7d

A dirty review-state card blocks the checkout in phase-advance

Artifacts:
- phase-01-tasks.md

🤖 Generated with Claude Code

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

chore(IW-583): update review-state to tasks_ready f6fa6970a4

Phase 1: A dirty review-state card blocks the checkout in phase-advance (#588) 53a56c7bc8

chore(IW-583): update review-state for phase 01 06cea773dc

chore(IW-583): mark phase 01 complete in tasks.md 3ed3322784

chore(IW-583): record premature 'CI did not run' verdict as a follow-up ... b35fb7732a

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

chore(IW-583): file follow-up as comment on #485 ... b485ae497a

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

docs(IW-583): add release notes ... cc16c2db5e

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

mph added 1 commit 2026-09-21 10:57:51 +00:00

chore(IW-583): update review-state to all_complete ef2c702805

mph merged commit 1ab9178765 into main 2026-09-21 11:20:13 +00:00

mph referenced this pull request from a commit 2026-09-21 11:20:15 +00:00

Merge pull request 'IW-583: phase-advance commits the review-state card before it checks out the feature branch' (#589) from IW-583 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!589

No description provided.