slopcannon 0.1.0 → 0.1.2

package/dist/cli.js

@@ -1384,27 +1384,38 @@ function detectDefaultBranch(root) {
 }
 function listBranches(root, defaultBranch) {
   const raw = exec(["branch", "-a", "--format=%(refname:short)"], root);
-  const seen = new Set;
-  const branches = [];
+  const localBranches = new Set;
+  const entries = new Map;
+  for (const line of raw.split(`
+`)) {
+    const name = line.trim();
+    if (!name || name.startsWith("origin/"))
+      continue;
+    localBranches.add(name);
+  }
   for (const line of raw.split(`
 `)) {
     const name = line.trim();
     if (!name)
       continue;
-    const short = name.startsWith("origin/") ? name.replace("origin/", "") : name;
+    const isRemote = name.startsWith("origin/");
+    const short = isRemote ? name.replace("origin/", "") : name;
     if (short === "HEAD")
       continue;
-    if (seen.has(short))
+    if (entries.has(short))
       continue;
-    seen.add(short);
-    branches.push(short);
+    entries.set(short, {
+      name: short,
+      ref: localBranches.has(short) ? short : name
+    });
   }
+  const branches = Array.from(entries.values());
   branches.sort((a, b) => {
-    if (a === defaultBranch)
+    if (a.name === defaultBranch)
       return -1;
-    if (b === defaultBranch)
+    if (b.name === defaultBranch)
       return 1;
-    return a.localeCompare(b);
+    return a.name.localeCompare(b.name);
   });
   return branches;
 }
@@ -1602,7 +1613,29 @@ var ADJECTIVES = [
   "haunted",
   "bootleg",
   "squishy",
-  "untested"
+  "untested",
+  "turbo",
+  "mega",
+  "bigly",
+  "massive",
+  "humongous",
+  "truculent",
+  "cackling",
+  "unruly",
+  "blistering",
+  "preposterous",
+  "ludicrous",
+  "rotund",
+  "swole",
+  "thicc",
+  "chunky",
+  "maximum",
+  "supreme",
+  "bonkers",
+  "absolute",
+  "industrial",
+  "weaponized",
+  "premium"
 ];
 var NOUNS = [
   "goose",
@@ -1629,7 +1662,26 @@ var NOUNS = [
   "gopher",
   "waffle",
   "blunderbuss",
-  "hotdog"
+  "hotdog",
+  "jester",
+  "slop",
+  "gumption",
+  "maxx",
+  "chungus",
+  "honk",
+  "donkey",
+  "biscuit",
+  "rascal",
+  "torpedo",
+  "avalanche",
+  "stampede",
+  "ruckus",
+  "shenanigan",
+  "juggernaut",
+  "unit",
+  "whopper",
+  "caboose",
+  "hooligan"
 ];
 function randomBranchName() {
   const adj = ADJECTIVES[Math.floor(Math.random() * ADJECTIVES.length)];
@@ -1690,21 +1742,23 @@ async function runTui() {
     return null;
   }
   R2.info(`${info.repoName}${info.remoteUrl ? ` (${info.remoteUrl})` : ""}`);
-  const baseBranch = await Xt({
+  const defaultEntry = info.branches.find((b) => b.name === info.defaultBranch);
+  const baseBranchEntry = await Xt({
     message: "Base branch",
     options: info.branches.map((b) => ({
       value: b,
-      label: b,
-      hint: b === info.defaultBranch ? "default" : undefined
+      label: b.name,
+      hint: b.name === info.defaultBranch ? "default" : undefined
     })),
     maxItems: 10,
-    initialValue: info.defaultBranch,
+    initialValue: defaultEntry,
     placeholder: "Type to filter..."
   });
-  if (Ct(baseBranch)) {
+  if (Ct(baseBranchEntry)) {
     Le("Cancelled.");
     return null;
   }
+  const baseBranch = baseBranchEntry;
   const defaultName = randomBranchName();
   const newBranch = await Ze({
     message: "New branch name",
@@ -1721,7 +1775,7 @@ async function runTui() {
   }
   const branchName = (newBranch || defaultName).trim();
   const worktreePath = computeWorktreePath(info.parentDir, info.repoName, branchName);
-  R2.step(`git worktree add -b ${branchName} ${worktreePath} ${baseBranch}`);
+  R2.step(`git worktree add -b ${branchName} ${worktreePath} ${baseBranch.ref}`);
   const confirmed = await Re({
     message: "Create worktree?"
   });
@@ -1732,7 +1786,7 @@ async function runTui() {
   const s = bt2();
   s.start("Creating worktree...");
   try {
-    createWorktree(info.root, worktreePath, baseBranch, branchName);
+    createWorktree(info.root, worktreePath, baseBranch.ref, branchName);
     s.stop("Worktree created.");
   } catch (err) {
     s.stop("Failed.");
@@ -1899,10 +1953,12 @@ What it does:
 `.trim();
 function parseArgs() {
   const args = process.argv.slice(2);
-  const result = { help: false, config: false, cleanup: false };
+  const result = { help: false, version: false, config: false, cleanup: false };
   for (let i = 0;i < args.length; i++) {
     if (args[i] === "--help" || args[i] === "-h") {
       result.help = true;
+    } else if (args[i] === "--version" || args[i] === "-v" || args[i] === "-V") {
+      result.version = true;
     } else if (args[i] === "--path-file" && i + 1 < args.length) {
       result.pathFile = args[++i];
     } else if (args[i] === "config") {
@@ -1929,6 +1985,11 @@ function requireGit(deps) {
 }
 async function main() {
   const args = parseArgs();
+  if (args.version) {
+    const pkg = await Bun.file(new URL("../package.json", import.meta.url)).json();
+    console.log(pkg.version);
+    process.exit(0);
+  }
   if (args.help) {
     console.log(HELP);
     process.exit(0);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "slopcannon",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Create a git worktree. Launch Claude Code. Ship slop.",
   "type": "module",
   "bin": {
-    "slopcannon": "./dist/cli.js"
+    "slopcannon": "dist/cli.js"
   },
   "scripts": {
     "build": "bun build ./src/cli.ts --outdir ./dist --target bun",