From 60dfab8df83acdd9e2dad4983d2628fc081dd97b Mon Sep 17 00:00:00 2001
From: mishraprafful <prafful.mishra@epidemicsound.com>
Date: Thu, 2 Apr 2026 11:09:15 +0200
Subject: [PATCH 1/5] feat: collapsible sidebar toggle

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/renderer/components/Sidebar/Sidebar.tsx | 121 +++++++++++++-------
 1 file changed, 78 insertions(+), 43 deletions(-)

diff --git a/src/renderer/components/Sidebar/Sidebar.tsx b/src/renderer/components/Sidebar/Sidebar.tsx
index b2ac6a9..9652b0e 100644
--- a/src/renderer/components/Sidebar/Sidebar.tsx
+++ b/src/renderer/components/Sidebar/Sidebar.tsx
@@ -36,6 +36,7 @@ export function Sidebar() {
 
   const [archiveOpen, setArchiveOpen] = useState(false);
   const [metaHeld, setMetaHeld] = useState(false);
+  const [collapsed, setCollapsed] = useState(false);
   const repoPickerRef = useRef<HTMLDivElement>(null);
 
   const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 8 } }));
@@ -175,62 +176,78 @@ export function Sidebar() {
   ]);
 
   return (
-    <aside className="w-60 border-r border-white/[0.06] bg-transparent flex flex-col">
+    <aside
+      className={`${collapsed ? "w-10" : "w-60"} border-r border-white/[0.06] bg-transparent flex flex-col transition-[width] duration-200 ease-in-out overflow-hidden`}
+    >
       {/* Draggable title bar + header */}
-      <div className="h-12 flex items-center px-4 [-webkit-app-region:drag]">
-        <span className="text-[13px] font-medium text-text-muted ml-16 flex-1">Codez</span>
-        <div className="[-webkit-app-region:no-drag]" ref={repoPickerRef}>
+      <div className="h-12 flex items-center px-2 [-webkit-app-region:drag] shrink-0">
+        {!collapsed && (
+          <span className="text-[13px] font-medium text-text-muted ml-16 flex-1 whitespace-nowrap overflow-hidden">Codez</span>
+        )}
+        <div className={`flex items-center gap-1 [-webkit-app-region:no-drag] ${collapsed ? "mx-auto" : ""}`} ref={repoPickerRef}>
+          {!collapsed && (
+            <button
+              type="button"
+              onClick={handleNewSessionClick}
+              className="w-6 h-6 flex items-center justify-center rounded-md text-text-muted hover:text-text-primary hover:bg-white/10 transition-colors"
+              title="New session"
+            >
+              <PlusIcon />
+            </button>
+          )}
           <button
             type="button"
-            onClick={handleNewSessionClick}
+            onClick={() => setCollapsed(!collapsed)}
             className="w-6 h-6 flex items-center justify-center rounded-md text-text-muted hover:text-text-primary hover:bg-white/10 transition-colors"
-            title="New session"
+            title={collapsed ? "Expand sidebar" : "Collapse sidebar"}
           >
-            <PlusIcon />
+            <CollapseIcon collapsed={collapsed} />
           </button>
         </div>
       </div>
 
       {/* Session list — sorted by user-defined order */}
-      <div className="flex-1 overflow-y-auto px-1.5 py-1 space-y-0.5">
-        {sessions.length === 0 ? (
-          <div className="flex items-center justify-center h-32">
-            <p className="text-xs text-text-muted">
-              {repos.length === 0 ? "Add a folder to get started" : "No sessions yet"}
-            </p>
-          </div>
-        ) : (
-          <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
-            <SortableContext items={sessions.map((s) => s.id)} strategy={verticalListSortingStrategy}>
-              {sessions.map((session, index) => (
-                <SortableSessionItem
-                  key={session.id}
-                  session={session}
-                  isActive={session.id === activeSessionId}
-                  onClick={() => setActiveSession(session.id)}
-                  onArchive={() => handleArchiveSession(session)}
-                  branchName={session.branchName ?? branches.get(session.repoPath)}
-                  shortcutNumber={metaHeld && index < 9 ? index + 1 : null}
-                />
-              ))}
-            </SortableContext>
-          </DndContext>
-        )}
+      {!collapsed && (
+        <div className="flex-1 overflow-y-auto px-1.5 py-1 space-y-0.5">
+          {sessions.length === 0 ? (
+            <div className="flex items-center justify-center h-32">
+              <p className="text-xs text-text-muted">
+                {repos.length === 0 ? "Add a folder to get started" : "No sessions yet"}
+              </p>
+            </div>
+          ) : (
+            <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
+              <SortableContext items={sessions.map((s) => s.id)} strategy={verticalListSortingStrategy}>
+                {sessions.map((session, index) => (
+                  <SortableSessionItem
+                    key={session.id}
+                    session={session}
+                    isActive={session.id === activeSessionId}
+                    onClick={() => setActiveSession(session.id)}
+                    onArchive={() => handleArchiveSession(session)}
+                    branchName={session.branchName ?? branches.get(session.repoPath)}
+                    shortcutNumber={metaHeld && index < 9 ? index + 1 : null}
+                  />
+                ))}
+              </SortableContext>
+            </DndContext>
+          )}
 
-        {/* Add folder link — only when no repos exist */}
-        {repos.length === 0 && (
-          <button
-            type="button"
-            onClick={addRepoViaDialog}
-            className="w-full text-left px-3 py-1.5 text-xs text-text-muted hover:text-accent transition-colors [-webkit-app-region:no-drag]"
-          >
-            + Add folder...
-          </button>
-        )}
-      </div>
+          {/* Add folder link — only when no repos exist */}
+          {repos.length === 0 && (
+            <button
+              type="button"
+              onClick={addRepoViaDialog}
+              className="w-full text-left px-3 py-1.5 text-xs text-text-muted hover:text-accent transition-colors [-webkit-app-region:no-drag]"
+            >
+              + Add folder...
+            </button>
+          )}
+        </div>
+      )}
 
       {/* Archive accordion */}
-      {archivedSessions.length > 0 && (
+      {!collapsed && archivedSessions.length > 0 && (
         <div className="border-t border-white/[0.06]">
           <button
             type="button"
@@ -306,6 +323,24 @@ function PlusIcon() {
   );
 }
 
+function CollapseIcon({ collapsed }: { collapsed: boolean }) {
+  return (
+    <svg
+      width="14"
+      height="14"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      className={`transition-transform ${collapsed ? "rotate-180" : ""}`}
+    >
+      <polyline points="15 18 9 12 15 6" />
+    </svg>
+  );
+}
+
 function ChevronIcon({ open }: { open: boolean }) {
   return (
     <svg

From dd1249e77ef54889105f7aa0b9e8d79211cecc28 Mon Sep 17 00:00:00 2001
From: mishraprafful <prafful.mishra@epidemicsound.com>
Date: Thu, 2 Apr 2026 11:18:35 +0200
Subject: [PATCH 2/5] fix: remove macOS quarantine flag from Electron binary
 before dev

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index fc5a214..92aee69 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 .PHONY: dev build lint format test test-watch test-e2e build-release clean
 
 dev: ## Start dev mode with isolated DB (safe to run alongside prod app)
+	xattr -cr node_modules/electron/dist/Electron.app 2>/dev/null || true
 	E2E_DATA_DIR=$(HOME)/.codez-dev npm run dev
 
 build:

From ed42bff2635ba47afbebf12734d586b9394fc75f Mon Sep 17 00:00:00 2001
From: mishraprafful <prafful.mishra@epidemicsound.com>
Date: Thu, 2 Apr 2026 11:19:58 +0200
Subject: [PATCH 3/5] chore: fix Biome formatting in Sidebar

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/renderer/components/Sidebar/Sidebar.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/Sidebar/Sidebar.tsx b/src/renderer/components/Sidebar/Sidebar.tsx
index 9652b0e..06ae8c5 100644
--- a/src/renderer/components/Sidebar/Sidebar.tsx
+++ b/src/renderer/components/Sidebar/Sidebar.tsx
@@ -182,9 +182,14 @@ export function Sidebar() {
       {/* Draggable title bar + header */}
       <div className="h-12 flex items-center px-2 [-webkit-app-region:drag] shrink-0">
         {!collapsed && (
-          <span className="text-[13px] font-medium text-text-muted ml-16 flex-1 whitespace-nowrap overflow-hidden">Codez</span>
+          <span className="text-[13px] font-medium text-text-muted ml-16 flex-1 whitespace-nowrap overflow-hidden">
+            Codez
+          </span>
         )}
-        <div className={`flex items-center gap-1 [-webkit-app-region:no-drag] ${collapsed ? "mx-auto" : ""}`} ref={repoPickerRef}>
+        <div
+          className={`flex items-center gap-1 [-webkit-app-region:no-drag] ${collapsed ? "mx-auto" : ""}`}
+          ref={repoPickerRef}
+        >
           {!collapsed && (
             <button
               type="button"

From 24a8c8d1691d9b7506c385f3517c98b11a497606 Mon Sep 17 00:00:00 2001
From: mishraprafful <prafful.mishra@epidemicsound.com>
Date: Thu, 2 Apr 2026 13:06:53 +0200
Subject: [PATCH 4/5] feat: add Cmd+\ keyboard shortcut to toggle sidebar

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/renderer/components/Sidebar/Sidebar.tsx |  9 ++++++---
 src/renderer/hooks/useGlobalShortcuts.ts    | 12 +++++++++++-
 src/renderer/stores/themeStore.ts           |  7 +++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/Sidebar/Sidebar.tsx b/src/renderer/components/Sidebar/Sidebar.tsx
index 06ae8c5..385632d 100644
--- a/src/renderer/components/Sidebar/Sidebar.tsx
+++ b/src/renderer/components/Sidebar/Sidebar.tsx
@@ -4,6 +4,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { useSessionShortcuts } from "../../hooks/useChordShortcuts";
 import { useRepoStore } from "../../stores/repoStore";
 import { useSessionStore } from "../../stores/sessionStore";
+import { useThemeStore } from "../../stores/themeStore";
 import { NewSessionDialog } from "./NewSessionDialog";
 import { SessionListItem, type SessionListItemProps } from "./SessionListItem";
 import { WorktreeDeleteDialog } from "./WorktreeDeleteDialog";
@@ -34,9 +35,11 @@ export function Sidebar() {
 
   const reorderSessions = useSessionStore((state) => state.reorderSessions);
 
+  const collapsed = useThemeStore((state) => state.sidebarCollapsed);
+  const toggleSidebar = useThemeStore((state) => state.toggleSidebar);
+
   const [archiveOpen, setArchiveOpen] = useState(false);
   const [metaHeld, setMetaHeld] = useState(false);
-  const [collapsed, setCollapsed] = useState(false);
   const repoPickerRef = useRef<HTMLDivElement>(null);
 
   const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 8 } }));
@@ -202,9 +205,9 @@ export function Sidebar() {
           )}
           <button
             type="button"
-            onClick={() => setCollapsed(!collapsed)}
+            onClick={toggleSidebar}
             className="w-6 h-6 flex items-center justify-center rounded-md text-text-muted hover:text-text-primary hover:bg-white/10 transition-colors"
-            title={collapsed ? "Expand sidebar" : "Collapse sidebar"}
+            title={collapsed ? "Expand sidebar (⌘\\)" : "Collapse sidebar (⌘\\)"}
           >
             <CollapseIcon collapsed={collapsed} />
           </button>
diff --git a/src/renderer/hooks/useGlobalShortcuts.ts b/src/renderer/hooks/useGlobalShortcuts.ts
index 8c5e980..475c665 100644
--- a/src/renderer/hooks/useGlobalShortcuts.ts
+++ b/src/renderer/hooks/useGlobalShortcuts.ts
@@ -11,8 +11,13 @@ export function isNewSessionShortcut(event: KeyboardEvent): boolean {
   return event.key === "n" && event.metaKey && !event.shiftKey && !event.altKey && !event.ctrlKey;
 }
 
+export function isSidebarToggleShortcut(event: KeyboardEvent): boolean {
+  return event.key === "\\" && event.metaKey && !event.shiftKey && !event.altKey && !event.ctrlKey;
+}
+
 export function useGlobalShortcuts(): void {
   const toggleSettings = useThemeStore((state) => state.toggleSettings);
+  const toggleSidebar = useThemeStore((state) => state.toggleSidebar);
   const setPendingNewSessionRepo = useSessionStore((state) => state.setPendingNewSessionRepo);
   const addRepoViaDialog = useRepoStore((state) => state.addRepoViaDialog);
 
@@ -30,9 +35,14 @@ export function useGlobalShortcuts(): void {
           setPendingNewSessionRepo(repo);
         }
       }
+
+      if (isSidebarToggleShortcut(event)) {
+        event.preventDefault();
+        toggleSidebar();
+      }
     }
 
     window.addEventListener("keydown", handleKeyDown);
     return () => window.removeEventListener("keydown", handleKeyDown);
-  }, [toggleSettings, setPendingNewSessionRepo, addRepoViaDialog]);
+  }, [toggleSettings, toggleSidebar, setPendingNewSessionRepo, addRepoViaDialog]);
 }
diff --git a/src/renderer/stores/themeStore.ts b/src/renderer/stores/themeStore.ts
index 34f1a3a..7823abe 100644
--- a/src/renderer/stores/themeStore.ts
+++ b/src/renderer/stores/themeStore.ts
@@ -12,9 +12,11 @@ export function applyThemeToElement(theme: ThemeDefinition, element: HTMLElement
 interface ThemeState {
   activeThemeId: ThemeId;
   settingsOpen: boolean;
+  sidebarCollapsed: boolean;
 
   toggleSettings: () => void;
   closeSettings: () => void;
+  toggleSidebar: () => void;
   setTheme: (id: ThemeId) => void;
   loadTheme: () => Promise<void>;
 }
@@ -22,11 +24,16 @@ interface ThemeState {
 export const useThemeStore = create<ThemeState>((set) => ({
   activeThemeId: DEFAULT_THEME_ID,
   settingsOpen: false,
+  sidebarCollapsed: false,
 
   toggleSettings: () => {
     set((state) => ({ settingsOpen: !state.settingsOpen }));
   },
 
+  toggleSidebar: () => {
+    set((state) => ({ sidebarCollapsed: !state.sidebarCollapsed }));
+  },
+
   closeSettings: () => {
     set({ settingsOpen: false });
   },

From 2a97d589bf7d620adcead5a7097fc41617333fe7 Mon Sep 17 00:00:00 2001
From: mishraprafful <prafful.mishra@epidemicsound.com>
Date: Thu, 2 Apr 2026 13:07:13 +0200
Subject: [PATCH 5/5] feat: change sidebar toggle shortcut to Cmd+B

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/renderer/components/Sidebar/Sidebar.tsx | 2 +-
 src/renderer/hooks/useGlobalShortcuts.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/Sidebar/Sidebar.tsx b/src/renderer/components/Sidebar/Sidebar.tsx
index 385632d..59eef68 100644
--- a/src/renderer/components/Sidebar/Sidebar.tsx
+++ b/src/renderer/components/Sidebar/Sidebar.tsx
@@ -207,7 +207,7 @@ export function Sidebar() {
             type="button"
             onClick={toggleSidebar}
             className="w-6 h-6 flex items-center justify-center rounded-md text-text-muted hover:text-text-primary hover:bg-white/10 transition-colors"
-            title={collapsed ? "Expand sidebar (⌘\\)" : "Collapse sidebar (⌘\\)"}
+            title={collapsed ? "Expand sidebar (⌘B)" : "Collapse sidebar (⌘B)"}
           >
             <CollapseIcon collapsed={collapsed} />
           </button>
diff --git a/src/renderer/hooks/useGlobalShortcuts.ts b/src/renderer/hooks/useGlobalShortcuts.ts
index 475c665..a46b8f8 100644
--- a/src/renderer/hooks/useGlobalShortcuts.ts
+++ b/src/renderer/hooks/useGlobalShortcuts.ts
@@ -12,7 +12,7 @@ export function isNewSessionShortcut(event: KeyboardEvent): boolean {
 }
 
 export function isSidebarToggleShortcut(event: KeyboardEvent): boolean {
-  return event.key === "\\" && event.metaKey && !event.shiftKey && !event.altKey && !event.ctrlKey;
+  return event.key === "b" && event.metaKey && !event.shiftKey && !event.altKey && !event.ctrlKey;
 }
 
 export function useGlobalShortcuts(): void {