zapdev 1.15.0 → 1.17.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.
 
-Repositories with no new changes can still send existing commits. 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 configured upstream remote; it is omitted when none have one.
 
 ```bash
 zapdev commit
@@ -127,7 +127,7 @@ zapdev commit
 | `--effort <effort>` | Override the reasoning effort                                                    |
 | `-t, --type <type>` | Force an exact lowercase Conventional Commit type (`feat`, `fix`, `chore`, etc.) |
 | `-p, --push`        | Skip push confirmation and push the current branch                               |
-| `--pull`           | Pull fast-forward updates in repositories with an upstream remote before staging or message generation |
+| `--pull`           | Pull fast-forward updates only in repositories with changes to commit and an upstream remote |
 | `-s, --staged`      | Commit only changes that are already staged                                      |
 | `-y, --yes`         | Skip commit review; still confirm push unless `--push` is set                    |
 
@@ -143,13 +143,13 @@ Before contacting the LLM endpoint, zapdev runs `gitleaks git --staged --verbose
 
 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.
 
-With `--pull`, repositories are pulled one at a time before any staging, secret scan, or message generation. 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 entire flow before staging; no rebase, merge commit, or automatic stash is performed. Earlier successful pulls 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; silent commands 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`.
+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`.
 
 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. A missing destination branch can be created even without new changes. No rebase, merge, retry, or force-push.
+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.
 
 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

@@ -1854,7 +1854,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "zapdev",
-  version: "1.15.0",
+  version: "1.17.0",
   description: "Fast, performant and lightweight git chores and dev tools using your terminal and an OpenAI-compatible LLM endpoint.",
   type: "module",
   bin: {
@@ -2583,10 +2583,10 @@ var COMMIT_TYPES = [
 
 // src/commands/git-task.ts
 import { styleText as styleText3 } from "node:util";
-async function runGitTask(label, operation, successMessage, run) {
+async function runGitTask(label, operation, successMessage, run, group) {
   const title = `${label}: ${operation}`;
   const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
-  const loader = interactive ? spinner({ withGuide: false }) : void 0;
+  const loader = interactive && !group ? spinner({ withGuide: false }) : void 0;
   const startLoading = () => {
     if (!loader) return;
     const wasRaw = Boolean(process.stdin.isRaw);
@@ -2594,7 +2594,7 @@ async function runGitTask(label, operation, successMessage, run) {
     process.stdin.setRawMode?.(wasRaw);
     process.stdin.pause();
   };
-  let task;
+  let task = group;
   const onOutput = (chunk, stream) => {
     if (!interactive) {
       process[stream].write(chunk);
@@ -2606,12 +2606,13 @@ async function runGitTask(label, operation, successMessage, run) {
   };
   const onHook = (event) => {
     loader?.clear();
-    const hook = `${label}: ${event.name}`;
-    const message = event.phase === "start" ? `${hook}: running\u2026` : `${hook}: ${event.exitCode === 0 ? "completed" : `failed (exit ${event.exitCode})`}`;
-    if (task) task.message(message);
-    else if (event.phase === "start") log.step(styleText3("bold", message));
-    else if (event.exitCode === 0) log.success(message);
-    else log.error(message);
+    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);
@@ -2625,6 +2626,7 @@ async function runGitTask(label, operation, successMessage, run) {
   } 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;
@@ -2699,24 +2701,35 @@ var commitCommand = defineCommand({
       if (interactive) outro("Nothing to do.");
       return;
     }
+    const loader = interactive ? spinner() : void 0;
     if (args.pull) {
-      for (const repo of repos) {
+      loader?.start("Pulling repositories in parallel");
+      let pullLog;
+      const pulls = await Promise.allSettled(repos.map(async (repo) => {
         const label = basename(repo);
-        try {
-          const branch = await currentBranch(repo);
-          if (!await getUpstreamRemote(repo, branch)) {
-            log.warn(`${label}: no configured upstream remote. Skipping pull.`);
-            continue;
-          }
-        } catch (error) {
-          reportGitFailure(`${label}: pull failed`, error);
-          process.exitCode = 1;
-          return;
+        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.`;
         }
-        if (!await runGitTask(label, "pull", `${label}: pulled`, (onHook, onOutput) => git(["pull", "--ff-only", "--no-rebase", "--no-autostash"], repo, onHook, onOutput))) {
-          process.exitCode = 1;
-          return;
+        if (interactive) {
+          loader?.clear();
+          pullLog ??= taskLog({ title: "Pulling repositories in parallel", limit: 10, retainLog: true });
         }
+        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;
+        return;
       }
     }
     let scan;
@@ -2728,7 +2741,6 @@ var commitCommand = defineCommand({
       return;
     }
     if (!scan) log.info("Gitleaks not found, skipping secret scan.");
-    const loader = interactive ? spinner() : void 0;
     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) => {
@@ -2747,7 +2759,6 @@ var commitCommand = defineCommand({
     }));
     loader?.stop("Repositories prepared");
     const drafts = [];
-    const unchanged = [];
     for (const [index, result] of results.entries()) {
       if (result.status === "rejected") {
         log.error(`${repositories[index].pendingLabel}: ${errorMessage(result.reason)}`);
@@ -2756,7 +2767,6 @@ var commitCommand = defineCommand({
         drafts.push(result.value);
       } else {
         log.info(`${repositories[index].pendingLabel}: nothing to commit.`);
-        unchanged.push(repositories[index]);
       }
     }
     const selected = drafts.length ? await reviewMessages(drafts, interactive && !args.yes) : [];
@@ -2797,7 +2807,6 @@ var commitCommand = defineCommand({
         process.exitCode = 1;
       }
     }
-    toSend.push(...unchanged);
     if (toSend.length === 0) return;
     if (!interactive && !args.push) return;
     const destinations = [];

package/package.json

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