@doccy/fell 0.1.2 → 0.1.4

package/cli.ts

@@ -838,7 +838,7 @@ async function handleBrowseKey(state: State, key: Key): Promise<void> {
   }
 
   // Quit
-  if (key === "ctrl-c" || ch === "q") {
+  if (key === "ctrl-c" || key === "escape" || ch === "q") {
     state.shouldQuit = true
     return
   }
@@ -1171,7 +1171,7 @@ async function main() {
 
         case "deleting":
           // Background delete in progress - ignore keys (spinner keeps animating via timer)
-          if (key === "ctrl-c") {
+          if (key === "ctrl-c" || key === "escape" || keyChar(key) === "q") {
             state.shouldQuit = true
           }
           break
@@ -1201,6 +1201,10 @@ async function main() {
     clearInterval(spinnerTimer)
   } finally {
     cleanup()
+    // Force exit immediately. Background async tasks (PR fetching, size
+    // estimation) hold the event loop open. They're non-critical UI state
+    // -- no data corruption risk from terminating mid-flight.
+    process.exit(0)
   }
 }
 

package/lib/git.ts

@@ -130,6 +130,10 @@ export async function listWorktrees(): Promise<Worktree[]> {
 /**
  * Remove a worktree directory and its git administrative tracking.
  * Use force when the worktree has uncommitted changes.
+ *
+ * Handles zombie worktrees (directory exists but .git file is missing):
+ * falls back to `git worktree prune` to clean the reference, then
+ * removes the leftover directory manually.
  */
 export async function removeWorktree(
   path: string,
@@ -137,19 +141,41 @@ export async function removeWorktree(
 ): Promise<{ ok: boolean; error?: string }> {
   const flags = force ? ["--force"] : []
   const result = await $`git worktree remove ${flags} ${path}`.nothrow().quiet()
-  if (result.exitCode !== 0) {
-    return { ok: false, error: result.stderr.toString().trim() }
+
+  if (result.exitCode === 0) return { ok: true }
+
+  const stderr = result.stderr.toString().trim()
+
+  // Zombie worktree: directory exists but .git is missing.
+  // git worktree remove refuses to act, so we prune the reference
+  // and remove the leftover directory ourselves.
+  const isZombie =
+    stderr.includes("does not exist") &&
+    (stderr.includes(".git") || stderr.includes("validation failed"))
+
+  if (isZombie) {
+    // Prune cleans the stale git reference
+    await $`git worktree prune`.nothrow().quiet()
+
+    // Remove the leftover directory if it still exists
+    await $`rm -rf ${path}`.nothrow().quiet()
+
+    return { ok: true }
   }
-  return { ok: true }
+
+  return { ok: false, error: stderr }
 }
 
 /**
  * Dry-run prune to show what stale references would be cleaned.
  * Returns human-readable descriptions of each stale entry.
+ * Note: git writes prune verbose output to stderr, not stdout.
  */
 export async function pruneWorktreesDryRun(): Promise<string[]> {
   const result = await $`git worktree prune --dry-run -v`.nothrow().quiet()
-  return result.stdout.toString().trim().split("\n").filter(Boolean)
+  const output = result.stderr.toString().trim()
+  if (!output) return []
+  return output.split("\n").filter(Boolean)
 }
 
 /** Actually prune stale worktree references. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doccy/fell",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Interactive git worktree manager. Navigate, inspect, delete, and prune worktrees with async PR status fetching.",
   "license": "MIT",
   "bin": {