zapdev 0.7.1 → 0.9.0

package/README.md

@@ -43,6 +43,8 @@ zapdev commit
 zapdev commit -t feat      # force the type; the model still writes scope + description
 ```
 
+Pushing is optimistic — no preliminary fetch, so the common case stays a single round-trip. If the push is rejected because the branch is behind its upstream, zapdev automatically runs `git pull --rebase` and retries the push once — no prompt, in every mode. A rebase conflict stops before pushing so you can resolve it, then re-run.
+
 Without a TTY (piped / CI), it commits automatically and only pushes when `--push` is set.
 
 ### `zapdev reset`
@@ -65,6 +67,17 @@ zapdev reset -t dev          # switch each repo to `dev` (or principal if absent
 
 Deletion is permanent: branches via `git branch -D` (force), worktrees via `git worktree remove --force`. Worktrees are removed first so the branches they held become deletable. Without a TTY, pass `--yes` — otherwise the destructive step is refused. `node_modules` is never scanned.
 
+## Shell aliases
+
+`--yes` skips every prompt, which is exactly what you want behind a short alias. Two that pay off daily — add them to `~/.zshrc` or `~/.bashrc`:
+
+```bash
+alias commit="zapdev commit --yes"                        # stage → generate message → commit, no prompts
+alias git-reset="zapdev reset --yes --principal --pull"   # switch each repo to its principal branch, wipe the rest, then pull
+```
+
+`commit` collapses the whole stage → message → commit flow into one word. `git-reset` brings a workspace back to a clean principal state in one shot — point it at a parent directory to reset every child repo at once.
+
 ## Configuration
 
 | Variable | Default | Description |

package/dist/cli.js

@@ -1718,7 +1718,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "zapdev",
-  version: "0.7.1",
+  version: "0.9.0",
   description: "Fast, performant and lightweight git chores and dev tools using your terminal and your own local LLM.",
   type: "module",
   bin: {
@@ -2222,6 +2222,16 @@ async function push() {
 async function pushSetUpstream(branch) {
   await git(["push", "-u", "origin", branch]);
 }
+async function pullRebase() {
+  await git(["pull", "--rebase"]);
+}
+async function fetchRemote() {
+  await git(["fetch"]);
+}
+async function behindCount() {
+  const out = await tryGit(["rev-list", "--count", `HEAD..${UPSTREAM_REF}`]);
+  return out === null ? 0 : Number(out.trim()) || 0;
+}
 async function findRepos(path) {
   if (await isGitRepo(path)) return [path];
   const entries = await readdir(path, { withFileTypes: true }).catch(() => null);
@@ -2467,16 +2477,8 @@ var commitCommand = defineCommand({
       shouldPush = answer;
     }
     if (shouldPush) {
-      const pushLoader = interactive ? spinner() : void 0;
-      pushLoader?.start("Pushing");
-      try {
-        const [upstream, branch] = await Promise.all([hasUpstream(), currentBranch()]);
-        if (upstream) await push();
-        else await pushSetUpstream(branch);
-        pushLoader?.stop("\u2713 Pushed");
-      } catch (error) {
-        pushLoader?.error("Push failed");
-        log.error(`Push failed: ${errorMessage(error)}`);
+      const pushed = await pushOptimistic(interactive);
+      if (!pushed) {
         process.exitCode = 1;
         return;
       }
@@ -2484,6 +2486,62 @@ var commitCommand = defineCommand({
     if (interactive) outro("Done.");
   }
 });
+async function rebaseOnUpstream(interactive) {
+  const loader = interactive ? spinner() : void 0;
+  loader?.start("Pulling --rebase");
+  try {
+    await pullRebase();
+    loader?.stop("\u2713 Rebased on upstream");
+    return true;
+  } catch (error) {
+    loader?.error("Rebase failed");
+    log.error(`Rebase failed (resolve conflicts, then push): ${errorMessage(error)}`);
+    return false;
+  }
+}
+async function pushOptimistic(interactive) {
+  const [upstream, branch] = await Promise.all([hasUpstream(), currentBranch()]);
+  const doPush = () => upstream ? push() : pushSetUpstream(branch);
+  const first = await tryPush(interactive, doPush);
+  if (first.ok) return true;
+  if (upstream && await isBehind(interactive)) {
+    if (!await rebaseOnUpstream(interactive)) return false;
+    const retry = await tryPush(interactive, doPush);
+    if (retry.ok) return true;
+    log.error(`Push failed: ${errorMessage(retry.error)}`);
+    return false;
+  }
+  log.error(`Push failed: ${errorMessage(first.error)}`);
+  return false;
+}
+async function tryPush(interactive, doPush) {
+  const loader = interactive ? spinner() : void 0;
+  loader?.start("Pushing");
+  try {
+    await doPush();
+    loader?.stop("\u2713 Pushed");
+    return { ok: true };
+  } catch (error) {
+    loader?.error("Push failed");
+    return { ok: false, error };
+  }
+}
+async function isBehind(interactive) {
+  const loader = interactive ? spinner() : void 0;
+  loader?.start("Checking upstream");
+  try {
+    await fetchRemote();
+    const behind = await behindCount();
+    loader?.stop(
+      behind > 0 ? `Behind upstream by ${behind} commit${behind > 1 ? "s" : ""}` : "Up to date with upstream"
+    );
+    return behind > 0;
+  } catch (error) {
+    loader?.error("Could not check upstream");
+    log.warn(`Could not check upstream: ${errorMessage(error)}`);
+    return false;
+  }
+}
 
 // src/commands/reset.ts
 var CANCEL = /* @__PURE__ */ Symbol("cancel");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapdev",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "description": "Fast, performant and lightweight git chores and dev tools using your terminal and your own local LLM.",
   "type": "module",
   "bin": {