zapdev 1.2.0 → 1.4.0

package/README.md

@@ -1,3 +1,12 @@
+<p align="center">
+  <img src="https://raw.githubusercontent.com/mvagnon/zapdev/main/.github/assets/preview.gif" alt="zapdev CLI demonstration">
+</p>
+
+---
+
+[![portfolio](https://img.shields.io/website?url=https%3A%2F%2Fmvagnon.dev&up_message=Visit&label=Portfolio&color=%23007fff)](https://mvagnon.dev)
+[![bymeacoffee](https://img.shields.io/badge/Buy%20me%20a%20coffee-Support-yellow?logo=buymeacoffee)](https://buymeacoffee.com/mvagnon)
+
 # zapdev
 
 ## Project Introduction
@@ -28,10 +37,10 @@ flowchart LR
 
 ## Environment Variables
 
-| Variable | Required | Description |
-| -------- | -------- | ----------- |
-| `ZD_URL` | For `commit` | Complete HTTP(S) Chat Completions endpoint, including its path |
-| `ZD_MODEL` | For `commit` | Model identifier supported by the endpoint |
+| Variable    | Required     | Description                                                                                         |
+| ----------- | ------------ | --------------------------------------------------------------------------------------------------- |
+| `ZD_URL`    | For `commit` | Complete HTTP(S) Chat Completions endpoint, including its path                                      |
+| `ZD_MODEL`  | For `commit` | Model identifier supported by the endpoint                                                          |
 | `ZD_EFFORT` | For `commit` | Sent as `reasoning_effort`; use a value supported by your model, such as `low`, `medium`, or `high` |
 
 There are no defaults, automatic provider detection, or backup models. CLI flags override these variables. Legacy `OLLAMA_*` variables are no longer read.
@@ -55,6 +64,12 @@ Install zapdev globally for daily use:
 npm install -g zapdev
 ```
 
+or
+
+```bash
+bun install -g zapdev
+```
+
 Configure your endpoint and model before running `commit` (replace these example values):
 
 ```bash
@@ -94,7 +109,7 @@ Stages all changes, scans them with Gitleaks when installed, generates Conventio
 
 - **Inside a Git repository:** uses that repository only, including when launched from a subdirectory. Does not inspect child repositories.
 - **Outside a Git repository:** processes only direct child repositories. No recursive search; `node_modules` is excluded.
-- **Unified review:** generates messages in parallel, then presents every message with its repository name and branch. Repositories with pending changes are shown in bold when terminal styling is enabled.
+- **Unified review:** generates messages in parallel, then presents every message with its repository name and branch. Repositories with pending changes are shown in bold and underlined when terminal styling is enabled.
 - **Actions:** commit all, commit only a named repository, edit a named repository's message, or cancel. Editing returns to the review menu.
 
 Repositories with nothing to commit are skipped. Unselected or cancelled changes remain staged. Push confirmation is asked once for the successfully committed repositories.
@@ -106,8 +121,8 @@ zapdev commit
 | Flag                | Description                                                       |
 | ------------------- | ----------------------------------------------------------------- |
 | `--url <url>`       | Override the complete Chat Completions endpoint                   |
-| `--model <model>`   | Override the model                                               |
-| `--effort <effort>` | Override the reasoning effort                                    |
+| `--model <model>`   | Override the model                                                |
+| `--effort <effort>` | Override the reasoning effort                                     |
 | `-t, --type <type>` | Force the Conventional Commit type (`feat`, `fix`, `chore`, etc.) |
 | `-p, --push`        | Push after committing without asking                              |
 | `-s, --staged`      | Commit only changes that are already staged                       |

package/dist/cli.js

@@ -554,7 +554,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "zapdev",
-  version: "1.2.0",
+  version: "1.4.0",
   description: "Fast, performant and lightweight git chores and dev tools using your terminal and an OpenAI-compatible LLM endpoint.",
   type: "module",
   bin: {
@@ -1839,6 +1839,8 @@ function resolveConfig(env = process.env, overrides = {}) {
 // src/lib/git.ts
 import { readdir } from "node:fs/promises";
 import { join } from "node:path";
+import { createInterface as createInterface2 } from "node:readline";
+import { Readable } from "node:stream";
 
 // node_modules/tinyexec/dist/main.mjs
 import { spawn as e, spawnSync as t2 } from "node:child_process";
@@ -2166,10 +2168,43 @@ var R2 = (e2, t3, n4) => {
 };
 var z = R2;
 
+// src/lib/git-hooks.ts
+function createHookReporter(onHook) {
+  const hooks = /* @__PURE__ */ new Map();
+  return (line) => {
+    let event;
+    try {
+      const value = JSON.parse(line);
+      if (!value || typeof value !== "object" || Array.isArray(value)) return;
+      event = value;
+    } catch {
+      return;
+    }
+    if (typeof event.sid !== "string" || typeof event.child_id !== "number") return;
+    const key = `${event.sid}:${event.child_id}`;
+    if (event.event === "child_start" && event.child_class === "hook" && typeof event.hook_name === "string") {
+      hooks.set(key, event.hook_name);
+      onHook({ name: event.hook_name, phase: "start" });
+    } else if (event.event === "child_exit" && typeof event.code === "number") {
+      const name = hooks.get(key);
+      if (name === void 0) return;
+      hooks.delete(key);
+      onHook({ name, phase: "exit", exitCode: event.code });
+    }
+  };
+}
+
 // src/lib/git.ts
 var UPSTREAM_REF = "@{upstream}";
-async function git(args, cwd) {
-  const result = await R2("git", args, { nodeOptions: { cwd } });
+async function git(args, cwd, onHook) {
+  const child = R2("git", args, {
+    nodeOptions: onHook ? { cwd, env: { ...process.env, GIT_TRACE2_EVENT: "3" }, stdio: ["pipe", "pipe", "pipe", "pipe"] } : { cwd }
+  });
+  const trace = child.process?.stdio[3];
+  if (onHook && trace instanceof Readable) {
+    createInterface2({ input: trace }).on("line", createHookReporter(onHook));
+  }
+  const result = await child;
   if (result.exitCode !== 0) {
     throw new Error(result.stderr.trim() || `git ${args.join(" ")} failed`);
   }
@@ -2185,8 +2220,8 @@ async function stageAll(repo) {
 async function getStagedDiff(repo) {
   return git(["diff", "--cached"], repo);
 }
-async function commit(repo, message) {
-  await git(["commit", "-m", message], repo);
+async function commit(repo, message, onHook) {
+  await git(["commit", "-m", message], repo, onHook);
 }
 async function currentBranch(repo) {
   return (await git(["symbolic-ref", "--short", "HEAD"], repo)).trim();
@@ -2203,20 +2238,20 @@ async function hasUpstream(repo) {
   const result = await tryGit(["rev-parse", "--abbrev-ref", "--symbolic-full-name", UPSTREAM_REF], repo);
   return result !== null;
 }
-async function push(repo) {
-  await git(["push"], repo);
+async function push(repo, onHook) {
+  await git(["push"], repo, onHook);
 }
-async function pushSetUpstream(repo, branch) {
-  await git(["push", "-u", "origin", branch], repo);
+async function pushSetUpstream(repo, branch, onHook) {
+  await git(["push", "-u", "origin", branch], repo, onHook);
 }
-async function pullRebase(repo) {
-  await git(["pull", "--rebase"], repo);
+async function pullRebase(repo, onHook) {
+  await git(["pull", "--rebase"], repo, onHook);
 }
-async function pullMerge(repo) {
-  await git(["pull", "--no-rebase", "--no-edit"], repo);
+async function pullMerge(repo, onHook) {
+  await git(["pull", "--no-rebase", "--no-edit"], repo, onHook);
 }
-async function fetchRemote(repo) {
-  await git(["fetch"], repo);
+async function fetchRemote(repo, onHook) {
+  await git(["fetch"], repo, onHook);
 }
 async function behindCount(repo) {
   const out = await tryGit(["rev-list", "--count", `HEAD..${UPSTREAM_REF}`], repo);
@@ -2436,7 +2471,7 @@ var commitCommand = defineCommand({
       const { repo } = repository;
       const { branch, hasChanges } = await getRepoStatus(repo);
       repository.label = `${basename(repo)} (${branch})`;
-      repository.pendingLabel = hasChanges ? styleText3("bold", repository.label) : repository.label;
+      repository.pendingLabel = hasChanges ? styleText3(["bold", "underline"], repository.label) : repository.label;
       if (!args.staged) await stageAll(repo);
       const diff = await getStagedDiff(repo);
       if (!diff.trim()) return null;
@@ -2468,11 +2503,16 @@ var commitCommand = defineCommand({
     }
     const committed = [];
     for (const draft of selected) {
+      const loader2 = interactive ? spinner() : void 0;
+      const message = `${draft.label}: committing`;
+      loader2?.start(message);
       try {
-        await commit(draft.repo, draft.message);
+        await commit(draft.repo, draft.message, reportHooks(draft.label, loader2, message));
+        loader2?.clear();
         committed.push(draft);
         log.success(`${draft.label}: committed ${draft.message}`);
       } catch (error) {
+        loader2?.clear();
         log.error(`${draft.pendingLabel}: commit failed: ${errorMessage(error)}`);
         process.exitCode = 1;
       }
@@ -2509,6 +2549,20 @@ var commitCommand = defineCommand({
     if (interactive) outro(process.exitCode ? "Finished with errors." : "Done.");
   }
 });
+function reportHooks(label, loader, message) {
+  return (event) => {
+    const hook = `${label}: ${event.name}`;
+    if (event.phase === "start") {
+      if (loader) loader.message(`${hook} running\u2026`);
+      else log.info(`${hook} running\u2026`);
+    } else {
+      loader?.clear();
+      if (event.exitCode === 0) log.success(`${hook} \u2713`);
+      else log.error(`${hook} \u2717 (exit ${event.exitCode})`);
+      loader?.start(message);
+    }
+  };
+}
 async function reviewMessages(drafts, canPrompt) {
   while (true) {
     for (const draft of drafts) log.message(`${draft.pendingLabel}: ${draft.message}`);
@@ -2544,9 +2598,10 @@ async function reviewMessages(drafts, canPrompt) {
 async function syncWithUpstream({ repo, label }, strategy, interactive) {
   const loader = interactive ? spinner() : void 0;
   const actionLabel = strategy === "rebase" ? "Rebase" : "Merge";
-  loader?.start(`${label}: pulling --${strategy === "rebase" ? "rebase" : "no-rebase"}`);
+  const message = `${label}: pulling --${strategy === "rebase" ? "rebase" : "no-rebase"}`;
+  loader?.start(message);
   try {
-    await (strategy === "rebase" ? pullRebase(repo) : pullMerge(repo));
+    await (strategy === "rebase" ? pullRebase : pullMerge)(repo, reportHooks(label, loader, message));
     loader?.stop(strategy === "rebase" ? "\u2713 Rebased on upstream" : "\u2713 Merged upstream");
     return true;
   } catch (error) {
@@ -2558,7 +2613,7 @@ async function syncWithUpstream({ repo, label }, strategy, interactive) {
 async function pushOptimistic(repository, interactive, canPrompt, strategy) {
   const { repo, label } = repository;
   const [upstream, branch] = await Promise.all([hasUpstream(repo), currentBranch(repo)]);
-  const doPush = () => upstream ? push(repo) : pushSetUpstream(repo, branch);
+  const doPush = (onHook) => upstream ? push(repo, onHook) : pushSetUpstream(repo, branch, onHook);
   const first = await tryPush(repository, interactive, doPush);
   if (first.ok) return true;
   if (upstream && await isBehind(repository, interactive)) {
@@ -2593,9 +2648,10 @@ async function chooseSyncStrategy({ label }, interactive) {
 }
 async function tryPush({ label }, interactive, doPush) {
   const loader = interactive ? spinner() : void 0;
-  loader?.start(`${label}: pushing`);
+  const message = `${label}: pushing`;
+  loader?.start(message);
   try {
-    await doPush();
+    await doPush(reportHooks(label, loader, message));
     loader?.stop("\u2713 Pushed");
     return { ok: true };
   } catch (error) {
@@ -2605,9 +2661,10 @@ async function tryPush({ label }, interactive, doPush) {
 }
 async function isBehind({ repo, label }, interactive) {
   const loader = interactive ? spinner() : void 0;
-  loader?.start(`${label}: checking upstream`);
+  const message = `${label}: checking upstream`;
+  loader?.start(message);
   try {
-    await fetchRemote(repo);
+    await fetchRemote(repo, reportHooks(label, loader, message));
     const behind = await behindCount(repo);
     loader?.stop(
       behind > 0 ? `Behind upstream by ${behind} commit${behind > 1 ? "s" : ""}` : "Up to date with upstream"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapdev",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Fast, performant and lightweight git chores and dev tools using your terminal and an OpenAI-compatible LLM endpoint.",
   "type": "module",
   "bin": {