scripts/release.ts (1)

805-809: Content guard applied consistently to Hotfix path — but merged_untagged guard is missing.

The content diff check mirrors the Regular release path correctly. However, the Hotfix merged_untagged case (lines 781-798) still creates PRs unconditionally without checking for existing ones, unlike the guarded Regular release path at lines 613-630.

Per the PR description intent to "add an open-PR guard to merged_untagged", consider applying the same pattern to the Hotfix path for full consistency:

Proposed fix for Hotfix merged_untagged guard

     case 'merged_untagged': {
       console.log(chalk.green(`Hotfix merged to main. Tagging ${nextVersion}...`))
       await git().checkout(['main'])
       await git().pull()
       await git().tag(['-a', nextVersion, '-m', nextVersion])
       console.log(chalk.green('Pushing tag...'))
       await git().push(['origin', '--tags'])
       console.log(chalk.green(`Tagged ${nextVersion}.`))

-      console.log(chalk.green('Creating PR to sync private to main...'))
-      const privatePrUrl = await createPr({
-        base: 'private',
-        head: 'main',
-        title: `chore: sync private to ${nextVersion}`,
-        body: `Sync private branch to main after hotfix ${nextVersion}.`,
-      })
-      console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
+      const existingPrivatePrAfterTag = await findOpenPr('main', 'private')
+      if (existingPrivatePrAfterTag) {
+        console.log(
+          chalk.yellow(
+            `Private sync PR already open: #${existingPrivatePrAfterTag.number}. Merge it on GitHub.`,
+          ),
+        )
+      } else {
+        console.log(chalk.green('Creating PR to sync private to main...'))
+        const privatePrUrl = await createPr({
+          base: 'private',
+          head: 'main',
+          title: `chore: sync private to ${nextVersion}`,
+          body: `Sync private branch to main after hotfix ${nextVersion}.`,
+        })
+        console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
+      }

-      console.log(chalk.green('Creating backmerge PR (main -> develop)...'))
-      const backmergeUrl = await createPr({
-        base: 'develop',
-        head: 'main',
-        title: `chore: backmerge ${nextVersion} into develop`,
-        body: `Backmerge main into develop after hotfix ${nextVersion} to sync cherry-picked commits.`,
-      })
-      console.log(chalk.green(`Backmerge PR created: ${backmergeUrl}`))
-      console.log(chalk.green('Merge both PRs on GitHub to complete the hotfix.'))
+      const existingBackmergePrAfterTag = await findOpenPr('main', 'develop')
+      if (existingBackmergePrAfterTag) {
+        console.log(
+          chalk.yellow(
+            `Backmerge PR already open: #${existingBackmergePrAfterTag.number}. Merge it on GitHub.`,
+          ),
+        )
+      } else {
+        console.log(chalk.green('Creating backmerge PR (main -> develop)...'))
+        const backmergeUrl = await createPr({
+          base: 'develop',
+          head: 'main',
+          title: `chore: backmerge ${nextVersion} into develop`,
+          body: `Backmerge main into develop after hotfix ${nextVersion} to sync cherry-picked commits.`,
+        })
+        console.log(chalk.green(`Backmerge PR created: ${backmergeUrl}`))
+      }
+      console.log(chalk.green('Merge PRs on GitHub to complete the hotfix.'))
       break
     }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@scripts/release.ts` around lines 805 - 809, The Hotfix `merged_untagged` path
is missing the open-PR guard present in the Regular release flow; modify the
Hotfix branch handling that uses `privateDiffHotfix`/`merged_untagged` so it
first queries for an existing open PR (reuse the same check used in the Regular
release path) and only calls the PR creation routine (e.g., the existing
`createPullRequest`/createPR call) when no open PR is found; if an open PR
exists, skip creating a new one and log or exit the same way the Regular path
does.

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

scripts/release.ts (1)

671-689: ⚠️ Potential issue | 🟠 Major

Auto-merge is still not enabled when a backmerge PR already exists.

When existingBackmerge is found, the script currently does nothing. On reruns, this can leave backmerge PRs open without auto-merge configured and stall automation.

🔧 Minimal fix (apply in both regular + hotfix backmerge blocks)

 const existingBackmerge = await findOpenPr('main', 'develop')
-if (!existingBackmerge) {
+if (existingBackmerge) {
+  console.log(chalk.yellow(`Backmerge PR already open: #${existingBackmerge.number}.`))
+  console.log(chalk.green('Setting auto-merge with merge commit strategy...'))
+  await pify(exec)(`gh pr merge --auto --merge ${existingBackmerge.number}`)
+  console.log(chalk.green('Auto-merge set. Backmerge will merge automatically when CI passes.'))
+} else {
   const mainDevelopCommits = await getCommitMessages('origin/develop..origin/main')
   if (mainDevelopCommits.length > 0) {
     console.log(chalk.green('Creating backmerge PR (main -> develop)...'))
     const backmergeUrl = await createPr({
       base: 'develop',
       head: 'main',
       title: `chore: backmerge ${nextVersion} into develop`,
       body: `Backmerge main into develop after release ${nextVersion}.`,
     })
     console.log(chalk.green(`Backmerge PR created: ${backmergeUrl}`))
     console.log(chalk.green('Setting auto-merge with merge commit strategy...'))
     await pify(exec)(`gh pr merge --auto --merge ${backmergeUrl}`)
     console.log(chalk.green('Auto-merge set. Backmerge will merge automatically when CI passes.'))
   }
 }

Also applies to: 864-882

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@scripts/release.ts` around lines 671 - 689, The code currently skips
configuring auto-merge when findOpenPr returns an existingBackmerge, leaving PRs
open without auto-merge; update the logic in the backmerge block around
existingBackmerge (and mirror the same change in the hotfix backmerge block) so
that if existingBackmerge is truthy you call the same auto-merge command used
after createPr (i.e., invoke pify(exec) with the gh pr merge --auto --merge
argument using existingBackmerge's URL or number), logging the same progress
messages as when a PR is newly created so reruns will enable auto-merge on
already-open backmerge PRs.

scripts/release.ts (1)

828-836: Consider enabling auto-merge immediately in hotfix merged_untagged.

The backmerge PR created here doesn't have auto-merge enabled, unlike when it's created/found in tagged_private_stale. If the user doesn't re-run the script after this state, the backmerge will sit waiting for manual merge.

For consistency with the stated automation goals, consider enabling auto-merge immediately:

♻️ Optional: Enable auto-merge on backmerge creation

       console.log(chalk.green(`Backmerge PR created: ${backmergeUrl}`))
-      console.log(chalk.green('Merge both PRs on GitHub to complete the hotfix.'))
+      console.log(chalk.green('Setting auto-merge with merge commit strategy...'))
+      await pify(exec)(`gh pr merge --auto --merge ${backmergeUrl}`)
+      console.log(
+        chalk.green('Auto-merge set. Backmerge will merge automatically when CI passes.'),
+      )
+      console.log(chalk.green('Merge the private sync PR on GitHub to complete the hotfix.'))
       break

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@scripts/release.ts` around lines 828 - 836, The backmerge PR created by the
createPr call (creating backmergeUrl) in the hotfix merged_untagged path does
not enable auto-merge, so the PR can stall; update the implementation around
createPr (or immediately after obtaining backmergeUrl) to enable auto-merge for
that PR—either by extending createPr to accept and apply auto-merge/merge_method
options or by invoking the same auto-merge helper used elsewhere (the logic used
for tagged_private_stale) immediately after the PR is created; ensure you
reference createPr and backmergeUrl when adding the auto-merge step so the
backmerge PR is configured the same way as the other flow.