@solaqua/gji 0.7.0 → 0.7.2

package/dist/back.js

@@ -39,7 +39,7 @@ export async function runBackCommand(options) {
         const repository = await detectRepository(target.path);
         const config = await loadEffectiveConfig(repository.repoRoot, options.home, options.stderr);
         const hooks = extractHooks(config);
-        await runHook(hooks.afterEnter, target.path, {
+        await runHook(hooks["after-enter"], target.path, {
             branch: target.branch ?? undefined,
             path: target.path,
             repo: basename(repository.repoRoot),

package/dist/clean.d.ts

@@ -1,4 +1,5 @@
 import type { WorktreeEntry } from "./repo.js";
+import { type WorktreePromptEntry } from "./worktree-picker.js";
 export interface CleanCommandOptions {
     cwd: string;
     dryRun?: boolean;
@@ -12,7 +13,7 @@ export interface CleanCommandDependencies {
     confirmForceDeleteBranch: (branch: string) => Promise<boolean>;
     confirmForceRemoveWorktree: (worktreePath: string) => Promise<boolean>;
     confirmRemoval: (worktrees: WorktreeEntry[]) => Promise<boolean>;
-    promptForWorktrees: (worktrees: WorktreeEntry[]) => Promise<string[] | null>;
+    promptForWorktrees: (worktrees: WorktreePromptEntry[]) => Promise<string[] | null>;
 }
 export declare function createCleanCommand(dependencies?: Partial<CleanCommandDependencies>): (options: CleanCommandOptions) => Promise<number>;
 export declare const runCleanCommand: (options: CleanCommandOptions) => Promise<number>;

package/dist/clean.js

@@ -1,9 +1,10 @@
-import { confirm, isCancel, multiselect } from "@clack/prompts";
+import { confirm, isCancel } from "@clack/prompts";
 import { loadEffectiveConfig } from "./config.js";
 import { isBranchMergedInto, readWorktreeHealth, resolveRemoteDefaultBranch, runGit, } from "./git.js";
 import { isHeadless } from "./headless.js";
-import { formatLastCommit, formatUpstreamState, formatWorktreeHint, readWorktreeInfos, serializeWorktreeInfo, } from "./worktree-info.js";
+import { formatLastCommit, formatUpstreamState, readWorktreeInfos, serializeWorktreeInfo, } from "./worktree-info.js";
 import { deleteBranch, forceDeleteBranch, forceRemoveWorktree, isBranchUnmergedError, isWorktreeDirtyError, loadLinkedWorktrees, removeWorktree, } from "./worktree-management.js";
+import { buildWorktreePromptEntries, promptForMultipleWorktrees, } from "./worktree-picker.js";
 import { defaultConfirmForceDeleteBranch, defaultConfirmForceRemoveWorktree, } from "./worktree-prompts.js";
 export function createCleanCommand(dependencies = {}) {
     const promptForWorktrees = dependencies.promptForWorktrees ?? defaultPromptForWorktrees;
@@ -43,7 +44,10 @@ export function createCleanCommand(dependencies = {}) {
             (options.dryRun && (options.stale || options.json || isHeadless()));
         const selections = shouldSelectAll
             ? cleanupCandidates.map((w) => w.path)
-            : await promptForWorktrees(cleanupCandidates);
+            : await promptForWorktrees(await buildWorktreePromptEntries(cleanupCandidates.map((worktree) => ({
+                repoName: repository.repoName,
+                worktree,
+            }))));
         if (!selections || selections.length === 0) {
             options.stderr("Aborted\n");
             return 1;
@@ -246,19 +250,7 @@ function toMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
 async function defaultPromptForWorktrees(worktrees) {
-    const infos = await readWorktreeInfos(worktrees);
-    const choice = await multiselect({
-        message: "Choose worktrees to clean",
-        options: worktrees.map((worktree, i) => {
-            return {
-                hint: formatWorktreeHint(infos[i]),
-                label: worktree.branch ?? "(detached)",
-                value: worktree.path,
-            };
-        }),
-        required: true,
-    });
-    return isCancel(choice) ? null : choice;
+    return promptForMultipleWorktrees("Choose worktrees to clean", worktrees);
 }
 async function defaultConfirmRemoval(worktrees) {
     const branchCount = worktrees.filter((worktree) => worktree.branch !== null).length;

package/dist/cli.js

@@ -17,10 +17,10 @@ import { runRemoveCommand } from "./remove.js";
 import { detectRepository } from "./repo.js";
 import { registerRepo } from "./repo-registry.js";
 import { runRootCommand } from "./root.js";
+import { runHookCommand } from "./run-hook.js";
 import { runStatusCommand } from "./status.js";
 import { runSyncCommand } from "./sync.js";
 import { runSyncFilesCommand } from "./sync-files-command.js";
-import { runTriggerHookCommand } from "./trigger-hook.js";
 import { runWarpCommand } from "./warp.js";
 export function createProgram() {
     const program = new Command();
@@ -214,9 +214,10 @@ function registerCommands(program) {
         .option("--json", "emit JSON on success or error instead of human-readable output")
         .action(notImplemented("remove"));
     program
-        .command("trigger-hook <hook>")
-        .description("run a named hook (afterCreate, afterEnter, beforeRemove) in the current worktree")
-        .action(notImplemented("trigger-hook"));
+        .command("run-hook <hook>")
+        .alias("trigger-hook")
+        .description("run a named hook (after-create, after-enter, before-remove) in the current worktree")
+        .action(notImplemented("run-hook"));
     program
         .command("warp [branch]")
         .description("jump to any worktree across all known repos")
@@ -506,9 +507,9 @@ function attachCommandActions(program, options) {
         .find((command) => command.name() === "remove")
         ?.action(runRemovalCommand);
     program.commands
-        .find((command) => command.name() === "trigger-hook")
+        .find((command) => command.name() === "run-hook")
         ?.action(async (hook) => {
-        const exitCode = await runTriggerHookCommand({
+        const exitCode = await runHookCommand({
             cwd: options.cwd,
             hook,
             stderr: options.stderr,