zapdev 0.8.0 → 0.9.0

package/README.md

@@ -36,7 +36,6 @@ zapdev commit
 | --- | --- |
 | `-m, --model <model>` | Override the Ollama model |
 | `-t, --type <type>` | Force the Conventional Commits type (`feat`, `fix`, `chore`, …) |
-| `--pull` | Rebase onto upstream (`git pull --rebase`) after committing, before pushing |
 | `-p, --push` | Push after committing without asking |
 | `-y, --yes` | Skip prompts and commit directly |
 
@@ -44,7 +43,7 @@ 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, in a TTY it offers to `git pull --rebase` and retry; non-interactively (`--yes` / piped) it stops and asks you to re-run with `--pull`. Pass `--pull` to rebase onto upstream right after the commit (a rebase conflict stops before pushing). `--yes` only silences prompts; it never rebases on its own.
+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.
 
@@ -68,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.8.0",
+  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: {
@@ -2382,10 +2382,6 @@ var commitCommand = defineCommand({
       alias: "t",
       description: `Force the Conventional Commits type (${COMMIT_TYPES.join(", ")}).`
     },
-    pull: {
-      type: "boolean",
-      description: "Rebase onto upstream (git pull --rebase) after committing, before pushing."
-    },
     push: {
       type: "boolean",
       alias: "p",
@@ -2471,10 +2467,6 @@ var commitCommand = defineCommand({
     }
     await commit(finalMessage);
     if (interactive) log.success(`Committed: ${finalMessage}`);
-    if (args.pull && !await rebaseOnUpstream(interactive)) {
-      process.exitCode = 1;
-      return;
-    }
     let shouldPush = Boolean(args.push);
     if (!shouldPush && interactive && !args.yes) {
       const answer = await confirm({ message: "Push?", initialValue: false });
@@ -2485,7 +2477,7 @@ var commitCommand = defineCommand({
       shouldPush = answer;
     }
     if (shouldPush) {
-      const pushed = await pushOptimistic(interactive, Boolean(args.yes));
+      const pushed = await pushOptimistic(interactive);
       if (!pushed) {
         process.exitCode = 1;
         return;
@@ -2495,10 +2487,6 @@ var commitCommand = defineCommand({
   }
 });
 async function rebaseOnUpstream(interactive) {
-  if (!await hasUpstream()) {
-    log.info("No upstream to pull from; skipping --pull.");
-    return true;
-  }
   const loader = interactive ? spinner() : void 0;
   loader?.start("Pulling --rebase");
   try {
@@ -2511,21 +2499,12 @@ async function rebaseOnUpstream(interactive) {
     return false;
   }
 }
-async function pushOptimistic(interactive, assumeYes) {
+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 (assumeYes || !interactive) {
-      log.error("Behind upstream \u2014 re-run with --pull to rebase and push.");
-      return false;
-    }
-    const answer = await confirm({ message: "Pull --rebase and retry push?", initialValue: true });
-    if (isCancel(answer) || !answer) {
-      log.info("Not pushed (still behind).");
-      return true;
-    }
     if (!await rebaseOnUpstream(interactive)) return false;
     const retry = await tryPush(interactive, doPush);
     if (retry.ok) return true;

package/package.json

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