ace-assign 0.56.1 → 0.57.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7982f8868f50e88cbaa0934bd8b68e2032338b9e65ea73dddcbdb6e53aa8dba0
-  data.tar.gz: ed218dffe3d5b5783aebda6931ae6de9db997dd5740a9dcf0bd2235ed5ee6e41
+  metadata.gz: 64ca0ab83e21423599cccecfdc9b20e7dfc4c62b0e262e40bf82dc96ba68e0e0
+  data.tar.gz: 5515ff2144574af8f820437a1423106925ec6f8674f5838921249445c8547f3b
 SHA512:
-  metadata.gz: 39b4c93407ddb18fa3abb8c21702f52b5d10f23ab912ed4fd58e3333dcf9e1c415b7f1b1a749a21e4e0016d67243bc37fa202628c1b400bd198cf577b0947cbe
-  data.tar.gz: 8f1526590957d67c23e7d6b7216bc6d868c12cd5b5c540b0c531b56dd3a490cf3c6e88d9a95081746f58a4e439a98a87983d04dec9326809a938af87605fd0b5
+  metadata.gz: 42b4a978e165872d2bb9c89e6ab9cd6ddc6698c2664d054c0c6fde53de2b18981288dde5f6760e2f4ca2fe6b41811deeafb1435b9071b80a36fe211a2abeeb00
+  data.tar.gz: f6c97237effc40614bcceb08b25a577a70fe0bc0d034791df6f90a8cf0050d9e9adf935bf89834bfd0a7641b2c3f5c5787bd8b73941e9784b04bcb479a0c61d9

data/.ace-defaults/assign/catalog/composition-rules.yml

@@ -10,9 +10,27 @@ ordering:
     before: create-pr
     after: review-pr
 
-  - rule: review-before-apply
+  - rule: apply-before-final-review
+    before: apply-feedback
+    after: review-pr
+    before_occurrence: last
+    after_occurrence: last
+    note: "The review-pr workflow includes fixes and its completed review rounds"
+
+  - rule: review-before-ready
     before: review-pr
-    after: apply-feedback
+    after: mark-pr-ready
+    before_occurrence: last
+
+  - rule: pr-desc-before-ready
+    before: update-pr-desc
+    after: mark-pr-ready
+    before_occurrence: last
+
+  - rule: ready-before-merge
+    before: mark-pr-ready
+    after: auto-merge
+    before_occurrence: last
 
   - rule: onboard-before-plan
     before: onboard
@@ -73,6 +91,13 @@ ordering:
     after: update-pr-desc
     note: "PR description should reflect pushed state"
 
+  - rule: review-before-update-pr
+    before: review-pr
+    after: update-pr-desc
+    before_occurrence: last
+    after_occurrence: last
+    note: "PR description should reflect fixes and evidence from the completed review"
+
   - rule: release-before-pr
     before: release
     after: create-pr
@@ -103,11 +128,6 @@ ordering:
     after: create-retro
     note: "Retro captures learnings after all implementation and release work is complete"
 
-  - rule: retro-after-apply-feedback
-    before: apply-feedback
-    after: create-retro
-    note: "Retro should follow all feedback application in review cycles"
-
   - rule: update-docs-after-release
     before: release
     after: update-docs
@@ -119,11 +139,6 @@ ordering:
     note: "Updated docs should be visible to PR reviewers"
 
 pairs:
-  - name: review-apply-cycle
-    steps: [review-pr, apply-feedback]
-    pattern: sequential
-    note: "Reviews should be followed by feedback application"
-
   - name: test-fix-cycle
     steps: [verify-test-suite, fix-tests]
     pattern: conditional
@@ -134,11 +149,6 @@ pairs:
     pattern: sequential
     note: "Reorganize then push for clean remote history"
 
-  - name: apply-release-cycle
-    steps: [apply-feedback, release]
-    pattern: sequential
-    note: "Patch release after applying review feedback"
-
   - name: reflect-verify-cycle
     steps: [reflect-and-refactor, verify-test-suite]
     pattern: conditional
@@ -184,23 +194,6 @@ conditional:
     suggest: [security-audit]
     strength: optional
 
-  - when: "assignment includes review-pr and apply-feedback"
-    suggest: [release]
-    strength: recommended
-    note: "Patch release after each review cycle captures fixes"
-
 fork_context:
   onboard_required: true
   note: "Steps with fork context should include onboard instruction as first step"
-
-review_cycles:
-  default_count: 3
-  max_count: 5
-  preset_progression:
-    1: code-valid
-    2: code-fit
-    3: code-shine
-  focus_progression:
-    1: "Correctness: bugs, logic errors, missing functionality, broken contracts"
-    2: "Quality: performance, architecture, standards, test coverage"
-    3: "Polish: simplification, naming, documentation (non-blocking suggestions)"

data/.ace-defaults/assign/catalog/recipes/batch-tasks.recipe.yml

@@ -1,5 +1,5 @@
 name: batch-tasks
-description: Work on multiple tasks with PR, review cycles, and releases
+description: Work on multiple tasks with PR, iterative review, and releases
 
 matches:
   - "work on tasks *"
@@ -8,7 +8,6 @@ matches:
 
 parameters:
   taskrefs: { required: true, type: array }
-  review_cycles: { required: false, default: 3 }
 
 steps:
   - name: onboard
@@ -25,20 +24,23 @@ steps:
     note: "Initial version bump (usually minor)"
   - name: create-pr
     required: true
-  - name: review-cycle
-    repeat: "{{review_cycles}}"
-    context: fork
-    sub_steps: [review-pr, apply-feedback, release, create-retro]
-    note: "Each cycle includes patch release after applying feedback"
+    instructions_template: "Create the pull request with --draft; keep it draft until the review completion rule is met."
   - name: reorganize-commits
     required: false
   - name: push-to-remote
     required: true
+  - name: review-pr
+    required: true
+    workflow: wfi://review/pr
+    note: "Apply verified fixes, release as needed, and rerun affected scopes using the shared round completion rule"
   - name: update-pr-desc
-    required: false
+    required: true
+  - name: mark-pr-ready
+    required: true
+    note: "Only after review completion rule and PR description update"
 
 customization_hints:
   - "Add create-pr after batch for consolidated review"
-  - "Add review cycles if changes need review"
+  - "Use the iterative PR review workflow for all changed modules"
   - "Reduce batch size for complex tasks"
   - "Skip reorganize-commits if history is already clean"

data/.ace-defaults/assign/catalog/recipes/documentation.recipe.yml

@@ -31,5 +31,5 @@ steps:
 customization_hints:
   - "Add create-pr step if create_pr=true for documentation PRs"
   - "Add lint step for markdown linting"
-  - "Add review-cycle for critical documentation"
+  - "Add review-pr with wfi://review/pr for critical documentation PRs"
   - "Skip onboard if already in context"

data/.ace-defaults/assign/catalog/recipes/fix-and-review.recipe.yml

@@ -8,7 +8,6 @@ matches:
 
 parameters:
   taskref: { required: true }
-  review_cycles: { required: false, default: 1 }
 
 steps:
   - name: onboard
@@ -22,11 +21,18 @@ steps:
     required: true
   - name: create-pr
     required: true
-  - name: review-cycle
-    repeat: "{{review_cycles}}"
-    sub_steps: [review-pr, apply-feedback]
+    instructions_template: "Create the pull request with --draft; keep it draft until the review completion rule is met."
+  - name: review-pr
+    required: true
+    workflow: wfi://review/pr
+    note: "Iterate verified fixes and affected reviews until the round completion rule is met"
+  - name: update-pr-desc
+    required: true
+  - name: mark-pr-ready
+    required: true
+    note: "Only after review completion rule"
 
 customization_hints:
   - "Add fix-tests after verify-test-suite if failures found"
   - "Add security-audit for security-related fixes"
-  - "Increase review cycles for critical fixes"
+  - "Include integration scope when the fix crosses module boundaries"

data/.ace-defaults/assign/catalog/recipes/implement-with-pr.recipe.yml

@@ -1,5 +1,5 @@
 name: implement-with-pr
-description: Implement a task, create PR, and iterate through review cycles with releases
+description: Implement a task, create PR, and review until the current PR passes
 
 matches:
   - "work on task * and create PR"
@@ -8,7 +8,6 @@ matches:
 
 parameters:
   taskref: { required: true }
-  review_cycles: { required: false, default: 3 }
 
 steps:
   - name: onboard
@@ -29,11 +28,7 @@ steps:
     note: "Initial version bump (usually minor)"
   - name: create-pr
     required: true
-  - name: review-cycle
-    repeat: "{{review_cycles}}"
-    context: fork
-    sub_steps: [review-pr, apply-feedback, release, create-retro]
-    note: "Each cycle uses preset_progression from composition rules (1: code-valid, 2: code-fit, 3: code-shine)"
+    instructions_template: "Create the pull request with --draft; keep it draft until the review completion rule is met."
   - name: reorganize-commits
     required: false
   - name: push-to-remote
@@ -41,12 +36,19 @@ steps:
   - name: record-demo
     required: false
     note: "Record demos for modified packages with tapes; skip if no tapes or VHS unavailable"
+  - name: review-pr
+    required: true
+    workflow: wfi://review/pr
+    note: "Verify and fix findings; rerun affected scopes until a fresh integration review passes on the current head"
   - name: update-pr-desc
-    required: false
+    required: true
+  - name: mark-pr-ready
+    required: true
+    note: "Only after review completion rule and PR description update"
 
 customization_hints:
   - "Skip onboard if already onboarded in a previous assignment"
   - "Add security-audit for security-sensitive changes"
-  - "Reduce review cycles to 1 for simple changes"
+  - "Use focused review scopes for simple changes; completion follows the shared round rule"
   - "Skip reorganize-commits if commit history is already clean"
   - "Skip record-demo if VHS is not available or no tape files exist"

data/.ace-defaults/assign/catalog/steps/apply-feedback.step.yml

@@ -2,10 +2,7 @@ name: apply-feedback
 skill: as-review-apply-feedback
 description: Apply review feedback and commit improvements
 
-prerequisites:
-  - name: review-pr
-    strength: required
-    reason: "Must have review feedback to apply"
+prerequisites: []
 
 produces: [code-changes, commits]
 consumes: [review-feedback]

data/.ace-defaults/assign/catalog/steps/create-pr.step.yml

@@ -1,2 +1,3 @@
 name: create-pr
 skill: as-github-pr-create
+instructions: "Create the pull request with --draft before PR review begins."

data/.ace-defaults/assign/catalog/steps/mark-pr-ready.step.yml

@@ -0,0 +1,11 @@
+name: mark-pr-ready
+description: Mark a reviewed draft pull request ready after the review completion rule
+instructions: "After the review completion rule is met and appropriate tests have passed, run gh pr ready on the draft PR."
+prerequisites:
+  - name: review-pr
+    strength: required
+    reason: Review must complete before marking the PR ready
+  - name: update-pr-desc
+    strength: required
+    reason: The PR description must record the review rounds, reviewer roster, tests, and dispositions before readiness
+consumes: [review-feedback]

data/.ace-defaults/assign/catalog/steps/review-pr.step.yml

@@ -1,2 +1,4 @@
 name: review-pr
 skill: as-review-pr
+produces:
+  - review-feedback

data/.ace-defaults/assign/presets/fix-bug.yml

@@ -8,10 +8,6 @@ parameters:
   taskref:
     required: true
     description: Task reference for the bug fix (e.g., 123 or 256.01)
-  review_cycles:
-    required: false
-    default: 1
-    description: Number of review cycles to perform
 
 steps:
   - name: onboard
@@ -44,23 +40,25 @@ steps:
     skill: as-github-pr-create
     instructions:
       - Create a pull request for the bug fix.
+      - Create it as a draft with --draft; mark it ready only after the review completion rule is met.
       - Include reference to the bug/task in the PR description.
 
-  - name: review-cycle-1
-    skill: as-review-pr
-    context: fork
+  - name: review-pr
+    workflow: wfi://review/pr
     instructions:
-      - "First: onboard yourself using /as-onboard skill to load project context."
-      - Review the bug fix code.
-      - Focus on correctness and edge cases.
+      - "Follow wfi://review/pr: minimum 3 completed PR rounds, last 2 without confirmed P0/P1. Include integration within those rounds."
+      - "Verify findings, fix concrete defects, and run appropriate tests. Record rounds and dispositions; commits do not reset counters."
+
+  - name: update-pr-desc
+    workflow: wfi://github/pr/update
+    instructions:
+      - "Record the review rounds, actual reviewers, findings and tests in the PR description before marking it ready."
 
-  - name: apply-feedback-1
-    skill: as-review-apply-feedback
+  - name: mark-pr-ready
     instructions:
-      - Apply feedback from the review.
-      - Commit changes with descriptive messages.
+      - "After review completes and appropriate tests pass, run `gh pr ready` on the draft PR."
 
 customization_hints:
   - "Add fix-tests after verify-test-suite if failures found"
   - "Add security-audit for security-related fixes"
-  - "Increase review cycles for critical fixes"
+  - "Use more focused scopes for critical fixes; continue until important findings are resolved"

data/.ace-defaults/assign/presets/work-on-task-ace-development.yml

@@ -33,13 +33,7 @@ steps:
     workflow: wfi://github/pr/create
     instructions:
       - "Create a pull request summarizing batch tasks: {{taskrefs}}."
-
-  - name: review-valid-1
-    number: "040"
-    context: fork
-    sub_steps: [review-pr, apply-feedback, release]
-    instructions:
-      - Execute valid review cycle.
+      - "Create it as a draft with --draft; mark it ready only after the review completion rule is met."
 
   - name: record-demo
     number: "145"
@@ -47,13 +41,31 @@ steps:
       - "Record a demo showing the feature implemented in this PR."
 
   - name: mark-tasks-done
-    number: "155"
+    number: "146"
     workflow: wfi://task/update
     instructions:
-      - "Mark each top-level task in {{taskrefs}} as done and archive it."
+      - "Mark each top-level task in {{taskrefs}} as done and archive it before review."
 
   - name: create-retro
-    number: "160"
+    number: "147"
     skill: as-retro-create
     instructions:
       - "Create a retrospective for the batch work on: {{taskrefs}}."
+
+  - name: review-pr
+    number: "148"
+    workflow: wfi://review/pr
+    instructions:
+      - "Follow wfi://review/pr: minimum 3 completed PR rounds, last 2 without confirmed P0/P1. Include integration within those rounds."
+      - "Verify findings, fix concrete defects, and run appropriate tests. Record rounds and dispositions; commits do not reset counters."
+
+  - name: update-pr-desc
+    number: "149"
+    workflow: wfi://github/pr/update
+    instructions:
+      - "Record the review rounds, actual reviewers, findings and tests in the PR description before marking it ready."
+
+  - name: mark-pr-ready
+    number: "150"
+    instructions:
+      - "After review completes and appropriate tests pass, run `gh pr ready` on the draft PR."

data/.ace-defaults/assign/presets/work-on-task-auto-merge.yml

@@ -2,7 +2,7 @@
 # Advanced authorized guarded auto-merge task delivery preset
 
 name: work-on-task-auto-merge
-description: Work on a task with PR, review cycles, and advance authorization for guarded auto-merge
+description: Work on a task with PR, converging review rounds, and advance authorization for guarded auto-merge
 
 parameters:
   taskrefs:
@@ -22,26 +22,38 @@ steps:
     workflow: wfi://github/pr/create
     instructions:
       - "Create a pull request summarizing task: {{taskrefs}}."
-
-  - name: review-valid-1
-    number: "040"
-    context: fork
-    sub_steps: [review-pr, apply-feedback]
-    instructions:
-      - Execute valid review cycle and apply feedback.
+      - "Create it as a draft with --draft; mark it ready only after the review completion rule is met."
 
   - name: push-to-remote
     number: "140"
     instructions:
       - Push changes with force-with-lease.
 
-  - name: auto-merge
-    number: "150"
-    instructions:
-      - "Guarded auto-merge authorized PR when checks pass."
-
   - name: mark-tasks-done
-    number: "155"
+    number: "142"
     workflow: wfi://task/update
     instructions:
-      - "Mark task {{taskrefs}} done during final delivery."
+      - "Mark task {{taskrefs}} done and commit tracked task-file changes before review."
+
+  - name: review-pr
+    number: "145"
+    workflow: wfi://review/pr
+    instructions:
+      - "Follow wfi://review/pr: minimum 3 completed PR rounds, last 2 without confirmed P0/P1. Include integration within those rounds."
+      - "Verify findings, fix concrete defects, and run appropriate tests. Record rounds and dispositions; commits do not reset counters."
+
+  - name: update-pr-desc
+    number: "147"
+    workflow: wfi://github/pr/update
+    instructions:
+      - "Record the review rounds, actual reviewers, findings and tests in the PR description before marking it ready."
+
+  - name: mark-pr-ready
+    number: "148"
+    instructions:
+      - "After review completes and appropriate tests pass, run `gh pr ready` on the draft PR."
+
+  - name: auto-merge
+    number: "150"
+    instructions:
+      - "Merge only when separately authorized and the existing merge checks pass."

data/.ace-defaults/assign/presets/work-on-task-in-place.yml

@@ -3,6 +3,7 @@
 
 name: work-on-task-in-place
 description: Work on a task in the current checkout with reviewed, verified, scoped commit (no worktree, PR, or merge)
+# This local-only preset does not create a PR; the PR review workflow does not apply.
 
 parameters:
   taskrefs:

data/.ace-defaults/assign/presets/work-on-task.yml

@@ -1,11 +1,11 @@
-# Unified task workflow: single or multi-task implement → release → PR → review cycles → reorganize → push
+# Unified task workflow: implement → release → draft PR → review rounds → ready
 # Usage: /as-assign-prepare work-on-task --taskref 123
 #        /as-assign-prepare work-on-task --taskrefs 148,149,150
 #        /as-assign-prepare work-on-task --taskrefs 148-152
 #        /as-assign-prepare work-on-task --taskrefs "240.*"
 
 name: work-on-task
-description: Work on one or more tasks with PR, review cycles, release, and clean history
+description: Work on one or more tasks with PR, iterative review, release, and clean history
 
 parameters:
   taskrefs:
@@ -51,41 +51,9 @@ steps:
     workflow: wfi://github/pr/create
     instructions:
       - "Create a pull request summarizing batch tasks: {{taskrefs}}."
+      - "Create it as a draft with --draft; mark it ready only after the review completion rule is met."
       - "Capture the PR number for the downstream review and PR-update steps."
 
-  - name: review-valid-1
-    number: "040"
-    context: fork
-    sub_steps: [review-pr, apply-feedback, release]
-    instructions:
-      - Execute the valid review cycle via child steps.
-      - "Child review-pr: use preset code-valid."
-      - "Focus: correctness — bugs, logic errors, missing functionality, broken contracts."
-      - "Child apply-feedback: apply medium+ priority review findings and commit."
-      - "Child release: follow `ace-bundle wfi://release/publish` to publish patch-level updates for modified packages touched by valid-cycle fixes and update both package and root CHANGELOGs."
-
-  - name: review-fit-1
-    number: "070"
-    context: fork
-    sub_steps: [review-pr, apply-feedback, release]
-    instructions:
-      - Execute the fit review cycle via child steps.
-      - "Child review-pr: use preset code-fit."
-      - "Focus: quality — performance, architecture, standards, test coverage."
-      - "Child apply-feedback: apply fit-cycle findings and commit."
-      - "Child release: follow `ace-bundle wfi://release/publish` to publish patch-level updates for modified packages touched by fit-cycle fixes and update both package and root CHANGELOGs."
-
-  - name: review-shine-1
-    number: "100"
-    context: fork
-    sub_steps: [review-pr, apply-feedback, release]
-    instructions:
-      - Execute the shine review cycle via child steps.
-      - "Child review-pr: use preset code-shine."
-      - "Focus: polish — simplification, naming, documentation (non-blocking suggestions)."
-      - "Child apply-feedback: apply worthwhile shine-cycle findings and commit."
-      - "Child release: follow `ace-bundle wfi://release/publish` to publish patch-level updates for modified packages touched by shine-cycle fixes and update both package and root CHANGELOGs."
-
   - name: reorganize-commits
     number: "130"
     workflow: wfi://git/reorganize-commits
@@ -128,16 +96,6 @@ steps:
       - "  4. Fix and retry: if the cause is a fixable config/env issue (wrong font, missing fixture, bad path), fix it and retry"
       - "  5. Only skip if the failure is truly unfixable (tool not installed, no tapes exist, hardware dependency)"
 
-  - name: update-pr-desc
-    number: "150"
-    context: fork
-    workflow: wfi://github/pr/update
-    instructions:
-      - "Update the PR description with the final batch summary for: {{taskrefs}}."
-      - "CRITICAL: The File Changes section must contain the complete, untruncated grouped-stats output from `ace-git diff`. Paste it verbatim — never summarize or abbreviate."
-      - "Include final release/version information and the key completed components when applicable."
-      - "Make sure the PR description reflects the post-review final state."
-
   - name: mark-tasks-done
     number: "155"
     workflow: wfi://task/update
@@ -159,6 +117,28 @@ steps:
       - "Capture what went well, what could improve, and action items across the batch."
       - "Focus on process learnings, not just task outcomes."
 
+  - name: review-pr
+    number: "170"
+    workflow: wfi://review/pr
+    instructions:
+      - "Follow wfi://review/pr: minimum 3 completed PR rounds, last 2 without confirmed P0/P1. Include integration within those rounds."
+      - "Verify findings, fix concrete defects, and run appropriate tests. Record rounds and dispositions; commits do not reset counters."
+
+  - name: update-pr-desc
+    number: "180"
+    context: fork
+    workflow: wfi://github/pr/update
+    instructions:
+      - "Update the PR description with the final batch summary for: {{taskrefs}}."
+      - "CRITICAL: The File Changes section must contain the complete, untruncated grouped-stats output from `ace-git diff`. Paste it verbatim — never summarize or abbreviate."
+      - "Include final release/version information and the key completed components when applicable."
+      - "Make sure the PR description reflects the post-review final state."
+
+  - name: mark-pr-ready
+    number: "190"
+    instructions:
+      - "After review completes and appropriate tests pass, run `gh pr ready` on the draft PR."
+
 expansion:
   batch-parent:
     name: batch-tasks

data/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.57.1] - 2026-09-27
+
+### Technical
+- Stop depending on the removed review-fit preset step in tests.
+
+## [0.57.0] - 2026-09-24
+
+### Changed
+
+- Delegate PR review rounds to the shared review workflow instead of duplicating fixed cycles in assignments.
+- Create PRs as drafts and update their descriptions before marking them ready after review; no separate coverage receipt or SHA gate.
 
 ## [0.56.1] - 2026-09-02
 

data/handbook/workflow-instructions/assign/compose.wf.md

@@ -156,7 +156,7 @@ Include:
 Use AskUserQuestion when needed:
 - Accept as-is
 - Add/remove step
-- Adjust review cycles
+- Adjust review scope and reviewer preferences; do not cap unresolved review rounds
 - Provide custom changes
 
 Re-validate after edits.

data/handbook/workflow-instructions/assign/drive.wf.md

@@ -168,7 +168,7 @@ Concrete example:
 
 - Never use report text to "skip" or synthesize completion for planned steps.
 - **Fork-delegation constraint**: If the active step has `FORK: yes`, the driver MUST delegate via `ace-assign fork-run`. The driver MUST NOT execute fork-marked steps inline, absorb remaining fork children after partial failure, or inject retry steps as top-level siblings. All fork recovery goes through re-fork (see [Fork-Run Crash Recovery](#fork-run-crash-recovery-partial-completion)).
-- **Conditional release in review subtrees**: A `release` step inside a review cycle (e.g., `[review-pr, apply-feedback, release]`) MUST skip the version bump when prior sibling steps produced no code changes. If `apply-feedback` reported no findings or `git diff HEAD~1 --stat` shows only report files, mark release done with "no-op: no changes to release" instead of bumping.
+- **Conditional release after review**: A `release` step MUST skip the version bump when review and feedback application produced no code changes. Record "no-op: no changes to release" instead of bumping.
 
 ### Adaptation Assessment (After Each Step)
 
@@ -186,11 +186,7 @@ After completing or failing each step, evaluate whether the assignment needs ada
   ace-assign add "fix-e2e" --instructions "Use /as-e2e-fix for the failing package and scenario IDs from the recorded evidence. If analysis is missing, let /as-e2e-fix generate it via wfi://e2e/analyze-failures before applying fixes. Re-run the targeted failing scenarios before completing this step." --assignment "$ASSIGNMENT_TARGET"
   ```
 
-- **Review found critical issues** → Consider adding an apply-critical-fixes step:
-
-  ```bash
-  ace-assign add "apply-critical-fixes" --instructions "Address critical review findings before proceeding" --assignment "$ASSIGNMENT_TARGET"
-  ```
+- **Review found critical issues** → Keep the review step active and resolve them inside `wfi://review/pr`. Repeat affected scopes and the completed review rounds before completing the step.
 
 - **Missing prerequisite discovered** → Consider adding the prerequisite step:
 
@@ -202,13 +198,9 @@ After completing or failing each step, evaluate whether the assignment needs ada
 
 Use `decision_notes` from step metadata (if present) as additional guidance for these assessments.
 
-- **Review-cycle circuit breaker**: When a review fork subtree fails due to provider unavailability (not code bugs), evaluate whether to attempt the next review cycle:
-
-  - If the **first** review cycle (valid) failed on providers: skip remaining cycles (fit, shine). Mark them done with "skipped: provider unavailable for prior cycle" reports.
-  - If the **second** cycle (fit) failed after valid succeeded: skip shine. Valid already captured correctness issues.
-  - **Never retry a provider-failed review cycle more than once.** If the re-fork also fails on providers, mark the cycle done-with-skip and move on.
+- **Review provider failure**: When a reviewer is unavailable, try an available substitute. At least one reviewer must complete every needed scope within a round; integration belongs to that round. Retry a provider failure once; if no reviewer completes, leave the PR draft and report the blocker. Never mark an incomplete review done.
 
-- **Transient network failure retry**: When a fork subtree fails due to a transient network error (connection reset, DNS timeout, socket hangup) -- as opposed to provider unavailability or auth failure -- wait 30 seconds and re-fork once. If the re-fork also fails on a network error, treat it as a hard failure and apply the circuit breaker rules above. Auth errors (401/403) and not-found errors (404) are never transient -- fail immediately on those.
+- **Transient network failure retry**: When review execution fails due to a transient network error (connection reset, DNS timeout, socket hangup), wait 30 seconds and retry once. If it fails again, try an available reviewer or leave the PR draft. Auth errors (401/403) and not-found errors (404) are not transient.
 
 ### 1. Check Status
 

data/handbook/workflow-instructions/assign/prepare.wf.md

@@ -172,35 +172,20 @@ When parsing informal instructions, identify:
    - "review", "review pr" → `ace:review-pr`
    - "commit" → `ace:git-commit`
    - "onboard" → `onboard`
-3. **Loop Indicators**: "2 cycles", "3 iterations", "twice"
+3. **Loop Indicators**: Treat requested review counts as a minimum number of independent passes, never as a stopping rule for unresolved findings.
 4. **Sequence Markers**: "then", "after that", "finally"
 
-### Loop Expansion
+### Review continuation
 
-Review loops expand into forked cycle parent steps with standard child sub-steps:
+Default PR delivery uses one `review-pr` workflow step after tracked code and history edits. The workflow verifies findings, applies fixes, reruns affected scopes, and finishes with a fresh integration review. It continues while important findings remain; a fixed count cannot declare completion.
 
 ```yaml
-# "do 3 review cycles" becomes:
-- name: review-valid-1
-  context: fork
-  sub_steps: [review-pr, apply-feedback, release]
+- name: review-pr
+  workflow: wfi://review/pr
   instructions:
-    - "Child review-pr: use preset code-valid."
-    - "Focus: correctness — bugs, logic errors, missing functionality, broken contracts."
-
-- name: review-fit-1
-  context: fork
-  sub_steps: [review-pr, apply-feedback, release]
-  instructions:
-    - "Child review-pr: use preset code-fit."
-    - "Focus: quality — performance, architecture, standards, test coverage."
-
-- name: review-shine-1
-  context: fork
-  sub_steps: [review-pr, apply-feedback, release]
-  instructions:
-    - "Child review-pr: use preset code-shine."
-    - "Focus: polish — simplification, naming, documentation (non-blocking suggestions)."
+    - "Cover all changed files with coherent scopes."
+    - "Verify findings and repeat affected scopes after fixes."
+    - "Require fresh integration evidence for the current head."
 ```
 
 ## Process Steps
@@ -269,7 +254,7 @@ ace-task show <taskref>
 Parse modifications:
 - "skip onboarding" → remove onboard step
 - "add security review" → insert security review step
-- "only 2 cycles" → adjust loop count
+- "2 reviews" → require at least 2 independent review passes; unresolved findings still require another pass
 
 ### 5. Expand and Inject Parameters
 
@@ -358,16 +343,14 @@ Report:
 Job configuration created: job.yaml
 
 Session: work-on-task-123
-Steps: 10 total
+Steps: 8 total
   - onboard
   - work-on-task
   - create-pr
-  - review-cycle-1
-  - apply-feedback-1
-  - review-cycle-2
-  - apply-feedback-2
-  - review-cycle-3
-  - apply-feedback-3
+  - push-to-remote
+  - review-pr
+  - update-pr-desc
+  - mark-pr-ready
   - finalize
 
 Start assignment with: ace-assign create --yaml job.yaml
@@ -380,7 +363,7 @@ Start assignment with: ace-assign create --yaml job.yaml
 ```yaml
 session:
   name: work-on-task-123
-  description: Work on task 123 with PR and review cycles
+  description: Work on task 123 with PR and iterative review
 
 steps:
   - name: onboard
@@ -424,20 +407,19 @@ steps:
 /as-assign-prepare work-on-task --taskref 148
 ```
 
-Creates job with 13 steps: onboard, work-on-task, release, create-pr, 2 review cycles (review + apply-feedback + release each), reorganize-commits, push-to-remote, update-pr-desc.
+Creates a job with implementation, release, draft PR, history/push, and one iterative review workflow. The agent completes at least three PR rounds and stops after two consecutive rounds without confirmed P0/P1. There is no separate final review.
 
 ### Example 2: Informal Instructions
 
 ```
-/as-assign-prepare "implement task 148, create pr, review twice"
+/as-assign-prepare "implement task 148, create pr, review until clear"
 ```
 
 Parses instructions and creates job with:
 - onboard
 - work-on-task (148)
 - create-pr
-- review-valid-1 (fork subtree: review-pr → apply-feedback → release)
-- review-fit-1 (fork subtree: review-pr → apply-feedback → release)
+- review-pr (review → verify → fix; minimum 3 rounds, last 2 without confirmed P0/P1)
 - finalize
 
 ### Example 3: Custom Output Path

data/lib/ace/assign/atoms/composition_rules.rb

@@ -21,7 +21,7 @@ module Ace
         # Load composition rules from catalog directory.
         #
         # @param catalog_dir [String] Path to catalog/ directory
-        # @return [Hash] Parsed rules with ordering, pairs, conditional, review_cycles
+        # @return [Hash] Parsed rules with ordering, pairs, conditional
         def self.load(catalog_dir)
           rules_path = File.join(catalog_dir, "composition-rules.yml")
           return default_rules unless File.exist?(rules_path)
@@ -78,11 +78,7 @@ module Ace
           {
             "ordering" => [],
             "pairs" => [],
-            "conditional" => [],
-            "review_cycles" => {
-              "default_count" => 2,
-              "max_count" => 5
-            }
+            "conditional" => []
           }
         end
         private_class_method :default_rules
@@ -107,8 +103,10 @@ module Ace
 
           # Before/after rules (e.g., "create-pr must come before review-pr")
           if rule["before"] && rule["after"]
-            before_idx = find_step_index(step_names, rule["before"])
-            after_idx = find_step_index(step_names, rule["after"])
+            before_idx = find_step_index(step_names, rule["before"],
+              last: rule["before_occurrence"] == "last")
+            after_idx = find_step_index(step_names, rule["after"],
+              last: rule["after_occurrence"] == "last")
 
             if before_idx && after_idx && before_idx >= after_idx
               return {
@@ -134,11 +132,13 @@ module Ace
         # @param step_names [Array<String>] Step name list
         # @param name [String] Name to find (exact or prefix)
         # @return [Integer, nil] Index or nil if not found
-        def self.find_step_index(step_names, name)
-          idx = step_names.index(name)
-          return idx if idx
-
-          step_names.index { |p| p.start_with?("#{name}-") }
+        def self.find_step_index(step_names, name, last: false)
+          names = [name]
+          matches = step_names.each_index.select do |index|
+            step = step_names[index]
+            names.any? { |candidate| step == candidate || step.start_with?("#{candidate}-") }
+          end
+          last ? matches.last : matches.first
         end
         private_class_method :find_step_index
 

data/lib/ace/assign/version.rb

@@ -2,6 +2,6 @@
 
 module Ace
   module Assign
-    VERSION = "0.56.1"
+    VERSION = "0.57.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-assign
 version: !ruby/object:Gem::Version
-  version: 0.56.1
+  version: 0.57.1
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-09-05 00:00:00.000000000 Z
+date: 2026-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-cli
@@ -200,6 +200,7 @@ files:
 - ".ace-defaults/assign/catalog/steps/create-retro.step.yml"
 - ".ace-defaults/assign/catalog/steps/fix-tests.step.yml"
 - ".ace-defaults/assign/catalog/steps/lint.step.yml"
+- ".ace-defaults/assign/catalog/steps/mark-pr-ready.step.yml"
 - ".ace-defaults/assign/catalog/steps/mark-task-done.step.yml"
 - ".ace-defaults/assign/catalog/steps/onboard-base.step.yml"
 - ".ace-defaults/assign/catalog/steps/onboard.step.yml"