From 8bbba3d358ae2fcd4ac47a0a9a2c96909f65089a Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Sat, 14 Feb 2026 23:02:37 -0800
Subject: [PATCH] Skip commit progress stages when no files changed

- Only include commit-related progress steps for stacked actions when there are working tree changes
- Prevents showing "Generating commit message"/"Committing" during pure push or PR flows
---
 apps/web/src/components/GitActionsControl.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index bc7a3533f8add846a586fc418ec85d4ed19bfbaa..109df3e47b578a00ae6418323a29aba02fdd1932 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -124,10 +124,14 @@ function GitQuickActionIcon({ quickAction }: { quickAction: GitQuickAction }) {
 function buildGitActionProgressStages(input: {
   action: GitStackedAction;
   hasCustomCommitMessage: boolean;
+  hasWorkingTreeChanges: boolean;
 }): string[] {
-  const commitStages = input.hasCustomCommitMessage
-    ? ["Committing..."]
-    : ["Generating commit message...", "Committing..."];
+  const shouldIncludeCommitStages = input.action === "commit" || input.hasWorkingTreeChanges;
+  const commitStages = !shouldIncludeCommitStages
+    ? []
+    : input.hasCustomCommitMessage
+      ? ["Committing..."]
+      : ["Generating commit message...", "Committing..."];
   if (input.action === "commit") {
     return commitStages;
   }
@@ -229,6 +233,7 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
       const progressStages = buildGitActionProgressStages({
         action,
         hasCustomCommitMessage: !!commitMessage?.trim(),
+        hasWorkingTreeChanges: !!gitStatus?.hasWorkingTreeChanges,
       });
       const progressToastId = toastManager.add({
         type: "loading",
@@ -306,6 +311,7 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
     },
     [
       api,
+      gitStatus?.hasWorkingTreeChanges,
       gitStatus?.openPr?.url,
       maybeConfirmPushToDefaultBranch,
       runImmediateGitActionMutation,
-- 
2.54.0