zapdev 1.5.0 → 1.6.0

package/dist/cli.js

@@ -554,7 +554,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "zapdev",
-  version: "1.5.0",
+  version: "1.6.0",
   description: "Fast, performant and lightweight git chores and dev tools using your terminal and an OpenAI-compatible LLM endpoint.",
   type: "module",
   bin: {
@@ -2176,6 +2176,18 @@ var R2 = (e2, t3, n4) => {
 };
 var z = R2;
 
+// src/lib/errors.ts
+var GitOutputError = class extends Error {
+  constructor(message, hookFailureReported = false) {
+    super(message);
+    this.hookFailureReported = hookFailureReported;
+  }
+  hookFailureReported;
+};
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+
 // src/lib/git-hooks.ts
 function createHookReporter(onHook, onTimeout, timeout) {
   const hooks = /* @__PURE__ */ new Map();
@@ -2226,7 +2238,11 @@ async function git(args, cwd, onHook) {
     }
   });
   let timeoutError;
-  const { report, close } = createHookReporter(onHook, (name) => {
+  let hookFailureReported = false;
+  const { report, close } = createHookReporter((event) => {
+    if (onHook && event.phase === "exit" && event.exitCode !== 0) hookFailureReported = true;
+    onHook?.(event);
+  }, (name) => {
     if (timeoutError || child.pid === void 0) return;
     timeoutError = new Error(`${name} hook timed out after ${timeout / 1e3} seconds`);
     try {
@@ -2247,7 +2263,9 @@ async function git(args, cwd, onHook) {
     const result = await child;
     if (timeoutError) throw timeoutError;
     if (result.exitCode !== 0) {
-      throw new Error(result.stderr.trim() || `git ${args.join(" ")} failed`);
+      const message = result.stderr.trim() || `git ${args.join(" ")} failed`;
+      if (interactive) throw new GitOutputError(message, hookFailureReported);
+      throw new Error(message);
     }
     return result.stdout;
   } finally {
@@ -2287,7 +2305,7 @@ async function getStagedDiff(repo) {
   return git(["diff", "--cached"], repo);
 }
 async function commit(repo, message, onHook) {
-  await git(["commit", "-m", message], repo, onHook);
+  await git(["commit", "--quiet", "-m", message], repo, onHook);
 }
 async function currentBranch(repo) {
   return (await git(["symbolic-ref", "--short", "HEAD"], repo)).trim();
@@ -2305,19 +2323,19 @@ async function hasUpstream(repo) {
   return result !== null;
 }
 async function push(repo, onHook) {
-  await git(["push"], repo, onHook);
+  await git(["push", "--quiet"], repo, onHook);
 }
 async function pushSetUpstream(repo, branch, onHook) {
-  await git(["push", "-u", "origin", branch], repo, onHook);
+  await git(["push", "--quiet", "-u", "origin", branch], repo, onHook);
 }
 async function pullRebase(repo, onHook) {
-  await git(["pull", "--rebase"], repo, onHook);
+  await git(["pull", "--quiet", "--rebase"], repo, onHook);
 }
 async function pullMerge(repo, onHook) {
-  await git(["pull", "--no-rebase", "--no-edit"], repo, onHook);
+  await git(["pull", "--quiet", "--no-rebase", "--no-edit"], repo, onHook);
 }
 async function fetchRemote(repo, onHook) {
-  await git(["fetch"], repo, onHook);
+  await git(["fetch", "--quiet"], repo, onHook);
 }
 async function behindCount(repo) {
   const out = await tryGit(["rev-list", "--count", `HEAD..${UPSTREAM_REF}`], repo);
@@ -2336,11 +2354,6 @@ async function repoRoot(dir) {
   return (await tryGit(["rev-parse", "--show-toplevel"], dir))?.trim() ?? null;
 }
 
-// src/lib/errors.ts
-function errorMessage(error) {
-  return error instanceof Error ? error.message : String(error);
-}
-
 // src/lib/gitleaks.ts
 async function hasGitleaks() {
   try {
@@ -2576,7 +2589,7 @@ var commitCommand = defineCommand({
         committed.push(draft);
         log.success(`${draft.label}: committed ${draft.message}`);
       } catch (error) {
-        log.error(`${draft.pendingLabel}: commit failed: ${errorMessage(error)}`);
+        reportGitFailure(`${draft.pendingLabel}: commit failed`, error);
         process.exitCode = 1;
       }
     }
@@ -2603,7 +2616,7 @@ var commitCommand = defineCommand({
           );
           if (!pushed) process.exitCode = 1;
         } catch (error) {
-          log.error(`${repository.label}: push failed: ${errorMessage(error)}`);
+          reportGitFailure(`${repository.label}: push failed`, error);
           process.exitCode = 1;
         }
       }
@@ -2611,14 +2624,19 @@ var commitCommand = defineCommand({
     if (interactive) outro(process.exitCode ? "Finished with errors." : "Done.");
   }
 });
+function reportGitFailure(message, error, level = "error") {
+  if (error instanceof GitOutputError && error.hookFailureReported) return;
+  log[level](error instanceof GitOutputError ? message : `${message}: ${errorMessage(error)}`);
+}
 function reportHooks(label) {
+  const options = { secondarySymbol: "" };
   return (event) => {
     const hook = `${label}: ${event.name}`;
     if (event.phase === "start") {
-      log.info(`${hook} running`);
+      log.step(styleText3("bold", hook), options);
     } else {
-      if (event.exitCode === 0) log.success(`${hook} \u2713`);
-      else log.error(`${hook} \u2717 (exit ${event.exitCode})`);
+      if (event.exitCode === 0) log.success(`${hook}: completed`, options);
+      else log.error(`${hook}: failed (exit ${event.exitCode})`, options);
     }
   };
 }
@@ -2662,7 +2680,7 @@ async function syncWithUpstream({ repo, label }, strategy) {
     log.success(`${label}: ${strategy === "rebase" ? "rebased on upstream" : "merged upstream"}`);
     return true;
   } catch (error) {
-    log.error(`${label}: ${actionLabel} failed (resolve conflicts, then push): ${errorMessage(error)}`);
+    reportGitFailure(`${label}: ${actionLabel} failed (resolve conflicts, then push)`, error);
     return false;
   }
 }
@@ -2677,10 +2695,10 @@ async function pushOptimistic(repository, canPrompt, strategy) {
     if (!syncStrategy || !await syncWithUpstream(repository, syncStrategy)) return false;
     const retry = await tryPush(repository, doPush);
     if (retry.ok) return true;
-    log.error(`${label}: push failed: ${errorMessage(retry.error)}`);
+    reportGitFailure(`${label}: push failed`, retry.error);
     return false;
   }
-  log.error(`${label}: push failed: ${errorMessage(first.error)}`);
+  reportGitFailure(`${label}: push failed`, first.error);
   return false;
 }
 async function chooseSyncStrategy({ label }, interactive) {
@@ -2720,7 +2738,7 @@ async function isBehind({ repo, label }) {
     log.info(`${label}: ${behind > 0 ? `Behind upstream by ${behind} commit${behind > 1 ? "s" : ""}` : "Up to date with upstream"}`);
     return behind > 0;
   } catch (error) {
-    log.warn(`${label}: could not check upstream: ${errorMessage(error)}`);
+    reportGitFailure(`${label}: could not check upstream`, error, "warn");
     return false;
   }
 }

package/package.json

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