From 67ea84a0fbbe5c2d7f17cbd68474bb75fdb2b20e Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 15 Apr 2026 20:16:52 -0700
Subject: [PATCH] fix: restore worktree sidebar scroll viewport (#688)

---
 src/renderer/src/App.tsx                      | 11 +++++++++--
 src/renderer/src/components/sidebar/index.tsx |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 8eefa02446c..063f41240b0 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -721,7 +721,7 @@ function App(): React.JSX.Element {
                  layout so the terminal/editor reclaim the left edge instead of
                  leaving behind a content-width blank strip. */
               <div
-                className={`flex flex-col shrink-0${sidebarOpen ? '' : ' relative w-0 overflow-visible'}`}
+                className={`flex min-h-0 flex-col shrink-0${sidebarOpen ? '' : ' relative w-0 overflow-visible'}`}
               >
                 <div
                   className={`titlebar-left${sidebarOpen ? '' : ' absolute top-0 left-0 z-10'}`}
@@ -736,7 +736,14 @@ function App(): React.JSX.Element {
                 >
                   {titlebarLeftControls}
                 </div>
-                <Sidebar />
+                <div className="flex min-h-0 flex-1">
+                  {/* Why: the workspace-view wrapper adds a fixed 42px header
+                      above the sidebar. Without a flex-1/min-h-0 slot here,
+                      the sidebar falls back to its content height, so the
+                      worktree list loses its scroll viewport and the fixed
+                      bottom toolbar (including Add Repo) gets pushed offscreen. */}
+                  <Sidebar />
+                </div>
               </div>
             ) : (
               <Sidebar />
diff --git a/src/renderer/src/components/sidebar/index.tsx b/src/renderer/src/components/sidebar/index.tsx
index d0779fa0d48..b65aed7eade 100644
--- a/src/renderer/src/components/sidebar/index.tsx
+++ b/src/renderer/src/components/sidebar/index.tsx
@@ -47,7 +47,7 @@ function Sidebar(): React.JSX.Element {
       <div
         ref={containerRef}
         className={cn(
-          'relative flex-shrink-0 bg-sidebar flex flex-col overflow-hidden scrollbar-sleek-parent',
+          'relative min-h-0 flex-shrink-0 bg-sidebar flex flex-col overflow-hidden scrollbar-sleek-parent',
           isResizing ? 'transition-none' : 'transition-[width] duration-200'
         )}
         style={{