@solaqua/gji 0.7.2 → 0.8.1

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/dist/worktree-picker.d.ts

@@ -1,3 +1,4 @@
+import type { Readable, Writable } from "node:stream";
 import type { WorktreeEntry } from "./repo.js";
 export interface WorktreePromptSource {
     repoName: string;
@@ -6,9 +7,20 @@ export interface WorktreePromptSource {
 export interface WorktreePromptEntry extends WorktreeEntry {
     group: "recent" | "other";
     label: string;
+    metadata?: string | null;
     repoName: string;
 }
+export interface WorktreePickerIO {
+    input?: Readable & {
+        isTTY?: boolean;
+        setRawMode?: (mode: boolean) => void;
+    };
+    output?: Writable & {
+        columns?: number;
+        rows?: number;
+    };
+}
 export declare function buildWorktreePromptEntries(sources: WorktreePromptSource[]): Promise<WorktreePromptEntry[]>;
 export declare function resolveWorktreeQuery(sources: WorktreePromptSource[], query: string): WorktreePromptSource | null;
-export declare function promptForSingleWorktree(message: string, worktrees: WorktreePromptEntry[]): Promise<string | null>;
-export declare function promptForMultipleWorktrees(message: string, worktrees: WorktreePromptEntry[]): Promise<string[] | null>;
+export declare function promptForSingleWorktree(message: string, worktrees: WorktreePromptEntry[], io?: WorktreePickerIO): Promise<string | null>;
+export declare function promptForMultipleWorktrees(message: string, worktrees: WorktreePromptEntry[], io?: WorktreePickerIO): Promise<string[] | null>;