@solaqua/gji 0.8.0 → 0.8.1

package/dist/clean.js

@@ -3,7 +3,7 @@ import { loadEffectiveConfig } from "./config.js";
 import { isBranchMergedInto, readWorktreeHealth, resolveRemoteDefaultBranch, runGit, } from "./git.js";
 import { isHeadless } from "./headless.js";
 import { formatLastCommit, formatUpstreamState, readWorktreeInfos, serializeWorktreeInfo, } from "./worktree-info.js";
-import { deleteBranch, forceDeleteBranch, forceRemoveWorktree, isBranchUnmergedError, isWorktreeDirtyError, loadLinkedWorktrees, removeWorktree, } from "./worktree-management.js";
+import { deleteBranch, forceDeleteBranch, forceRemoveWorktree, isBranchUnmergedError, isWorktreeDeletionError, isWorktreeForceRemovalError, loadLinkedWorktrees, removeWorktree, } from "./worktree-management.js";
 import { buildWorktreePromptEntries, promptForMultipleWorktrees, } from "./worktree-picker.js";
 import { defaultConfirmForceDeleteBranch, defaultConfirmForceRemoveWorktree, } from "./worktree-prompts.js";
 export function createCleanCommand(dependencies = {}) {
@@ -77,8 +77,8 @@ export function createCleanCommand(dependencies = {}) {
             }
             return 0;
         }
-        const removedPaths = [];
         const removedWorktrees = [];
+        const failures = [];
         for (const worktree of selectedWorktrees) {
             if (options.stale &&
                 !(await isStaleCleanupCandidate(repository.repoRoot, worktree, staleBaseRef))) {
@@ -89,31 +89,39 @@ export function createCleanCommand(dependencies = {}) {
                 await removeWorktree(repository.repoRoot, worktree.path);
             }
             catch (error) {
-                if (!isWorktreeDirtyError(error)) {
-                    throw error;
+                if (!isWorktreeForceRemovalError(error)) {
+                    failures.push({
+                        branch: worktree.branch,
+                        message: toMessage(error),
+                        path: worktree.path,
+                    });
+                    continue;
                 }
-                if (options.stale) {
+                if (options.stale && !isWorktreeDeletionError(error)) {
                     options.stderr(`Skipped ${worktree.path}: no longer a safe stale cleanup candidate\n`);
                     continue;
                 }
                 if (!options.force &&
                     !(await confirmForceRemoveWorktree(worktree.path))) {
-                    reportRemovedPaths(removedPaths, options.stderr);
-                    options.stderr("Aborted\n");
-                    return 1;
+                    failures.push({
+                        branch: worktree.branch,
+                        message: "force removal declined",
+                        path: worktree.path,
+                    });
+                    continue;
                 }
                 try {
                     await forceRemoveWorktree(repository.repoRoot, worktree.path);
                 }
                 catch (forceError) {
-                    if (!options.json) {
-                        reportRemovedPaths(removedPaths, options.stderr);
-                    }
-                    emitError(options, `Failed to remove worktree at ${worktree.path}: ${toMessage(forceError)}`);
-                    return 1;
+                    failures.push({
+                        branch: worktree.branch,
+                        message: toMessage(forceError),
+                        path: worktree.path,
+                    });
+                    continue;
                 }
             }
-            removedPaths.push(worktree.path);
             removedWorktrees.push(worktree);
             if (worktree.branch) {
                 try {
@@ -145,12 +153,16 @@ export function createCleanCommand(dependencies = {}) {
                     ? { branch: worktree.branch, path: worktree.path }
                     : serializeWorktreeInfo(info);
             });
-            options.stdout(`${JSON.stringify({ removed }, null, 2)}\n`);
+            const payload = failures.length === 0 ? { removed } : { removed, failed: failures };
+            options.stdout(`${JSON.stringify(payload, null, 2)}\n`);
+        }
+        else if (failures.length > 0) {
+            reportCleanFailures(failures, options.stderr);
         }
         else {
             options.stdout(`${repository.repoRoot}\n`);
         }
-        return 0;
+        return failures.length === 0 ? 0 : 1;
     };
 }
 export const runCleanCommand = createCleanCommand();
@@ -216,9 +228,12 @@ function resolveSelectedWorktrees(worktrees, selections) {
     }
     return selectedWorktrees;
 }
-function reportRemovedPaths(paths, stderr) {
-    if (paths.length > 0) {
-        stderr(`Already removed: ${paths.join(", ")}\n`);
+function reportCleanFailures(failures, stderr) {
+    const noun = failures.length === 1 ? "worktree" : "worktrees";
+    stderr(`Failed to clean ${failures.length} ${noun}:\n`);
+    for (const failure of failures) {
+        const branch = failure.branch === null ? "detached" : failure.branch;
+        stderr(`- ${failure.path} (${branch}): ${failure.message}\n`);
     }
 }
 function formatCleanInfo(info) {

package/dist/gji-bundle.mjs

@@ -14127,6 +14127,7 @@ function formatRelativeAge(timestampSeconds) {
 
 // src/worktree-management.ts
 import { execFile as execFile2 } from "node:child_process";
+import { rm } from "node:fs/promises";
 import { promisify as promisify3 } from "node:util";
 var execFileAsync2 = promisify3(execFile2);
 var GIT_ENV = { ...process.env, LC_ALL: "C" };
@@ -14147,10 +14148,24 @@ async function removeWorktree(repoRoot, worktreePath) {
   });
 }
 async function forceRemoveWorktree(repoRoot, worktreePath) {
-  await execFileAsync2("git", ["worktree", "remove", "--force", worktreePath], {
-    cwd: repoRoot,
-    env: GIT_ENV
-  });
+  try {
+    await execFileAsync2(
+      "git",
+      ["worktree", "remove", "--force", worktreePath],
+      {
+        cwd: repoRoot,
+        env: GIT_ENV
+      }
+    );
+  } catch (error) {
+    const worktreeIsStillRegistered = (await listWorktrees(repoRoot)).some(
+      (worktree) => worktree.path === worktreePath
+    );
+    if (worktreeIsStillRegistered) {
+      throw error;
+    }
+    await rm(worktreePath, { force: true, recursive: true });
+  }
 }
 async function deleteBranch(repoRoot, branch) {
   await execFileAsync2("git", ["branch", "-d", branch], {
@@ -14164,8 +14179,14 @@ async function forceDeleteBranch(repoRoot, branch) {
     env: GIT_ENV
   });
 }
-function isWorktreeDirtyError(error) {
-  return hasStderr(error) && error.stderr.includes("contains modified or untracked files");
+function isWorktreeForceRemovalError(error) {
+  if (!hasStderr(error)) {
+    return false;
+  }
+  return error.stderr.includes("contains modified or untracked files") || isWorktreeDeletionError(error);
+}
+function isWorktreeDeletionError(error) {
+  return hasStderr(error) && error.stderr.includes("failed to delete");
 }
 function isBranchUnmergedError(error) {
   return hasStderr(error) && error.stderr.includes("is not fully merged");
@@ -15156,8 +15177,8 @@ function createCleanCommand(dependencies = {}) {
       }
       return 0;
     }
-    const removedPaths = [];
     const removedWorktrees = [];
+    const failures = [];
     for (const worktree of selectedWorktrees) {
       if (options.stale && !await isStaleCleanupCandidate(
         repository.repoRoot,
@@ -15173,10 +15194,15 @@ function createCleanCommand(dependencies = {}) {
       try {
         await removeWorktree(repository.repoRoot, worktree.path);
       } catch (error) {
-        if (!isWorktreeDirtyError(error)) {
-          throw error;
+        if (!isWorktreeForceRemovalError(error)) {
+          failures.push({
+            branch: worktree.branch,
+            message: toMessage(error),
+            path: worktree.path
+          });
+          continue;
         }
-        if (options.stale) {
+        if (options.stale && !isWorktreeDeletionError(error)) {
           options.stderr(
             `Skipped ${worktree.path}: no longer a safe stale cleanup candidate
 `
@@ -15184,24 +15210,24 @@ function createCleanCommand(dependencies = {}) {
           continue;
         }
         if (!options.force && !await confirmForceRemoveWorktree(worktree.path)) {
-          reportRemovedPaths(removedPaths, options.stderr);
-          options.stderr("Aborted\n");
-          return 1;
+          failures.push({
+            branch: worktree.branch,
+            message: "force removal declined",
+            path: worktree.path
+          });
+          continue;
         }
         try {
           await forceRemoveWorktree(repository.repoRoot, worktree.path);
         } catch (forceError) {
-          if (!options.json) {
-            reportRemovedPaths(removedPaths, options.stderr);
-          }
-          emitError(
-            options,
-            `Failed to remove worktree at ${worktree.path}: ${toMessage(forceError)}`
-          );
-          return 1;
+          failures.push({
+            branch: worktree.branch,
+            message: toMessage(forceError),
+            path: worktree.path
+          });
+          continue;
         }
       }
-      removedPaths.push(worktree.path);
       removedWorktrees.push(worktree);
       if (worktree.branch) {
         try {
@@ -15233,13 +15259,16 @@ function createCleanCommand(dependencies = {}) {
         const info = selectedInfoByPath.get(worktree.path);
         return info === void 0 ? { branch: worktree.branch, path: worktree.path } : serializeWorktreeInfo(info);
       });
-      options.stdout(`${JSON.stringify({ removed }, null, 2)}
+      const payload = failures.length === 0 ? { removed } : { removed, failed: failures };
+      options.stdout(`${JSON.stringify(payload, null, 2)}
 `);
+    } else if (failures.length > 0) {
+      reportCleanFailures(failures, options.stderr);
     } else {
       options.stdout(`${repository.repoRoot}
 `);
     }
-    return 0;
+    return failures.length === 0 ? 0 : 1;
   };
 }
 var runCleanCommand = createCleanCommand();
@@ -15316,9 +15345,13 @@ function resolveSelectedWorktrees(worktrees, selections) {
   }
   return selectedWorktrees;
 }
-function reportRemovedPaths(paths, stderr) {
-  if (paths.length > 0) {
-    stderr(`Already removed: ${paths.join(", ")}
+function reportCleanFailures(failures, stderr) {
+  const noun = failures.length === 1 ? "worktree" : "worktrees";
+  stderr(`Failed to clean ${failures.length} ${noun}:
+`);
+  for (const failure of failures) {
+    const branch = failure.branch === null ? "detached" : failure.branch;
+    stderr(`- ${failure.path} (${branch}): ${failure.message}
 `);
   }
 }
@@ -17918,7 +17951,7 @@ function createRemoveCommand(dependencies = {}) {
     try {
       await removeWorktree(repository.repoRoot, worktree.path);
     } catch (error) {
-      if (!isWorktreeDirtyError(error)) {
+      if (!isWorktreeForceRemovalError(error)) {
         throw error;
       }
       if (!options.force && !await confirmForceRemoveWorktree(worktree.path)) {

package/dist/remove.js

@@ -4,7 +4,7 @@ import { loadEffectiveConfig } from "./config.js";
 import { isHeadless } from "./headless.js";
 import { extractHooks, runHook } from "./hooks.js";
 import { writeShellOutput } from "./shell-handoff.js";
-import { deleteBranch, forceDeleteBranch, forceRemoveWorktree, isBranchUnmergedError, isWorktreeDirtyError, loadLinkedWorktrees, removeWorktree, } from "./worktree-management.js";
+import { deleteBranch, forceDeleteBranch, forceRemoveWorktree, isBranchUnmergedError, isWorktreeForceRemovalError, loadLinkedWorktrees, removeWorktree, } from "./worktree-management.js";
 import { buildWorktreePromptEntries, promptForSingleWorktree, } from "./worktree-picker.js";
 import { defaultConfirmForceDeleteBranch, defaultConfirmForceRemoveWorktree, } from "./worktree-prompts.js";
 const REMOVE_OUTPUT_FILE_ENV = "GJI_REMOVE_OUTPUT_FILE";
@@ -83,7 +83,7 @@ export function createRemoveCommand(dependencies = {}) {
             await removeWorktree(repository.repoRoot, worktree.path);
         }
         catch (error) {
-            if (!isWorktreeDirtyError(error)) {
+            if (!isWorktreeForceRemovalError(error)) {
                 throw error;
             }
             if (!options.force &&

package/dist/worktree-management.d.ts

@@ -8,5 +8,6 @@ export declare function removeWorktree(repoRoot: string, worktreePath: string):
 export declare function forceRemoveWorktree(repoRoot: string, worktreePath: string): Promise<void>;
 export declare function deleteBranch(repoRoot: string, branch: string): Promise<void>;
 export declare function forceDeleteBranch(repoRoot: string, branch: string): Promise<void>;
-export declare function isWorktreeDirtyError(error: unknown): boolean;
+export declare function isWorktreeForceRemovalError(error: unknown): boolean;
+export declare function isWorktreeDeletionError(error: unknown): boolean;
 export declare function isBranchUnmergedError(error: unknown): boolean;

package/dist/worktree-management.js

@@ -1,4 +1,5 @@
 import { execFile } from "node:child_process";
+import { rm } from "node:fs/promises";
 import { promisify } from "node:util";
 import { detectRepository, listWorktrees, } from "./repo.js";
 const execFileAsync = promisify(execFile);
@@ -19,10 +20,19 @@ export async function removeWorktree(repoRoot, worktreePath) {
     });
 }
 export async function forceRemoveWorktree(repoRoot, worktreePath) {
-    await execFileAsync("git", ["worktree", "remove", "--force", worktreePath], {
-        cwd: repoRoot,
-        env: GIT_ENV,
-    });
+    try {
+        await execFileAsync("git", ["worktree", "remove", "--force", worktreePath], {
+            cwd: repoRoot,
+            env: GIT_ENV,
+        });
+    }
+    catch (error) {
+        const worktreeIsStillRegistered = (await listWorktrees(repoRoot)).some((worktree) => worktree.path === worktreePath);
+        if (worktreeIsStillRegistered) {
+            throw error;
+        }
+        await rm(worktreePath, { force: true, recursive: true });
+    }
 }
 export async function deleteBranch(repoRoot, branch) {
     await execFileAsync("git", ["branch", "-d", branch], {
@@ -36,9 +46,15 @@ export async function forceDeleteBranch(repoRoot, branch) {
         env: GIT_ENV,
     });
 }
-export function isWorktreeDirtyError(error) {
-    return (hasStderr(error) &&
-        error.stderr.includes("contains modified or untracked files"));
+export function isWorktreeForceRemovalError(error) {
+    if (!hasStderr(error)) {
+        return false;
+    }
+    return (error.stderr.includes("contains modified or untracked files") ||
+        isWorktreeDeletionError(error));
+}
+export function isWorktreeDeletionError(error) {
+    return hasStderr(error) && error.stderr.includes("failed to delete");
 }
 export function isBranchUnmergedError(error) {
     return hasStderr(error) && error.stderr.includes("is not fully merged");

package/man/man1/gji-back.1

@@ -1,4 +1,4 @@
-.TH GJI\-BACK 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-BACK 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-back \- navigate to the previously visited worktree, optionally N steps back
 .SH SYNOPSIS

package/man/man1/gji-clean.1

@@ -1,4 +1,4 @@
-.TH GJI\-CLEAN 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-CLEAN 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-clean \- interactively prune linked worktrees
 .SH SYNOPSIS

package/man/man1/gji-completion.1

@@ -1,4 +1,4 @@
-.TH GJI\-COMPLETION 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-COMPLETION 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-completion \- print shell completion definitions
 .SH SYNOPSIS

package/man/man1/gji-config.1

@@ -1,4 +1,4 @@
-.TH GJI\-CONFIG 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-CONFIG 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-config \- manage global config defaults
 .SH SYNOPSIS

package/man/man1/gji-go.1

@@ -1,4 +1,4 @@
-.TH GJI\-GO 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-GO 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-go \- print or select a worktree path
 .SH SYNOPSIS

package/man/man1/gji-history.1

@@ -1,4 +1,4 @@
-.TH GJI\-HISTORY 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-HISTORY 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-history \- show navigation history
 .SH SYNOPSIS

package/man/man1/gji-init.1

@@ -1,4 +1,4 @@
-.TH GJI\-INIT 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-INIT 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-init \- print or install shell integration
 .SH SYNOPSIS

package/man/man1/gji-ls.1

@@ -1,4 +1,4 @@
-.TH GJI\-LS 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-LS 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-ls \- list active worktrees
 .SH SYNOPSIS

package/man/man1/gji-new.1

@@ -1,4 +1,4 @@
-.TH GJI\-NEW 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-NEW 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-new \- create a new branch or detached linked worktree
 .SH SYNOPSIS

package/man/man1/gji-open.1

@@ -1,4 +1,4 @@
-.TH GJI\-OPEN 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-OPEN 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-open \- open the worktree in an editor
 .SH SYNOPSIS

package/man/man1/gji-pr.1

@@ -1,4 +1,4 @@
-.TH GJI\-PR 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-PR 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-pr \- fetch a pull request by number, #number, or URL into a linked worktree
 .SH SYNOPSIS

package/man/man1/gji-remove.1

@@ -1,4 +1,4 @@
-.TH GJI\-REMOVE 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-REMOVE 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-remove \- remove a linked worktree and delete its branch when present
 .SH SYNOPSIS

package/man/man1/gji-root.1

@@ -1,4 +1,4 @@
-.TH GJI\-ROOT 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-ROOT 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-root \- print the main repository root path
 .SH SYNOPSIS

package/man/man1/gji-run-hook.1

@@ -1,4 +1,4 @@
-.TH GJI\-RUN\-HOOK 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-RUN\-HOOK 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-run\-hook \- run a named hook (after\-create, after\-enter, before\-remove) in the current worktree
 .SH SYNOPSIS

package/man/man1/gji-status.1

@@ -1,4 +1,4 @@
-.TH GJI\-STATUS 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-STATUS 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-status \- summarize repository and worktree health
 .SH SYNOPSIS

package/man/man1/gji-sync-files.1

@@ -1,4 +1,4 @@
-.TH GJI\-SYNC\-FILES 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-SYNC\-FILES 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-sync\-files \- manage local files copied into new worktrees
 .SH SYNOPSIS

package/man/man1/gji-sync.1

@@ -1,4 +1,4 @@
-.TH GJI\-SYNC 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-SYNC 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-sync \- fetch and update one or all worktrees
 .SH SYNOPSIS

package/man/man1/gji-warp.1

@@ -1,4 +1,4 @@
-.TH GJI\-WARP 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI\-WARP 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji\-warp \- jump to any worktree across all known repos
 .SH SYNOPSIS

package/man/man1/gji.1

@@ -1,4 +1,4 @@
-.TH GJI 1 "July 2026" "gji 0.8.0" "User Commands"
+.TH GJI 1 "July 2026" "gji 0.8.1" "User Commands"
 .SH NAME
 gji \- Context switching without the mess.
 .SH SYNOPSIS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solaqua/gji",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Git worktree CLI for fast context switching.",
   "license": "MIT",
   "author": "sjquant",