contribute-now 0.3.0 → 0.4.0-dev.ba6545c

package/dist/index.js

@@ -10,7 +10,7 @@ import { defineCommand } from "citty";
 import pc2 from "picocolors";
 
 // src/utils/config.ts
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { appendFileSync, existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 var CONFIG_FILENAME = ".contributerc.json";
 function getConfigPath(cwd = process.cwd()) {
@@ -86,6 +86,23 @@ function isGitignored(cwd = process.cwd()) {
     return false;
   }
 }
+function ensureGitignored(cwd = process.cwd()) {
+  if (isGitignored(cwd))
+    return false;
+  const gitignorePath = join(cwd, ".gitignore");
+  const line = `${CONFIG_FILENAME}
+`;
+  if (!existsSync(gitignorePath)) {
+    writeFileSync(gitignorePath, line, "utf-8");
+    return true;
+  }
+  const content = readFileSync(gitignorePath, "utf-8");
+  const needsLeadingNewline = content.length > 0 && !content.endsWith(`
+`);
+  appendFileSync(gitignorePath, `${needsLeadingNewline ? `
+` : ""}${line}`, "utf-8");
+  return true;
+}
 function getDefaultConfig() {
   return {
     workflow: "clean-flow",
@@ -205,6 +222,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 +2018,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.3.0",
+  version: "0.4.0-dev.ba6545c",
   description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   type: "module",
   bin: {
@@ -2792,9 +2816,8 @@ var setup_default = defineCommand7({
         warn("Config was saved — verify the branch name and re-run setup if needed.");
       }
     }
-    if (!isGitignored()) {
-      warn(".contributerc.json is not in .gitignore. Add it to avoid committing personal config.");
-      warn('  echo ".contributerc.json" >> .gitignore');
+    if (ensureGitignored()) {
+      info("Added .contributerc.json to .gitignore to avoid committing personal config.");
     }
     console.log();
     info(`Workflow: ${pc10.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
@@ -2897,6 +2920,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.ba6545c",
   "description": "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   "type": "module",
   "bin": {