From 3c90fc616e7d4cbabe8af825404367beca69a2a9 Mon Sep 17 00:00:00 2001
From: Lyon <88232613+pikasTech@users.noreply.github.com>
Date: Mon, 22 Jun 2026 14:15:49 +0800
Subject: [PATCH] fix: point pr create next step to one-command merge (#655)

Co-authored-by: Codex <codex@noreply.local>
---
 scripts/src/gh.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/src/gh.ts b/scripts/src/gh.ts
index 3dcc8dde..4b14b402 100644
--- a/scripts/src/gh.ts
+++ b/scripts/src/gh.ts
@@ -4821,7 +4821,7 @@ function prMetadataSummary(metadata: GitHubPullRequestGraphqlMetadata): Record<s
 
 function prMergeBoundary(): Record<string, unknown> {
   return {
-    runnerAllowed: ["pr create", "pr update/edit", "pr comment", "pr read/view", "pr close", "pr merge after explicit command authorization and preflight success"],
+    runnerAllowed: ["pr create", "pr update/edit", "pr comment", "pr read/view", "pr close", "pr merge after explicit command authorization"],
     ordinaryRunnerFinalActionAllowed: true,
     commanderRequiredWhen: ["conflicts", "failed required checks", "production/runtime/release/security/database scope", "ambiguous task boundary"],
     hostAllowedToolsAfterReview: ["bun scripts/cli.ts gh pr merge", "GitHub UI merge/close"],
@@ -5025,7 +5025,7 @@ function prPreflightPolicy(repo: string, number: number): Record<string, unknown
     mergeCommand: `bun scripts/cli.ts gh pr merge ${number} --repo ${repo} --merge`,
     unideskCliMergeSupported: true,
     ordinaryRunnerFinalActionAllowed: true,
-    note: "This preflight only reads GitHub auth, PR metadata, mergeability, and status checks; use gh pr merge only after this command reports ready and the task boundary allows merge.",
+    note: "This preflight only reads GitHub auth, PR metadata, mergeability, and status checks for diagnosis; gh pr merge performs its own guarded readiness check and does not require this preflight step.",
   };
 }
 
@@ -5785,7 +5785,8 @@ function renderPrCreateTable(result: GitHubCommandResult): string {
     "Next:",
   ];
   if (status === "created" && number !== "-") {
-    lines.push(`  bun scripts/cli.ts gh pr preflight ${number} --repo ${ghText(result.repo)}`);
+    lines.push(`  bun scripts/cli.ts gh pr merge ${number} --repo ${ghText(result.repo)} --squash --delete-branch`);
+    lines.push(`  bun scripts/cli.ts gh pr preflight ${number} --repo ${ghText(result.repo)} --full`);
   } else {
     lines.push("  rerun without --dry-run to create the PR");
   }