Skip to content

fix: stop review PR flow before merge - #479

Open
haosenwang1018 wants to merge 1 commit into
the-open-engine:mainfrom
haosenwang1018:fix/pr-flag-stops-before-merge
Open

fix: stop review PR flow before merge#479
haosenwang1018 wants to merge 1 commit into
the-open-engine:mainfrom
haosenwang1018:fix/pr-flag-stops-before-merge

Conversation

@haosenwang1018

@haosenwang1018 haosenwang1018 commented Apr 17, 2026

Copy link
Copy Markdown
Contributor

Summary

Fix the --pr workflow so it creates a review PR and stops, while keeping --ship as the mode that continues into merge/auto-complete.

Related Issues

Fixes #452

Changes Made

  • persist ship intent as autoMerge in cluster start options
  • persist/pass autoMerge through orchestrator PR options into git-pusher generation
  • update git-pusher-template prompt generation so review-only PR mode stops after PR creation instead of always forcing step 6 merge
  • only require merge_commit_sha in structured output when merge/auto-complete is actually expected
  • add regression tests covering review-only vs ship mode schema/prompt behavior

Testing

  • node -c src/agents/git-pusher-template.js
  • direct generateGitPusherAgent() checks for review-only and ship mode behavior
  • npx mocha tests/structuredOutput-mapping.test.js

Checklist

  • Tests pass (npm test)
  • Documentation updated (if needed)
  • Follows commit guidelines

@tomdps tomdps added the duplicate This issue or pull request already exists label Jul 29, 2026
@tomdps

tomdps commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

Status review (2026-07-29):

  • Current main already separates review and ship behavior: buildStartOptionsFromPlan() derives autoMerge from the canonical run plan, buildPrOptions() persists it, and generatePrompt() selects generateReviewModePrompt() when it is false.
  • This PR is currently conflicting (DIRTY) with no reported check runs, and its four-file patch predates the current canonical run-plan and transport-only prompt/hook structure, so it is not merge-ready.
  • Linked issue --pr flag auto-merges PR instead of stopping at creation #452 is closed as fixed; this patch is superseded by current main and is triaged as a duplicate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

duplicate This issue or pull request already exists

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

--pr flag auto-merges PR instead of stopping at creation

2 participants

@haosenwang1018 @tomdps