From 1ea340e561ea30d46733f3d2c8de6bf337126e3f Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Fri, 27 Mar 2026 12:44:46 -0700
Subject: [PATCH] fix: use GH_PROMPT_DISABLED instead of invalid --yes flag

---
 src/main/github/client.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/github/client.ts b/src/main/github/client.ts
index f50363833b1..055db10d1fd 100644
--- a/src/main/github/client.ts
+++ b/src/main/github/client.ts
@@ -249,14 +249,11 @@ export async function mergePR(
 ): Promise<{ ok: true } | { ok: false; error: string }> {
   await acquire()
   try {
-    await execFileAsync(
-      'gh',
-      ['pr', 'merge', String(prNumber), `--${method}`, '--delete-branch', '--yes'],
-      {
-        cwd: repoPath,
-        encoding: 'utf-8'
-      }
-    )
+    await execFileAsync('gh', ['pr', 'merge', String(prNumber), `--${method}`, '--delete-branch'], {
+      cwd: repoPath,
+      encoding: 'utf-8',
+      env: { ...process.env, GH_PROMPT_DISABLED: '1' }
+    })
     return { ok: true }
   } catch (err) {
     const message =