contribute-now 0.8.0-dev.5d00afd → 0.8.0-dev.5fd8c38

package/README.md

@@ -274,6 +274,8 @@ List branches with workflow-aware labels and tracking status.
 cn branch             # local branches
 cn branch --all       # local + remote branches
 cn branch --remote    # remote branches only
+cn branch --sync      # sync refs (friendly alias of --prune)
+cn branch --prune     # fetch remotes + prune deleted remote branches
 ```
 
 Branches are annotated with workflow labels (e.g., base, dev, feature) and tracking info (upstream, gone, no remote).

package/dist/cli.js

@@ -2949,7 +2949,9 @@ var init_tips = __esm(() => {
         { command: "cn branch --help", description: "learn branch list modes and filters" },
         { command: "cn branch", description: "list local branches and tracking info" },
         { command: "cn branch --all", description: "include local and remote branches" },
-        { command: "cn branch --remote", description: "show only remote branches" }
+        { command: "cn branch --remote", description: "show only remote branches" },
+        { command: "cn branch --sync", description: "sync remote refs before listing branches" },
+        { command: "cn branch --prune", description: "fetch remotes and prune deleted refs first" }
       ]
     },
     hook: {
@@ -9311,6 +9313,9 @@ async function addRemote(name, url) {
 async function fetchAll() {
   return run(["fetch", "--all", "--quiet"]);
 }
+async function fetchAllPrune() {
+  return run(["fetch", "--all", "--prune", "--quiet"]);
+}
 async function checkoutBranch(branch) {
   return run(["checkout", branch]);
 }
@@ -9768,10 +9773,16 @@ function isBranchProtected(branch, config) {
 }
 
 // src/commands/branch.ts
+function shouldPruneBranchRefs(args) {
+  return Boolean(args.prune || args.sync);
+}
+function shouldWarnDeletedRemoteBranch(params) {
+  return params.isCurrent && params.gone && (params.hasUncommitted || params.uniqueCommitsAheadOfBase > 0);
+}
 var branch_default = defineCommand({
   meta: {
     name: "branch",
-    description: "List branches with workflow-aware labels and status"
+    description: "List branches with workflow-aware labels and optional remote pruning"
   },
   args: {
     all: {
@@ -9785,6 +9796,18 @@ var branch_default = defineCommand({
       alias: "r",
       description: "Show only remote branches",
       default: false
+    },
+    prune: {
+      type: "boolean",
+      alias: "p",
+      description: "Fetch all remotes and prune deleted remote-tracking branches first",
+      default: false
+    },
+    sync: {
+      type: "boolean",
+      alias: "s",
+      description: "Sync remote branch refs before listing (alias of --prune)",
+      default: false
     }
   },
   async run({ args }) {
@@ -9797,10 +9820,45 @@ var branch_default = defineCommand({
     const currentBranch = await getCurrentBranch();
     const showRemoteOnly = args.remote;
     const showAll = args.all;
+    const shouldPrune = shouldPruneBranchRefs(args);
     await projectHeading("branch", "\uD83C\uDF3F");
+    if (shouldPrune) {
+      info("Fetching remotes and pruning stale remote-tracking branches...");
+      const pruneResult = await fetchAllPrune();
+      if (pruneResult.exitCode === 0) {
+        success("Remote refs refreshed and stale branches pruned.");
+      } else {
+        warn(`Could not fully prune remote refs: ${pruneResult.stderr.trim() || "git fetch --all --prune failed"}`);
+      }
+    }
     console.log();
     if (!showRemoteOnly) {
       const localBranches = await getLocalBranches();
+      const currentLocalBranch = localBranches.find((b2) => b2.isCurrent);
+      if (currentLocalBranch?.gone) {
+        const hasUncommitted = await hasUncommittedChanges();
+        let uniqueCommitsAheadOfBase = 0;
+        if (config) {
+          const syncSource = getSyncSource(config);
+          uniqueCommitsAheadOfBase = await countCommitsAhead(currentLocalBranch.name, syncSource.ref);
+        }
+        if (shouldWarnDeletedRemoteBranch({
+          isCurrent: currentLocalBranch.isCurrent,
+          gone: currentLocalBranch.gone,
+          hasUncommitted,
+          uniqueCommitsAheadOfBase
+        })) {
+          warn(`Current branch ${import_picocolors2.default.bold(currentLocalBranch.name)} was deleted remotely but still has local work.`);
+          if (hasUncommitted) {
+            info("You have uncommitted local changes.");
+          }
+          if (uniqueCommitsAheadOfBase > 0) {
+            info(`You have ${uniqueCommitsAheadOfBase} local commit(s) not in the base sync branch.`);
+          }
+          info(`Run ${import_picocolors2.default.bold("cn update")} to move your work to a fresh branch safely.`, "");
+          console.log();
+        }
+      }
       if (localBranches.length === 0) {
         console.log(import_picocolors2.default.dim("  No local branches found."));
       } else {
@@ -13708,7 +13766,7 @@ var import_picocolors12 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.8.0-dev.5d00afd",
+  version: "0.8.0-dev.5fd8c38",
   description: "Developer CLI that automates git workflows \u2014 branching, syncing, committing, and PRs \u2014 with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -17885,6 +17943,26 @@ function getAnnouncementTone(kind) {
 }
 
 // src/cli.ts
+var CLI_SUBCOMMANDS = {
+  setup: setup_default,
+  config: config_default,
+  sync: sync_default,
+  start: start_default,
+  commit: commit_default,
+  update: update_default,
+  submit: submit_default,
+  switch: switch_default,
+  discard: discard_default,
+  save: save_default,
+  branch: branch_default,
+  clean: clean_default,
+  status: status_default,
+  log: log_default,
+  hook: hook_default,
+  validate: validate_default,
+  doctor: doctor_default,
+  label: label_default
+};
 function formatVersionInfo() {
   return `Contribute Now v${getVersion()} - Built by Waren Gonzaga`;
 }
@@ -17902,7 +17980,7 @@ function showCompactRootHelp() {
   console.log(cmd("submit", "Push and open a pull request on GitHub"));
   console.log();
   console.log(import_picocolors26.default.bold("BRANCH & COMMITS"));
-  console.log(cmd("branch", "List, create, or delete branches"));
+  console.log(cmd("branch", "List local/remote branches and optionally prune remotes"));
   console.log(cmd("switch", "Switch to a different branch"));
   console.log(cmd("save", "Stash uncommitted changes for later"));
   console.log(cmd("discard", "Discard uncommitted changes"));
@@ -17924,6 +18002,53 @@ function showCompactRootHelp() {
   console.log();
   console.log(import_picocolors26.default.dim("Run cn <command> --help for detailed options and examples."));
 }
+function formatArgLabel(name, arg) {
+  if (arg.type === "positional") {
+    return arg.required ? `<${name}>` : `[${name}]`;
+  }
+  const flags = [];
+  if (arg.alias) {
+    flags.push(`-${arg.alias}`);
+  }
+  flags.push(`--${name}`);
+  const needsValue = arg.type && arg.type !== "boolean";
+  const valueHint = needsValue ? ` <${arg.type}>` : "";
+  return `${flags.join(", ")}${valueHint}`;
+}
+function findRequestedSubCommand(argv2) {
+  const names = Object.keys(CLI_SUBCOMMANDS);
+  for (const token of argv2) {
+    if (names.includes(token)) {
+      return token;
+    }
+  }
+  return null;
+}
+function showCompactSubCommandHelp(commandName) {
+  const command = CLI_SUBCOMMANDS[commandName];
+  const description = command.meta?.description ?? `Run ${commandName} command`;
+  const args = command.args ?? {};
+  const positionalArgs = Object.entries(args).filter(([, arg]) => arg.type === "positional");
+  const optionArgs = Object.entries(args).filter(([, arg]) => arg.type !== "positional");
+  console.log(description);
+  console.log();
+  const positionalUsage = positionalArgs.map(([name, arg]) => formatArgLabel(name, arg)).join(" ").trim();
+  const usageSuffix = positionalUsage.length > 0 ? ` ${positionalUsage}` : " [OPTIONS]";
+  console.log(`${import_picocolors26.default.bold("USAGE")}  ${import_picocolors26.default.cyan(`cn ${commandName}${usageSuffix}`)}`);
+  if (optionArgs.length > 0) {
+    console.log();
+    console.log(import_picocolors26.default.bold("OPTIONS"));
+    console.log();
+    const labels = optionArgs.map(([name, arg]) => formatArgLabel(name, arg));
+    const maxLabel = labels.reduce((max, label) => Math.max(max, label.length), 0);
+    optionArgs.forEach(([, arg], index) => {
+      const label = labels[index].padEnd(maxLabel + 2);
+      const desc = arg.description ?? "";
+      console.log(`  ${import_picocolors26.default.cyan(label)}${desc}`);
+    });
+  }
+  console.log();
+}
 function normalizeCliArgs(argv2) {
   return argv2.map((arg, index) => {
     const previous = argv2[index - 1];
@@ -17939,29 +18064,11 @@ function normalizeCliArgs(argv2) {
 }
 process.argv = normalizeCliArgs(process.argv);
 var isVersion = process.argv.includes("--version") || process.argv.includes("-v");
-var subCommands = [
-  "setup",
-  "config",
-  "sync",
-  "start",
-  "commit",
-  "update",
-  "submit",
-  "switch",
-  "discard",
-  "save",
-  "clean",
-  "status",
-  "log",
-  "branch",
-  "hook",
-  "validate",
-  "doctor",
-  "label"
-];
+var subCommands = Object.keys(CLI_SUBCOMMANDS);
 var isHelp = process.argv.includes("--help") || process.argv.includes("-h");
 var hasSubCommand = subCommands.some((cmd2) => process.argv.includes(cmd2));
 var isRootHelp = isHelp && !hasSubCommand;
+var requestedSubCommand = isHelp ? findRequestedSubCommand(process.argv) : null;
 if (!isVersion) {
   const useBigBanner = !hasSubCommand && !isHelp;
   showBanner(useBigBanner ? "big" : "small");
@@ -17970,6 +18077,10 @@ if (isRootHelp) {
   showCompactRootHelp();
   process.exit(0);
 }
+if (isHelp && requestedSubCommand) {
+  showCompactSubCommandHelp(requestedSubCommand);
+  process.exit(0);
+}
 var main = defineCommand({
   meta: {
     name: "cn",
@@ -17984,24 +18095,7 @@ var main = defineCommand({
     }
   },
   subCommands: {
-    setup: setup_default,
-    config: config_default,
-    sync: sync_default,
-    start: start_default,
-    commit: commit_default,
-    update: update_default,
-    submit: submit_default,
-    switch: switch_default,
-    discard: discard_default,
-    save: save_default,
-    branch: branch_default,
-    clean: clean_default,
-    status: status_default,
-    log: log_default,
-    hook: hook_default,
-    validate: validate_default,
-    doctor: doctor_default,
-    label: label_default
+    ...CLI_SUBCOMMANDS
   },
   run({ args }) {
     if (args.version) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contribute-now",
-  "version": "0.8.0-dev.5d00afd",
+  "version": "0.8.0-dev.5fd8c38",
   "description": "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   "type": "module",
   "bin": {