@solaqua/gji 0.7.2 → 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) {