@xuhaojun/githunk 0.1.2 → 0.2.0

package/bin/githunk.js

@@ -1,23 +1,95 @@
 #!/usr/bin/env node
 
+// githunk launcher: prefer the prebuilt standalone binary installed as an
+// optional platform package, and fall back to the Node bundle otherwise.
+//
+// npm installs only the optional dependency whose `os`/`cpu` matches this
+// machine, so the binary usually lives at
+// `<install-root>/node_modules/@xuhaojun/githunk-<os>-<arch>/bin/githunk`.
+// The lookup walks up from this file (the hunk `findInstalledBinary` shape in
+// `learn-projects/hunk/bin/hunk.cjs`), which keeps working no matter which
+// Node version owns the invoking shell: the prebuilt binary embeds its own
+// Bun runtime and takes no `--experimental-ffi` flag. `$GITHUNK_BIN_PATH`
+// overrides everything for debugging and custom installs.
+
 import { spawn } from "node:child_process"
+import { existsSync, realpathSync } from "node:fs"
 import { constants } from "node:os"
+import { dirname, join } from "node:path"
 import { fileURLToPath } from "node:url"
 
-const cliPath = fileURLToPath(new URL("../dist/githunk.js", import.meta.url))
-const child = spawn(process.execPath, ["--experimental-ffi", cliPath, ...process.argv.slice(2)], {
-  stdio: "inherit",
-})
+const PLATFORM_PACKAGES = [
+  { packageName: "@xuhaojun/githunk-darwin-arm64", binary: "bin/githunk" },
+  { packageName: "@xuhaojun/githunk-darwin-x64", binary: "bin/githunk" },
+  { packageName: "@xuhaojun/githunk-linux-arm64", binary: "bin/githunk" },
+  { packageName: "@xuhaojun/githunk-linux-x64", binary: "bin/githunk" },
+  { packageName: "@xuhaojun/githunk-windows-x64", binary: "bin/githunk.exe" },
+]
+
+function hostCandidates() {
+  const platformMap = {
+    darwin: "darwin",
+    linux: "linux",
+    win32: "windows",
+  }
+  const archMap = {
+    x64: "x64",
+    arm64: "arm64",
+  }
+  const platform = platformMap[process.platform]
+  const arch = archMap[process.arch]
+  if (platform === undefined || arch === undefined) return []
+  return PLATFORM_PACKAGES.filter((candidate) => candidate.packageName === `@xuhaojun/githunk-${platform}-${arch}`)
+}
+
+/** Find the prebuilt binary installed next to this package, walking up past nested installs. */
+function findInstalledBinary(startDir) {
+  let current = startDir
+  for (;;) {
+    const modulesDir = join(current, "node_modules")
+    for (const candidate of hostCandidates()) {
+      const resolved = join(modulesDir, ...candidate.packageName.split("/"), candidate.binary)
+      if (existsSync(resolved)) return resolved
+    }
+    const parent = dirname(current)
+    if (parent === current) return null
+    current = parent
+  }
+}
+
+function launch(target, args) {
+  const child = spawn(target, args, { stdio: "inherit" })
 
-for (const signal of ["SIGINT", "SIGTERM", "SIGHUP", "SIGQUIT"]) {
-  process.once(signal, () => { child.kill(signal) })
+  for (const signal of ["SIGINT", "SIGTERM", "SIGHUP", "SIGQUIT"]) {
+    process.once(signal, () => { child.kill(signal) })
+  }
+
+  child.once("error", (error) => {
+    process.stderr.write(`githunk: failed to start: ${error instanceof Error ? error.message : String(error)}\n`)
+    process.exitCode = 1
+  })
+  child.once("close", (exitCode, signal) => {
+    const signalNumber = signal === null ? undefined : constants.signals[signal]
+    process.exitCode = exitCode ?? (signalNumber === undefined ? 1 : 128 + signalNumber)
+  })
 }
 
-child.once("error", (error) => {
-  process.stderr.write(`githunk: failed to start: ${error instanceof Error ? error.message : String(error)}\n`)
-  process.exitCode = 1
-})
-child.once("close", (exitCode, signal) => {
-  const signalNumber = signal === null ? undefined : constants.signals[signal]
-  process.exitCode = exitCode ?? (signalNumber === undefined ? 1 : 128 + signalNumber)
-})
+const forwardedArgs = process.argv.slice(2)
+const overrideBinary = process.env.GITHUNK_BIN_PATH
+if (typeof overrideBinary === "string" && overrideBinary !== "") {
+  launch(overrideBinary, forwardedArgs)
+} else {
+  let scriptDir = dirname(fileURLToPath(import.meta.url))
+  try {
+    scriptDir = realpathSync(scriptDir)
+  } catch {
+    // Unresolved symlinks just start the walk from the literal directory.
+  }
+  const prebuiltBinary = findInstalledBinary(scriptDir)
+  if (prebuiltBinary !== null) {
+    launch(prebuiltBinary, forwardedArgs)
+  } else {
+    const cliPath = fileURLToPath(new URL("../dist/githunk.js", import.meta.url))
+    launch(process.execPath, ["--experimental-ffi", cliPath, ...forwardedArgs])
+  }
+}

package/dist/githunk.js

@@ -2,35 +2,86 @@
 
 // src/cli/args.ts
 import { Command, CommanderError } from "commander";
-import { readFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-var cachedVersion;
-function getCliVersion() {
-  if (cachedVersion !== undefined)
-    return cachedVersion;
-  let directory = dirname(fileURLToPath(import.meta.url));
-  for (let level = 0;level < 4; level += 1) {
-    try {
-      const manifest = JSON.parse(readFileSync(join(directory, "package.json"), "utf8"));
-      if (manifest.name === "@xuhaojun/githunk" && typeof manifest.version === "string") {
-        cachedVersion = manifest.version;
-        return cachedVersion;
-      }
-    } catch {}
-    const parent = dirname(directory);
-    if (parent === directory)
-      break;
-    directory = parent;
+// package.json
+var package_default = {
+  name: "@xuhaojun/githunk",
+  version: "0.2.0",
+  description: "A review-first Git TUI combining lazygit's everyday Git workflow with focused hunk review.",
+  type: "module",
+  bin: {
+    githunk: "bin/githunk.js"
+  },
+  files: [
+    "bin",
+    "dist/githunk.js",
+    "README.md",
+    "LICENSE"
+  ],
+  scripts: {
+    start: "bun run src/main.ts",
+    dev: "bun --watch src/main.ts",
+    build: "bun build src/cli.ts --target=node --format=esm --packages=external --outfile=dist/githunk.js --banner '#!/usr/bin/env node'",
+    "build:bin": "bun run ./scripts/build-bin.ts",
+    "build:prebuilt:artifact": "bun run ./scripts/build-prebuilt-artifact.ts",
+    "stage:prebuilt:release": "bun run ./scripts/stage-prebuilt-npm.ts --artifact-root ./dist/release/artifacts",
+    "check:release-version": "bun run ./scripts/check-release-version.ts",
+    "check:prebuilt-pack": "bun run ./scripts/check-prebuilt-pack.ts",
+    "publish:prebuilt:npm": "bun run ./scripts/publish-prebuilt-npm.ts",
+    "smoke:prebuilt-install": "bun run ./scripts/smoke-prebuilt-install.ts",
+    prepack: "bun run build",
+    "pack:check": "npm pack --dry-run",
+    "spike:selection": "bun run spikes/selection/src/main.ts",
+    test: "bun test --path-ignore-patterns='learn-projects/**'",
+    typecheck: "tsc --noEmit",
+    check: "bun run typecheck && bun run test",
+    "bench:review-load": "bun run benchmarks/review-document-load.ts",
+    "bench:review-rows": "bun run benchmarks/review-row-plan.ts",
+    "bench:review-reconcile": "bun run benchmarks/review-reconcile.ts"
+  },
+  keywords: [
+    "git",
+    "tui",
+    "code-review",
+    "cli"
+  ],
+  homepage: "https://github.com/XuHaoJun/githunk#readme",
+  bugs: {
+    url: "https://github.com/XuHaoJun/githunk/issues"
+  },
+  repository: {
+    type: "git",
+    url: "git+https://github.com/XuHaoJun/githunk.git"
+  },
+  license: "MIT",
+  engines: {
+    node: ">=26.1.0"
+  },
+  packageManager: "bun@1.4.0",
+  publishConfig: {
+    access: "public"
+  },
+  dependencies: {
+    "@opentui/core": "0.5.10",
+    "@opentui/react": "0.5.10",
+    "@pierre/diffs": "1.3.5",
+    commander: "^15.0.0",
+    react: "19.2.8",
+    zod: "^4.4.3"
+  },
+  devDependencies: {
+    "@types/bun": "1.4.0",
+    "@types/react": "19.2.8",
+    typescript: "5.9.2"
   }
-  cachedVersion = "0.0.0-dev";
-  return cachedVersion;
-}
+};
+
+// src/cli/args.ts
+var cliVersion = typeof package_default.version === "string" && package_default.version !== "" ? package_default.version : "0.0.0-dev";
 function parseCliArgs(argv) {
   let stdout = "";
   let stderr = "";
   const program = new Command;
-  program.name("githunk").description("A review-first Git TUI combining lazygit's everyday Git workflow with focused hunk review.").version(getCliVersion(), "-V, --version", "output the version number").option("-p, --path <dir>", "path to the Git repository to open").argument("[path]", "path to the Git repository to open").exitOverride().configureOutput({
+  program.name("githunk").description("A review-first Git TUI combining lazygit's everyday Git workflow with focused hunk review.").version(cliVersion, "-V, --version", "output the version number").option("-p, --path <dir>", "path to the Git repository to open").argument("[path]", "path to the Git repository to open").exitOverride().configureOutput({
     writeOut: (text) => {
       stdout += text;
     },
@@ -978,7 +1029,7 @@ function fingerprintWorkingTreeFile(target, filePatch) {
 
 // src/storage/local-state-file.ts
 import { mkdir, open, rename, stat, unlink, lstat, link, readFile } from "node:fs/promises";
-import { dirname as dirname2, isAbsolute, join as join2, resolve } from "node:path";
+import { dirname, isAbsolute, join, resolve } from "node:path";
 import { randomUUID } from "node:crypto";
 async function assertNoSymlinkInPath(path, pathKind) {
   const absolute = resolve(path);
@@ -1008,7 +1059,7 @@ class LocalStateFile {
     this.pathKind = options.pathKind ?? "state";
   }
   get path() {
-    return this.resolvedPath ?? join2(this.runner.cwd, ".git", this.relativePath);
+    return this.resolvedPath ?? join(this.runner.cwd, ".git", this.relativePath);
   }
   async resolvePath() {
     if (this.resolvedPath !== undefined)
@@ -1016,7 +1067,7 @@ class LocalStateFile {
     const output = (await this.runner.run(["rev-parse", "--git-path", this.relativePath], { readOnly: true })).stdout.trim();
     if (output.length === 0)
       throw new Error(`git returned an empty path for ${this.relativePath}`);
-    this.resolvedPath = isAbsolute(output) ? output : join2(this.runner.cwd, output);
+    this.resolvedPath = isAbsolute(output) ? output : join(this.runner.cwd, output);
     return this.resolvedPath;
   }
   async readText() {
@@ -1033,7 +1084,7 @@ class LocalStateFile {
   async writeText(text) {
     const path = await this.resolvePath();
     await assertNoSymlinkInPath(path, this.pathKind);
-    await mkdir(dirname2(path), { recursive: true, mode: 448 });
+    await mkdir(dirname(path), { recursive: true, mode: 448 });
     const temporary = `${path}.tmp-${process.pid}-${randomUUID()}`;
     await assertNoSymlinkInPath(temporary, this.pathKind);
     const handle = await open(temporary, "wx", 384);
@@ -1046,7 +1097,7 @@ class LocalStateFile {
     }
     await rename(temporary, path);
     try {
-      const directory = await open(dirname2(path), "r");
+      const directory = await open(dirname(path), "r");
       try {
         await directory.sync();
       } finally {
@@ -1070,7 +1121,7 @@ class LocalStateFile {
   async createTextExclusive(text) {
     const path = await this.resolvePath();
     await assertNoSymlinkInPath(path, this.pathKind);
-    await mkdir(dirname2(path), { recursive: true, mode: 448 });
+    await mkdir(dirname(path), { recursive: true, mode: 448 });
     const temporary = `${path}.tmp-${process.pid}-${randomUUID()}`;
     await assertNoSymlinkInPath(temporary, this.pathKind);
     const handle = await open(temporary, "wx", 384);
@@ -1099,7 +1150,7 @@ class LocalStateFile {
       return;
     });
     try {
-      const directory = await open(dirname2(path), "r");
+      const directory = await open(dirname(path), "r");
       try {
         await directory.sync();
       } finally {
@@ -1439,7 +1490,7 @@ class GitMutations {
         await this.runner.run(["restore", "--staged", "--", path], { acceptedExitCodes: [0, 1] });
       }
       await this.runner.run(["restore", "--", path], { acceptedExitCodes: [0, 1] });
-      await this.runner.run(["clean", "-f", "-d", "--", path]);
+      await this.runner.run(["clean", "-ff", "-d", "--", path]);
       await this.refresh();
     });
   }
@@ -1449,7 +1500,7 @@ class GitMutations {
         await this.runner.run(["restore", "--staged", "--", path], { acceptedExitCodes: [0, 1] });
       }
       await this.runner.run(["restore", "--", path], { acceptedExitCodes: [0, 1] });
-      await this.runner.run(["clean", "-f", "-d", "--", path]);
+      await this.runner.run(["clean", "-ff", "-d", "--", path]);
     });
   }
   async applySelection(document, includedLineIndexes, options = { reverse: false, wholeFile: false }) {
@@ -2134,7 +2185,7 @@ async function listReflog(runner, options = {}) {
 
 // src/git/worktrees.ts
 import { readFile as readFile2, stat as stat2 } from "node:fs/promises";
-import { dirname as dirname3, join as join3 } from "node:path";
+import { dirname as dirname2, join as join2 } from "node:path";
 function finalizeEntry(entry) {
   return {
     path: entry.path,
@@ -2236,7 +2287,7 @@ async function resolveRepositoryPaths(runner) {
   const worktreeGitDirPath = lines[1] ?? "";
   const repoGitDirPath = lines[2] ?? "";
   const isSubmodule = (lines[3] ?? "").length > 0;
-  const repoPath = worktreeGitDirPath === repoGitDirPath || isSubmodule ? worktreePath : dirname3(repoGitDirPath);
+  const repoPath = worktreeGitDirPath === repoGitDirPath || isSubmodule ? worktreePath : dirname2(repoGitDirPath);
   return { worktreePath, worktreeGitDirPath, repoPath, repoGitDirPath };
 }
 async function isPathMissing(path) {
@@ -2269,11 +2320,11 @@ async function readTrimmedFile(path) {
 }
 async function inProgressBranch(gitDir) {
   for (const directory of ["rebase-merge", "rebase-apply"]) {
-    const headName = await readTrimmedFile(join3(gitDir, directory, "head-name"));
+    const headName = await readTrimmedFile(join2(gitDir, directory, "head-name"));
     if (headName !== undefined)
       return headName.replace(/^refs\/heads\//, "");
   }
-  return await readTrimmedFile(join3(gitDir, "BISECT_START"));
+  return await readTrimmedFile(join2(gitDir, "BISECT_START"));
 }
 async function listWorktrees(runner) {
   const repositoryPaths = await resolveRepositoryPaths(runner);
@@ -2340,7 +2391,7 @@ function worktreeRemovalRequiresForce(error) {
 
 // src/git/submodules.ts
 import { readFile as readFile3 } from "node:fs/promises";
-import { join as join4, resolve as resolve2 } from "node:path";
+import { join as join3, resolve as resolve2 } from "node:path";
 
 // src/domain/submodule.ts
 function submoduleFullName(submodule) {
@@ -2395,7 +2446,7 @@ function parseGitModules(raw) {
 }
 async function readGitModules(directory) {
   try {
-    return await readFile3(join4(directory, ".gitmodules"), "utf8");
+    return await readFile3(join3(directory, ".gitmodules"), "utf8");
   } catch (error) {
     if (error instanceof Error && "code" in error) {
       const code = error.code;
@@ -2406,7 +2457,7 @@ async function readGitModules(directory) {
   }
 }
 async function collectSubmodules(worktreePath, parentModule, visited) {
-  const directory = parentModule === undefined ? worktreePath : join4(worktreePath, submoduleFullPath(parentModule));
+  const directory = parentModule === undefined ? worktreePath : join3(worktreePath, submoduleFullPath(parentModule));
   const resolved = resolve2(directory);
   if (visited.has(resolved))
     return [];
@@ -15418,7 +15469,7 @@ async function loadRefsSnapshot(runner) {
 }
 
 // src/git/editor.ts
-import { join as join5, basename } from "node:path";
+import { join as join4, basename } from "node:path";
 function standardTerminalPreset(editor) {
   return {
     edit: `${editor} -- {{filename}}`,
@@ -15556,7 +15607,7 @@ async function resolveEditCommand(files, options = {}) {
 function absolutePath(repoRoot, relativePath) {
   if (relativePath.startsWith("/"))
     return relativePath;
-  return join5(repoRoot, relativePath);
+  return join4(repoRoot, relativePath);
 }
 
 // src/app/create-app.ts
@@ -15564,7 +15615,7 @@ import { isAbsolute as isAbsolute2, resolve as resolve3 } from "node:path";
 
 // src/app/index-watcher.ts
 import { watch, statSync } from "node:fs";
-import { basename as basename2, dirname as dirname4 } from "node:path";
+import { basename as basename2, dirname as dirname3 } from "node:path";
 var DEFAULT_INDEX_EVENT_DEBOUNCE_MS = 50;
 var BUSY_RETRY_MS = 50;
 function fingerprint(path) {
@@ -15605,7 +15656,7 @@ class IndexWatcher {
     this.stopped = false;
     this.baseline = fingerprint(this.options.indexPath);
     try {
-      const watcher = watch(dirname4(this.options.indexPath), { persistent: false }, (_eventType, filename) => {
+      const watcher = watch(dirname3(this.options.indexPath), { persistent: false }, (_eventType, filename) => {
         if (this.stopped)
           return;
         const name = eventFileName(filename);
@@ -16271,7 +16322,7 @@ function reviewHelp(focus, state) {
 }
 
 // src/ui/review-workspace/review-sidebar.ts
-import { basename as basename3, dirname as dirname5 } from "node:path/posix";
+import { basename as basename3, dirname as dirname4 } from "node:path/posix";
 function normalizeDiffPath(p) {
   return p?.replace(/[\r\n]+$/u, "");
 }
@@ -16357,7 +16408,7 @@ function buildReviewSidebarEntries(state) {
   let activeGroup;
   visible.forEach((file, index) => {
     const path = formatTerminalPath(normalizeDiffPath(file.path) ?? file.path);
-    const group = dirname5(path);
+    const group = dirname4(path);
     if (group !== activeGroup) {
       activeGroup = group;
       entries.push({

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@xuhaojun/githunk",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "A review-first Git TUI combining lazygit's everyday Git workflow with focused hunk review.",
-  "type": "module",
   "bin": {
     "githunk": "bin/githunk.js"
   },
@@ -12,42 +11,24 @@
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "start": "bun run src/main.ts",
-    "dev": "bun --watch src/main.ts",
-    "build": "bun build src/cli.ts --target=node --format=esm --packages=external --outfile=dist/githunk.js --banner '#!/usr/bin/env node'",
-    "prepack": "bun run build",
-    "pack:check": "npm pack --dry-run",
-    "spike:selection": "bun run spikes/selection/src/main.ts",
-    "test": "bun test --path-ignore-patterns='learn-projects/**'",
-    "typecheck": "tsc --noEmit",
-    "check": "bun run typecheck && bun run test",
-    "bench:review-load": "bun run benchmarks/review-document-load.ts",
-    "bench:review-rows": "bun run benchmarks/review-row-plan.ts",
-    "bench:review-reconcile": "bun run benchmarks/review-reconcile.ts"
-  },
+  "type": "module",
   "keywords": [
     "git",
     "tui",
     "code-review",
     "cli"
   ],
-  "homepage": "https://github.com/XuHaoJun/githunk#readme",
-  "bugs": {
-    "url": "https://github.com/XuHaoJun/githunk/issues"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/XuHaoJun/githunk.git"
   },
-  "license": "MIT",
+  "homepage": "https://github.com/XuHaoJun/githunk#readme",
+  "bugs": {
+    "url": "https://github.com/XuHaoJun/githunk/issues"
+  },
   "engines": {
     "node": ">=26.1.0"
   },
-  "packageManager": "bun@1.4.0",
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
     "@opentui/core": "0.5.10",
     "@opentui/react": "0.5.10",
@@ -56,9 +37,15 @@
     "react": "19.2.8",
     "zod": "^4.4.3"
   },
-  "devDependencies": {
-    "@types/bun": "1.4.0",
-    "@types/react": "19.2.8",
-    "typescript": "5.9.2"
+  "optionalDependencies": {
+    "@xuhaojun/githunk-darwin-arm64": "0.2.0",
+    "@xuhaojun/githunk-darwin-x64": "0.2.0",
+    "@xuhaojun/githunk-linux-arm64": "0.2.0",
+    "@xuhaojun/githunk-linux-x64": "0.2.0",
+    "@xuhaojun/githunk-windows-x64": "0.2.0"
+  },
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
   }
 }