From ca5b00f0d24ee35fc71bb8ae7d6ea0968764bd77 Mon Sep 17 00:00:00 2001 From: Adam Zvada Date: Sat, 18 Oct 2025 21:04:36 +0200 Subject: [PATCH 01/78] conductor-checkpoint-start --- .mcp.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.mcp.json b/.mcp.json index 39b7a439a..7fe3d775b 100644 --- a/.mcp.json +++ b/.mcp.json @@ -10,6 +10,16 @@ "shadcn": { "command": "npx", "args": ["shadcn@latest", "mcp"] + }, + "exa": { + "command": "npx", + "args": [ + "-y", + "exa-mcp-server" + ], + "env": { + "EXA_API_KEY": "64d127d2-c680-47d8-bf81-54b7052dd6aa" + } } } } From d7451b5baae709f0361f1298d878d3d6be05bb11 Mon Sep 17 00:00:00 2001 From: Adam Zvada Date: Sat, 18 Oct 2025 21:12:11 +0200 Subject: [PATCH 02/78] conductor-checkpoint-msg_01HirAbc19YdqizM5TpH91L6 --- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 10 +++- src/Dashboard.tsx | 29 +++++---- src/components/app-sidebar.tsx | 60 +++++++------------ src/components/ui/sidebar.tsx | 25 ++++---- .../browser/components/BrowserPanel.tsx | 8 +-- .../workspace/components/FileChangesPanel.tsx | 4 +- .../workspace/components/MessageInput.tsx | 2 +- src/styles.css | 34 ++++++++++- 9 files changed, 101 insertions(+), 73 deletions(-) diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 94c08b9a7..8a57649ea 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ path = "src/main.rs" tauri-build = { version = "2.0", features = [] } [dependencies] -tauri = { version = "2.0", features = ["config-toml", "protocol-asset", "devtools"] } +tauri = { version = "2.0", features = ["config-toml", "protocol-asset", "devtools", "macos-private-api"] } tauri-plugin-fs = "2.0" tauri-plugin-dialog = "2.0" tauri-plugin-shell = "2.0" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ba601cf03..33cd58119 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -20,6 +20,7 @@ } }, "app": { + "macOSPrivateApi": true, "windows": [ { "label": "main", @@ -29,8 +30,13 @@ "resizable": true, "fullscreen": false, "decorations": true, - "transparent": false, - "backgroundColor": "#ffffff" + "transparent": true, + "titleBarStyle": "Overlay", + "hiddenTitle": true, + "windowEffects": { + "state": "active", + "effects": ["underWindowBackground"] + } } ], "security": { diff --git a/src/Dashboard.tsx b/src/Dashboard.tsx index 3f45710ac..932212c12 100644 --- a/src/Dashboard.tsx +++ b/src/Dashboard.tsx @@ -22,6 +22,7 @@ import { Skeleton, SidebarProvider, SidebarInset, + SidebarTrigger, Tabs, TabsList, TabsTrigger, @@ -333,7 +334,7 @@ export function Dashboard() { return ( - {/* Floating Sidebar */} + {/* Inset Sidebar with vibrancy */} {loading ? (
@@ -371,23 +372,28 @@ export function Dashboard() { /> )} - {/* Main Content with SidebarInset */} + {/* Main Content with SidebarInset and inset padding */} - +
+ {/* MAIN CONTENT */}
{selectedWorkspace ? ( <> - {/* Workspace Header - Simplified */} + {/* Workspace Header - with SidebarTrigger */}
- {/* Left: Branch name with inline badge */} - + {/* Left: SidebarTrigger, separator, and Branch name */} +
+ + + +
{/* Right: Open in dropdown */} - + +
{/* Modals */} diff --git a/src/components/app-sidebar.tsx b/src/components/app-sidebar.tsx index 854ff54e8..0ee67f300 100644 --- a/src/components/app-sidebar.tsx +++ b/src/components/app-sidebar.tsx @@ -73,47 +73,27 @@ export function AppSidebar({ const isExpanded = state === "expanded"; return ( - - {/* Header with Profile and Collapse Button */} + + {/* Header with Profile (no collapse button) */} -
- {isExpanded ? ( - <> -
navigate("/settings")} - > - - - {profile.username.slice(0, 2).toUpperCase()} - - -
-

{profile.username}

-
-
- - - ) : ( - - )} -
+ {isExpanded ? ( +
+ + + {profile.username.slice(0, 2).toUpperCase()} + + +

{profile.username}

+
+ ) : ( +
+ + + {profile.username.slice(0, 2).toUpperCase()} + + +
+ )}
{/* Repositories List */} diff --git a/src/components/ui/sidebar.tsx b/src/components/ui/sidebar.tsx index 7f9044414..623aef2e2 100644 --- a/src/components/ui/sidebar.tsx +++ b/src/components/ui/sidebar.tsx @@ -145,7 +145,7 @@ const SidebarProvider = React.forwardRef< } as React.CSSProperties } className={cn( - "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar", + "group/sidebar-wrapper flex min-h-svh w-full", className )} ref={ref} @@ -185,7 +185,7 @@ const Sidebar = React.forwardRef< return (