@n-seiji/nuthatch 0.1.7 → 0.2.1

package/dist/cli.js

@@ -8,16 +8,18 @@ import {
   dispatchCliArgs,
   wantsJson,
   reportFatalError,
-  firstExecutable,
   VERSION
-} from "./cli-3ya15je0.js";
+} from "./cli-sre95k9x.js";
 import {
   GIT_EXECUTABLE_OVERRIDE_ENV,
   GIT_NOT_FOUND_ERROR_CODE,
   gitExecutableCandidates,
   gitNotFoundMessage,
   describeFatalError
-} from "./cli-qrxgkskr.js";
+} from "./cli-ph0gp56k.js";
+import {
+  createTermPort
+} from "./cli-26d2drt6.js";
 import {
   render,
   reportResult
@@ -25,16 +27,16 @@ import {
 import {
   UPSTREAM_FORMAT,
   parseUpstreamStates
-} from "./cli-pqd2qe7v.js";
-import {
-  isWithin
-} from "./cli-g72ra4e5.js";
+} from "./cli-btqjpf1q.js";
 import {
   EXIT_SUCCESS,
   EXIT_USAGE_ERROR,
   EXIT_CANCELLED,
   ok
-} from "./cli-2bhb9p0x.js";
+} from "./cli-77yanq37.js";
+import {
+  isWithinOrSelf
+} from "./cli-a56b2ar0.js";
 
 // src/cli-args.ts
 var DASH = "-";
@@ -144,7 +146,7 @@ var filterOutNestedWorktreePaths = (relativePaths, targetPath, otherWorktreePath
   }
   return relativePaths.filter((relativePath) => {
     const absolutePath = stripTrailingSlash(`${target}/${relativePath}`);
-    return !others.some((other) => absolutePath === other || isWithin(other, absolutePath));
+    return !others.some((other) => isWithinOrSelf(other, absolutePath));
   });
 };
 var isDirtyFromStatus = (statusOutput, targetPath, otherWorktreePaths) => {
@@ -173,6 +175,32 @@ var parseStatusPaths = (statusOutput) => {
   return paths;
 };
 
+// src/infra/executable.ts
+import { constants } from "node:fs";
+import { access, stat } from "node:fs/promises";
+var isExecutableFile = async (path) => {
+  try {
+    const stats = await stat(path);
+    if (!stats.isFile()) {
+      return false;
+    }
+    await access(path, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+};
+var firstExecutable = async (candidates) => {
+  const probes = candidates.map(async (candidate) => await isExecutableFile(candidate) ? candidate : null);
+  for (const probe of probes) {
+    const found = await probe;
+    if (found !== null) {
+      return found;
+    }
+  }
+  return null;
+};
+
 // src/infra/git-executable.ts
 var resolveGitExecutable = async (env) => {
   const candidates = gitExecutableCandidates({
@@ -304,12 +332,12 @@ var createBranchMethods = () => ({
         args.push(options.track);
       }
     } else {
-      args.push(ref);
+      args.push("--end-of-options", ref);
     }
     await run(cwd, args);
   },
   async deleteBranch(cwd, branch) {
-    await run(cwd, ["branch", "-D", branch]);
+    await run(cwd, ["branch", "-D", "--end-of-options", branch]);
   },
   async detachHead(cwd) {
     await run(cwd, ["switch", "--detach", "HEAD"]);
@@ -337,7 +365,7 @@ var createGarbagePolicyMethods = () => ({
   },
   async isAncestor(cwd, branch, ref) {
     try {
-      await run(cwd, ["merge-base", "--is-ancestor", branch, ref]);
+      await run(cwd, ["merge-base", "--is-ancestor", "--end-of-options", branch, ref]);
       return true;
     } catch (error) {
       if (failedWithExitCode(error, GIT_ANCESTOR_EXIT_CODE)) {
@@ -348,7 +376,7 @@ var createGarbagePolicyMethods = () => ({
   },
   async hasEquivalentCommits(cwd, branch, ref) {
     try {
-      const out = await run(cwd, ["cherry", ref, branch]);
+      const out = await run(cwd, ["cherry", "--end-of-options", ref, branch]);
       return !out.split(`
 `).some((line) => line.startsWith("+"));
     } catch {
@@ -362,34 +390,6 @@ var createGitPort = () => ({
   ...createGarbagePolicyMethods()
 });
 
-// src/infra/term.ts
-import { createInterface } from "node:readline";
-var createTermPort = () => ({
-  isTTY() {
-    return process.stderr.isTTY === true && process.stdin.isTTY === true;
-  },
-  logStderr(message) {
-    process.stderr.write(`${message}
-`);
-  },
-  confirm(message) {
-    return new Promise((resolve) => {
-      const rl = createInterface({
-        input: process.stdin,
-        output: process.stderr,
-        terminal: false
-      });
-      rl.question(`${message} [y/N] `, (answer) => {
-        rl.close();
-        resolve(answer.trim().toLowerCase() === "y");
-      });
-      rl.once("close", () => {
-        resolve(false);
-      });
-    });
-  }
-});
-
 // src/usage.ts
 var USAGE = `Usage: hop [command] [options]
 
@@ -406,7 +406,7 @@ var USAGE = `Usage: hop [command] [options]
   hop root -             Switch the root clone back
   hop init zsh           Print the zsh shell integration (eval "$(hop init zsh)")
 
-  hop --update           Update hop to the latest release, the way it was installed
+  hop --update           Replace a standalone binary with the latest release (else: how to update)
   hop --update --check   Only report whether an update is available; change nothing
   hop --version          Print hop's version
 
@@ -416,7 +416,7 @@ Interactive picker keys:
                          (stacks below it instead on narrow terminals)
   Ctrl+X                 Delete the selected worktree (y/N confirmation)
   Ctrl+R                 Switch the root clone to the selected branch (y/N first for an external worktree)
-  ↑/↓, Ctrl+P/N, Ctrl+K/J Move the selection (arrow, emacs, and vim keys all work)
+  ↑/↓, Ctrl+P/N, Ctrl+K Move the selection (arrow, emacs, and vim keys all work)
   Esc                    Cancel (exit 0, no output)
   Ctrl+C                 Cancel like an interrupt (exit 130, same as SIGINT)
   In the action panel: same up/down movement keys, Enter to run the highlighted
@@ -426,8 +426,7 @@ Options:
   --create               Create the worktree when jumping to a branch without one (always required, TTY or not)
   --json                 Output JSON instead of plain text
   --force                Force removal even if the worktree is dirty (hop rm)
-  --ext                  [deprecated, no-op for hop rm] hop rm no longer requires it to
-                         remove external worktrees; still gates hop clean's auto-cleanup scope
+  --ext                  Also include external worktrees in the auto-cleanup scope (hop clean)
   --yes                  Skip confirmation and execute (hop clean)
   --dry-run              Only report candidates as JSON, without deleting (hop clean)
   --with-branch          Also delete the branch when cleaning (hop clean)
@@ -443,14 +442,14 @@ var getPorts = () => {
 var JSON_FLAG = "json";
 var runLs = async (json) => {
   const [{ ls }, { reportLs }] = await Promise.all([
-    import("./ls-kvz4wmc9.js"),
-    import("./render-ls-6r3vv7y0.js")
+    import("./ls-3hyjf60d.js"),
+    import("./render-ls-x4hpnsvy.js")
   ]);
   const { git, fs } = getPorts();
   reportLs(await ls(git, fs, { cwd: process.cwd() }), json);
 };
 var runJump = async (target, options) => {
-  const { jump } = await import("./jump-nvdkeega.js");
+  const { jump } = await import("./jump-1zkraat1.js");
   const { git, fs } = getPorts();
   const result = await jump(git, fs, {
     cwd: process.cwd(),
@@ -466,7 +465,7 @@ var runInteractivePick = async (json) => {
     loadPickCandidates,
     renderSwitchRootOutcome,
     runInteractivePicker
-  } = await import("./cli-pick-w9qk71fy.js");
+  } = await import("./cli-pick-yjd4qpd9.js");
   const { git, fs } = getPorts();
   const candidates = await loadPickCandidates(git, fs, json);
   if (candidates === null) {
@@ -523,15 +522,14 @@ var runJumpFromArgs = async (tokens) => {
 var runRm = async (tokens) => {
   const args = parseCliArgs(tokens, {
     positionals: [{ name: "branch", required: true }],
-    booleans: ["force", "ext", JSON_FLAG]
+    booleans: ["force", JSON_FLAG]
   });
-  const { rm } = await import("./rm-231qjgd8.js");
+  const { rm } = await import("./rm-eg3j8ae1.js");
   const { git, fs } = getPorts();
   const result = await rm(git, fs, {
     cwd: process.cwd(),
     branch: args.positionals.branch ?? "",
-    force: args.booleans.force ?? false,
-    ext: args.booleans.ext ?? false
+    force: args.booleans.force ?? false
   });
   reportResult("rm", result, args.booleans.json ?? false);
 };
@@ -539,7 +537,7 @@ var runClean = async (tokens) => {
   const args = parseCliArgs(tokens, {
     booleans: ["ext", "withBranch", "dryRun", "yes", JSON_FLAG]
   });
-  const { clean } = await import("./clean-n2f9z8n3.js");
+  const { clean } = await import("./clean-rn2476my.js");
   const { git, fs, term } = getPorts();
   const result = await clean(git, fs, term, {
     cwd: process.cwd(),
@@ -556,7 +554,7 @@ var runRoot = async (tokens) => {
     booleans: [JSON_FLAG],
     strings: ["track"]
   });
-  const { root } = await import("./root-mmyazwc3.js");
+  const { root } = await import("./root-49vcb8x2.js");
   const { git, fs } = getPorts();
   const { branch } = args.positionals;
   const { track } = args.strings;
@@ -578,8 +576,8 @@ var runInit = async (tokens) => {
     process.exitCode = EXIT_USAGE_ERROR;
     return;
   }
-  const { renderInit } = await import("./init-s0dafa83.js");
-  process.stdout.write(renderInit({ shell: "zsh" }));
+  const { renderInit } = await import("./init-167d1bbs.js");
+  process.stdout.write(renderInit());
 };
 var RESERVED_COMMANDS = {
   ls: (tokens) => runLs(parseCliArgs(tokens, { booleans: [JSON_FLAG] }).booleans.json ?? false),
@@ -594,7 +592,7 @@ var dispatchAndRun = async (dispatch) => {
   await (command === undefined ? runJumpFromArgs(dispatch.args) : command(dispatch.args));
 };
 var runUpdate = async (rawArgs) => {
-  const update = await import("./cli-update-7exha1em.js");
+  const update = await import("./cli-update-x0r4b4xk.js");
   await update.runUpdate(rawArgs, getPorts().term);
 };
 var main = async () => {

package/dist/{init-s0dafa83.js → init-167d1bbs.js}

@@ -2,6 +2,14 @@
 var ZSH_TEMPLATE = `# nuthatch shell integration for zsh.
 # Usage: eval "$(hop init zsh)"
 hop() {
+  # stdout is not a terminal (e.g. inside p=$(hop ...)): a cd here would only
+  # affect the capturing subshell and leave the caller with an empty string,
+  # so just print the path.
+  if [[ ! -t 1 ]]; then
+    command hop "$@"
+    return $?
+  fi
+
   if [[ "$1" == "-" ]]; then
     cd - > /dev/null || return $?
     return 0
@@ -50,16 +58,7 @@ hop() {
   return $rc
 }
 `;
-var renderInit = (options) => {
-  switch (options.shell) {
-    case "zsh": {
-      return ZSH_TEMPLATE;
-    }
-    default: {
-      return ZSH_TEMPLATE;
-    }
-  }
-};
+var renderInit = () => ZSH_TEMPLATE;
 export {
   renderInit
 };

package/dist/{jump-nvdkeega.js → jump-1zkraat1.js}

@@ -1,19 +1,20 @@
 import {
   messageOf
-} from "./cli-qrxgkskr.js";
+} from "./cli-ph0gp56k.js";
 import {
   withRepoLock
-} from "./cli-rcw5adqd.js";
+} from "./cli-wcnyhk4w.js";
 import {
+  refArgumentRejection,
   loadRepoContext,
   resolveBranchCheckout
-} from "./cli-7jg5qqs9.js";
+} from "./cli-y8vsqre6.js";
 import {
   EXIT_GENERAL_ERROR,
   EXIT_SAFE_REJECTION,
   ok,
   fail
-} from "./cli-2bhb9p0x.js";
+} from "./cli-77yanq37.js";
 
 // src/commands/jump.ts
 import { join } from "node:path";
@@ -64,6 +65,10 @@ var jump = async (git, fs, options) => {
       data: { branch: options.target, created: false }
     });
   }
+  const refRejection = refArgumentRejection(options.target, options.track);
+  if (refRejection !== null) {
+    return refRejection;
+  }
   const context = await loadRepoContext(git, fs, options.cwd);
   const existing = context.worktrees.find((wt) => wt.branch === options.target);
   if (existing !== undefined) {
@@ -88,7 +93,7 @@ var jump = async (git, fs, options) => {
         return existingWorktreeResult(options.target, racedExisting.path);
       }
       await fs.mkdir(context.managedRoot);
-      await git.addWorktree(context.rootPath, targetPath, options.target, checkout.options);
+      await git.addWorktree(context.rootPath, targetPath, options.target, checkout.value);
       return ok({
         path: targetPath,
         data: { branch: options.target, created: true }

package/dist/{ls-kvz4wmc9.js → ls-3hyjf60d.js}

@@ -1,13 +1,13 @@
 import {
   upstreamStateOf
-} from "./cli-pqd2qe7v.js";
+} from "./cli-btqjpf1q.js";
 import {
   loadRepoContext,
   worktreeDirtyState
-} from "./cli-7jg5qqs9.js";
+} from "./cli-y8vsqre6.js";
 import {
   ok
-} from "./cli-2bhb9p0x.js";
+} from "./cli-77yanq37.js";
 
 // src/commands/ls.ts
 var ls = async (git, fs, options) => {

package/dist/{render-ls-6r3vv7y0.js → render-ls-x4hpnsvy.js}

@@ -2,26 +2,26 @@ import {
   displayWidth,
   padToWidth,
   truncateToWidth,
-  truncateToWidthKeepingTail
-} from "./cli-71jgs14h.js";
+  truncateToWidthKeepingTail,
+  SGR,
+  SGR_RESET
+} from "./cli-fhta3tr8.js";
+import {
+  colorEnabled
+} from "./cli-26d2drt6.js";
 import {
   reportResult
 } from "./cli-dbzx9nzg.js";
+import {
+  shortenHome
+} from "./cli-s5qcjcwk.js";
+import {
+  isWithinOrSelf
+} from "./cli-a56b2ar0.js";
 
 // src/render-ls.ts
-var ESC = "\x1B";
-var SGR = {
-  plain: "",
-  bold: `${ESC}[1m`,
-  dim: `${ESC}[2m`,
-  green: `${ESC}[32m`,
-  yellow: `${ESC}[33m`,
-  red: `${ESC}[31m`,
-  magenta: `${ESC}[35m`,
-  cyan: `${ESC}[36m`
-};
 var cell = (text, tone = "plain") => ({ text, tone });
-var paint = (value, color) => !color || value.tone === "plain" ? value.text : `${SGR[value.tone]}${value.text}${ESC}[0m`;
+var paint = (value, color) => !color || value.tone === "plain" ? value.text : `${SGR[value.tone]}${value.text}${SGR_RESET}`;
 var SHORT_SHA_LENGTH = 7;
 var MIN_PATH_WIDTH = 12;
 var MAX_BRANCH_WIDTH = 32;
@@ -78,17 +78,7 @@ var syncCells = (entry) => {
   }
   return cells;
 };
-var shortenHome = (path, home) => {
-  if (home === "" || home === "/") {
-    return path;
-  }
-  if (path === home) {
-    return "~";
-  }
-  return path.startsWith(`${home}/`) ? `~${path.slice(home.length)}` : path;
-};
-var isInside = (cwd, path) => cwd === path || cwd.startsWith(path.endsWith("/") ? path : `${path}/`);
-var currentPath = (entries, cwd) => entries.filter((entry) => isInside(cwd, entry.path)).reduce((best, entry) => best === null || entry.path.length > best.length ? entry.path : best, null);
+var currentPath = (entries, cwd) => entries.filter((entry) => isWithinOrSelf(entry.path, cwd)).reduce((best, entry) => best === null || entry.path.length > best.length ? entry.path : best, null);
 var summaryLine = (entries) => {
   const parts = [`${entries.length} worktree${entries.length === 1 ? "" : "s"}`];
   const counts = [
@@ -136,13 +126,12 @@ var formatLsTable = (entries, options) => {
 `)}
 `;
 };
-var stdoutColor = () => process.stdout.isTTY === true && (process.env["NO_COLOR"] ?? "") === "";
 var reportLs = (result, json) => {
   if (json || !result.ok || result.data === undefined) {
     reportResult("ls", result, json);
     return;
   }
-  const color = stdoutColor();
+  const color = colorEnabled(process.stdout);
   process.stdout.write(formatLsTable(result.data, {
     color,
     width: process.stdout.isTTY === true ? process.stdout.columns ?? null : null,

package/dist/rm-eg3j8ae1.js

@@ -0,0 +1,7 @@
+import {
+  rm2
+} from "./cli-9n04gsq1.js";
+import"./cli-ph0gp56k.js";
+export {
+  rm2 as rm
+};

package/dist/root-49vcb8x2.js

@@ -0,0 +1,7 @@
+import {
+  root2
+} from "./cli-hz0r7zw8.js";
+import"./cli-ph0gp56k.js";
+export {
+  root2 as root
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n-seiji/nuthatch",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "git worktree manager (hop)",
   "homepage": "https://github.com/n-seiji/nuthatch#readme",
   "bugs": {
@@ -15,8 +15,7 @@
     "hop": "dist/cli.js"
   },
   "files": [
-    "dist",
-    "shell"
+    "dist"
   ],
   "type": "module",
   "publishConfig": {
@@ -36,7 +35,7 @@
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "oxfmt": "^0.66.0",
+    "oxfmt": "^0.72.0",
     "oxlint": "^1.81.0",
     "typescript": "^5.6.0"
   },

package/dist/rm-231qjgd8.js

@@ -1,7 +0,0 @@
-import {
-  rm2
-} from "./cli-23z98dw1.js";
-import"./cli-qrxgkskr.js";
-export {
-  rm2 as rm
-};

package/dist/root-mmyazwc3.js

@@ -1,7 +0,0 @@
-import {
-  root2
-} from "./cli-ygt2w4e1.js";
-import"./cli-qrxgkskr.js";
-export {
-  root2 as root
-};

package/shell/init.zsh

@@ -1,53 +0,0 @@
-# nuthatch shell integration for zsh.
-# Usage: eval "$(hop init zsh)"
-#
-# This file is a reference copy of the template embedded in
-# src/commands/init.ts (renderInit). Keep the two in sync.
-hop() {
-  if [[ "$1" == "-" ]]; then
-    cd - > /dev/null || return $?
-    return 0
-  fi
-
-  local should_cd=1
-  case "$1" in
-    ls|rm|clean|init) should_cd=0 ;;
-    --) ;; # "hop -- <branch>" escapes a reserved word; still a jump, so cd.
-    "")
-      # Bare "hop": picker on a real terminal (cd on success), ls fallback
-      # otherwise (prints a listing, not a path — don't cd). fd 2/0 are what
-      # the child inherits unchanged; fd 1 is about to become the capture
-      # pipe below, so it can't be checked here — this mirrors hop's own
-      # isTTY() check (stderr + stdin), not stdout.
-      if [[ -t 2 && -t 0 ]]; then
-        should_cd=1
-      else
-        should_cd=0
-      fi
-      ;;
-    --*) should_cd=0 ;;
-  esac
-
-  # Nothing to cd into: run hop with the terminal as its stdout, so a listing
-  # keeps its colors (hop only colors stdout when it is a terminal).
-  if [[ $should_cd -eq 0 ]]; then
-    command hop "$@"
-    return $?
-  fi
-
-  # "status" is a zsh read-only special parameter (mirrors $?); using it as a
-  # local name fails with "read-only variable: status". Use "rc" instead, and
-  # declare it before the command substitution so the exit code isn't
-  # clobbered by "local"'s own exit status.
-  local out rc
-  out="$(command hop "$@")"
-  rc=$?
-
-  if [[ $rc -eq 0 && $should_cd -eq 1 && -n "$out" ]]; then
-    cd -- "$out" || return $?
-  elif [[ -n "$out" ]]; then
-    print -r -- "$out"
-  fi
-
-  return $rc
-}