zapdev 1.16.0 → 1.17.0

package/README.md

@@ -143,9 +143,9 @@ 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`, only repositories with local changes are pulled, one at a time before any staging, secret scan, or message generation. With `--staged`, only repositories with a staged diff are pulled. 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.
 

package/dist/cli.js

@@ -1854,7 +1854,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "zapdev",
-  version: "1.16.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);
@@ -2626,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;
@@ -2700,26 +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 hasChanges = args.staged ? Boolean((await getStagedDiff(repo)).trim()) : (await getRepoStatus(repo)).hasChanges;
-          if (!hasChanges) continue;
-          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;
@@ -2731,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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapdev",
-  "version": "1.16.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": {