From 4f6eea9ea5c48430d5e16990163856fc12c39932 Mon Sep 17 00:00:00 2001
From: Bohdan Triapitsyn <artmore@protonmail.com>
Date: Wed, 7 Jan 2026 12:13:08 +0200
Subject: [PATCH] refactor: reorganize worktree action buttons in
 SessionDialogs component

---
 .../src/components/session/SessionDialogs.tsx | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/ui/src/components/session/SessionDialogs.tsx b/packages/ui/src/components/session/SessionDialogs.tsx
index 37b1985e..410942e1 100644
--- a/packages/ui/src/components/session/SessionDialogs.tsx
+++ b/packages/ui/src/components/session/SessionDialogs.tsx
@@ -1067,15 +1067,6 @@ export const SessionDialogs: React.FC = () => {
                             )}
                         </p>
                     ) : null}
-
-                    {/* Create button */}
-                    <Button
-                        onClick={handleCreateWorktree}
-                        disabled={isCreatingWorktree || isLoading || !isGitRepo || !worktreeTargetBranch}
-                        className="h-8"
-                    >
-                        {isCreatingWorktree ? 'Creating…' : 'Create'}
-                    </Button>
                 </div>
 
                 {worktreeError && <p className="typography-meta text-destructive">{worktreeError}</p>}
@@ -1187,13 +1178,21 @@ export const SessionDialogs: React.FC = () => {
     );
 
     const worktreeManagerActions = (
-        <Button
-            variant="ghost"
-            onClick={() => setSessionCreateDialogOpen(false)}
-            disabled={isCreatingWorktree}
-        >
-            Close
-        </Button>
+        <>
+            <Button
+                onClick={handleCreateWorktree}
+                disabled={isCreatingWorktree || isLoading || !isGitRepo || !worktreeTargetBranch}
+            >
+                {isCreatingWorktree ? 'Creating…' : 'Create'}
+            </Button>
+            <Button
+                variant="ghost"
+                onClick={() => setSessionCreateDialogOpen(false)}
+                disabled={isCreatingWorktree}
+            >
+                Close
+            </Button>
+        </>
     );
 
     const targetWorktree = deleteDialog?.worktree ?? deleteDialogSummaries[0]?.metadata ?? null;