From 46e883db6e0bbf522d690ab3ceb6bc87743c9039 Mon Sep 17 00:00:00 2001
From: Douwe Osinga <douwe@block.xyz>
Date: Wed, 6 Aug 2025 10:46:27 +0200
Subject: [PATCH] Cmd click open finder (#3807)

Co-authored-by: Douwe Osinga <douwe@squareup.com>
Co-authored-by: Michael Neale <michael.neale@gmail.com>
---
 .../src/components/bottom_menu/DirSwitcher.tsx    | 15 ++++++++++++++-
 ui/desktop/src/main.ts                            |  9 +++++++++
 ui/desktop/src/preload.ts                         |  3 +++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ui/desktop/src/components/bottom_menu/DirSwitcher.tsx b/ui/desktop/src/components/bottom_menu/DirSwitcher.tsx
index 4bf19998..d5d0c824 100644
--- a/ui/desktop/src/components/bottom_menu/DirSwitcher.tsx
+++ b/ui/desktop/src/components/bottom_menu/DirSwitcher.tsx
@@ -13,13 +13,26 @@ export const DirSwitcher: React.FC<DirSwitcherProps> = ({ className = '' }) => {
     window.electron.directoryChooser(true);
   };
 
+  const handleDirectoryClick = async (event: React.MouseEvent) => {
+    const isCmdOrCtrlClick = event.metaKey || event.ctrlKey;
+
+    if (isCmdOrCtrlClick) {
+      event.preventDefault();
+      event.stopPropagation();
+      const workingDir = window.appConfig.get('GOOSE_WORKING_DIR') as string;
+      await window.electron.openDirectoryInExplorer(workingDir);
+    } else {
+      await handleDirectoryChange();
+    }
+  };
+
   return (
     <TooltipProvider>
       <Tooltip open={isTooltipOpen} onOpenChange={setIsTooltipOpen}>
         <TooltipTrigger asChild>
           <button
             className={`z-[100] hover:cursor-pointer text-text-default/70 hover:text-text-default text-xs flex items-center transition-colors pl-1 [&>svg]:size-4 ${className}`}
-            onClick={handleDirectoryChange}
+            onClick={handleDirectoryClick}
           >
             <FolderDot className="mr-1" size={16} />
             <div className="max-w-[200px] truncate [direction:rtl]">
diff --git a/ui/desktop/src/main.ts b/ui/desktop/src/main.ts
index 589acd2d..ea972105 100644
--- a/ui/desktop/src/main.ts
+++ b/ui/desktop/src/main.ts
@@ -2212,6 +2212,15 @@ app.whenReady().then(async () => {
   ipcMain.on('get-app-version', (event) => {
     event.returnValue = app.getVersion();
   });
+
+  ipcMain.handle('open-directory-in-explorer', async (_event, path: string) => {
+    try {
+      return !!(await shell.openPath(path));
+    } catch (error) {
+      console.error('Error opening directory in explorer:', error);
+      return false;
+    }
+  });
 });
 
 async function getAllowList(): Promise<string[]> {
diff --git a/ui/desktop/src/preload.ts b/ui/desktop/src/preload.ts
index 7f73d296..8de1613f 100644
--- a/ui/desktop/src/preload.ts
+++ b/ui/desktop/src/preload.ts
@@ -112,6 +112,7 @@ type ElectronAPI = {
   closeWindow: () => void;
   hasAcceptedRecipeBefore: (recipeConfig: Recipe) => Promise<boolean>;
   recordRecipeHash: (recipeConfig: Recipe) => Promise<boolean>;
+  openDirectoryInExplorer: (directoryPath: string) => Promise<boolean>;
 };
 
 type AppConfigAPI = {
@@ -240,6 +241,8 @@ const electronAPI: ElectronAPI = {
     ipcRenderer.invoke('has-accepted-recipe-before', recipeConfig),
   recordRecipeHash: (recipeConfig: Recipe) =>
     ipcRenderer.invoke('record-recipe-hash', recipeConfig),
+  openDirectoryInExplorer: (directoryPath: string) =>
+    ipcRenderer.invoke('open-directory-in-explorer', directoryPath),
 };
 
 const appConfigAPI: AppConfigAPI = {