Automatically prepare releases for completed features

2026-09-23 12:21:30 -04:00
2 changed files with 8 additions and 3 deletions
@@ -60,6 +60,11 @@ class CyclePromptTests(unittest.TestCase):
        self.assertIn("Task completion inside an unmerged feature branch does not trigger", output)
        self.assertIn("Do not create a duplicate promotion", output)
        self.assertIn("Allow only one active promotion pull request to `main`", output)
+        self.assertIn("if it was closed without merge, recalculate", output)
+        self.assertLess(
+            output.index("Begin an automatically triggered, requested, or scheduled release"),
+            output.index("Advance to the next eligible feature"),
+        )
        self.assertIn("Only Joshua may merge into `main`", output)


@@ -254,8 +254,8 @@ Choose the highest-priority actionable transition in this order:
 8. Remediate feature-level review findings.
 9. Obtain feature approval.
 10. Merge an approved feature into `{{INTEGRATION_BRANCH}}`.
-11. Advance to the next eligible feature when mission scope permits.
-12. Begin an automatically triggered, requested, or scheduled release when appropriate.
+11. Begin an automatically triggered, requested, or scheduled release when appropriate.
+12. Advance to the next eligible feature when mission scope permits.
 13. Continue unrelated work around locally blocked items.
 14. Escalate only when the defined escalation rules require it.

@@ -682,7 +682,7 @@ Before creating a release branch or pull request:

 1. Reconcile open release records, release branches, and promotion pull requests.
 2. Do not create a duplicate promotion for an already-covered `{{INTEGRATION_BRANCH}}` commit.
-3. Allow only one active promotion pull request to `{{RELEASE_BRANCH}}`. If an earlier promotion is still open and does not contain the newly completed feature, record the feature as pending for the next automatic promotion and resume it after the active promotion resolves.
+3. Allow only one active promotion pull request to `{{RELEASE_BRANCH}}`. If an earlier promotion is still open and does not contain the newly completed feature, record the feature as pending for the next automatic promotion. Resume it after the active promotion is merged or closed; if it was closed without merge, recalculate the next promotion from the current validated `{{INTEGRATION_BRANCH}}` head.
 4. Record the triggering feature and exact `{{INTEGRATION_BRANCH}}` commit so the automatic trigger runs once for that merge.

 Release process: