From b617067c5e1f9644fe3320f0ff2e80643e7142a9 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Thu, 2 Apr 2026 11:10:36 +1100
Subject: [PATCH 1/5] fix: hide branch actions during setup

---
 .../branches/BranchCardActionsBar.svelte      | 211 +++++++++---------
 1 file changed, 108 insertions(+), 103 deletions(-)

diff --git a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
index 08da7e20..7bd56ea3 100644
--- a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
@@ -376,6 +376,10 @@
     return groupActionsByType(actions);
   });
 
+  let isInitializing = $derived(
+    (isLocal && !branch.worktreePath) || (isRemote && remoteWorkspaceStatus === 'starting')
+  );
+
   let primaryRunAction = $derived.by(() => {
     return getPrimaryRunAction(groupedActions);
   });
@@ -612,7 +616,7 @@
     </div>
   {/each}
   <!-- Primary run action button -->
-  {#if primaryRunAction}
+  {#if !isInitializing && primaryRunAction}
     {@const execution = primaryActionExecution}
     {@const isRunning = execution?.status === 'running'}
     {@const isStopping = execution && stoppingExecutions.has(execution.executionId)}
@@ -750,131 +754,132 @@
   </button>
   {#if showMoreMenu}
     <div class="more-menu">
-      <!-- Remote-only: Copy workspace name -->
-      {#if isRemote && branch.workspaceName}
-        <button
-          class="more-menu-item"
-          onclick={() => {
-            showMoreMenu = false;
-            navigator.clipboard.writeText(branch.workspaceName!);
-          }}
-        >
-          <Copy size={14} />
-          Copy Workspace Name
-        </button>
-      {/if}
-
-      <!-- Actions submenu -->
-      {#if hasActionsForSubmenu}
-        <div class="submenu-container">
+      {#if !isInitializing}
+        <!-- Remote-only: Copy workspace name -->
+        {#if isRemote && branch.workspaceName}
           <button
-            class="more-menu-item submenu-trigger"
-            onmouseenter={handleActionsSubmenuEnter}
-            onmouseleave={handleActionsSubmenuLeave}
+            class="more-menu-item"
+            onclick={() => {
+              showMoreMenu = false;
+              navigator.clipboard.writeText(branch.workspaceName!);
+            }}
           >
-            <Play size={14} />
-            Actions
-            <ChevronDown size={12} class="submenu-chevron" />
+            <Copy size={14} />
+            Copy Workspace Name
           </button>
-          {#if showActionsSubmenu}
-            <div
-              class="submenu"
-              role="group"
+        {/if}
+
+        <!-- Actions submenu -->
+        {#if hasActionsForSubmenu}
+          <div class="submenu-container">
+            <button
+              class="more-menu-item submenu-trigger"
               onmouseenter={handleActionsSubmenuEnter}
               onmouseleave={handleActionsSubmenuLeave}
             >
-              {#each ['run', 'build', 'format', 'check', 'test', 'cleanUp', 'prerun'] as type}
-                {@const typeActions = type === 'run' ? remainingRunActions : groupedActions[type]}
-                {#if typeActions.length > 0}
-                  {#each typeActions as action (action.id)}
-                    {@const Icon = getActionIcon(type)}
-                    <button
-                      class="more-menu-item action-item"
-                      onclick={() => handleRunAction(action)}
-                    >
-                      <Icon size={14} />
-                      {action.name}
-                    </button>
-                  {/each}
-                {/if}
-              {/each}
-            </div>
-          {/if}
-        </div>
-      {/if}
+              <Play size={14} />
+              Actions
+              <ChevronDown size={12} class="submenu-chevron" />
+            </button>
+            {#if showActionsSubmenu}
+              <div
+                class="submenu"
+                role="group"
+                onmouseenter={handleActionsSubmenuEnter}
+                onmouseleave={handleActionsSubmenuLeave}
+              >
+                {#each ['run', 'build', 'format', 'check', 'test', 'cleanUp', 'prerun'] as type}
+                  {@const typeActions = type === 'run' ? remainingRunActions : groupedActions[type]}
+                  {#if typeActions.length > 0}
+                    {#each typeActions as action (action.id)}
+                      {@const Icon = getActionIcon(type)}
+                      <button
+                        class="more-menu-item action-item"
+                        onclick={() => handleRunAction(action)}
+                      >
+                        <Icon size={14} />
+                        {action.name}
+                      </button>
+                    {/each}
+                  {/if}
+                {/each}
+              </div>
+            {/if}
+          </div>
+        {/if}
 
-      <!-- Local-only: Open In submenu -->
-      {#if isLocal && branch.worktreePath && openerApps.length > 0}
-        <div class="menu-separator"></div>
-        <div class="submenu-container">
-          <button
-            class="more-menu-item submenu-trigger"
-            onmouseenter={handleOpenInSubmenuEnter}
-            onmouseleave={handleOpenInSubmenuLeave}
-          >
-            <ExternalLink size={14} />
-            Open In
-            <ChevronDown size={12} class="submenu-chevron" />
-          </button>
-          {#if showOpenInSubmenu}
-            <div
-              class="submenu"
-              role="group"
+        <!-- Local-only: Open In submenu -->
+        {#if isLocal && branch.worktreePath && openerApps.length > 0}
+          <div class="menu-separator"></div>
+          <div class="submenu-container">
+            <button
+              class="more-menu-item submenu-trigger"
               onmouseenter={handleOpenInSubmenuEnter}
               onmouseleave={handleOpenInSubmenuLeave}
             >
-              {#each openerApps as app (app.id)}
-                <button class="more-menu-item" onclick={() => handleOpenInApp(app.id)}>
-                  {app.name}
+              <ExternalLink size={14} />
+              Open In
+              <ChevronDown size={12} class="submenu-chevron" />
+            </button>
+            {#if showOpenInSubmenu}
+              <div
+                class="submenu"
+                role="group"
+                onmouseenter={handleOpenInSubmenuEnter}
+                onmouseleave={handleOpenInSubmenuLeave}
+              >
+                {#each openerApps as app (app.id)}
+                  <button class="more-menu-item" onclick={() => handleOpenInApp(app.id)}>
+                    {app.name}
+                  </button>
+                {/each}
+                <div class="menu-separator"></div>
+                <button class="more-menu-item" onclick={handleCopyPath}>
+                  <Copy size={14} />
+                  Copy Path
                 </button>
-              {/each}
-              <div class="menu-separator"></div>
-              <button class="more-menu-item" onclick={handleCopyPath}>
-                <Copy size={14} />
-                Copy Path
-              </button>
-            </div>
-          {/if}
-        </div>
-      {:else if isLocal && branch.worktreePath}
+              </div>
+            {/if}
+          </div>
+        {:else if isLocal && branch.worktreePath}
+          <div class="menu-separator"></div>
+          <button class="more-menu-item" onclick={handleCopyPath}>
+            <Copy size={14} />
+            Copy Worktree Path
+          </button>
+        {/if}
+
         <div class="menu-separator"></div>
-        <button class="more-menu-item" onclick={handleCopyPath}>
-          <Copy size={14} />
-          Copy Worktree Path
+        <button class="more-menu-item" onclick={handleRenameFromMenu}>
+          <GitBranch size={14} />
+          Rename Branch
         </button>
-      {/if}
-
-      <!-- Delete last -->
-      <div class="menu-separator"></div>
-      <button class="more-menu-item" onclick={handleRenameFromMenu}>
-        <GitBranch size={14} />
-        Rename Branch
-      </button>
-      <button
-        class="more-menu-item"
-        disabled={newCommitDisabled}
-        onclick={() => {
-          showMoreMenu = false;
-          onRebaseBranch?.();
-        }}
-      >
-        <GitBranch size={14} />
-        Rebase Branch
-      </button>
-      {#if commitCount >= 2}
         <button
           class="more-menu-item"
           disabled={newCommitDisabled}
           onclick={() => {
             showMoreMenu = false;
-            onSquashCommits?.();
+            onRebaseBranch?.();
           }}
         >
           <GitBranch size={14} />
-          Squash Commits
+          Rebase Branch
         </button>
+        {#if commitCount >= 2}
+          <button
+            class="more-menu-item"
+            disabled={newCommitDisabled}
+            onclick={() => {
+              showMoreMenu = false;
+              onCollapseCommits?.();
+            }}
+          >
+            <GitBranch size={14} />
+            Collapse Commits
+          </button>
+        {/if}
+        <div class="menu-separator"></div>
       {/if}
-      <div class="menu-separator"></div>
       <button class="more-menu-item danger" onclick={handleDeleteFromMenu}>
         <Trash2 size={14} />
         Delete Repo

From 6acc5d6767bf070e2bdb8392d1c1264e8d6bc2a8 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Thu, 2 Apr 2026 11:04:38 +1100
Subject: [PATCH 2/5] fix: rename collapse commits action to squash commits
 (#571)

---
 .../branches/BranchCardActionsBar.svelte      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
index 7bd56ea3..a50090b4 100644
--- a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
@@ -854,14 +854,14 @@
           <GitBranch size={14} />
           Rename Branch
         </button>
-        <button
-          class="more-menu-item"
-          disabled={newCommitDisabled}
-          onclick={() => {
-            showMoreMenu = false;
-            onRebaseBranch?.();
-          }}
-        >
+          <button
+            class="more-menu-item"
+            disabled={newCommitDisabled}
+            onclick={() => {
+              showMoreMenu = false;
+              onRebaseBranch?.();
+            }}
+          >
           <GitBranch size={14} />
           Rebase Branch
         </button>
@@ -871,11 +871,11 @@
             disabled={newCommitDisabled}
             onclick={() => {
               showMoreMenu = false;
-              onCollapseCommits?.();
+              onSquashCommits?.();
             }}
           >
             <GitBranch size={14} />
-            Collapse Commits
+            Squash Commits
           </button>
         {/if}
         <div class="menu-separator"></div>

From 2ad1ce395aec5e3faf82c2f352e1f5b6de91735b Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Thu, 2 Apr 2026 11:30:04 +1100
Subject: [PATCH 3/5] fix: hide branch actions on setup error

---
 apps/staged/src/lib/features/branches/BranchCard.svelte      | 1 +
 .../src/lib/features/branches/BranchCardActionsBar.svelte    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/staged/src/lib/features/branches/BranchCard.svelte b/apps/staged/src/lib/features/branches/BranchCard.svelte
index ada1d947..aaed9317 100644
--- a/apps/staged/src/lib/features/branches/BranchCard.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCard.svelte
@@ -809,6 +809,7 @@
           {isLocal}
           {isRemote}
           {remoteWorkspaceStatus}
+          {worktreeError}
           {onDelete}
           {onRename}
           onNoteCreated={() => loadTimeline()}
diff --git a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
index a50090b4..b918c9df 100644
--- a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
@@ -62,6 +62,7 @@
     isLocal: boolean;
     isRemote: boolean;
     remoteWorkspaceStatus: string | null;
+    worktreeError?: string;
     onDelete?: () => void;
     onRename?: (branchName: string) => void;
     onNoteCreated?: () => void;
@@ -77,6 +78,7 @@
     isLocal,
     isRemote,
     remoteWorkspaceStatus,
+    worktreeError,
     onDelete,
     onRename,
     onNoteCreated,
@@ -377,7 +379,8 @@
   });
 
   let isInitializing = $derived(
-    (isLocal && !branch.worktreePath) || (isRemote && remoteWorkspaceStatus === 'starting')
+    (isLocal && !branch.worktreePath && !worktreeError) ||
+      (isRemote && remoteWorkspaceStatus === 'starting')
   );
 
   let primaryRunAction = $derived.by(() => {

From 2a075480cf1860eaed29cba5b8a6f0d4b5b557fc Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Thu, 2 Apr 2026 13:47:13 +1100
Subject: [PATCH 4/5] Fix branch card actions bar formatting

---
 .../branches/BranchCardActionsBar.svelte         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
index b918c9df..bb13c845 100644
--- a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
@@ -857,14 +857,14 @@
           <GitBranch size={14} />
           Rename Branch
         </button>
-          <button
-            class="more-menu-item"
-            disabled={newCommitDisabled}
-            onclick={() => {
-              showMoreMenu = false;
-              onRebaseBranch?.();
-            }}
-          >
+        <button
+          class="more-menu-item"
+          disabled={newCommitDisabled}
+          onclick={() => {
+            showMoreMenu = false;
+            onRebaseBranch?.();
+          }}
+        >
           <GitBranch size={14} />
           Rebase Branch
         </button>

From 91ba1ca6c0be6ced3f89f925eb2b9b462d75d558 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Thu, 2 Apr 2026 15:12:55 +1100
Subject: [PATCH 5/5] fix: reuse branch provisioning state in actions bar

---
 .../src/lib/features/branches/BranchCard.svelte     |  2 +-
 .../features/branches/BranchCardActionsBar.svelte   | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/apps/staged/src/lib/features/branches/BranchCard.svelte b/apps/staged/src/lib/features/branches/BranchCard.svelte
index aaed9317..3f0c426a 100644
--- a/apps/staged/src/lib/features/branches/BranchCard.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCard.svelte
@@ -808,8 +808,8 @@
           {repoLabel}
           {isLocal}
           {isRemote}
+          {isProvisioning}
           {remoteWorkspaceStatus}
-          {worktreeError}
           {onDelete}
           {onRename}
           onNoteCreated={() => loadTimeline()}
diff --git a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
index bb13c845..bb3d14a0 100644
--- a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
@@ -61,8 +61,8 @@
     repoLabel?: ProjectRepo | null;
     isLocal: boolean;
     isRemote: boolean;
+    isProvisioning: boolean;
     remoteWorkspaceStatus: string | null;
-    worktreeError?: string;
     onDelete?: () => void;
     onRename?: (branchName: string) => void;
     onNoteCreated?: () => void;
@@ -77,8 +77,8 @@
     repoLabel = null,
     isLocal,
     isRemote,
+    isProvisioning,
     remoteWorkspaceStatus,
-    worktreeError,
     onDelete,
     onRename,
     onNoteCreated,
@@ -378,11 +378,6 @@
     return groupActionsByType(actions);
   });
 
-  let isInitializing = $derived(
-    (isLocal && !branch.worktreePath && !worktreeError) ||
-      (isRemote && remoteWorkspaceStatus === 'starting')
-  );
-
   let primaryRunAction = $derived.by(() => {
     return getPrimaryRunAction(groupedActions);
   });
@@ -619,7 +614,7 @@
     </div>
   {/each}
   <!-- Primary run action button -->
-  {#if !isInitializing && primaryRunAction}
+  {#if !isProvisioning && primaryRunAction}
     {@const execution = primaryActionExecution}
     {@const isRunning = execution?.status === 'running'}
     {@const isStopping = execution && stoppingExecutions.has(execution.executionId)}
@@ -757,7 +752,7 @@
   </button>
   {#if showMoreMenu}
     <div class="more-menu">
-      {#if !isInitializing}
+      {#if !isProvisioning}
         <!-- Remote-only: Copy workspace name -->
         {#if isRemote && branch.workspaceName}
           <button