Make sidebar worktrees opt-in and drop the inverse expansion set

With the section hidden until the user enables it in Settings →
Worktrees, expanded-by-default is the right behavior for those who
opted in. That removes the need for expandedWorktreeSections — the
inverse-polarity twin of collapsedSections — so the section now uses
the shared collapsedSections/toggleSection mechanism like every other
sidebar section.

Generated-By: PostHog Code
Task-Id: 24032eac-82cc-4c5f-a7e9-30ed9278a6e1

Author: haacked

packages/ui/src/features/settings/settingsStore.ts

@@ -232,7 +232,7 @@ interface SettingsStore {
 
   // Sidebar
   // Shows a per-repo "Worktrees" dropdown of task-less worktrees a click can
-  // start a task in.
+  // start a task in. Opt-in: off by default to keep the sidebar uncluttered.
   showSidebarWorktrees: boolean;
   setShowSidebarWorktrees: (enabled: boolean) => void;
 
@@ -454,7 +454,7 @@ export const useSettingsStore = create<SettingsStore>()(
         set({ conversationCollapseMode: mode }),
 
       // Sidebar
-      showSidebarWorktrees: true,
+      showSidebarWorktrees: false,
       setShowSidebarWorktrees: (enabled) =>
         set({ showSidebarWorktrees: enabled }),
 

packages/ui/src/features/sidebar/components/GroupWorktreesSection.tsx

@@ -13,20 +13,15 @@ interface GroupWorktreesSectionProps {
 /**
  * Nested "Worktrees" dropdown at the bottom of a repo group listing the repo's
  * task-less worktrees. Clicking one starts a task in that worktree and opens
- * its chat + shell. Collapsed by default; renders nothing when the repo has no
- * adoptable worktrees.
+ * its chat + shell. Renders nothing when the repo has no adoptable worktrees.
  */
 export function GroupWorktreesSection({
   groupId,
   mainRepoPath,
 }: GroupWorktreesSectionProps) {
   const worktrees = useAdoptableWorktrees(mainRepoPath);
-  const expandedWorktreeSections = useSidebarStore(
-    (state) => state.expandedWorktreeSections,
-  );
-  const toggleWorktreeSection = useSidebarStore(
-    (state) => state.toggleWorktreeSection,
-  );
+  const collapsedSections = useSidebarStore((state) => state.collapsedSections);
+  const toggleSection = useSidebarStore((state) => state.toggleSection);
   const { startTask, startingBranches } =
     useStartTaskFromWorktree(mainRepoPath);
 
@@ -39,8 +34,8 @@ export function GroupWorktreesSection({
       label={`Worktrees (${worktrees.length})`}
       icon={<TreeStructure size={14} className="text-gray-10" />}
       depth={1}
-      isExpanded={expandedWorktreeSections.has(sectionId)}
-      onToggle={() => toggleWorktreeSection(sectionId)}
+      isExpanded={!collapsedSections.has(sectionId)}
+      onToggle={() => toggleSection(sectionId)}
       tooltipContent="Worktrees without a task — click one to start a task there"
     >
       {worktrees.map((worktree) => {

packages/ui/src/features/sidebar/sidebarStore.ts

@@ -10,9 +10,6 @@ interface SidebarStoreState {
   width: number;
   isResizing: boolean;
   collapsedSections: Set<string>;
-  // Per-repo "Worktrees" subsections start collapsed, so unlike
-  // collapsedSections this tracks the expanded exceptions.
-  expandedWorktreeSections: Set<string>;
   folderOrder: string[];
   historyVisibleCount: number;
   organizeMode: "by-project" | "chronological";
@@ -33,7 +30,6 @@ interface SidebarStoreActions {
   setWidth: (width: number) => void;
   setIsResizing: (isResizing: boolean) => void;
   toggleSection: (sectionId: string) => void;
-  toggleWorktreeSection: (sectionId: string) => void;
   reorderFolders: (fromIndex: number, toIndex: number) => void;
   setFolderOrder: (order: string[]) => void;
   syncFolderOrder: (folderIds: string[]) => void;
@@ -57,7 +53,6 @@ export const useSidebarStore = create<SidebarStore>()(
       width: 256,
       isResizing: false,
       collapsedSections: new Set<string>(),
-      expandedWorktreeSections: new Set<string>(),
       folderOrder: [],
       historyVisibleCount: 25,
       organizeMode: "by-project",
@@ -83,16 +78,6 @@ export const useSidebarStore = create<SidebarStore>()(
           }
           return { collapsedSections: newCollapsedSections };
         }),
-      toggleWorktreeSection: (sectionId) =>
-        set((state) => {
-          const next = new Set(state.expandedWorktreeSections);
-          if (next.has(sectionId)) {
-            next.delete(sectionId);
-          } else {
-            next.add(sectionId);
-          }
-          return { expandedWorktreeSections: next };
-        }),
       reorderFolders: (fromIndex, toIndex) =>
         set((state) => {
           const newOrder = [...state.folderOrder];
@@ -141,7 +126,6 @@ export const useSidebarStore = create<SidebarStore>()(
         hasUserSetOpen: state.hasUserSetOpen,
         width: state.width,
         collapsedSections: Array.from(state.collapsedSections),
-        expandedWorktreeSections: Array.from(state.expandedWorktreeSections),
         folderOrder: state.folderOrder,
         historyVisibleCount: state.historyVisibleCount,
         organizeMode: state.organizeMode,
@@ -157,7 +141,6 @@ export const useSidebarStore = create<SidebarStore>()(
           hasUserSetOpen?: boolean;
           width?: number;
           collapsedSections?: string[];
-          expandedWorktreeSections?: string[];
           folderOrder?: string[];
           historyVisibleCount?: number;
           organizeMode?: SidebarStoreState["organizeMode"];
@@ -177,9 +160,6 @@ export const useSidebarStore = create<SidebarStore>()(
             persistedState.width ?? current.width,
           ),
           collapsedSections: new Set(persistedState.collapsedSections ?? []),
-          expandedWorktreeSections: new Set(
-            persistedState.expandedWorktreeSections ?? [],
-          ),
           folderOrder: persistedState.folderOrder ?? [],
           historyVisibleCount:
             persistedState.historyVisibleCount ?? current.historyVisibleCount,