zapdev 1.17.0 → 2.0.0

package/README.md

@@ -114,7 +114,7 @@ Stages all changes, scans them with Gitleaks when installed, generates Conventio
 - **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.
 - **Actions:** commit all, commit only a named repository, edit a named repository's message, or cancel. Editing returns to the review menu.
 
-Only repositories successfully committed during the current run are offered for push or pushed with `--push`. Unselected or cancelled changes remain staged; failed or unselected commit drafts are not pushed. The branch is chosen before committing, never when pushing. Push confirmation is asked once, only for repositories with a configured upstream remote; it is omitted when none have one.
+Only repositories successfully committed during the current run are offered for push or pushed with `--push`. Unselected or cancelled changes remain staged; failed or unselected commit drafts are not pushed. The branch is chosen before committing, never when pushing. Push confirmation is asked once, only for repositories with a resolved push remote; it is omitted when none have one.
 
 ```bash
 zapdev commit
@@ -139,17 +139,17 @@ zapdev commit -yp          # skip review and push confirmation; choose a branch
 zapdev commit --pull       # pull first, then follow the normal commit flow
 ```
 
-Before contacting the LLM endpoint, zapdev runs `gitleaks git --staged --verbose` in each changed repository when Gitleaks is installed. A failed scan skips that repository without sending its diff; when Gitleaks is absent, the scan is skipped. The staged diff is sent to the configured endpoint, which may be remote.
+Before contacting the LLM endpoint, zapdev runs `gitleaks git --staged --verbose` in each changed repository when Gitleaks is installed. A failed scan never sends that repository's diff to the LLM and stops the flow before any commit; when Gitleaks is absent, the scan is skipped. The staged diff is sent to the configured endpoint, which may be remote.
 
-Preparation and commit failures are reported per repository while the others continue. A push failure stops all remaining sends. Any failure produces a nonzero exit code.
+Any error stops the flow with a nonzero exit code. Parallel work already in flight finishes before exiting; later steps never start. Earlier successful pulls or commits remain applied.
 
 With `--pull`, only repositories with local changes are pulled, in parallel. With `--staged`, only repositories with a staged diff are pulled. All pulls must finish successfully before preparation and message generation start in parallel. Git uses each current branch's configured upstream. Repositories without a configured upstream remote are skipped with a warning, even if they have a single remote. Divergent history, a missing upstream branch, or conflicting local changes stop the flow before staging, after all in-flight pulls finish; no rebase, merge commit, or automatic stash is performed. Successful pulls remain applied.
 
-In a terminal, commit, pull, and push output is streamed into Clack task logs; parallel pulls share one log grouped by repository. Silent commits and pushes create no output block. Git keeps terminal input, but stdout/stderr are pipes: hooks requiring a TTY on those streams are not supported. Git controls hook stdin; hooks can read from `/dev/tty`, although prompts written there appear outside the blocks. `--yes` skips commit review, not native prompts. Without a terminal, stdout/stderr are streamed directly. Each hook has a 60-second deadline, including time spent answering prompts; override it with `ZD_HOOK_TIMEOUT=120 zapdev commit`.
+Each step uses one spinner: start, wait, stop. Normal Git and hook output is captured without live task logs; failure diagnostics are displayed once. Without a terminal, steps print plain progress messages instead. Git keeps terminal input, but interactive hooks must read and write through `/dev/tty`; prompts on captured stdout/stderr are not displayed. Each hook retains a 60-second deadline; override it with `ZD_HOOK_TIMEOUT=120 zapdev commit`. `--yes` skips commit review, not native prompts.
 
 Immediately before each selected commit, zapdev asks for a local branch only when the current name exactly matches `main`, `master`, `principal`, `dev`, or `development`, including with `--yes`. The first prompt starts empty; subsequent prompts reuse the previous input across repositories. Press Enter to accept the prefilled name; an empty or cleared input keeps the current branch and leaves the next prompt empty. A different name switches to the existing local branch or creates it from HEAD, without forcing or discarding pending changes. Other branches and repositories with nothing to commit never trigger this prompt. Cancelling stops the remaining commits and all pushes; earlier commits remain local.
 
-Pushes always target a remote branch with the current local branch's name, with no destination input. They use only the current branch's configured upstream remote and run `git push <remote> HEAD:refs/heads/<current-branch>`. Repositories without a configured upstream remote are skipped with a warning, even if they have a single remote. Pushes run directly, without a preliminary fetch or history comparison; Git handles up-to-date branches and rejects non-fast-forward updates. No rebase, merge, retry, or force-push.
+Pushes always target a remote branch with the current local branch's name, with no destination input. The remote is the branch's configured upstream remote, otherwise `origin`, otherwise the only configured remote. With no remote or multiple remotes and no `origin`, push is skipped with a warning. The first successful push sets the upstream when none exists; existing upstreams are preserved. Pushes run directly, without a preliminary fetch or history comparison; Git handles up-to-date branches and rejects non-fast-forward updates. No rebase, merge, retry, or force-push.
 
 Without a TTY, zapdev commits prepared repositories on nonprotected branches automatically; protected-branch commits are refused and changes remain staged. `--push` can publish without a TTY; without it, commits stay local. Repositories without new changes do not trigger an LLM call, branch prompt, or new commit.
 

package/dist/cli.js

@@ -830,7 +830,6 @@ function isUnicodeSupported() {
 }
 var unicode = isUnicodeSupported();
 var isCI = () => process.env.CI === "true";
-var isTTY = (o2) => o2.isTTY === true;
 var unicodeOr = (o2, e2) => unicode ? o2 : e2;
 var S_STEP_ACTIVE = unicodeOr("\u25C6", "*");
 var S_STEP_CANCEL = unicodeOr("\u25A0", "x");
@@ -1076,7 +1075,7 @@ var spinner = ({
   const x2 = getColumns(n4), k2 = I3?.styleFrame ?? W, g2 = (e2) => {
     const r3 = e2 > 1 ? O2 ?? settings.messages.error : G ?? settings.messages.cancel;
     S2 = e2 === 1, d2 && (a3(r3, e2), S2 && typeof h3 == "function" && h3());
-  }, f2 = () => g2(2), i3 = () => g2(1), A2 = () => {
+  }, f2 = () => g2(2), i3 = () => g2(1), A = () => {
     process.on("uncaughtExceptionMonitor", f2), process.on("unhandledRejection", f2), process.on("SIGINT", i3), process.on("SIGTERM", i3), process.on("exit", g2), m2 && m2.addEventListener("abort", i3);
   }, H = () => {
     process.removeListener("uncaughtExceptionMonitor", f2), process.removeListener("unhandledRejection", f2), process.removeListener("SIGINT", i3), process.removeListener("SIGTERM", i3), process.removeListener("exit", g2), m2 && m2.removeEventListener("abort", i3);
@@ -1097,7 +1096,7 @@ var spinner = ({
     d2 = true, M = block({ output: n4 }), s2 = C2(e2), w2 = performance.now(), N2 && n4.write(`${styleText2("gray", S_BAR)}
 `);
     let r3 = 0, t3 = 0;
-    A2(), T2 = setInterval(() => {
+    A(), T2 = setInterval(() => {
       if (u4 && s2 === p2)
         return;
       y2(), p2 = s2;
@@ -1225,123 +1224,6 @@ ${b2}
   }).prompt();
 };
 var i = `${styleText2("gray", S_BAR)}  `;
-var A = (l3) => l3.replace(/\x1b\[(?:\d+;)*\d*[ABCDEFGHfJKSTsu]|\x1b\[(s|u)/g, "");
-var taskLog = (l3) => {
-  const r3 = l3.output ?? process.stdout, O2 = getColumns(r3), i3 = styleText2("gray", S_BAR), p2 = l3.spacing ?? 1, k2 = 3, m2 = l3.retainLog === true, d2 = !isCI() && isTTY(r3);
-  r3.write(`${i3}
-`), r3.write(`${styleText2("green", S_STEP_SUBMIT)}  ${l3.title}
-`);
-  for (let e2 = 0; e2 < p2; e2++)
-    r3.write(`${i3}
-`);
-  const n4 = [
-    {
-      value: "",
-      full: ""
-    }
-  ];
-  let v2 = false;
-  const f2 = (e2) => {
-    if (n4.length === 0)
-      return;
-    let s2 = 0;
-    e2 && (s2 += p2 + 2);
-    for (const t3 of n4) {
-      const { value: o2, result: a3 } = t3;
-      let g2 = a3?.message ?? o2;
-      if (g2.length === 0)
-        continue;
-      a3 === void 0 && t3.header !== void 0 && t3.header !== "" && (g2 += `
-${t3.header}`);
-      const E2 = g2.split(`
-`).reduce((b2, w2) => w2 === "" ? b2 + 1 : b2 + Math.ceil((w2.length + k2) / O2), 0);
-      s2 += E2;
-    }
-    s2 > 0 && (s2 += 1, r3.write(import_sisteransi2.erase.lines(s2)));
-  }, h3 = (e2, s2, t3) => {
-    const o2 = t3 ? `${e2.full}
-${e2.value}` : e2.value;
-    e2.header !== void 0 && e2.header !== "" && log.message(
-      e2.header.split(`
-`).map((a3) => styleText2("bold", a3)),
-      {
-        output: r3,
-        secondarySymbol: i3,
-        symbol: i3,
-        spacing: 0
-      }
-    ), log.message(
-      o2.split(`
-`).map((a3) => styleText2("dim", a3)),
-      {
-        output: r3,
-        secondarySymbol: i3,
-        symbol: i3,
-        spacing: s2 ?? p2
-      }
-    );
-  }, T2 = () => {
-    for (const e2 of n4) {
-      const { header: s2, value: t3, full: o2 } = e2;
-      (s2 === void 0 || s2.length === 0) && t3.length === 0 || h3(e2, void 0, m2 === true && o2.length > 0);
-    }
-  }, L = (e2, s2, t3) => {
-    if (f2(false), (t3?.raw !== true || !v2) && e2.value !== "" && (e2.value += `
-`), e2.value += A(s2), v2 = t3?.raw === true, l3.limit !== void 0) {
-      const o2 = e2.value.split(`
-`), a3 = o2.length - l3.limit;
-      if (a3 > 0) {
-        const g2 = o2.splice(0, a3);
-        m2 && (e2.full += (e2.full === "" ? "" : `
-`) + g2.join(`
-`));
-      }
-      e2.value = o2.join(`
-`);
-    }
-    d2 && y2();
-  }, y2 = () => {
-    for (const e2 of n4)
-      e2.result ? e2.result.status === "error" ? log.error(e2.result.message, { output: r3, secondarySymbol: i3, spacing: 0 }) : log.success(e2.result.message, { output: r3, secondarySymbol: i3, spacing: 0 }) : e2.value !== "" && h3(e2, 0);
-  }, B = (e2, s2) => {
-    f2(false), e2.result = s2, d2 && y2();
-  };
-  return {
-    message(e2, s2) {
-      L(n4[0], e2, s2);
-    },
-    group(e2) {
-      const s2 = {
-        header: e2,
-        value: "",
-        full: ""
-      };
-      return n4.push(s2), {
-        message(t3, o2) {
-          L(s2, t3, o2);
-        },
-        error(t3) {
-          B(s2, {
-            status: "error",
-            message: t3
-          });
-        },
-        success(t3) {
-          B(s2, {
-            status: "success",
-            message: t3
-          });
-        }
-      };
-    },
-    error(e2, s2) {
-      f2(true), log.error(e2, { output: r3, secondarySymbol: i3, spacing: 1 }), s2?.showLog !== false && T2(), n4.splice(1, n4.length - 1), n4[0].value = "", n4[0].full = "";
-    },
-    success(e2, s2) {
-      f2(true), log.success(e2, { output: r3, secondarySymbol: i3, spacing: 1 }), s2?.showLog === true && T2(), n4.splice(1, n4.length - 1), n4[0].value = "", n4[0].full = "";
-    }
-  };
-};
 var text = (e2) => new n2({
   validate: e2.validate,
   placeholder: e2.placeholder,
@@ -1854,7 +1736,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "zapdev",
-  version: "1.17.0",
+  version: "2.0.0",
   description: "Fast, performant and lightweight git chores and dev tools using your terminal and an OpenAI-compatible LLM endpoint.",
   type: "module",
   bin: {
@@ -1914,7 +1796,7 @@ var package_default = {
 
 // src/commands/commit.ts
 import { basename } from "node:path";
-import { styleText as styleText4 } from "node:util";
+import { styleText as styleText3 } from "node:util";
 
 // src/lib/config.ts
 function resolveHookTimeout(env = process.env) {
@@ -2441,13 +2323,24 @@ async function getRepoStatus(repo) {
   };
 }
 async function getUpstreamRemote(repo, branch) {
-  const remotes = (await git(["remote"], repo)).trim().split("\n").filter(Boolean);
+  const remotes = await getRemotes(repo);
   const upstream = (await git(["for-each-ref", "--format=%(upstream:remotename)", `refs/heads/${branch}`], repo)).trim();
   return remotes.includes(upstream) ? upstream : null;
 }
+async function getPushRemote(repo, branch) {
+  const upstream = await getUpstreamRemote(repo, branch);
+  if (upstream) return upstream;
+  const remotes = await getRemotes(repo);
+  return remotes.includes("origin") ? "origin" : remotes.length === 1 ? remotes[0] : null;
+}
+async function getRemotes(repo) {
+  return (await git(["remote"], repo)).trim().split("\n").filter(Boolean);
+}
 async function push(repo, remote, branch, onHook, onOutput) {
   await git(["check-ref-format", "--branch", branch], repo);
-  await git(["push", "--", remote, `HEAD:refs/heads/${branch}`], repo, onHook, onOutput);
+  const current = await currentBranch(repo);
+  const upstream = (await git(["for-each-ref", "--format=%(upstream)", `refs/heads/${current}`], repo)).trim();
+  await git(["push", ...!upstream ? ["--set-upstream"] : [], "--", remote, `HEAD:refs/heads/${branch}`], repo, onHook, onOutput);
 }
 async function findRepos(path) {
   const root = await repoRoot(path);
@@ -2582,54 +2475,23 @@ var COMMIT_TYPES = [
 ];
 
 // src/commands/git-task.ts
-import { styleText as styleText3 } from "node:util";
-async function runGitTask(label, operation, successMessage, run, group) {
-  const title = `${label}: ${operation}`;
+async function runTask(title, successMessage, run, withGuide = true) {
   const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
-  const loader = interactive && !group ? spinner({ withGuide: false }) : void 0;
-  const startLoading = () => {
-    if (!loader) return;
-    const wasRaw = Boolean(process.stdin.isRaw);
-    loader.start(title);
+  const loader = interactive ? spinner({ withGuide }) : void 0;
+  const wasRaw = Boolean(process.stdin.isRaw);
+  loader?.start(title);
+  if (loader) {
     process.stdin.setRawMode?.(wasRaw);
     process.stdin.pause();
-  };
-  let task = group;
-  const onOutput = (chunk, stream) => {
-    if (!interactive) {
-      process[stream].write(chunk);
-      return;
-    }
-    if (!task) loader?.clear();
-    task ??= taskLog({ title: `${title}: running\u2026`, limit: 10, retainLog: true });
-    task.message(chunk, { raw: true });
-  };
-  const onHook = (event) => {
-    loader?.clear();
-    if (event.phase === "start" || event.exitCode !== 0) {
-      const hook = `${label}: ${event.name}`;
-      const message = event.phase === "start" ? `${hook}: running\u2026` : `${hook}: failed (exit ${event.exitCode})`;
-      if (task) task.message(message);
-      else if (event.phase === "start") log.step(styleText3("bold", message));
-      else log.error(message);
-    }
-    if (event.phase === "exit" && !task) startLoading();
-  };
-  if (!interactive) log.info(title);
-  startLoading();
+  } else log.info(title);
   try {
-    await run(onHook, onOutput);
-    loader?.clear();
-    if (task) task.success(successMessage, { showLog: true });
-    else log.success(successMessage);
-    return true;
+    const result = await run(() => void 0);
+    if (loader) loader.stop(successMessage);
+    else log.success(successMessage, { spacing: 0 });
+    return result;
   } catch (error) {
     loader?.clear();
-    const message = `${label}: ${operation} failed${error instanceof GitOutputError ? "" : `: ${errorMessage(error)}`}`;
-    group?.message(message);
-    if (task) task.error(message);
-    else if (!(error instanceof GitOutputError && error.hookFailureReported)) log.error(message);
-    return false;
+    throw new Error(`${title} failed: ${errorMessage(error)}`, { cause: error });
   }
 }
 
@@ -2690,94 +2552,79 @@ var commitCommand = defineCommand({
         effort: args.effort
       });
     } catch (error) {
-      log.error(errorMessage(error));
+      log.error(errorMessage(error), { spacing: 0 });
       process.exitCode = 1;
       return;
     }
     if (interactive) intro("zapdev commit");
-    const repos = await findRepos(process.cwd());
-    if (repos.length === 0) {
-      log.warn("No git repository found here or in direct children.");
-      if (interactive) outro("Nothing to do.");
-      return;
-    }
-    const loader = interactive ? spinner() : void 0;
-    if (args.pull) {
-      loader?.start("Pulling repositories in parallel");
-      let pullLog;
-      const pulls = await Promise.allSettled(repos.map(async (repo) => {
-        const label = basename(repo);
-        const hasChanges = args.staged ? Boolean((await getStagedDiff(repo)).trim()) : (await getRepoStatus(repo)).hasChanges;
-        if (!hasChanges) return true;
-        const branch = await currentBranch(repo);
-        if (!await getUpstreamRemote(repo, branch)) {
-          return `${label}: no configured upstream remote. Skipping pull.`;
+    try {
+      const repos = await findRepos(process.cwd());
+      if (repos.length === 0) {
+        log.warn("No git repository found here or in direct children.");
+        if (interactive) outro("Nothing to do.");
+        return;
+      }
+      if (args.pull) {
+        const pulls = await runTask("Pulling repositories in parallel", "Repositories pulled", async (onOutput) => {
+          const results2 = await Promise.allSettled(repos.map(async (repo) => {
+            const label = basename(repo);
+            const hasChanges = args.staged ? Boolean((await getStagedDiff(repo)).trim()) : (await getRepoStatus(repo)).hasChanges;
+            if (!hasChanges) return null;
+            const branch = await currentBranch(repo);
+            if (!await getUpstreamRemote(repo, branch)) {
+              return `${label}: no configured upstream remote. Skipping pull.`;
+            }
+            await git(["pull", "--ff-only", "--no-rebase", "--no-autostash"], repo, void 0, onOutput);
+            return null;
+          }));
+          for (const [index, result] of results2.entries()) {
+            if (result.status === "rejected") throw new Error(`${basename(repos[index])}: ${errorMessage(result.reason)}`);
+          }
+          return results2;
+        });
+        for (const result of pulls) {
+          if (result.status === "fulfilled" && result.value) log.warn(result.value, { spacing: 0 });
         }
-        if (interactive) {
-          loader?.clear();
-          pullLog ??= taskLog({ title: "Pulling repositories in parallel", limit: 10, retainLog: true });
+      }
+      const repositories = repos.map((repo) => ({ repo, label: basename(repo), pendingLabel: basename(repo) }));
+      const { results, scan } = await runTask("Preparing repositories and generating commit messages in parallel", "Repositories prepared", async () => {
+        const scan2 = await hasGitleaks();
+        const results2 = await Promise.allSettled(repositories.map(async (repository) => {
+          const { repo } = repository;
+          const { branch, hasChanges } = await getRepoStatus(repo);
+          repository.label = `${basename(repo)} (${branch})`;
+          repository.pendingLabel = hasChanges ? styleText3("bold", repository.label) : repository.label;
+          if (!args.staged) await stageAll(repo);
+          const diff = await getStagedDiff(repo);
+          if (!diff.trim()) return null;
+          const stats = await getStagedDiffStats(repo);
+          if (scan2) await scanStagedChanges(repo);
+          const message = await generateCommitMessage(diff, config, args.type);
+          if (!message) throw new Error("The model returned an empty message.");
+          return { ...repository, message, stats };
+        }));
+        for (const [index, result] of results2.entries()) {
+          if (result.status === "rejected") throw new Error(`${repositories[index].pendingLabel}: ${errorMessage(result.reason)}`);
+        }
+        return { results: results2, scan: scan2 };
+      });
+      if (!scan) log.info("Gitleaks not found, skipping secret scan.", { spacing: 0 });
+      const drafts = [];
+      for (const [index, result] of results.entries()) {
+        if (result.status === "fulfilled") {
+          if (result.value) drafts.push(result.value);
+          else log.info(`${repositories[index].pendingLabel}: nothing to commit.`, { spacing: 0 });
         }
-        return runGitTask(label, "pull", `${label}: pulled`, (onHook, onOutput) => git(["pull", "--ff-only", "--no-rebase", "--no-autostash"], repo, onHook, onOutput), pullLog?.group(label));
-      }));
-      loader?.clear();
-      const failed = pulls.some((result) => result.status === "rejected" || result.value === false);
-      if (failed) pullLog?.error("Pulling failed");
-      else pullLog?.success("Repositories pulled", { showLog: true });
-      for (const [index, result] of pulls.entries()) {
-        if (result.status === "rejected") reportGitFailure(`${basename(repos[index])}: pull failed`, result.reason);
-        else if (typeof result.value === "string") log.warn(result.value);
       }
-      if (failed) {
-        process.exitCode = 1;
+      const selected = drafts.length ? await reviewMessages(drafts, interactive && !args.yes) : [];
+      if (!selected) {
+        cancel("Cancelled (changes left staged).");
         return;
       }
-    }
-    let scan;
-    try {
-      scan = await hasGitleaks();
-    } catch (error) {
-      log.error(`Gitleaks check failed: ${errorMessage(error)}`);
-      process.exitCode = 1;
-      return;
-    }
-    if (!scan) log.info("Gitleaks not found, skipping secret scan.");
-    loader?.start("Preparing repositories and generating commit messages in parallel");
-    const repositories = repos.map((repo) => ({ repo, label: basename(repo), pendingLabel: basename(repo) }));
-    const results = await Promise.allSettled(repositories.map(async (repository) => {
-      const { repo } = repository;
-      const { branch, hasChanges } = await getRepoStatus(repo);
-      repository.label = `${basename(repo)} (${branch})`;
-      repository.pendingLabel = hasChanges ? styleText4("bold", repository.label) : repository.label;
-      if (!args.staged) await stageAll(repo);
-      const diff = await getStagedDiff(repo);
-      if (!diff.trim()) return null;
-      const stats = await getStagedDiffStats(repo);
-      if (scan) await scanStagedChanges(repo);
-      const message = await generateCommitMessage(diff, config, args.type);
-      if (!message) throw new Error("The model returned an empty message.");
-      return { ...repository, message, stats };
-    }));
-    loader?.stop("Repositories prepared");
-    const drafts = [];
-    for (const [index, result] of results.entries()) {
-      if (result.status === "rejected") {
-        log.error(`${repositories[index].pendingLabel}: ${errorMessage(result.reason)}`);
-        process.exitCode = 1;
-      } else if (result.value) {
-        drafts.push(result.value);
-      } else {
-        log.info(`${repositories[index].pendingLabel}: nothing to commit.`);
-      }
-    }
-    const selected = drafts.length ? await reviewMessages(drafts, interactive && !args.yes) : [];
-    if (!selected) {
-      cancel("Cancelled (changes left staged).");
-      return;
-    }
-    const toSend = [];
-    let previousBranchInput = "";
-    for (const draft of selected) {
-      try {
+      const toSend = [];
+      let previousBranchInput = "";
+      for (const draft of selected) {
+        let withGuide = true;
         const current = await currentBranch(draft.repo);
         if (/^(main|master|principal|dev|development)$/.test(current)) {
           if (!interactive) throw new Error("Committing on a protected branch requires a terminal to choose a branch. Changes remain staged.");
@@ -2790,70 +2637,54 @@ var commitCommand = defineCommand({
             return;
           }
           previousBranchInput = answer.trim();
+          withGuide = Boolean(previousBranchInput);
           const branch = previousBranchInput || current;
           if (branch !== current) {
             await switchBranch(draft.repo, branch);
             draft.label = `${basename(draft.repo)} (${branch})`;
-            draft.pendingLabel = styleText4("bold", draft.label);
+            draft.pendingLabel = styleText3("bold", draft.label);
           }
         }
-        if (!await runGitTask(draft.label, "commit", `${draft.label}: committed ${draft.message}`, (onHook, onOutput) => commit(draft.repo, draft.message, onHook, onOutput))) {
-          process.exitCode = 1;
-          continue;
-        }
+        await runTask(`${draft.label}: commit`, `${draft.label}: committed ${draft.message}`, (onOutput) => commit(draft.repo, draft.message, void 0, onOutput), withGuide);
         toSend.push(draft);
-      } catch (error) {
-        reportGitFailure(`${draft.pendingLabel}: commit failed`, error);
-        process.exitCode = 1;
       }
-    }
-    if (toSend.length === 0) return;
-    if (!interactive && !args.push) return;
-    const destinations = [];
-    for (const { repo, label } of toSend) {
-      try {
+      if (toSend.length === 0) return;
+      if (!interactive && !args.push) return;
+      const destinations = [];
+      for (const { repo, label } of toSend) {
         const branch = await currentBranch(repo);
-        const remote = await getUpstreamRemote(repo, branch);
+        const remote = await getPushRemote(repo, branch);
         if (remote) destinations.push({ repo, label, branch, remote });
-        else log.warn(`${label}: no configured upstream remote. Skipping push; commit remains local.`);
-      } catch (error) {
-        reportGitFailure(`${label}: push failed`, error);
-        process.exitCode = 1;
-        return;
+        else log.warn(`${label}: no unambiguous push remote. Skipping push; commit remains local.`, { spacing: 0 });
       }
-    }
-    let shouldPush = Boolean(args.push);
-    if (!shouldPush && interactive && destinations.length) {
-      const answer = await confirm({
-        message: `Push ${destinations.map(({ label }) => label).join(", ")}?`,
-        initialValue: false
-      });
-      if (isCancel(answer)) {
-        outro("Committed. Not pushed.");
-        return;
-      }
-      shouldPush = answer;
-    }
-    if (shouldPush) {
-      for (const { repo, label, branch, remote } of destinations) {
-        if (!await runGitTask(label, "push", `${label}: pushed to ${remote}/${branch}`, (onHook, onOutput) => push(repo, remote, branch, onHook, onOutput))) {
-          process.exitCode = 1;
-          outro("Sending stopped after a Git failure.");
+      let shouldPush = Boolean(args.push);
+      if (!shouldPush && interactive && destinations.length) {
+        const answer = await confirm({
+          message: `Push ${destinations.map(({ label }) => label).join(", ")}?`,
+          initialValue: false
+        });
+        if (isCancel(answer)) {
+          cancel("Committed. Not pushed.");
           return;
         }
+        shouldPush = answer;
       }
+      if (shouldPush) {
+        for (const { repo, label, branch, remote } of destinations) {
+          await runTask(`${label}: push`, `${label}: pushed to ${remote}/${branch}`, (onOutput) => push(repo, remote, branch, void 0, onOutput));
+        }
+      }
+      if (interactive) outro("Done.");
+    } catch (error) {
+      log.error(errorMessage(error), { spacing: 0 });
+      process.exitCode = 1;
     }
-    if (interactive) outro(process.exitCode ? "Finished with errors." : "Done.");
   }
 });
-function reportGitFailure(message, error) {
-  if (error instanceof GitOutputError && error.hookFailureReported) return;
-  log.error(error instanceof GitOutputError ? message : `${message}: ${errorMessage(error)}`);
-}
 async function reviewMessages(drafts, canPrompt) {
   while (true) {
-    for (const { stats, pendingLabel, message } of drafts) {
-      log.message(`(${styleText4("green", `+${stats.additions}`)} ${styleText4("red", `-${stats.deletions}`)}) ${pendingLabel}: ${message}`);
+    for (const [index, { stats, pendingLabel, message }] of drafts.entries()) {
+      log.message(`(${styleText3("green", `+${stats.additions}`)} ${styleText3("red", `-${stats.deletions}`)}) ${pendingLabel}: ${message}`, { spacing: index === 0 ? 1 : 0 });
     }
     if (!canPrompt) return drafts;
     const action = await select({

package/package.json

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