Merge pull request #4 from built-by-as/configure-worktree-dir

Add configurable worktree root directory

Author: built-by-as

index.html

@@ -225,6 +225,15 @@ <h2 class="modal-title">Terminal Settings</h2>
           </label>
         </div>
 
+        <div class="form-group">
+          <label class="form-label">Worktree Root Directory</label>
+          <div class="directory-input-group">
+            <input type="text" id="settings-worktree-dir" class="form-input" readonly placeholder="~/worktrees" />
+            <button id="browse-worktree-dir" class="btn-icon">Browse</button>
+          </div>
+          <span class="text-xs text-gray-400 mt-1 block">Directory where session worktrees will be stored</span>
+        </div>
+
         <div class="btn-group">
           <button id="cancel-settings" class="btn-secondary">Cancel</button>
           <button id="reset-settings" class="btn-secondary">Reset to Default</button>

main.ts

@@ -22,6 +22,14 @@ function getPersistedSessions(): PersistedSession[] {
   return (store as any).get("sessions", []);
 }
 
+function getWorktreeBaseDir(): string {
+  const settings = (store as any).get("terminalSettings");
+  if (settings && settings.worktreeDir) {
+    return settings.worktreeDir;
+  }
+  return path.join(os.homedir(), "worktrees");
+}
+
 function isTerminalReady(buffer: string, startPos: number = 0): boolean {
   const searchBuffer = buffer.slice(startPos);
 
@@ -63,7 +71,7 @@ function extractProjectMcpConfig(projectDir: string): any {
 // Get a safe directory name from project path, with collision handling
 function getProjectWorktreeDirName(projectDir: string): string {
   const baseName = path.basename(projectDir);
-  const worktreesBaseDir = path.join(os.homedir(), "worktrees");
+  const worktreesBaseDir = getWorktreeBaseDir();
   const candidatePath = path.join(worktreesBaseDir, baseName);
 
   // If directory doesn't exist or points to the same project, use base name
@@ -90,7 +98,7 @@ function getProjectWorktreeDirName(projectDir: string): string {
 function writeMcpConfigFile(projectDir: string, mcpServers: any): string | null {
   try {
     const projectDirName = getProjectWorktreeDirName(projectDir);
-    const worktreesDir = path.join(os.homedir(), "worktrees");
+    const worktreesDir = getWorktreeBaseDir();
     if (!fs.existsSync(worktreesDir)) {
       fs.mkdirSync(worktreesDir, { recursive: true });
     }
@@ -303,7 +311,7 @@ async function createWorktree(projectDir: string, parentBranch: string, sessionN
   const git = simpleGit(projectDir);
 
   const projectDirName = getProjectWorktreeDirName(projectDir);
-  const worktreesBaseDir = path.join(os.homedir(), "worktrees");
+  const worktreesBaseDir = getWorktreeBaseDir();
   const projectWorktreeDir = path.join(worktreesBaseDir, projectDirName);
   const worktreeName = customBranchName || `session${sessionNumber}`;
   const worktreePath = path.join(projectWorktreeDir, worktreeName);

renderer.ts

@@ -30,6 +30,7 @@ interface TerminalSettings {
   fontSize: number;
   theme: string; // Theme preset name
   cursorBlink: boolean;
+  worktreeDir: string;
 }
 
 interface ThemeColors {
@@ -203,6 +204,7 @@ const DEFAULT_SETTINGS: TerminalSettings = {
   fontSize: 11,
   theme: getSystemTheme() === "dark" ? "macos-dark" : "macos-light",
   cursorBlink: false,
+  worktreeDir: require("path").join(require("os").homedir(), "worktrees"),
 };
 
 const sessions = new Map<string, Session>();
@@ -1217,6 +1219,8 @@ const settingsTheme = document.getElementById("settings-theme") as HTMLSelectEle
 const settingsFontFamily = document.getElementById("settings-font-family") as HTMLSelectElement;
 const settingsFontSize = document.getElementById("settings-font-size") as HTMLInputElement;
 const settingsCursorBlink = document.getElementById("settings-cursor-blink") as HTMLInputElement;
+const settingsWorktreeDir = document.getElementById("settings-worktree-dir") as HTMLInputElement;
+const browseWorktreeDirBtn = document.getElementById("browse-worktree-dir");
 
 // Load saved settings on startup
 async function loadSettings() {
@@ -1243,6 +1247,7 @@ function populateSettingsForm() {
 
   settingsFontSize.value = terminalSettings.fontSize.toString();
   settingsCursorBlink.checked = terminalSettings.cursorBlink;
+  settingsWorktreeDir.value = terminalSettings.worktreeDir;
 }
 
 // Apply settings to all existing terminals
@@ -1281,13 +1286,22 @@ resetSettingsBtn?.addEventListener("click", () => {
   populateSettingsForm();
 });
 
+// Browse worktree directory
+browseWorktreeDirBtn?.addEventListener("click", async () => {
+  const dir = await ipcRenderer.invoke("select-directory");
+  if (dir) {
+    settingsWorktreeDir.value = dir;
+  }
+});
+
 // Save settings
 saveSettingsBtn?.addEventListener("click", async () => {
   // Read values from form
   terminalSettings.theme = settingsTheme.value;
   terminalSettings.fontFamily = settingsFontFamily.value || DEFAULT_SETTINGS.fontFamily;
   terminalSettings.fontSize = parseInt(settingsFontSize.value) || DEFAULT_SETTINGS.fontSize;
   terminalSettings.cursorBlink = settingsCursorBlink.checked;
+  terminalSettings.worktreeDir = settingsWorktreeDir.value || DEFAULT_SETTINGS.worktreeDir;
 
   // Save to electron-store
   await ipcRenderer.invoke("save-terminal-settings", terminalSettings);