zapdev 0.6.0 → 0.7.1

package/README.md

@@ -45,22 +45,25 @@ zapdev commit -t feat      # force the type; the model still writes scope + desc
 
 Without a TTY (piped / CI), it commits automatically and only pushes when `--push` is set.
 
-### `zapdev cleanup`
+### `zapdev reset`
 
-Walks a directory for git repos, and for each one: `git fetch --prune`, lets you switch to the default branch (from `origin/HEAD`) or stay on the current one, interactively deletes stale local branches, then optionally pulls.
+Operates on a git repo, or — when the path is a plain directory — on its **direct child** repos (level 1, non-recursive). For each one: `git fetch --prune`, switch to a branch (chosen interactively, or forced with `--principal` / `--target`), then permanently delete every other local branch and every linked worktree. The principal branch (from `origin/HEAD`) and the branch you switched to are always kept. Ends with an optional `pull`.
 
 ```bash
-zapdev cleanup            # scan the current directory
-zapdev cleanup ~/dev      # scan a specific directory
+zapdev reset                 # the current repo, or the child repos of the current directory
+zapdev reset ~/dev           # a repo, or the child repos of a directory
+zapdev reset -p              # switch each repo to its principal branch, no prompt
+zapdev reset -t dev          # switch each repo to `dev` (or principal if absent)
 ```
 
 | Flag | Description |
 | --- | --- |
-| `-s, --stay` | Stay on the current branch instead of switching to the default |
-| `-p, --pull` | Pull the checked-out branch after cleanup without asking |
-| `-y, --yes` | Non-interactive: switch to default and delete every other local branch |
+| `-p, --principal` | Switch every repo to its resolved principal branch (`origin/HEAD`) |
+| `-t, --target <branch>` | Switch every repo to `<branch>`, falling back to the principal one |
+| `--pull` | Pull the checked-out branch after reset without asking |
+| `-y, --yes` | Non-interactive: switch and delete without confirmation |
 
-Deletion uses `git branch -D` (force). Without a TTY (or with `--yes`), every non-default branch is deleted automatically. The walk prunes at each repo, so submodules and `node_modules` are never scanned.
+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.
 
 ## Configuration
 

package/dist/cli.js

@@ -529,8 +529,8 @@ function block({
       return;
     }
     if (!o2) return;
-    const i3 = a3 === "return" ? 0 : -1, m3 = a3 === "return" ? -1 : 0;
-    l.moveCursor(r3, i3, m3, () => {
+    const i3 = a3 === "return" ? 0 : -1, m2 = a3 === "return" ? -1 : 0;
+    l.moveCursor(r3, i3, m2, () => {
       l.clearLine(r3, 1, () => {
         e2.once("keypress", n4);
       });
@@ -548,9 +548,9 @@ function wrapTextWithPrefix(e2, r3, o2, t3 = o2, s2 = o2, n4) {
     hard: true,
     trim: false
   }).split(`
-`).map((c3, i3, m3) => {
+`).map((c3, i3, m2) => {
     const d2 = n4 ? n4(c3, i3) : c3;
-    return i3 === 0 ? `${t3}${d2}` : i3 === m3.length - 1 ? `${s2}${d2}` : `${o2}${d2}`;
+    return i3 === 0 ? `${t3}${d2}` : i3 === m2.length - 1 ? `${s2}${d2}` : `${o2}${d2}`;
   }).join(`
 `);
 }
@@ -747,56 +747,6 @@ var r = class extends V {
     });
   }
 };
-var a = class extends V {
-  options;
-  cursor = 0;
-  get _value() {
-    return this.options[this.cursor]?.value;
-  }
-  get _enabledOptions() {
-    return this.options.filter((e2) => e2.disabled !== true);
-  }
-  toggleAll() {
-    const e2 = this._enabledOptions, i3 = this.value !== void 0 && this.value.length === e2.length;
-    this.value = i3 ? [] : e2.map((t3) => t3.value);
-  }
-  toggleInvert() {
-    const e2 = this.value;
-    if (!e2)
-      return;
-    const i3 = this._enabledOptions.filter((t3) => !e2.includes(t3.value));
-    this.value = i3.map((t3) => t3.value);
-  }
-  toggleValue() {
-    this.value === void 0 && (this.value = []);
-    const e2 = this.value.includes(this._value);
-    this.value = e2 ? this.value.filter((i3) => i3 !== this._value) : [...this.value, this._value];
-  }
-  constructor(e2) {
-    super(e2, false), this.options = e2.options, this.value = [...e2.initialValues ?? []];
-    const i3 = Math.max(
-      this.options.findIndex(({ value: t3 }) => t3 === e2.cursorAt),
-      0
-    );
-    this.cursor = this.options[i3]?.disabled ? findCursor(i3, 1, this.options) : i3, this.on("key", (t3, l3) => {
-      l3.name === "a" && this.toggleAll(), l3.name === "i" && this.toggleInvert();
-    }), this.on("cursor", (t3) => {
-      switch (t3) {
-        case "left":
-        case "up":
-          this.cursor = findCursor(this.cursor, -1, this.options);
-          break;
-        case "down":
-        case "right":
-          this.cursor = findCursor(this.cursor, 1, this.options);
-          break;
-        case "space":
-          this.toggleValue();
-          break;
-      }
-    });
-  }
-};
 var n$1 = class n extends V {
   options;
   cursor = 0;
@@ -922,13 +872,13 @@ var I = (l3, e2, w2, p2, b2, C2 = false) => {
   let r3 = e2, O2 = 0;
   if (C2)
     for (let i3 = p2 - 1; i3 >= w2; i3--) {
-      const m3 = l3[i3];
-      if (m3 && (r3 -= m3.length), O2++, r3 <= b2) break;
+      const m2 = l3[i3];
+      if (m2 && (r3 -= m2.length), O2++, r3 <= b2) break;
     }
   else
     for (let i3 = w2; i3 < p2; i3++) {
-      const m3 = l3[i3];
-      if (m3 && (r3 -= m3.length), O2++, r3 <= b2) break;
+      const m2 = l3[i3];
+      if (m2 && (r3 -= m2.length), O2++, r3 <= b2) break;
     }
   return { lineCount: r3, removals: O2 };
 };
@@ -941,7 +891,7 @@ var limitOptions = ({
   columnPadding: C2 = 0,
   rowPadding: r3 = 4
 }) => {
-  const i3 = getColumns(p2) - C2, m3 = getRows(p2), M = styleText2("dim", "..."), v2 = Math.max(m3 - r3, 0), a3 = Math.max(Math.min(b2, v2), 5);
+  const i3 = getColumns(p2) - C2, m2 = getRows(p2), M = styleText2("dim", "..."), v2 = Math.max(m2 - r3, 0), a3 = Math.max(Math.min(b2, v2), 5);
   let f2 = 0;
   l3 >= a3 - 3 && (f2 = Math.max(
     Math.min(l3 - a3 + 3, e2.length - a3),
@@ -1029,118 +979,11 @@ var MULTISELECT_INSTRUCTIONS = [
   `${styleText2("dim", "Space:")} select`,
   `${styleText2("dim", "Enter:")} confirm`
 ];
-var m = (i3, u4) => i3.split(`
-`).map((d2) => u4(d2)).join(`
-`);
-var multiselect = (i3) => {
-  const u4 = (t3, a3) => {
-    const r3 = t3.label ?? String(t3.value);
-    return a3 === "disabled" ? `${styleText2("gray", S_CHECKBOX_INACTIVE)} ${m(r3, (o2) => styleText2(["strikethrough", "gray"], o2))}${t3.hint ? ` ${styleText2("dim", `(${t3.hint ?? "disabled"})`)}` : ""}` : a3 === "active" ? `${styleText2("cyan", S_CHECKBOX_ACTIVE)} ${r3}${t3.hint ? ` ${styleText2("dim", `(${t3.hint})`)}` : ""}` : a3 === "selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${m(r3, (o2) => styleText2("dim", o2))}${t3.hint ? ` ${styleText2("dim", `(${t3.hint})`)}` : ""}` : a3 === "cancelled" ? `${m(r3, (o2) => styleText2(["strikethrough", "dim"], o2))}` : a3 === "active-selected" ? `${styleText2("green", S_CHECKBOX_SELECTED)} ${r3}${t3.hint ? ` ${styleText2("dim", `(${t3.hint})`)}` : ""}` : a3 === "submitted" ? `${m(r3, (o2) => styleText2("dim", o2))}` : `${styleText2("dim", S_CHECKBOX_INACTIVE)} ${m(r3, (o2) => styleText2("dim", o2))}`;
-  }, d2 = i3.required ?? true, v2 = i3.showInstructions ?? true;
-  return new a({
-    options: i3.options,
-    signal: i3.signal,
-    input: i3.input,
-    output: i3.output,
-    initialValues: i3.initialValues,
-    required: d2,
-    cursorAt: i3.cursorAt,
-    validate(t3) {
-      if (d2 && (t3 === void 0 || t3.length === 0))
-        return `Please select at least one option.
-${styleText2(
-          "reset",
-          styleText2(
-            "dim",
-            `Press ${styleText2(["gray", "bgWhite", "inverse"], " space ")} to select, ${styleText2(
-              "gray",
-              styleText2("bgWhite", styleText2("inverse", " enter "))
-            )} to submit`
-          )
-        )}`;
-    },
-    render() {
-      const t3 = i3.withGuide ?? settings.withGuide, a3 = wrapTextWithPrefix(
-        i3.output,
-        i3.message,
-        t3 ? `${symbolBar(this.state)}  ` : "",
-        `${symbol(this.state)}  `
-      ), r3 = `${t3 ? `${styleText2("gray", S_BAR)}
-` : ""}${a3}
-`, o2 = this.value ?? [], p2 = (n4, l3) => {
-        if (n4.disabled)
-          return u4(n4, "disabled");
-        const s2 = o2.includes(n4.value);
-        return l3 && s2 ? u4(n4, "active-selected") : s2 ? u4(n4, "selected") : u4(n4, l3 ? "active" : "inactive");
-      };
-      switch (this.state) {
-        case "submit": {
-          const n4 = this.options.filter(({ value: s2 }) => o2.includes(s2)).map((s2) => u4(s2, "submitted")).join(styleText2("dim", ", ")) || styleText2("dim", "none"), l3 = wrapTextWithPrefix(
-            i3.output,
-            n4,
-            t3 ? `${styleText2("gray", S_BAR)}  ` : ""
-          );
-          return `${r3}${l3}`;
-        }
-        case "cancel": {
-          const n4 = this.options.filter(({ value: s2 }) => o2.includes(s2)).map((s2) => u4(s2, "cancelled")).join(styleText2("dim", ", "));
-          if (n4.trim() === "")
-            return `${r3}${styleText2("gray", S_BAR)}`;
-          const l3 = wrapTextWithPrefix(
-            i3.output,
-            n4,
-            t3 ? `${styleText2("gray", S_BAR)}  ` : ""
-          );
-          return `${r3}${l3}${t3 ? `
-${styleText2("gray", S_BAR)}` : ""}`;
-        }
-        case "error": {
-          const n4 = t3 ? `${styleText2("yellow", S_BAR)}  ` : "", l3 = this.error.split(`
-`).map(
-            ($, C2) => C2 === 0 ? `${t3 ? `${styleText2("yellow", S_BAR_END)}  ` : ""}${styleText2("yellow", $)}` : `   ${$}`
-          ).join(`
-`), s2 = r3.split(`
-`).length, h3 = l3.split(`
-`).length + 1;
-          return `${r3}${n4}${limitOptions({
-            output: i3.output,
-            options: this.options,
-            cursor: this.cursor,
-            maxItems: i3.maxItems,
-            columnPadding: n4.length,
-            rowPadding: s2 + h3,
-            style: p2
-          }).join(`
-${n4}`)}
-${l3}
-`;
-        }
-        default: {
-          const n4 = t3 ? `${styleText2("cyan", S_BAR)}  ` : "", l3 = r3.split(`
-`).length, s2 = v2 ? formatInstructionFooter(MULTISELECT_INSTRUCTIONS, t3) : t3 ? [styleText2("cyan", S_BAR_END)] : [], h3 = s2.join(`
-`), $ = s2.length + 1;
-          return `${r3}${n4}${limitOptions({
-            output: i3.output,
-            options: this.options,
-            cursor: this.cursor,
-            maxItems: i3.maxItems,
-            columnPadding: n4.length,
-            rowPadding: l3 + $,
-            style: p2
-          }).join(`
-${n4}`)}
-${h3}
-`;
-        }
-      }
-    }
-  }).prompt();
-};
 var log = {
   message: (s2 = [], {
     symbol: e2 = styleText2("gray", S_BAR),
     secondarySymbol: r3 = styleText2("gray", S_BAR),
-    output: m3 = process.stdout,
+    output: m2 = process.stdout,
     spacing: l3 = 1,
     withGuide: c3
   } = {}) => {
@@ -1155,7 +998,7 @@ var log = {
       for (const p2 of y2)
         p2.length > 0 ? t3.push(`${u4}${p2}`) : t3.push(o2 ? r3 : "");
     }
-    m3.write(`${t3.join(`
+    m2.write(`${t3.join(`
 `)}
 `);
   },
@@ -1206,7 +1049,7 @@ var spinner = ({
   errorMessage: O2,
   frames: E2 = unicode ? ["\u25D2", "\u25D0", "\u25D3", "\u25D1"] : ["\u2022", "o", "O", "0"],
   delay: F2 = unicode ? 80 : 120,
-  signal: m3,
+  signal: m2,
   ...I3
 } = {}) => {
   const u4 = isCI();
@@ -1215,9 +1058,9 @@ var spinner = ({
     const r3 = e2 > 1 ? O2 ?? settings.messages.error : G ?? settings.messages.cancel;
     S2 = e2 === 1, d2 && (a3(r3, e2), S2 && typeof h3 == "function" && h3());
   }, f2 = () => g2(2), i3 = () => g2(1), A = () => {
-    process.on("uncaughtExceptionMonitor", f2), process.on("unhandledRejection", f2), process.on("SIGINT", i3), process.on("SIGTERM", i3), process.on("exit", g2), m3 && m3.addEventListener("abort", i3);
+    process.on("uncaughtExceptionMonitor", f2), process.on("unhandledRejection", f2), process.on("SIGINT", i3), process.on("SIGTERM", i3), process.on("exit", g2), m2 && m2.addEventListener("abort", i3);
   }, H = () => {
-    process.removeListener("uncaughtExceptionMonitor", f2), process.removeListener("unhandledRejection", f2), process.removeListener("SIGINT", i3), process.removeListener("SIGTERM", i3), process.removeListener("exit", g2), m3 && m3.removeEventListener("abort", i3);
+    process.removeListener("uncaughtExceptionMonitor", f2), process.removeListener("unhandledRejection", f2), process.removeListener("SIGINT", i3), process.removeListener("SIGTERM", i3), process.removeListener("exit", g2), m2 && m2.removeEventListener("abort", i3);
   }, y2 = () => {
     if (p2 === void 0) return;
     u4 && n4.write(`
@@ -1291,11 +1134,11 @@ var c = (t3, o2) => t3.includes(`
 `).map((d2) => o2(d2)).join(`
 `) : o2(t3);
 var select = (t3) => {
-  const o2 = (n4, m3) => {
+  const o2 = (n4, m2) => {
     if (n4 === void 0)
       return "";
     const s2 = n4.label ?? String(n4.value);
-    switch (m3) {
+    switch (m2) {
       case "disabled":
         return `${styleText2("gray", S_RADIO_INACTIVE)} ${c(s2, (i3) => styleText2("gray", i3))}${n4.hint ? ` ${styleText2("dim", `(${n4.hint ?? "disabled"})`)}` : ""}`;
       case "selected":
@@ -1315,11 +1158,11 @@ var select = (t3) => {
     output: t3.output,
     initialValue: t3.initialValue,
     render() {
-      const n4 = t3.withGuide ?? settings.withGuide, m3 = `${symbol(this.state)}  `, s2 = `${symbolBar(this.state)}  `, i3 = wrapTextWithPrefix(
+      const n4 = t3.withGuide ?? settings.withGuide, m2 = `${symbol(this.state)}  `, s2 = `${symbolBar(this.state)}  `, i3 = wrapTextWithPrefix(
         t3.output,
         t3.message,
         s2,
-        m3
+        m2
       ), u4 = `${n4 ? `${styleText2("gray", S_BAR)}
 ` : ""}${i3}
 `;
@@ -1875,7 +1718,7 @@ function _getBuiltinFlags(long, short, userNames, userAliases) {
 // package.json
 var package_default = {
   name: "zapdev",
-  version: "0.6.0",
+  version: "0.7.1",
   description: "Fast, performant and lightweight git chores and dev tools using your terminal and your own local LLM.",
   type: "module",
   bin: {
@@ -1934,23 +1777,52 @@ var package_default = {
   }
 };
 
-// src/lib/branches.ts
-function parseDefaultBranch(originHead) {
-  const trimmed = originHead.trim();
-  if (!trimmed) return null;
-  return trimmed.replace(/^origin\//, "");
+// src/types/commit.ts
+var COMMIT_TYPES = [
+  "feat",
+  "fix",
+  "chore",
+  "docs",
+  "style",
+  "refactor",
+  "perf",
+  "test",
+  "build",
+  "ci",
+  "revert"
+];
+
+// src/lib/commit-message.ts
+function normalizeCommitType(input) {
+  const normalized = input.trim().toLowerCase();
+  return COMMIT_TYPES.includes(normalized) ? normalized : null;
 }
-function parseBranches(raw) {
-  return raw.split("\n").map((branch) => branch.trim()).filter(Boolean);
+function applyCommitType(systemPrompt, type) {
+  return `${systemPrompt}
+
+The type MUST be exactly "${type}".`;
 }
-function deletableBranches(all, protectedBranches) {
-  const kept = new Set(protectedBranches.filter(Boolean));
-  return all.filter((branch) => !kept.has(branch));
+var MAX_DIFF_CHARS = 12e3;
+function truncateDiff(diff, max = MAX_DIFF_CHARS) {
+  return diff.length > max ? diff.slice(0, max) : diff;
+}
+function sanitizeCommitMessage(raw) {
+  const firstLine = raw.split("\n", 1)[0] ?? "";
+  return firstLine.replace(/[`"]/g, "").trim();
 }
 
-// src/lib/errors.ts
-function errorMessage(error) {
-  return error instanceof Error ? error.message : String(error);
+// src/lib/config.ts
+var DEFAULT_OLLAMA_URL = "http://localhost:11434";
+var DEFAULT_MODEL = "deepseek-v4-flash:cloud";
+function resolveConfig(env = process.env, overrides = {}) {
+  return {
+    ollamaUrl: normalizeBaseUrl(overrides.ollamaUrl ?? env.OLLAMA_URL ?? DEFAULT_OLLAMA_URL),
+    model: overrides.model ?? env.OLLAMA_MODEL ?? DEFAULT_MODEL
+  };
+}
+function normalizeBaseUrl(raw) {
+  const trimmed = raw.trim().replace(/\/+$/, "");
+  return /^https?:\/\//.test(trimmed) ? trimmed : `http://${trimmed}`;
 }
 
 // src/lib/git.ts
@@ -1964,7 +1836,7 @@ import { basename as r2, delimiter as i2, dirname as a2, normalize as o, resolve
 import { pipeline as c2 } from "node:stream/promises";
 import { PassThrough as l2 } from "node:stream";
 import u3 from "node:readline";
-import { closeSync as d, openSync as f, readSync as p, statSync as m2 } from "node:fs";
+import { closeSync as d, openSync as f, readSync as p, statSync as m } from "node:fs";
 var h2 = /^path$/i;
 var g = {
   key: "PATH",
@@ -2105,7 +1977,7 @@ function O(e2, t3) {
     for (const e3 of l3) {
       const t5 = n4 + e3;
       try {
-        if (m2(t5).isFile()) return t5;
+        if (m(t5).isFile()) return t5;
       } catch {
       }
     }
@@ -2283,6 +2155,37 @@ var R2 = (e2, t3, n4) => {
 };
 var z = R2;
 
+// src/lib/branches.ts
+function parseDefaultBranch(originHead) {
+  const trimmed = originHead.trim();
+  if (!trimmed) return null;
+  return trimmed.replace(/^origin\//, "");
+}
+function parseBranches(raw) {
+  return raw.split("\n").map((branch) => branch.trim()).filter(Boolean);
+}
+function deletableBranches(all, protectedBranches) {
+  const kept = new Set(protectedBranches.filter(Boolean));
+  return all.filter((branch) => !kept.has(branch));
+}
+
+// src/lib/worktrees.ts
+var WORKTREE_PREFIX = "worktree ";
+var BRANCH_PREFIX = "branch ";
+function parseWorktrees(porcelain) {
+  const worktrees = [];
+  let current = null;
+  for (const line of porcelain.split("\n")) {
+    if (line.startsWith(WORKTREE_PREFIX)) {
+      current = { path: line.slice(WORKTREE_PREFIX.length).trim(), branch: null };
+      worktrees.push(current);
+    } else if (current && line.startsWith(BRANCH_PREFIX)) {
+      current.branch = line.slice(BRANCH_PREFIX.length).trim().replace(/^refs\/heads\//, "");
+    }
+  }
+  return worktrees;
+}
+
 // src/lib/git.ts
 var UPSTREAM_REF = "@{upstream}";
 var BRANCH_FORMAT = "%(refname:short)";
@@ -2319,22 +2222,22 @@ async function push() {
 async function pushSetUpstream(branch) {
   await git(["push", "-u", "origin", branch]);
 }
-async function findGitRepos(start) {
-  const repos = [];
-  await collectRepos(start, repos);
-  return repos.sort();
+async function findRepos(path) {
+  if (await isGitRepo(path)) return [path];
+  const entries = await readdir(path, { withFileTypes: true }).catch(() => null);
+  if (!entries) return [];
+  const dirs = entries.filter((entry) => entry.isDirectory() && entry.name !== "node_modules");
+  const repos = await Promise.all(
+    dirs.map(async (entry) => {
+      const dir = join(path, entry.name);
+      return await isGitRepo(dir) ? dir : null;
+    })
+  );
+  return repos.filter((dir) => dir !== null).sort();
 }
-async function collectRepos(dir, repos) {
+async function isGitRepo(dir) {
   const entries = await readdir(dir, { withFileTypes: true }).catch(() => null);
-  if (!entries) return;
-  if (entries.some((entry) => entry.name === ".git")) {
-    repos.push(dir);
-    return;
-  }
-  const subdirs = entries.filter(
-    (entry) => entry.isDirectory() && entry.name !== "node_modules"
-  );
-  await Promise.all(subdirs.map((entry) => collectRepos(join(dir, entry.name), repos)));
+  return entries?.some((entry) => entry.name === ".git" && entry.isDirectory()) ?? false;
 }
 async function fetchPrune(repo) {
   await git(["fetch", "--prune"], repo);
@@ -2353,6 +2256,21 @@ async function currentBranchAt(repo) {
 async function localBranches(repo) {
   return parseBranches(await git(["branch", `--format=${BRANCH_FORMAT}`], repo));
 }
+async function branchExists(repo, branch) {
+  const local = await tryGit(["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], repo);
+  if (local !== null) return true;
+  const remote = await tryGit(
+    ["show-ref", "--verify", "--quiet", `refs/remotes/origin/${branch}`],
+    repo
+  );
+  return remote !== null;
+}
+async function listWorktrees(repo) {
+  return parseWorktrees(await git(["worktree", "list", "--porcelain"], repo));
+}
+async function removeWorktree(repo, path) {
+  await git(["worktree", "remove", "--force", path], repo);
+}
 async function switchBranch(repo, branch) {
   await git(["switch", branch], repo);
 }
@@ -2363,188 +2281,9 @@ async function pull(repo) {
   await git(["pull"], repo);
 }
 
-// src/commands/cleanup.ts
-var cleanupCommand = defineCommand({
-  meta: {
-    name: "cleanup",
-    description: "Prune every git repo under a path, then delete stale local branches."
-  },
-  args: {
-    path: {
-      type: "positional",
-      required: false,
-      default: ".",
-      description: "Directory to scan for git repos (recursively)."
-    },
-    stay: {
-      type: "boolean",
-      alias: "s",
-      description: "Stay on the current branch instead of switching to the default."
-    },
-    pull: {
-      type: "boolean",
-      alias: "p",
-      description: "Pull the checked-out branch after cleanup without asking."
-    },
-    yes: {
-      type: "boolean",
-      alias: "y",
-      description: "Non-interactive: switch to default and delete every other local branch."
-    }
-  },
-  async run({ args }) {
-    const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY) && !args.yes;
-    const options = { stay: Boolean(args.stay), pull: Boolean(args.pull) };
-    const path = args.path || ".";
-    if (interactive) intro("zapdev cleanup");
-    const repos = await findGitRepos(path);
-    if (repos.length === 0) {
-      log.warn(`No git repository found under ${path}.`);
-      if (interactive) outro("Nothing to do.");
-      return;
-    }
-    for (const repo of repos) {
-      const cancelled = await cleanupRepo(repo, options, interactive);
-      if (cancelled) {
-        cancel("Cancelled.");
-        return;
-      }
-    }
-    if (interactive) outro(`Done (${repos.length} repo${repos.length > 1 ? "s" : ""}).`);
-  }
-});
-async function cleanupRepo(repo, options, interactive) {
-  log.step(`Cleaning ${repo}`);
-  const fetchLoader = interactive ? spinner() : void 0;
-  fetchLoader?.start("Fetching + pruning\u2026");
-  try {
-    await fetchPrune(repo);
-    fetchLoader?.stop("Fetched + pruned");
-  } catch (error) {
-    fetchLoader?.error("Fetch failed");
-    log.warn(`  Fetch failed, continuing: ${errorMessage(error)}`);
-  }
-  const [base, current] = await Promise.all([defaultBranch(repo), currentBranchAt(repo)]);
-  if (!base) {
-    log.warn("  Skipped: no origin/HEAD.");
-    return false;
-  }
-  let endBranch = base;
-  if (current && current !== base) {
-    if (options.stay) {
-      endBranch = current;
-    } else if (interactive) {
-      const choice = await select({
-        message: "After cleanup, be on:",
-        initialValue: base,
-        options: [
-          { value: base, label: `Switch to ${base}` },
-          { value: current, label: `Stay on ${current} (keep it)` }
-        ]
-      });
-      if (isCancel(choice)) return true;
-      endBranch = choice;
-    }
-  }
-  if (current !== endBranch) {
-    try {
-      await switchBranch(repo, endBranch);
-    } catch (error) {
-      log.error(`  Could not switch to ${endBranch}: ${errorMessage(error)}`);
-      return false;
-    }
-  }
-  const candidates = deletableBranches(await localBranches(repo), [base, endBranch]);
-  if (candidates.length === 0) {
-    log.info("  No branch to delete.");
-  } else {
-    let toDelete = candidates;
-    if (interactive) {
-      const selected = await multiselect({
-        message: "Branches to delete",
-        options: candidates.map((branch) => ({ value: branch, label: branch })),
-        required: false
-      });
-      if (isCancel(selected)) return true;
-      toDelete = selected;
-    }
-    let deleted = 0;
-    for (const branch of toDelete) {
-      try {
-        await deleteBranch(repo, branch);
-        deleted += 1;
-      } catch (error) {
-        log.error(`  Could not delete ${branch}: ${errorMessage(error)}`);
-      }
-    }
-    if (deleted > 0) log.success(`  Deleted ${deleted} branch${deleted > 1 ? "es" : ""}.`);
-  }
-  let shouldPull = options.pull;
-  if (!shouldPull && interactive) {
-    const answer = await confirm({ message: `Pull ${endBranch}?`, initialValue: false });
-    if (isCancel(answer)) return true;
-    shouldPull = answer;
-  }
-  if (shouldPull) {
-    const pullLoader = interactive ? spinner() : void 0;
-    pullLoader?.start(`Pulling ${endBranch}\u2026`);
-    try {
-      await pull(repo);
-      pullLoader?.stop(`\u2713 Pulled ${endBranch}`);
-    } catch (error) {
-      pullLoader?.error("Pull failed");
-      log.error(`  Pull failed: ${errorMessage(error)}`);
-    }
-  }
-  return false;
-}
-
-// src/types/commit.ts
-var COMMIT_TYPES = [
-  "feat",
-  "fix",
-  "chore",
-  "docs",
-  "style",
-  "refactor",
-  "perf",
-  "test",
-  "build",
-  "ci",
-  "revert"
-];
-
-// src/lib/commit-message.ts
-function normalizeCommitType(input) {
-  const normalized = input.trim().toLowerCase();
-  return COMMIT_TYPES.includes(normalized) ? normalized : null;
-}
-function applyCommitType(systemPrompt, type) {
-  return `${systemPrompt}
-
-The type MUST be exactly "${type}".`;
-}
-var MAX_DIFF_CHARS = 12e3;
-function truncateDiff(diff, max = MAX_DIFF_CHARS) {
-  return diff.length > max ? diff.slice(0, max) : diff;
-}
-function sanitizeCommitMessage(raw) {
-  const firstLine = raw.split("\n", 1)[0] ?? "";
-  return firstLine.replace(/[`"]/g, "").trim();
-}
-
-// src/lib/config.ts
-var DEFAULT_OLLAMA_URL = "http://localhost:11434";
-var DEFAULT_MODEL = "deepseek-v4-flash:cloud";
-function resolveConfig(env = process.env, overrides = {}) {
-  return {
-    ollamaUrl: normalizeBaseUrl(overrides.ollamaUrl ?? env.OLLAMA_URL ?? DEFAULT_OLLAMA_URL),
-    model: overrides.model ?? env.OLLAMA_MODEL ?? DEFAULT_MODEL
-  };
-}
-function normalizeBaseUrl(raw) {
-  const trimmed = raw.trim().replace(/\/+$/, "");
-  return /^https?:\/\//.test(trimmed) ? trimmed : `http://${trimmed}`;
+// src/lib/errors.ts
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
 }
 
 // src/prompts/commit-message.md
@@ -2746,14 +2485,208 @@ var commitCommand = defineCommand({
   }
 });
 
+// src/commands/reset.ts
+var CANCEL = /* @__PURE__ */ Symbol("cancel");
+var resetCommand = defineCommand({
+  meta: {
+    name: "reset",
+    description: "Switch each repo to a branch, then delete all other local branches and worktrees."
+  },
+  args: {
+    path: {
+      type: "positional",
+      required: false,
+      default: ".",
+      description: "A git repo to reset, or a directory whose direct child repos are reset."
+    },
+    principal: {
+      type: "boolean",
+      alias: "p",
+      description: "Switch every repo to its resolved principal branch (origin/HEAD)."
+    },
+    target: {
+      type: "string",
+      alias: "t",
+      description: "Switch every repo to this branch, falling back to the principal one."
+    },
+    pull: {
+      type: "boolean",
+      description: "Pull the checked-out branch after reset without asking."
+    },
+    yes: {
+      type: "boolean",
+      alias: "y",
+      description: "Non-interactive: switch and delete without confirmation."
+    }
+  },
+  async run({ args }) {
+    const assumeYes = Boolean(args.yes);
+    const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY) && !assumeYes;
+    const options = {
+      principal: Boolean(args.principal),
+      target: typeof args.target === "string" ? args.target.trim() : "",
+      pull: Boolean(args.pull)
+    };
+    const path = args.path || ".";
+    if (interactive) intro("zapdev reset");
+    const repos = await findRepos(path);
+    if (repos.length === 0) {
+      log.warn(`No git repository found at or under ${path}.`);
+      if (interactive) outro("Nothing to do.");
+      return;
+    }
+    for (const repo of repos) {
+      try {
+        const cancelled = await resetRepo(repo, options, interactive, assumeYes);
+        if (cancelled) {
+          cancel("Cancelled.");
+          return;
+        }
+      } catch (error) {
+        log.error(`Skipped ${repo}: ${errorMessage(error)}`);
+      }
+    }
+    if (interactive) outro(`Done (${repos.length} repo${repos.length > 1 ? "s" : ""}).`);
+  }
+});
+async function resetRepo(repo, options, interactive, assumeYes) {
+  log.step(`Resetting ${repo}`);
+  const fetchLoader = interactive ? spinner() : void 0;
+  fetchLoader?.start("Fetching + pruning\u2026");
+  try {
+    await fetchPrune(repo);
+    fetchLoader?.stop("Fetched + pruned");
+  } catch (error) {
+    fetchLoader?.error("Fetch failed");
+    log.warn(`  Fetch failed, continuing: ${errorMessage(error)}`);
+  }
+  const [principal, current] = await Promise.all([defaultBranch(repo), currentBranchAt(repo)]);
+  const endBranch = await resolveEndBranch(repo, principal, current, options, interactive);
+  if (endBranch === CANCEL) return true;
+  if (endBranch === null) return false;
+  const [branches, worktrees] = await Promise.all([localBranches(repo), listWorktrees(repo)]);
+  const branchesToDelete = deletableBranches(branches, [principal ?? "", endBranch]);
+  const worktreesToRemove = worktrees.slice(1);
+  if (branchesToDelete.length > 0 || worktreesToRemove.length > 0) {
+    if (!assumeYes) {
+      if (!interactive) {
+        log.warn("  Refusing to delete non-interactively; pass --yes.");
+        return false;
+      }
+      announcePlan(endBranch, branchesToDelete, worktreesToRemove);
+      const ok = await confirm({ message: "Delete permanently?", initialValue: false });
+      if (isCancel(ok)) return true;
+      if (!ok) {
+        log.info("  Skipped.");
+        return false;
+      }
+    }
+    await removeWorktrees(repo, worktreesToRemove);
+  }
+  if (!await switchTo(repo, current, endBranch)) return false;
+  if (branchesToDelete.length > 0) await deleteBranches(repo, branchesToDelete);
+  return maybePull(repo, endBranch, options, interactive);
+}
+async function resolveEndBranch(repo, principal, current, options, interactive) {
+  if (options.target) {
+    if (await branchExists(repo, options.target)) return options.target;
+    if (principal) return principal;
+    log.warn(`  Target "${options.target}" not found and no origin/HEAD; skipped.`);
+    return null;
+  }
+  if (options.principal || !interactive) {
+    if (principal) return principal;
+    log.warn("  No origin/HEAD to resolve the principal branch; skipped.");
+    return null;
+  }
+  const branches = await localBranches(repo);
+  if (branches.length === 0) return principal;
+  const choice = await select({
+    message: "Switch to:",
+    initialValue: principal ?? current ?? branches[0],
+    options: branches.map((branch) => ({
+      value: branch,
+      label: branch === principal ? `${branch} (principal)` : branch
+    }))
+  });
+  if (isCancel(choice)) return CANCEL;
+  return choice;
+}
+function announcePlan(endBranch, branches, worktrees) {
+  log.info(`  Switch to ${endBranch}`);
+  if (branches.length > 0) {
+    const label = branches.length > 1 ? "branches" : "branch";
+    log.warn(`  Delete ${branches.length} ${label}: ${branches.join(", ")}`);
+  }
+  if (worktrees.length > 0) {
+    const label = worktrees.length > 1 ? "worktrees" : "worktree";
+    const paths = worktrees.map((worktree) => worktree.path).join(", ");
+    log.warn(`  Remove ${worktrees.length} ${label}: ${paths}`);
+  }
+}
+async function removeWorktrees(repo, worktrees) {
+  let removed = 0;
+  for (const worktree of worktrees) {
+    try {
+      await removeWorktree(repo, worktree.path);
+      removed += 1;
+    } catch (error) {
+      log.error(`  Could not remove worktree ${worktree.path}: ${errorMessage(error)}`);
+    }
+  }
+  if (removed > 0) log.success(`  Removed ${removed} worktree${removed > 1 ? "s" : ""}.`);
+}
+async function switchTo(repo, current, endBranch) {
+  if (current === endBranch) return true;
+  try {
+    await switchBranch(repo, endBranch);
+    return true;
+  } catch (error) {
+    log.error(`  Could not switch to ${endBranch}: ${errorMessage(error)}`);
+    return false;
+  }
+}
+async function deleteBranches(repo, branches) {
+  let deleted = 0;
+  for (const branch of branches) {
+    try {
+      await deleteBranch(repo, branch);
+      deleted += 1;
+    } catch (error) {
+      log.error(`  Could not delete ${branch}: ${errorMessage(error)}`);
+    }
+  }
+  if (deleted > 0) log.success(`  Deleted ${deleted} branch${deleted > 1 ? "es" : ""}.`);
+}
+async function maybePull(repo, endBranch, options, interactive) {
+  let shouldPull = options.pull;
+  if (!shouldPull && interactive) {
+    const answer = await confirm({ message: `Pull ${endBranch}?`, initialValue: false });
+    if (isCancel(answer)) return true;
+    shouldPull = answer;
+  }
+  if (shouldPull) {
+    const loader = interactive ? spinner() : void 0;
+    loader?.start(`Pulling ${endBranch}\u2026`);
+    try {
+      await pull(repo);
+      loader?.stop(`\u2713 Pulled ${endBranch}`);
+    } catch (error) {
+      loader?.error("Pull failed");
+      log.error(`  Pull failed: ${errorMessage(error)}`);
+    }
+  }
+  return false;
+}
+
 // src/cli.ts
 var commands = {
   commit: commitCommand,
-  cleanup: cleanupCommand
+  reset: resetCommand
 };
 var MENU = {
   commit: "Stage all changes and commit with an AI-generated message",
-  cleanup: "Prune repos and delete stale local branches"
+  reset: "Switch repos to a branch and delete the other branches and worktrees"
 };
 var menuOptions = Object.keys(MENU).map((value) => ({
   value,

package/package.json

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