Merge pull request #23 from InterestingSoftware/large-repo-updates

Switch-Hook Lifecycle, Persistent Terminal Sessions and Worktree Creation UX

Author: liam-russell

e2e/specs/daily-workflow.spec.ts

@@ -564,15 +564,11 @@ test.describe('Daily developer workflow', () => {
     // emitted — the shell script runs asynchronously afterward.  Waiting for a
     // filesystem artifact (the output file) is therefore inherently racy.
     // Instead, assert on the UI state that appears synchronously:
-    //   1. The hook-operation-header confirms hooks were triggered.
-    //   2. The terminal session tab confirms the terminal_tab launch request
-    //      was handled by the frontend.
-    const hookHeader = tauriPage.getByTestId('hook-operation-header');
-    await hookHeader.waitFor(DEFAULT_UI_TIMEOUT);
-    await expect(hookHeader).toBeVisible();
+    // the terminal session tab confirms the terminal_tab launch request
+    // was handled by the frontend.
 
     const sessionTab = tauriPage.locator(
-      `[data-testid="terminal-session-tab"][data-session-label^="${hookName} ("]`
+      `[data-testid="terminal-session-tab"][data-session-label="${hookName}"]`
     );
     await sessionTab.waitFor(DEFAULT_UI_TIMEOUT);
     await expect(sessionTab).toBeVisible();
@@ -677,15 +673,11 @@ test.describe('Daily developer workflow', () => {
     const targetBranch = 'feature/multi-hooks';
     await createWorktreeViaUi(tauriPage, targetBranch);
 
-    const hookHeader = tauriPage.getByTestId('hook-operation-header');
-    await hookHeader.waitFor(DEFAULT_UI_TIMEOUT);
-    await expect(hookHeader).toBeVisible();
-
     const firstSessionTab = tauriPage.locator(
-      `[data-testid="terminal-session-tab"][data-session-label^="${firstHookName} ("]`
+      `[data-testid="terminal-session-tab"][data-session-label="${firstHookName}"]`
     );
     const secondSessionTab = tauriPage.locator(
-      `[data-testid="terminal-session-tab"][data-session-label^="${secondHookName} ("]`
+      `[data-testid="terminal-session-tab"][data-session-label="${secondHookName}"]`
     );
 
     await firstSessionTab.waitFor(DEFAULT_UI_TIMEOUT);
@@ -764,10 +756,10 @@ test.describe('Daily developer workflow', () => {
     await createWorktreeViaUi(tauriPage, targetBranch);
 
     const autoCloseSessionTab = tauriPage.locator(
-      `[data-testid="terminal-session-tab"][data-session-label^="${autoCloseHookName} ("]`
+      `[data-testid="terminal-session-tab"][data-session-label="${autoCloseHookName}"]`
     );
     const keepOpenSessionTab = tauriPage.locator(
-      `[data-testid="terminal-session-tab"][data-session-label^="${keepOpenHookName} ("]`
+      `[data-testid="terminal-session-tab"][data-session-label="${keepOpenHookName}"]`
     );
 
     // ── Why this test races and how we synchronise on it ──────────────────────

src-tauri/migrations/workspace/006_hook_switch_once_per_session.sql

@@ -0,0 +1,2 @@
+ALTER TABLE hook_definitions
+ADD COLUMN switch_once_per_session INTEGER NOT NULL DEFAULT 0;

src-tauri/migrations/workspace/007_hook_switch_auto_run_contexts.sql

@@ -0,0 +1,5 @@
+ALTER TABLE hook_definitions
+ADD COLUMN switch_run_on_create INTEGER NOT NULL DEFAULT 1;
+
+ALTER TABLE hook_definitions
+ADD COLUMN switch_run_on_delete INTEGER NOT NULL DEFAULT 0;

src-tauri/src/db.rs

@@ -48,6 +48,12 @@ static WORKSPACE_MIGRATIONS: LazyLock<Migrations<'static>> = LazyLock::new(|| {
         M::up(include_str!(
             "../migrations/workspace/005_hooks_terminal_tab_only.sql"
         )),
+        M::up(include_str!(
+            "../migrations/workspace/006_hook_switch_once_per_session.sql"
+        )),
+        M::up(include_str!(
+            "../migrations/workspace/007_hook_switch_auto_run_contexts.sql"
+        )),
     ])
 });
 

src-tauri/src/editor.rs

@@ -349,7 +349,16 @@ pub async fn open_in_editor(worktree_path: String) -> Result<String, String> {
     cmd.spawn()
         .map_err(|e| format!("Failed to open editor '{}': {e}", parts[0]))?;
 
-    Ok(editor)
+    // Return a friendly display name: check known editors first, then fall back
+    // to just the bare command name (strips flags like --wait from the label).
+    let cmd_name = parts[0].as_str();
+    let display = known_editors()
+        .into_iter()
+        .find(|e| e.command == cmd_name || e.mac_bundle_bin == Some(cmd_name))
+        .map(|e| e.name.to_string())
+        .unwrap_or_else(|| cmd_name.to_string());
+
+    Ok(display)
 }
 
 #[tauri::command]

src-tauri/src/git/operations.rs

@@ -738,6 +738,31 @@ pub async fn delete_managed_worktree(
             "--force",
         ],
     )?;
+
+    // On Windows, `git worktree remove` can fail with "Permission denied" even
+    // with --force when a file watcher or shell process holds an open handle to
+    // the worktree directory.  If that happens, fall back to Rust's own
+    // directory removal (which uses the same Win32 APIs but retries on transient
+    // sharing violations), then let `git worktree prune` clean up the metadata.
+    #[cfg(target_os = "windows")]
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        if stderr.contains("Permission denied") || stderr.contains("failed to delete") {
+            if let Err(rm_err) = std::fs::remove_dir_all(&wt_path) {
+                // Both git and Rust failed — surface the original git error.
+                return Err(format!(
+                    "Failed to remove worktree (git: {}; fs: {})",
+                    stderr.trim(),
+                    rm_err
+                ));
+            }
+            // Directory removed; git metadata will be pruned below.
+        } else {
+            ensure_git_success(output, "Failed to remove worktree")?;
+        }
+    }
+
+    #[cfg(not(target_os = "windows"))]
     ensure_git_success(output, "Failed to remove worktree")?;
 
     // Prune stale worktree metadata regardless of branch deletion.
@@ -758,6 +783,8 @@ pub async fn delete_managed_worktree(
     }
 
     if let Some(workspace_path) = workspace_from_root_repo(&root_repo) {
+        crate::hooks::clear_switch_hook_session_runs_for_worktree(&workspace_path, &wt_path);
+
         if let Err(err) = delete_worktree_provenance(&workspace_path, &wt_path).await {
             eprintln!("Failed to remove worktree provenance: {err}");
         }