@solaqua/gji 0.7.0 → 0.7.1

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/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,

package/dist/gji-bundle.mjs

@@ -13176,9 +13176,13 @@ function extractHooks(config) {
   }
   const hooks = raw;
   return {
-    afterCreate: parseHookCommand(hooks.afterCreate),
-    afterEnter: parseHookCommand(hooks.afterEnter),
-    beforeRemove: parseHookCommand(hooks.beforeRemove)
+    "after-create": parseHookCommand(
+      hooks["after-create"] ?? hooks.afterCreate
+    ),
+    "after-enter": parseHookCommand(hooks["after-enter"] ?? hooks.afterEnter),
+    "before-remove": parseHookCommand(
+      hooks["before-remove"] ?? hooks.beforeRemove
+    )
   };
 }
 function parseHookCommand(value) {
@@ -13450,7 +13454,7 @@ async function runBackCommand(options) {
     );
     const hooks = extractHooks(config);
     await runHook(
-      hooks.afterEnter,
+      hooks["after-enter"],
       target.path,
       {
         branch: target.branch ?? void 0,
@@ -14623,14 +14627,14 @@ var TOP_LEVEL_COMMANDS = [
   },
   { name: "rm", description: "alias of remove" },
   {
-    name: "trigger-hook",
+    name: "run-hook",
     description: "run a named hook in the current worktree"
   },
   { name: "warp", description: "jump to any worktree across all known repos" },
   { name: "config", description: "manage global config defaults" }
 ];
 var SHELL_NAMES = ["bash", "fish", "zsh"];
-var HOOK_NAMES = ["afterCreate", "afterEnter", "beforeRemove"];
+var HOOK_NAMES = ["after-create", "after-enter", "before-remove"];
 var CONFIG_KEYS = Array.from(KNOWN_GLOBAL_CONFIG_KEYS);
 function renderShellCompletion(shell) {
   switch (shell) {
@@ -14714,7 +14718,7 @@ _gji_completion() {
     remove|rm)
       COMPREPLY=( $(compgen -W "$(__gji_worktree_branches) -f --force --dry-run --json --help" -- "$cur") )
       ;;
-    trigger-hook)
+    run-hook)
       COMPREPLY=( $(compgen -W "${hooks} --help" -- "$cur") )
       ;;
     warp)
@@ -14752,7 +14756,7 @@ function renderFishCompletion() {
     (shell) => `complete -c gji -n '__fish_seen_subcommand_from init' -a '${shell}' -d 'shell'`
   ).join("\n");
   const hookLines = HOOK_NAMES.map(
-    (hook) => `complete -c gji -n '__fish_seen_subcommand_from trigger-hook' -a '${hook}' -d 'hook'`
+    (hook) => `complete -c gji -n '__fish_seen_subcommand_from run-hook' -a '${hook}' -d 'hook'`
   ).join("\n");
   const configKeyLines = CONFIG_KEYS.map(
     (key) => `complete -c gji -n '__gji_should_complete_config_key' -a '${key}' -d 'config key'`
@@ -14917,7 +14921,7 @@ case "\${words[2]}" in
   remove|rm)
     _arguments '(-f --force)'{-f,--force}'[bypass prompts, force-remove a dirty worktree, and force-delete an unmerged branch]' '--dry-run[show what would be deleted without removing anything]' '--json[emit JSON on success or error instead of human-readable output]' '2:branch:->worktrees'
     ;;
-  trigger-hook)
+  run-hook)
     _arguments "2:hook:(${hooks})"
     ;;
   warp)
@@ -15303,8 +15307,7 @@ async function maybeRunInstallPrompt(worktreePath, repoRoot, config, stderr, dep
   if (isHeadless() || nonInteractive) {
     return;
   }
-  const hooks = isPlainObject2(config.hooks) ? config.hooks : null;
-  if (isConfiguredHookCommand(hooks?.afterCreate)) {
+  if (extractHooks(config)["after-create"]) {
     return;
   }
   if (config.skipInstallPrompt === true) {
@@ -15337,17 +15340,28 @@ async function maybeRunInstallPrompt(worktreePath, repoRoot, config, stderr, dep
   if (choice === "always") {
     try {
       if (saveGlobal) {
-        const existingHooks = await loadExistingGlobalRepoHooks(repoRoot);
+        const existingRaw = await loadExistingGlobalRepoHooks(repoRoot);
+        const existing = extractHooks({ hooks: existingRaw });
         await writeGlobalKey(repoRoot, "hooks", {
-          ...existingHooks,
-          afterCreate: pm.installCommand
+          ...existing["after-enter"] !== void 0 && {
+            "after-enter": existing["after-enter"]
+          },
+          ...existing["before-remove"] !== void 0 && {
+            "before-remove": existing["before-remove"]
+          },
+          "after-create": pm.installCommand
         });
       } else {
         const { config: localConfig } = await loadConfig(repoRoot);
-        const existingLocalHooks = isPlainObject2(localConfig.hooks) ? localConfig.hooks : {};
+        const existing = extractHooks(localConfig);
         await writeKey(repoRoot, "hooks", {
-          ...existingLocalHooks,
-          afterCreate: pm.installCommand
+          ...existing["after-enter"] !== void 0 && {
+            "after-enter": existing["after-enter"]
+          },
+          ...existing["before-remove"] !== void 0 && {
+            "before-remove": existing["before-remove"]
+          },
+          "after-create": pm.installCommand
         });
       }
     } catch (error) {
@@ -15412,7 +15426,7 @@ async function defaultPromptForInstallChoice(pm) {
     options: [
       { value: "yes", label: "Yes", hint: "run once" },
       { value: "no", label: "No", hint: "skip this time" },
-      { value: "always", label: "Always", hint: "save as afterCreate hook" },
+      { value: "always", label: "Always", hint: "save as after-create hook" },
       {
         value: "never",
         label: "Never",
@@ -15428,10 +15442,6 @@ async function defaultPromptForInstallChoice(pm) {
 function isPlainObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function isConfiguredHookCommand(value) {
-  if (typeof value === "string") return value.length > 0;
-  return Array.isArray(value) && value.length > 0 && value[0] !== "" && value.every((item) => typeof item === "string");
-}
 
 // src/new.ts
 var execFileAsync3 = promisify4(execFile3);
@@ -15549,7 +15559,7 @@ function createNewCommand(dependencies = {}) {
 `
           );
           options.stderr(
-            `Hint: Use 'gji trigger-hook afterCreate' inside the worktree to re-run setup hooks
+            `Hint: Use 'gji run-hook after-create' inside the worktree to re-run setup hooks
 `
           );
         }
@@ -15610,7 +15620,7 @@ function createNewCommand(dependencies = {}) {
     );
     const hooks = extractHooks(config);
     await runHook(
-      hooks.afterCreate,
+      hooks["after-create"],
       worktreePath,
       {
         branch: worktreeName,
@@ -16116,7 +16126,7 @@ function createGoCommand(dependencies = {}) {
     );
     const hooks = extractHooks(config);
     await runHook(
-      hooks.afterEnter,
+      hooks["after-enter"],
       resolvedPath,
       {
         branch: chosenWorktree?.branch ?? void 0,
@@ -16329,10 +16339,12 @@ async function saveWizardConfig(result, cwd, home) {
   if (result.branchPrefix) values.branchPrefix = result.branchPrefix;
   if (result.worktreePath) values.worktreePath = result.worktreePath;
   const hooks = {};
-  if (result.hooks?.afterCreate) hooks.afterCreate = result.hooks.afterCreate;
-  if (result.hooks?.afterEnter) hooks.afterEnter = result.hooks.afterEnter;
-  if (result.hooks?.beforeRemove)
-    hooks.beforeRemove = result.hooks.beforeRemove;
+  if (result.hooks?.["after-create"])
+    hooks["after-create"] = result.hooks["after-create"];
+  if (result.hooks?.["after-enter"])
+    hooks["after-enter"] = result.hooks["after-enter"];
+  if (result.hooks?.["before-remove"])
+    hooks["before-remove"] = result.hooks["before-remove"];
   if (Object.keys(hooks).length > 0) values.hooks = hooks;
   if (Object.keys(values).length === 0) return;
   if (result.installSaveTarget === "local") {
@@ -16463,7 +16475,7 @@ async function defaultPromptForSetup() {
     return null;
   }
   const afterCreate = await he({
-    message: "afterCreate hook \u2014 run after creating a worktree?",
+    message: "after-create hook \u2014 run after creating a worktree?",
     placeholder: "e.g. pnpm install \u2014 leave blank to skip"
   });
   if (pD(afterCreate)) {
@@ -16471,7 +16483,7 @@ async function defaultPromptForSetup() {
     return null;
   }
   const afterEnter = await he({
-    message: "afterEnter hook \u2014 run after entering a worktree?",
+    message: "after-enter hook \u2014 run after entering a worktree?",
     placeholder: "e.g. nvm use \u2014 leave blank to skip"
   });
   if (pD(afterEnter)) {
@@ -16479,7 +16491,7 @@ async function defaultPromptForSetup() {
     return null;
   }
   const beforeRemove = await he({
-    message: "beforeRemove hook \u2014 run before removing a worktree?",
+    message: "before-remove hook \u2014 run before removing a worktree?",
     placeholder: "leave blank to skip"
   });
   if (pD(beforeRemove)) {
@@ -16488,9 +16500,9 @@ async function defaultPromptForSetup() {
   }
   Se("Setup complete!");
   const hooks = {};
-  if (afterCreate) hooks.afterCreate = afterCreate;
-  if (afterEnter) hooks.afterEnter = afterEnter;
-  if (beforeRemove) hooks.beforeRemove = beforeRemove;
+  if (afterCreate) hooks["after-create"] = afterCreate;
+  if (afterEnter) hooks["after-enter"] = afterEnter;
+  if (beforeRemove) hooks["before-remove"] = beforeRemove;
   return {
     branchPrefix: branchPrefix || void 0,
     hooks: Object.keys(hooks).length > 0 ? hooks : void 0,
@@ -16899,7 +16911,7 @@ function createPrCommand(dependencies = {}) {
     );
     const hooks = extractHooks(config);
     await runHook(
-      hooks.afterCreate,
+      hooks["after-create"],
       worktreePath,
       {
         branch: branchName,
@@ -17062,7 +17074,7 @@ function createRemoveCommand(dependencies = {}) {
     );
     const hooks = extractHooks(config);
     await runHook(
-      hooks.beforeRemove,
+      hooks["before-remove"],
       worktree.path,
       {
         branch: worktree.branch ?? void 0,
@@ -17180,6 +17192,54 @@ async function runRootCommand(options) {
   return 0;
 }
 
+// src/run-hook.ts
+var VALID_HOOKS = [
+  "after-create",
+  "after-enter",
+  "before-remove"
+];
+var CAMEL_ALIASES = {
+  afterCreate: "after-create",
+  afterEnter: "after-enter",
+  beforeRemove: "before-remove"
+};
+function isValidHook(hook) {
+  return VALID_HOOKS.includes(hook);
+}
+async function runHookCommand(options) {
+  const normalized = CAMEL_ALIASES[options.hook] ?? options.hook;
+  if (!isValidHook(normalized)) {
+    options.stderr(
+      `gji run-hook: unknown hook '${options.hook}'. Valid hooks: ${VALID_HOOKS.join(", ")}
+`
+    );
+    return 1;
+  }
+  const hookName = normalized;
+  const repository = await detectRepository(options.cwd);
+  const config = await loadEffectiveConfig(
+    repository.repoRoot,
+    void 0,
+    options.stderr
+  );
+  const hooks = extractHooks(config);
+  const worktrees = await listWorktrees(options.cwd);
+  const currentWorktree = worktrees.find(
+    (w2) => w2.path === repository.currentRoot
+  );
+  await runHook(
+    hooks[hookName],
+    repository.currentRoot,
+    {
+      branch: currentWorktree?.branch ?? void 0,
+      path: repository.currentRoot,
+      repo: repository.repoName
+    },
+    options.stderr
+  );
+  return 0;
+}
+
 // src/status.ts
 async function runStatusCommand(options) {
   const repository = await detectRepository(options.cwd);
@@ -17552,48 +17612,6 @@ function expandTilde2(value, home) {
   return value;
 }
 
-// src/trigger-hook.ts
-var VALID_HOOKS = [
-  "afterCreate",
-  "afterEnter",
-  "beforeRemove"
-];
-function isValidHook(hook) {
-  return VALID_HOOKS.includes(hook);
-}
-async function runTriggerHookCommand(options) {
-  if (!isValidHook(options.hook)) {
-    options.stderr(
-      `gji trigger-hook: unknown hook '${options.hook}'. Valid hooks: ${VALID_HOOKS.join(", ")}
-`
-    );
-    return 1;
-  }
-  const hookName = options.hook;
-  const repository = await detectRepository(options.cwd);
-  const config = await loadEffectiveConfig(
-    repository.repoRoot,
-    void 0,
-    options.stderr
-  );
-  const hooks = extractHooks(config);
-  const worktrees = await listWorktrees(options.cwd);
-  const currentWorktree = worktrees.find(
-    (w2) => w2.path === repository.currentRoot
-  );
-  await runHook(
-    hooks[hookName],
-    repository.currentRoot,
-    {
-      branch: currentWorktree?.branch ?? void 0,
-      path: repository.currentRoot,
-      repo: repository.repoName
-    },
-    options.stderr
-  );
-  return 0;
-}
-
 // src/cli.ts
 function createProgram() {
   const program2 = new Command();
@@ -17724,9 +17742,9 @@ function registerCommands(program2) {
     "--json",
     "emit JSON on success or error instead of human-readable output"
   ).action(notImplemented("remove"));
-  program2.command("trigger-hook <hook>").description(
-    "run a named hook (afterCreate, afterEnter, beforeRemove) in the current worktree"
-  ).action(notImplemented("trigger-hook"));
+  program2.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"));
   program2.command("warp [branch]").description("jump to any worktree across all known repos").option("-n, --new [branch]", "create a new worktree in a registered repo").option(
     "--print",
     "print the resolved worktree path without changing directory"
@@ -17984,8 +18002,8 @@ function attachCommandActions(program2, options) {
     }
   };
   program2.commands.find((command) => command.name() === "remove")?.action(runRemovalCommand);
-  program2.commands.find((command) => command.name() === "trigger-hook")?.action(async (hook) => {
-    const exitCode = await runTriggerHookCommand({
+  program2.commands.find((command) => command.name() === "run-hook")?.action(async (hook) => {
+    const exitCode = await runHookCommand({
       cwd: options.cwd,
       hook,
       stderr: options.stderr

package/dist/go.js

@@ -59,7 +59,7 @@ export function createGoCommand(dependencies = {}) {
         const chosenWorktree = worktrees.find((w) => w.path === resolvedPath);
         const config = await loadEffectiveConfig(repository.repoRoot, undefined, options.stderr);
         const hooks = extractHooks(config);
-        await runHook(hooks.afterEnter, resolvedPath, {
+        await runHook(hooks["after-enter"], resolvedPath, {
             branch: chosenWorktree?.branch ?? undefined,
             path: resolvedPath,
             repo: basename(repository.repoRoot),

package/dist/hooks.d.ts

@@ -1,8 +1,8 @@
 export type GjiHookCommand = string | string[];
 export interface GjiHooks {
-    afterCreate?: GjiHookCommand;
-    afterEnter?: GjiHookCommand;
-    beforeRemove?: GjiHookCommand;
+    "after-create"?: GjiHookCommand;
+    "after-enter"?: GjiHookCommand;
+    "before-remove"?: GjiHookCommand;
 }
 export interface HookContext {
     branch?: string;

package/dist/hooks.js

@@ -84,9 +84,9 @@ export function extractHooks(config) {
     }
     const hooks = raw;
     return {
-        afterCreate: parseHookCommand(hooks.afterCreate),
-        afterEnter: parseHookCommand(hooks.afterEnter),
-        beforeRemove: parseHookCommand(hooks.beforeRemove),
+        "after-create": parseHookCommand(hooks["after-create"] ?? hooks.afterCreate),
+        "after-enter": parseHookCommand(hooks["after-enter"] ?? hooks.afterEnter),
+        "before-remove": parseHookCommand(hooks["before-remove"] ?? hooks.beforeRemove),
     };
 }
 function parseHookCommand(value) {

package/dist/init.d.ts

@@ -3,9 +3,9 @@ export type InstallSaveTarget = "local" | "global";
 export interface SetupWizardResult {
     branchPrefix?: string;
     hooks?: {
-        afterCreate?: string;
-        afterEnter?: string;
-        beforeRemove?: string;
+        "after-create"?: string;
+        "after-enter"?: string;
+        "before-remove"?: string;
     };
     installSaveTarget: InstallSaveTarget;
     worktreePath?: string;

package/dist/init.js

@@ -135,12 +135,12 @@ async function saveWizardConfig(result, cwd, home) {
     if (result.worktreePath)
         values.worktreePath = result.worktreePath;
     const hooks = {};
-    if (result.hooks?.afterCreate)
-        hooks.afterCreate = result.hooks.afterCreate;
-    if (result.hooks?.afterEnter)
-        hooks.afterEnter = result.hooks.afterEnter;
-    if (result.hooks?.beforeRemove)
-        hooks.beforeRemove = result.hooks.beforeRemove;
+    if (result.hooks?.["after-create"])
+        hooks["after-create"] = result.hooks["after-create"];
+    if (result.hooks?.["after-enter"])
+        hooks["after-enter"] = result.hooks["after-enter"];
+    if (result.hooks?.["before-remove"])
+        hooks["before-remove"] = result.hooks["before-remove"];
     if (Object.keys(hooks).length > 0)
         values.hooks = hooks;
     if (Object.keys(values).length === 0)
@@ -283,7 +283,7 @@ async function defaultPromptForSetup() {
         return null;
     }
     const afterCreate = await text({
-        message: "afterCreate hook — run after creating a worktree?",
+        message: "after-create hook — run after creating a worktree?",
         placeholder: "e.g. pnpm install — leave blank to skip",
     });
     if (isCancel(afterCreate)) {
@@ -291,7 +291,7 @@ async function defaultPromptForSetup() {
         return null;
     }
     const afterEnter = await text({
-        message: "afterEnter hook — run after entering a worktree?",
+        message: "after-enter hook — run after entering a worktree?",
         placeholder: "e.g. nvm use — leave blank to skip",
     });
     if (isCancel(afterEnter)) {
@@ -299,7 +299,7 @@ async function defaultPromptForSetup() {
         return null;
     }
     const beforeRemove = await text({
-        message: "beforeRemove hook — run before removing a worktree?",
+        message: "before-remove hook — run before removing a worktree?",
         placeholder: "leave blank to skip",
     });
     if (isCancel(beforeRemove)) {
@@ -309,11 +309,11 @@ async function defaultPromptForSetup() {
     outro("Setup complete!");
     const hooks = {};
     if (afterCreate)
-        hooks.afterCreate = afterCreate;
+        hooks["after-create"] = afterCreate;
     if (afterEnter)
-        hooks.afterEnter = afterEnter;
+        hooks["after-enter"] = afterEnter;
     if (beforeRemove)
-        hooks.beforeRemove = beforeRemove;
+        hooks["before-remove"] = beforeRemove;
     return {
         branchPrefix: branchPrefix || undefined,
         hooks: Object.keys(hooks).length > 0 ? hooks : undefined,

package/dist/install-prompt.js

@@ -2,15 +2,15 @@ import { spawn } from "node:child_process";
 import { isCancel, select } from "@clack/prompts";
 import { loadConfig, loadGlobalConfig, updateGlobalRepoConfigKey, updateLocalConfigKey, } from "./config.js";
 import { isHeadless } from "./headless.js";
+import { extractHooks } from "./hooks.js";
 import { detectPackageManager, } from "./package-manager.js";
 export async function maybeRunInstallPrompt(worktreePath, repoRoot, config, stderr, dependencies = {}, nonInteractive = false) {
     // Skip in non-interactive mode — no prompt can be shown.
     if (isHeadless() || nonInteractive) {
         return;
     }
-    // Skip if afterCreate hook is already configured in effective config.
-    const hooks = isPlainObject(config.hooks) ? config.hooks : null;
-    if (isConfiguredHookCommand(hooks?.afterCreate)) {
+    // Skip if an after-create hook is already configured (accepts both kebab and legacy camelCase).
+    if (extractHooks(config)["after-create"]) {
         return;
     }
     // Skip if user has permanently opted out of install prompts.
@@ -43,21 +43,30 @@ export async function maybeRunInstallPrompt(worktreePath, repoRoot, config, stde
         try {
             if (saveGlobal) {
                 // Deep-merge with any existing per-repo global hooks so other keys are preserved.
-                const existingHooks = await loadExistingGlobalRepoHooks(repoRoot);
+                const existingRaw = await loadExistingGlobalRepoHooks(repoRoot);
+                const existing = extractHooks({ hooks: existingRaw });
                 await writeGlobalKey(repoRoot, "hooks", {
-                    ...existingHooks,
-                    afterCreate: pm.installCommand,
+                    ...(existing["after-enter"] !== undefined && {
+                        "after-enter": existing["after-enter"],
+                    }),
+                    ...(existing["before-remove"] !== undefined && {
+                        "before-remove": existing["before-remove"],
+                    }),
+                    "after-create": pm.installCommand,
                 });
             }
             else {
-                // Read local config hooks to deep-merge so other hook keys (e.g. afterEnter) are preserved.
+                // Read local config hooks to deep-merge so other hook keys (e.g. after-enter) are preserved.
                 const { config: localConfig } = await loadConfig(repoRoot);
-                const existingLocalHooks = isPlainObject(localConfig.hooks)
-                    ? localConfig.hooks
-                    : {};
+                const existing = extractHooks(localConfig);
                 await writeKey(repoRoot, "hooks", {
-                    ...existingLocalHooks,
-                    afterCreate: pm.installCommand,
+                    ...(existing["after-enter"] !== undefined && {
+                        "after-enter": existing["after-enter"],
+                    }),
+                    ...(existing["before-remove"] !== undefined && {
+                        "before-remove": existing["before-remove"],
+                    }),
+                    "after-create": pm.installCommand,
                 });
             }
         }
@@ -122,7 +131,7 @@ async function defaultPromptForInstallChoice(pm) {
         options: [
             { value: "yes", label: "Yes", hint: "run once" },
             { value: "no", label: "No", hint: "skip this time" },
-            { value: "always", label: "Always", hint: "save as afterCreate hook" },
+            { value: "always", label: "Always", hint: "save as after-create hook" },
             {
                 value: "never",
                 label: "Never",
@@ -138,11 +147,3 @@ async function defaultPromptForInstallChoice(pm) {
 function isPlainObject(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function isConfiguredHookCommand(value) {
-    if (typeof value === "string")
-        return value.length > 0;
-    return (Array.isArray(value) &&
-        value.length > 0 &&
-        value[0] !== "" &&
-        value.every((item) => typeof item === "string"));
-}

package/dist/new.js

@@ -110,7 +110,7 @@ export function createNewCommand(dependencies = {}) {
                 else {
                     options.stderr(`gji new: ${message} in non-interactive mode (GJI_NO_TUI=1)\n`);
                     options.stderr(`Hint: Use 'gji remove ${worktreeName}' or 'gji clean' to remove the existing worktree\n`);
-                    options.stderr(`Hint: Use 'gji trigger-hook afterCreate' inside the worktree to re-run setup hooks\n`);
+                    options.stderr(`Hint: Use 'gji run-hook after-create' inside the worktree to re-run setup hooks\n`);
                 }
                 return 1;
             }
@@ -161,7 +161,7 @@ export function createNewCommand(dependencies = {}) {
         }
         await maybeRunInstallPrompt(worktreePath, repository.repoRoot, config, options.stderr, dependencies, !!options.json);
         const hooks = extractHooks(config);
-        await runHook(hooks.afterCreate, worktreePath, {
+        await runHook(hooks["after-create"], worktreePath, {
             branch: worktreeName,
             path: worktreePath,
             repo: basename(repository.repoRoot),

package/dist/pr.js

@@ -111,7 +111,7 @@ export function createPrCommand(dependencies = {}) {
         }
         await maybeRunInstallPrompt(worktreePath, repository.repoRoot, config, options.stderr, dependencies, !!options.json);
         const hooks = extractHooks(config);
-        await runHook(hooks.afterCreate, worktreePath, {
+        await runHook(hooks["after-create"], worktreePath, {
             branch: branchName,
             path: worktreePath,
             repo: basename(repository.repoRoot),

package/dist/remove.js

@@ -71,7 +71,7 @@ export function createRemoveCommand(dependencies = {}) {
         }
         const config = await loadEffectiveConfig(repository.repoRoot, undefined, options.stderr);
         const hooks = extractHooks(config);
-        await runHook(hooks.beforeRemove, worktree.path, {
+        await runHook(hooks["before-remove"], worktree.path, {
             branch: worktree.branch ?? undefined,
             path: worktree.path,
             repo: basename(repository.repoRoot),

package/dist/run-hook.d.ts

@@ -0,0 +1,6 @@
+export interface RunHookCommandOptions {
+    cwd: string;
+    hook: string;
+    stderr: (chunk: string) => void;
+}
+export declare function runHookCommand(options: RunHookCommandOptions): Promise<number>;

package/dist/{trigger-hook.js → run-hook.js}

@@ -2,19 +2,25 @@ import { loadEffectiveConfig } from "./config.js";
 import { extractHooks, runHook } from "./hooks.js";
 import { detectRepository, listWorktrees } from "./repo.js";
 const VALID_HOOKS = [
-    "afterCreate",
-    "afterEnter",
-    "beforeRemove",
+    "after-create",
+    "after-enter",
+    "before-remove",
 ];
+const CAMEL_ALIASES = {
+    afterCreate: "after-create",
+    afterEnter: "after-enter",
+    beforeRemove: "before-remove",
+};
 function isValidHook(hook) {
     return VALID_HOOKS.includes(hook);
 }
-export async function runTriggerHookCommand(options) {
-    if (!isValidHook(options.hook)) {
-        options.stderr(`gji trigger-hook: unknown hook '${options.hook}'. Valid hooks: ${VALID_HOOKS.join(", ")}\n`);
+export async function runHookCommand(options) {
+    const normalized = CAMEL_ALIASES[options.hook] ?? options.hook;
+    if (!isValidHook(normalized)) {
+        options.stderr(`gji run-hook: unknown hook '${options.hook}'. Valid hooks: ${VALID_HOOKS.join(", ")}\n`);
         return 1;
     }
-    const hookName = options.hook;
+    const hookName = normalized;
     const repository = await detectRepository(options.cwd);
     const config = await loadEffectiveConfig(repository.repoRoot, undefined, options.stderr);
     const hooks = extractHooks(config);

package/dist/shell-completion.js

@@ -27,14 +27,14 @@ const TOP_LEVEL_COMMANDS = [
     },
     { name: "rm", description: "alias of remove" },
     {
-        name: "trigger-hook",
+        name: "run-hook",
         description: "run a named hook in the current worktree",
     },
     { name: "warp", description: "jump to any worktree across all known repos" },
     { name: "config", description: "manage global config defaults" },
 ];
 const SHELL_NAMES = ["bash", "fish", "zsh"];
-const HOOK_NAMES = ["afterCreate", "afterEnter", "beforeRemove"];
+const HOOK_NAMES = ["after-create", "after-enter", "before-remove"];
 const CONFIG_KEYS = Array.from(KNOWN_GLOBAL_CONFIG_KEYS);
 export function renderShellCompletion(shell) {
     switch (shell) {
@@ -116,7 +116,7 @@ _gji_completion() {
     remove|rm)
       COMPREPLY=( $(compgen -W "$(__gji_worktree_branches) -f --force --dry-run --json --help" -- "$cur") )
       ;;
-    trigger-hook)
+    run-hook)
       COMPREPLY=( $(compgen -W "${hooks} --help" -- "$cur") )
       ;;
     warp)
@@ -149,7 +149,7 @@ complete -F _gji_completion gji`;
 function renderFishCompletion() {
     const commandLines = TOP_LEVEL_COMMANDS.map((command) => `complete -c gji -n '__fish_use_subcommand' -a '${command.name}' -d '${escapeSingleQuotes(command.description)}'`).join("\n");
     const shellLines = SHELL_NAMES.map((shell) => `complete -c gji -n '__fish_seen_subcommand_from init' -a '${shell}' -d 'shell'`).join("\n");
-    const hookLines = HOOK_NAMES.map((hook) => `complete -c gji -n '__fish_seen_subcommand_from trigger-hook' -a '${hook}' -d 'hook'`).join("\n");
+    const hookLines = HOOK_NAMES.map((hook) => `complete -c gji -n '__fish_seen_subcommand_from run-hook' -a '${hook}' -d 'hook'`).join("\n");
     const configKeyLines = CONFIG_KEYS.map((key) => `complete -c gji -n '__gji_should_complete_config_key' -a '${key}' -d 'config key'`).join("\n");
     return `function __gji_worktree_branches
     command gji ls --compact 2>/dev/null | awk 'NR > 1 { branch = ($1 == "*" ? $2 : $1); if (branch != "(detached)") print branch }'
@@ -309,7 +309,7 @@ case "\${words[2]}" in
   remove|rm)
     _arguments '(-f --force)'{-f,--force}'[bypass prompts, force-remove a dirty worktree, and force-delete an unmerged branch]' '--dry-run[show what would be deleted without removing anything]' '--json[emit JSON on success or error instead of human-readable output]' '2:branch:->worktrees'
     ;;
-  trigger-hook)
+  run-hook)
     _arguments "2:hook:(${hooks})"
     ;;
   warp)

package/man/man1/gji-back.1

@@ -1,4 +1,4 @@
-.TH GJI\-BACK 1 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-BACK 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-CLEAN 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-COMPLETION 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-CONFIG 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-GO 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-HISTORY 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-INIT 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-LS 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-NEW 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-OPEN 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-PR 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-REMOVE 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-ROOT 1 "June 2026" "gji 0.7.1" "User Commands"
 .SH NAME
 gji\-root \- print the main repository root path
 .SH SYNOPSIS

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

@@ -0,0 +1,9 @@
+.TH GJI\-RUN\-HOOK 1 "June 2026" "gji 0.7.1" "User Commands"
+.SH NAME
+gji\-run\-hook \- run a named hook (after\-create, after\-enter, before\-remove) in the current worktree
+.SH SYNOPSIS
+.B gji run\-hook [options] <hook>
+.SH DESCRIPTION
+run a named hook (after\-create, after\-enter, before\-remove) in the current worktree
+.SH "SEE ALSO"
+.BR gji (1)

package/man/man1/gji-status.1

@@ -1,4 +1,4 @@
-.TH GJI\-STATUS 1 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-STATUS 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-SYNC\-FILES 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-SYNC 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI\-WARP 1 "June 2026" "gji 0.7.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 "May 2026" "gji 0.7.0" "User Commands"
+.TH GJI 1 "June 2026" "gji 0.7.1" "User Commands"
 .SH NAME
 gji \- Context switching without the mess.
 .SH SYNOPSIS
@@ -60,8 +60,10 @@ remove a linked worktree and delete its branch when present
 .br
 Alias: \fBrm\fR
 .TP
-.B trigger\-hook [options] <hook>
-run a named hook (afterCreate, afterEnter, beforeRemove) in the current worktree
+.B run\-hook [options] <hook>
+run a named hook (after\-create, after\-enter, before\-remove) in the current worktree
+.br
+Alias: \fBtrigger\-hook\fR
 .TP
 .B warp [options] [branch]
 jump to any worktree across all known repos
@@ -88,6 +90,6 @@ output the version number
 .BR gji\-ls (1),
 .BR gji\-clean (1),
 .BR gji\-remove (1),
-.BR gji\-trigger\-hook (1),
+.BR gji\-run\-hook (1),
 .BR gji\-warp (1),
 .BR gji\-config (1)

package/package.json

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

package/dist/trigger-hook.d.ts

@@ -1,6 +0,0 @@
-export interface TriggerHookCommandOptions {
-    cwd: string;
-    hook: string;
-    stderr: (chunk: string) => void;
-}
-export declare function runTriggerHookCommand(options: TriggerHookCommandOptions): Promise<number>;

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

@@ -1,9 +0,0 @@
-.TH GJI\-TRIGGER\-HOOK 1 "May 2026" "gji 0.7.0" "User Commands"
-.SH NAME
-gji\-trigger\-hook \- run a named hook (afterCreate, afterEnter, beforeRemove) in the current worktree
-.SH SYNOPSIS
-.B gji trigger\-hook [options] <hook>
-.SH DESCRIPTION
-run a named hook (afterCreate, afterEnter, beforeRemove) in the current worktree
-.SH "SEE ALSO"
-.BR gji (1)