@n-seiji/nuthatch 0.1.3 → 0.1.4

package/README.ja.md

@@ -137,6 +137,17 @@ install script は `hop` を `~/.local/bin` に置き (`HOP_INSTALL_DIR` で
 には `HOP_VERSION=vX.Y.Z` を使う。Linux arm64 はビルド済みバイナリが
 まだないため、npm install を使う。
 
+## トラブルシューティング
+
+`hop: git executable not found. Looked in: …` は git のバイナリを見つけられ
+なかったという意味。hop は `PATH` の絶対パスエントリを順に探し、その後
+`/opt/homebrew/bin`, `/usr/local/bin`, `/usr/bin`, `/bin` を見る。git が
+それ以外の場所にある場合は、直接指定する:
+
+```sh
+export HOP_GIT=/path/to/git
+```
+
 ## Agent skill (Claude Code / Codex plugin)
 
 このリポジトリは plugin marketplace も兼ねており、

package/README.md

@@ -146,6 +146,17 @@ The install script places `hop` in `~/.local/bin` (override with
 specific version with `HOP_VERSION=vX.Y.Z`. Linux arm64 has no prebuilt
 binary yet — use the npm install instead.
 
+## Troubleshooting
+
+`hop: git executable not found. Looked in: …` means hop could not find a git
+binary. hop searches every absolute entry in `PATH`, then `/opt/homebrew/bin`,
+`/usr/local/bin`, `/usr/bin` and `/bin`. If your git lives somewhere else,
+point hop straight at it:
+
+```sh
+export HOP_GIT=/path/to/git
+```
+
 ## Agent skill (Claude Code / Codex plugin)
 
 This repo doubles as a plugin marketplace that ships the

package/dist/cli.js

@@ -2054,6 +2054,31 @@ var dispatchCliArgs = (rawArgs, reservedNames) => {
   return { kind: "jump", args: rawArgs };
 };
 
+// src/domain/git-executable.ts
+var GIT_EXECUTABLE_OVERRIDE_ENV = "HOP_GIT";
+var GIT_NOT_FOUND_ERROR_CODE = "HOP_GIT_NOT_FOUND";
+var GIT_NOT_FOUND_HINT = `Install git, or set ${GIT_EXECUTABLE_OVERRIDE_ENV} to its absolute path.`;
+var GIT_FALLBACK_BIN_DIRS = [
+  "/opt/homebrew/bin",
+  "/usr/local/bin",
+  "/usr/bin",
+  "/bin"
+];
+var PATH_SEPARATOR = ":";
+var joinBin = (dir) => {
+  const base = dir.endsWith("/") ? dir.slice(0, -1) : dir;
+  return `${base}/git`;
+};
+var gitExecutableCandidates = (input) => {
+  const override = input.override?.trim() ?? "";
+  if (override.length > 0) {
+    return [override];
+  }
+  const dirs = (input.path ?? "").split(PATH_SEPARATOR).map((entry) => entry.trim()).filter((entry) => entry.startsWith("/"));
+  return [...new Set([...dirs, ...GIT_FALLBACK_BIN_DIRS].map((dir) => joinBin(dir)))];
+};
+var gitNotFoundMessage = (candidates) => `git executable not found. Looked in: ${candidates.join(", ")}. ${GIT_NOT_FOUND_HINT}`;
+
 // src/domain/result.ts
 var EXIT_SUCCESS = 0;
 var EXIT_GENERAL_ERROR = 1;
@@ -2072,6 +2097,75 @@ var fail = (exitCode, errorMessage, warnings) => ({
   ...warnings === undefined || warnings.length === 0 ? {} : { warnings }
 });
 
+// src/domain/fatal-error.ts
+var fieldsOf = (error) => typeof error === "object" && error !== null ? error : {};
+var messageOf = (error) => error instanceof Error ? error.message : String(error);
+var trimmedStringOf = (value) => typeof value === "string" ? value.trim() : "";
+var isSpawnFailure = (fields) => fields.code === "ENOENT" && typeof fields.syscall === "string" && fields.syscall.startsWith("spawn");
+var isGitFailure = (fields) => typeof fields.code === "number" || typeof fields.signal === "string" && fields.signal !== "";
+var describeFatalError = (error) => {
+  const fields = fieldsOf(error);
+  if (isSpawnFailure(fields)) {
+    const binary = trimmedStringOf(fields.path) || "git";
+    return {
+      message: `failed to run ${binary}: no such executable. ${GIT_NOT_FOUND_HINT}`,
+      exitCode: EXIT_GENERAL_ERROR
+    };
+  }
+  if (isGitFailure(fields)) {
+    const stderr = trimmedStringOf(fields.stderr);
+    return {
+      message: stderr.length > 0 ? stderr : messageOf(error),
+      exitCode: EXIT_SAFE_REJECTION
+    };
+  }
+  return { message: messageOf(error), exitCode: EXIT_GENERAL_ERROR };
+};
+
+// src/render.ts
+var PLAIN_JSON_INDENT = 2;
+var render = (command, result, json) => {
+  if (json) {
+    const envelope = {
+      schemaVersion: 1,
+      command,
+      data: result.ok ? result.data : undefined,
+      warnings: result.warnings ?? []
+    };
+    process.stdout.write(`${JSON.stringify(envelope)}
+`);
+    if (!result.ok && result.errorMessage !== undefined) {
+      process.stderr.write(`${result.errorMessage}
+`);
+    }
+    return;
+  }
+  if (result.path !== undefined) {
+    process.stdout.write(`${result.path}
+`);
+  } else if (result.ok && result.data !== undefined) {
+    process.stdout.write(`${JSON.stringify(result.data, null, PLAIN_JSON_INDENT)}
+`);
+  }
+  for (const warning of result.warnings ?? []) {
+    process.stderr.write(`warning: ${warning}
+`);
+  }
+  if (!result.ok && result.errorMessage !== undefined) {
+    process.stderr.write(`${result.errorMessage}
+`);
+  }
+};
+
+// src/cli-fatal.ts
+var wantsJson = (args) => args.some((arg) => arg === "--json" || arg.startsWith("--json="));
+var reportFatalError = (command, json, error) => {
+  const fatal = describeFatalError(error);
+  const result = fail(fatal.exitCode, `hop: ${fatal.message}`);
+  render(command, result, json);
+  process.exitCode = result.exitCode;
+};
+
 // src/infra/lock.ts
 import { randomUUID } from "node:crypto";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
@@ -2498,41 +2592,6 @@ var switchAndReport = async ({
   }
 };
 
-// src/render.ts
-var PLAIN_JSON_INDENT = 2;
-var render = (command, result, json) => {
-  if (json) {
-    const envelope = {
-      schemaVersion: 1,
-      command,
-      data: result.ok ? result.data : undefined,
-      warnings: result.warnings ?? []
-    };
-    process.stdout.write(`${JSON.stringify(envelope)}
-`);
-    if (!result.ok && result.errorMessage !== undefined) {
-      process.stderr.write(`${result.errorMessage}
-`);
-    }
-    return;
-  }
-  if (result.path !== undefined) {
-    process.stdout.write(`${result.path}
-`);
-  } else if (result.ok && result.data !== undefined) {
-    process.stdout.write(`${JSON.stringify(result.data, null, PLAIN_JSON_INDENT)}
-`);
-  }
-  for (const warning of result.warnings ?? []) {
-    process.stderr.write(`warning: ${warning}
-`);
-  }
-  if (!result.ok && result.errorMessage !== undefined) {
-    process.stderr.write(`${result.errorMessage}
-`);
-  }
-};
-
 // src/cli-root-command.ts
 var ROOT_PREVIOUS_TOKEN = " hop-root-previous ";
 var VALUE_FLAGS = new Set(["--track"]);
@@ -4734,12 +4793,52 @@ var parseStatusPaths = (statusOutput) => {
 };
 var STATUS_CODE_WIDTH = 3;
 
+// src/infra/git-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 resolveGitExecutable = async (env2) => {
+  const candidates = gitExecutableCandidates({
+    override: env2[GIT_EXECUTABLE_OVERRIDE_ENV],
+    path: env2.PATH
+  });
+  const probes = candidates.map(async (candidate) => await isExecutableFile(candidate) ? candidate : undefined);
+  for (const probe of probes) {
+    const found = await probe;
+    if (found !== undefined) {
+      return found;
+    }
+  }
+  throw Object.assign(new Error(gitNotFoundMessage(candidates)), {
+    code: GIT_NOT_FOUND_ERROR_CODE
+  });
+};
+var createGitExecutableResolver = (env2) => {
+  let cached = null;
+  return () => {
+    cached ??= resolveGitExecutable(env2);
+    return cached;
+  };
+};
+
 // src/infra/git.ts
 var execFile = promisify(execFileCb);
+var gitExecutable = createGitExecutableResolver(process.env);
 var MAX_BUFFER_BYTES = 64 * 1024 * 1024;
 var GIT_ANCESTOR_EXIT_CODE = 1;
 var run = async (cwd, args) => {
-  const { stdout: stdout2 } = await execFile("git", [...args], {
+  const { stdout: stdout2 } = await execFile(await gitExecutable(), [...args], {
     cwd,
     maxBuffer: MAX_BUFFER_BYTES
   });
@@ -5164,19 +5263,37 @@ var runJumpFromArgs = async (rawArgs) => {
   });
 };
 var ARGV_USER_ARGS_START = 2;
-var rawArgs = normalizeCliArgs(process.argv.slice(ARGV_USER_ARGS_START), process.argv0, isRunningAsCompiledBinary());
-if (isHelpRequest(rawArgs)) {
-  process.stderr.write(USAGE);
-  process.exitCode = 0;
-} else {
-  const dispatch = dispatchCliArgs(rawArgs, Object.keys(RESERVED_COMMANDS));
+var dispatchAndRun = async (dispatch) => {
   if (dispatch.kind === "reserved") {
     const command = RESERVED_COMMANDS[dispatch.name];
     const commandArgs = dispatch.name === "root" ? rewriteRootPreviousToken(dispatch.args) : [...dispatch.args];
     await runCommand(command, {
       rawArgs: commandArgs
     });
-  } else {
-    await runJumpFromArgs(dispatch.args);
+    return;
+  }
+  await runJumpFromArgs(dispatch.args);
+};
+var main = async () => {
+  const rawArgs = normalizeCliArgs(process.argv.slice(ARGV_USER_ARGS_START), process.argv0, isRunningAsCompiledBinary());
+  if (isHelpRequest(rawArgs)) {
+    process.stderr.write(USAGE);
+    process.exitCode = 0;
+    return;
   }
+  const dispatch = dispatchCliArgs(rawArgs, Object.keys(RESERVED_COMMANDS));
+  try {
+    await dispatchAndRun(dispatch);
+  } catch (error) {
+    const command = dispatch.kind === "reserved" ? dispatch.name : "jump";
+    reportFatalError(command, wantsJson(rawArgs), error);
+  }
+};
+try {
+  await main();
+} catch (error) {
+  const fatal = describeFatalError(error);
+  process.stderr.write(`hop: ${fatal.message}
+`);
+  process.exitCode = fatal.exitCode;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n-seiji/nuthatch",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "git worktree manager (hop)",
   "homepage": "https://github.com/n-seiji/nuthatch#readme",
   "bugs": {
@@ -42,6 +42,6 @@
     "typescript": "^5.6.0"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }