From 067196e41de75c2ed91b0546b357f3a3aaf39927 Mon Sep 17 00:00:00 2001
From: neriousy <hejmowskifilip@gmail.com>
Date: Sun, 28 Jun 2026 12:27:17 +0200
Subject: [PATCH 1/4] fix(app): hide empty server chevron

---
 packages/app/src/pages/home.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index 8817ef22b7c7..5e47ef998953 100644
--- a/packages/app/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
@@ -568,6 +568,8 @@ function HomeProjectColumn(props: {
             const key = ServerConnection.key(item)
             const healthy = () => !!global.servers.health[key]?.healthy
             const serverCtx = global.ensureServerCtx(item)
+            const projects = () => serverCtx.projects.list()
+            const hasProjects = () => projects().length > 0
             const collapsed = () => !!state().collapsed[key]
             return (
               <div class="flex max-h-[min(572px,calc(100vh_-_300px))] min-w-0 flex-col gap-1 overflow-y-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
@@ -575,6 +577,7 @@ function HomeProjectColumn(props: {
                   server={item}
                   selected={props.selected.server === key && !props.selected.directory}
                   healthy={healthy()}
+                  hasProjects={hasProjects()}
                   collapsed={collapsed()}
                   health={global.servers.health[key]}
                   controller={controller}
@@ -584,9 +587,9 @@ function HomeProjectColumn(props: {
                   toggleCollapsed={() => setState("collapsed", key, !state().collapsed[key])}
                   language={props.language}
                 />
-                <Show when={healthy() && !collapsed()}>
+                <Show when={healthy() && hasProjects() && !collapsed()}>
                   <div class="mx-3 h-px bg-v2-border-border-base" />
-                  <HomeProjectList {...props} server={item} projects={serverCtx.projects.list()} />
+                  <HomeProjectList {...props} server={item} projects={projects()} />
                 </Show>
               </div>
             )
@@ -635,6 +638,7 @@ function HomeServerRow(props: {
   server: ServerConnection.Any
   selected: boolean
   healthy: boolean
+  hasProjects: boolean
   collapsed: boolean
   health: ServerHealth | undefined
   controller: ReturnType<typeof useServerManagementController>
@@ -654,7 +658,7 @@ function HomeServerRow(props: {
         disabled={!props.healthy}
         onClick={() => props.focusServer(props.server)}
       >
-        <Show when={props.healthy}>
+        <Show when={props.healthy && props.hasProjects}>
           <span
             data-action="home-server-collapse"
             class="inline-flex -ml-0.5 -mr-1.5 size-5 shrink-0 items-center justify-center rounded-[4px] text-v2-icon-icon-muted hover:bg-v2-overlay-simple-overlay-hover"

From 946999d71f7392942597c7ad6b25aeca72b2bbfb Mon Sep 17 00:00:00 2001
From: neriousy <hejmowskifilip@gmail.com>
Date: Sun, 28 Jun 2026 12:48:21 +0200
Subject: [PATCH 2/4] disable rather than hide

---
 packages/app/src/pages/home.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index 5e47ef998953..5c6ca9ccc956 100644
--- a/packages/app/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
@@ -649,6 +649,7 @@ function HomeServerRow(props: {
   language: ReturnType<typeof useLanguage>
 }) {
   const [state, setState] = createStore({ menuOpen: false })
+  const canToggle = () => props.healthy && props.hasProjects
   return (
     <div class="group/server relative flex h-7 min-w-0 items-center rounded-[6px]">
       <button
@@ -658,17 +659,23 @@ function HomeServerRow(props: {
         disabled={!props.healthy}
         onClick={() => props.focusServer(props.server)}
       >
-        <Show when={props.healthy && props.hasProjects}>
+        <Show when={props.healthy}>
           <span
             data-action="home-server-collapse"
-            class="inline-flex -ml-0.5 -mr-1.5 size-5 shrink-0 items-center justify-center rounded-[4px] text-v2-icon-icon-muted hover:bg-v2-overlay-simple-overlay-hover"
+            class="inline-flex -ml-0.5 -mr-1.5 size-5 shrink-0 items-center justify-center rounded-[4px] text-v2-icon-icon-muted"
+            classList={{
+              "hover:bg-v2-overlay-simple-overlay-hover": canToggle(),
+              "cursor-default opacity-40": !canToggle(),
+            }}
             aria-label={
               props.collapsed ? props.language.t("home.server.expand") : props.language.t("home.server.collapse")
             }
-            aria-expanded={!props.collapsed}
+            aria-disabled={!canToggle()}
+            aria-expanded={canToggle() ? !props.collapsed : undefined}
             onClick={(event) => {
               event.preventDefault()
               event.stopPropagation()
+              if (!canToggle()) return
               props.toggleCollapsed()
             }}
             onPointerDown={(event) => event.preventDefault()}

From 83209a7f09a9aee0f5c997f5b81760b521909e76 Mon Sep 17 00:00:00 2001
From: neriousy <hejmowskifilip@gmail.com>
Date: Sun, 28 Jun 2026 12:53:27 +0200
Subject: [PATCH 3/4] remove props passing

---
 packages/app/src/pages/home.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/app/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index 5c6ca9ccc956..c217e791dafa 100644
--- a/packages/app/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
@@ -576,8 +576,6 @@ function HomeProjectColumn(props: {
                 <HomeServerRow
                   server={item}
                   selected={props.selected.server === key && !props.selected.directory}
-                  healthy={healthy()}
-                  hasProjects={hasProjects()}
                   collapsed={collapsed()}
                   health={global.servers.health[key]}
                   controller={controller}
@@ -637,8 +635,6 @@ function HomeUtilityNav(props: {
 function HomeServerRow(props: {
   server: ServerConnection.Any
   selected: boolean
-  healthy: boolean
-  hasProjects: boolean
   collapsed: boolean
   health: ServerHealth | undefined
   controller: ReturnType<typeof useServerManagementController>
@@ -648,18 +644,20 @@ function HomeServerRow(props: {
   toggleCollapsed: () => void
   language: ReturnType<typeof useLanguage>
 }) {
+  const global = useGlobal()
   const [state, setState] = createStore({ menuOpen: false })
-  const canToggle = () => props.healthy && props.hasProjects
+  const healthy = () => !!props.health?.healthy
+  const canToggle = () => healthy() && global.ensureServerCtx(props.server).projects.list().length > 0
   return (
     <div class="group/server relative flex h-7 min-w-0 items-center rounded-[6px]">
       <button
         type="button"
         class={`${HOME_PROJECT_NAV_ROW} pr-16 disabled:opacity-60`}
         data-selected={props.selected ? "" : undefined}
-        disabled={!props.healthy}
+        disabled={!healthy()}
         onClick={() => props.focusServer(props.server)}
       >
-        <Show when={props.healthy}>
+        <Show when={healthy()}>
           <span
             data-action="home-server-collapse"
             class="inline-flex -ml-0.5 -mr-1.5 size-5 shrink-0 items-center justify-center rounded-[4px] text-v2-icon-icon-muted"

From 3138feb4fea628489e43e6f43d1f7aa1b0336d98 Mon Sep 17 00:00:00 2001
From: neriousy <hejmowskifilip@gmail.com>
Date: Sun, 28 Jun 2026 12:58:43 +0200
Subject: [PATCH 4/4] render chevron on disabled servers

---
 packages/app/src/pages/home.tsx | 56 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/packages/app/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index c217e791dafa..0656c9f31414 100644
--- a/packages/app/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
@@ -657,35 +657,33 @@ function HomeServerRow(props: {
         disabled={!healthy()}
         onClick={() => props.focusServer(props.server)}
       >
-        <Show when={healthy()}>
-          <span
-            data-action="home-server-collapse"
-            class="inline-flex -ml-0.5 -mr-1.5 size-5 shrink-0 items-center justify-center rounded-[4px] text-v2-icon-icon-muted"
-            classList={{
-              "hover:bg-v2-overlay-simple-overlay-hover": canToggle(),
-              "cursor-default opacity-40": !canToggle(),
-            }}
-            aria-label={
-              props.collapsed ? props.language.t("home.server.expand") : props.language.t("home.server.collapse")
-            }
-            aria-disabled={!canToggle()}
-            aria-expanded={canToggle() ? !props.collapsed : undefined}
-            onClick={(event) => {
-              event.preventDefault()
-              event.stopPropagation()
-              if (!canToggle()) return
-              props.toggleCollapsed()
-            }}
-            onPointerDown={(event) => event.preventDefault()}
-          >
-            <IconV2
-              name="chevron-down"
-              size="small"
-              class="transition-transform duration-150 ease-in-out"
-              style={{ transform: `rotate(${props.collapsed ? -90 : 0}deg)` }}
-            />
-          </span>
-        </Show>
+        <span
+          data-action="home-server-collapse"
+          class="inline-flex -ml-0.5 -mr-1.5 size-5 shrink-0 items-center justify-center rounded-[4px] text-v2-icon-icon-muted"
+          classList={{
+            "hover:bg-v2-overlay-simple-overlay-hover": canToggle(),
+            "cursor-default opacity-40": !canToggle(),
+          }}
+          aria-label={
+            props.collapsed ? props.language.t("home.server.expand") : props.language.t("home.server.collapse")
+          }
+          aria-disabled={!canToggle()}
+          aria-expanded={canToggle() ? !props.collapsed : undefined}
+          onClick={(event) => {
+            event.preventDefault()
+            event.stopPropagation()
+            if (!canToggle()) return
+            props.toggleCollapsed()
+          }}
+          onPointerDown={(event) => event.preventDefault()}
+        >
+          <IconV2
+            name="chevron-down"
+            size="small"
+            class="transition-transform duration-150 ease-in-out"
+            style={{ transform: `rotate(${props.collapsed ? -90 : 0}deg)` }}
+          />
+        </span>
         <div class="flex size-4 shrink-0 items-center justify-center -mr-0.5">
           <ServerHealthIndicator health={props.health} />
         </div>