From ff83cc99ab8887c069de3ae3ac629abcb71e8df9 Mon Sep 17 00:00:00 2001
From: Jiayuan <forrestchang7@gmail.com>
Date: Wed, 14 Jan 2026 03:35:43 +0800
Subject: [PATCH] feat: add directory picker for new session dialog

- Add Browse button to open native directory picker
- Add selectDirectory IPC handler using dialog.showOpenDialog
- User can still type path manually or use system picker

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 src/main/ipc/handlers.ts     | 17 ++++++++++++++++-
 src/preload/index.ts         |  3 +++
 src/renderer/src/App.tsx     | 34 ++++++++++++++++++++++------------
 src/shared/electron-api.d.ts |  3 +++
 src/shared/ipc-channels.ts   |  3 +++
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/main/ipc/handlers.ts b/src/main/ipc/handlers.ts
index ab262bfbf0..839a4181e3 100644
--- a/src/main/ipc/handlers.ts
+++ b/src/main/ipc/handlers.ts
@@ -2,7 +2,7 @@
  * IPC handlers for main process
  * Registers all IPC handlers for communication with renderer process
  */
-import { ipcMain } from 'electron'
+import { ipcMain, dialog } from 'electron'
 import { IPC_CHANNELS } from '../../shared/ipc-channels'
 import { DEFAULT_AGENTS } from '../config/defaults'
 import type { Conductor } from '../conductor/Conductor'
@@ -107,5 +107,20 @@ export function registerIPCHandlers(conductor: Conductor): void {
     return config
   })
 
+  // --- Dialog handlers ---
+
+  ipcMain.handle(IPC_CHANNELS.DIALOG_SELECT_DIRECTORY, async () => {
+    const result = await dialog.showOpenDialog({
+      properties: ['openDirectory', 'createDirectory'],
+      title: 'Select Working Directory',
+    })
+
+    if (result.canceled || result.filePaths.length === 0) {
+      return null
+    }
+
+    return result.filePaths[0]
+  })
+
   console.log('[IPC] All handlers registered')
 }
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 9316c0ecb5..c963e2124b 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -41,6 +41,9 @@ const electronAPI: ElectronAPI = {
 
   updateConfig: (config) => ipcRenderer.invoke(IPC_CHANNELS.CONFIG_UPDATE, config),
 
+  // Dialog
+  selectDirectory: () => ipcRenderer.invoke(IPC_CHANNELS.DIALOG_SELECT_DIRECTORY),
+
   // Event listeners
   onAgentMessage: (callback) => {
     const listener = (_event: Electron.IpcRendererEvent, message: unknown) =>
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 1b4de504bc..e9b11a4cca 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -130,18 +130,28 @@ function App(): React.JSX.Element {
             <label className="mb-2 block text-sm text-[var(--color-text-muted)]">
               Working Directory
             </label>
-            <input
-              type="text"
-              value={newSessionCwd}
-              onChange={(e) => setNewSessionCwd(e.target.value)}
-              placeholder="/path/to/project"
-              className="mb-4 w-full rounded-lg border border-[var(--color-border)] bg-[var(--color-background)] px-4 py-2 text-[var(--color-text)] outline-none placeholder:text-[var(--color-text-muted)] focus:border-[var(--color-primary)]"
-              autoFocus
-              onKeyDown={(e) => {
-                if (e.key === 'Enter') handleCreateSession()
-                if (e.key === 'Escape') setShowNewSession(false)
-              }}
-            />
+            <div className="mb-4 flex gap-2">
+              <input
+                type="text"
+                value={newSessionCwd}
+                onChange={(e) => setNewSessionCwd(e.target.value)}
+                placeholder="Select a directory..."
+                className="flex-1 rounded-lg border border-[var(--color-border)] bg-[var(--color-background)] px-4 py-2 text-[var(--color-text)] outline-none placeholder:text-[var(--color-text-muted)] focus:border-[var(--color-primary)]"
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter') handleCreateSession()
+                  if (e.key === 'Escape') setShowNewSession(false)
+                }}
+              />
+              <button
+                onClick={async () => {
+                  const dir = await window.electronAPI.selectDirectory()
+                  if (dir) setNewSessionCwd(dir)
+                }}
+                className="flex-shrink-0 rounded-lg border border-[var(--color-border)] bg-[var(--color-surface-hover)] px-4 py-2 text-[var(--color-text)] transition-colors hover:bg-[var(--color-border)]"
+              >
+                Browse...
+              </button>
+            </div>
 
             <div className="flex justify-end gap-2">
               <button
diff --git a/src/shared/electron-api.d.ts b/src/shared/electron-api.d.ts
index db184945f1..53e68da873 100644
--- a/src/shared/electron-api.d.ts
+++ b/src/shared/electron-api.d.ts
@@ -38,6 +38,9 @@ export interface ElectronAPI {
   getConfig(): Promise<AppConfig>
   updateConfig(config: Partial<AppConfig>): Promise<AppConfig>
 
+  // Dialog
+  selectDirectory(): Promise<string | null>
+
   // Event listeners (return unsubscribe function)
   onAgentMessage(callback: (message: AgentMessage) => void): () => void
   onAgentStatus(callback: (status: AgentStatus) => void): () => void
diff --git a/src/shared/ipc-channels.ts b/src/shared/ipc-channels.ts
index 541837f78b..779b0e49b3 100644
--- a/src/shared/ipc-channels.ts
+++ b/src/shared/ipc-channels.ts
@@ -24,6 +24,9 @@ export const IPC_CHANNELS = {
   CONFIG_GET: 'config:get',
   CONFIG_UPDATE: 'config:update',
 
+  // Dialog
+  DIALOG_SELECT_DIRECTORY: 'dialog:select-directory',
+
   // File system (V2)
   FILE_APPROVAL_REQUEST: 'file:approval-request',
   FILE_APPROVAL_RESPONSE: 'file:approval-response',