contribute-now 0.3.0 → 0.4.0-dev.c791252

package/dist/index.js

@@ -205,6 +205,13 @@ async function branchExists(branch) {
   const { exitCode } = await run(["rev-parse", "--verify", branch]);
   return exitCode === 0;
 }
+async function countCommitsAhead(branch, upstream) {
+  const { exitCode, stdout } = await run(["rev-list", "--count", `${upstream}..${branch}`]);
+  if (exitCode !== 0)
+    return 0;
+  const count = Number.parseInt(stdout.trim(), 10);
+  return Number.isNaN(count) ? 0 : count;
+}
 async function fetchRemote(remote) {
   return run(["fetch", remote]);
 }
@@ -1994,7 +2001,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.3.0",
+  version: "0.4.0-dev.c791252",
   description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   type: "module",
   bin: {
@@ -2897,6 +2904,19 @@ var start_default = defineCommand8({
     if (!await refExists(syncSource.ref)) {
       warn(`Remote ref ${pc11.bold(syncSource.ref)} not found. Creating branch from local ${pc11.bold(baseBranch)}.`);
     }
+    const currentBranch = await getCurrentBranch();
+    if (currentBranch === baseBranch && await refExists(syncSource.ref)) {
+      const ahead = await countCommitsAhead(baseBranch, syncSource.ref);
+      if (ahead > 0) {
+        warn(`You are on ${pc11.bold(baseBranch)} with ${pc11.bold(String(ahead))} local commit${ahead > 1 ? "s" : ""} not in ${pc11.bold(syncSource.ref)}.`);
+        info("  Syncing will discard those commits. Consider backing them up first (e.g. create a branch).");
+        const proceed = await confirmPrompt("Discard local commits and sync to remote?");
+        if (!proceed) {
+          info("Aborted. Your local commits are untouched.");
+          process.exit(0);
+        }
+      }
+    }
     const updateResult = await updateLocalBranch(baseBranch, syncSource.ref);
     if (updateResult.exitCode !== 0) {
       if (await refExists(syncSource.ref)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contribute-now",
-  "version": "0.3.0",
+  "version": "0.4.0-dev.c791252",
   "description": "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   "type": "module",
   "bin": {