zapdev 1.18.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
@@ -149,7 +149,7 @@ Each step uses one spinner: start, wait, stop. Normal Git and hook output is cap
 
 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

@@ -1736,7 +1736,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "zapdev",
-  version: "1.18.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: {
@@ -2323,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);
@@ -2464,9 +2475,9 @@ var COMMIT_TYPES = [
 ];
 
 // src/commands/git-task.ts
-async function runTask(title, successMessage, run) {
+async function runTask(title, successMessage, run, withGuide = true) {
   const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
-  const loader = interactive ? spinner({ withGuide: false }) : void 0;
+  const loader = interactive ? spinner({ withGuide }) : void 0;
   const wasRaw = Boolean(process.stdin.isRaw);
   loader?.start(title);
   if (loader) {
@@ -2476,7 +2487,7 @@ async function runTask(title, successMessage, run) {
   try {
     const result = await run(() => void 0);
     if (loader) loader.stop(successMessage);
-    else log.success(successMessage);
+    else log.success(successMessage, { spacing: 0 });
     return result;
   } catch (error) {
     loader?.clear();
@@ -2541,7 +2552,7 @@ var commitCommand = defineCommand({
         effort: args.effort
       });
     } catch (error) {
-      log.error(errorMessage(error));
+      log.error(errorMessage(error), { spacing: 0 });
       process.exitCode = 1;
       return;
     }
@@ -2572,7 +2583,7 @@ var commitCommand = defineCommand({
           return results2;
         });
         for (const result of pulls) {
-          if (result.status === "fulfilled" && result.value) log.warn(result.value);
+          if (result.status === "fulfilled" && result.value) log.warn(result.value, { spacing: 0 });
         }
       }
       const repositories = repos.map((repo) => ({ repo, label: basename(repo), pendingLabel: basename(repo) }));
@@ -2597,12 +2608,12 @@ var commitCommand = defineCommand({
         }
         return { results: results2, scan: scan2 };
       });
-      if (!scan) log.info("Gitleaks not found, skipping secret scan.");
+      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.`);
+          else log.info(`${repositories[index].pendingLabel}: nothing to commit.`, { spacing: 0 });
         }
       }
       const selected = drafts.length ? await reviewMessages(drafts, interactive && !args.yes) : [];
@@ -2613,6 +2624,7 @@ var commitCommand = defineCommand({
       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.");
@@ -2625,6 +2637,7 @@ var commitCommand = defineCommand({
             return;
           }
           previousBranchInput = answer.trim();
+          withGuide = Boolean(previousBranchInput);
           const branch = previousBranchInput || current;
           if (branch !== current) {
             await switchBranch(draft.repo, branch);
@@ -2632,7 +2645,7 @@ var commitCommand = defineCommand({
             draft.pendingLabel = styleText3("bold", draft.label);
           }
         }
-        await runTask(`${draft.label}: commit`, `${draft.label}: committed ${draft.message}`, (onOutput) => commit(draft.repo, draft.message, void 0, onOutput));
+        await runTask(`${draft.label}: commit`, `${draft.label}: committed ${draft.message}`, (onOutput) => commit(draft.repo, draft.message, void 0, onOutput), withGuide);
         toSend.push(draft);
       }
       if (toSend.length === 0) return;
@@ -2640,9 +2653,9 @@ var commitCommand = defineCommand({
       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.`);
+        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) {
@@ -2651,7 +2664,7 @@ var commitCommand = defineCommand({
           initialValue: false
         });
         if (isCancel(answer)) {
-          outro("Committed. Not pushed.");
+          cancel("Committed. Not pushed.");
           return;
         }
         shouldPush = answer;
@@ -2663,15 +2676,15 @@ var commitCommand = defineCommand({
       }
       if (interactive) outro("Done.");
     } catch (error) {
-      log.error(errorMessage(error));
+      log.error(errorMessage(error), { spacing: 0 });
       process.exitCode = 1;
     }
   }
 });
 async function reviewMessages(drafts, canPrompt) {
   while (true) {
-    for (const { stats, pendingLabel, message } of drafts) {
-      log.message(`(${styleText3("green", `+${stats.additions}`)} ${styleText3("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.18.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": {