contribute-now 0.4.0-dev.c791252 → 0.4.0-dev.d24b735

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",
@@ -2001,7 +2018,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.4.0-dev.c791252",
+  version: "0.4.0-dev.d24b735",
   description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   type: "module",
   bin: {
@@ -2660,6 +2677,40 @@ function colorizeSubject(subject) {
 // src/commands/setup.ts
 import { defineCommand as defineCommand7 } from "citty";
 import pc10 from "picocolors";
+async function shouldContinueSetupWithExistingConfig(options) {
+  const {
+    existingConfig,
+    hasConfigFile,
+    confirm: confirm2,
+    ensureIgnored,
+    onInfo,
+    onWarn,
+    onSuccess,
+    summary
+  } = options;
+  if (existingConfig) {
+    onInfo("Existing .contributerc.json detected:");
+    summary(existingConfig);
+    const shouldContinue = await confirm2("Continue setup and overwrite existing config?");
+    if (!shouldContinue) {
+      if (ensureIgnored()) {
+        onInfo("Added .contributerc.json to .gitignore to avoid committing personal config.");
+      }
+      onSuccess("Keeping existing setup.");
+      return false;
+    }
+    return true;
+  }
+  if (hasConfigFile) {
+    onWarn("Found .contributerc.json but it appears invalid.");
+    const shouldContinue = await confirm2("Continue setup and overwrite invalid config?");
+    if (!shouldContinue) {
+      onInfo("Keeping existing file. Run setup again when ready to repair it.");
+      return false;
+    }
+  }
+  return true;
+}
 var setup_default = defineCommand7({
   meta: {
     name: "setup",
@@ -2671,6 +2722,20 @@ var setup_default = defineCommand7({
       process.exit(1);
     }
     heading("\uD83D\uDD27 contribute-now setup");
+    const existingConfig = readConfig();
+    const shouldContinue = await shouldContinueSetupWithExistingConfig({
+      existingConfig,
+      hasConfigFile: configExists(),
+      confirm: confirmPrompt,
+      ensureIgnored: ensureGitignored,
+      onInfo: info,
+      onWarn: warn,
+      onSuccess: success,
+      summary: logConfigSummary
+    });
+    if (!shouldContinue) {
+      return;
+    }
     const workflowChoice = await selectPrompt("Which git workflow does this project use?", [
       "Clean Flow — main + dev, squash features into dev, merge dev into main (recommended)",
       "GitHub Flow — main + feature branches, squash/merge into main",
@@ -2700,31 +2765,42 @@ var setup_default = defineCommand7({
     info(`Found remotes: ${remotes.join(", ")}`);
     let detectedRole = null;
     let detectionSource = "";
-    const ghInstalled = await checkGhInstalled();
-    if (ghInstalled && await checkGhAuth()) {
-      const isFork = await isRepoFork();
-      if (isFork === true) {
-        detectedRole = "contributor";
-        detectionSource = "gh CLI (fork detected)";
-      } else if (isFork === false) {
-        const repoInfo = await getCurrentRepoInfo();
-        if (repoInfo) {
-          const perms = await checkRepoPermissions(repoInfo.owner, repoInfo.repo);
-          if (perms?.admin || perms?.push) {
-            detectedRole = "maintainer";
-            detectionSource = "gh CLI (admin/push permissions)";
+    const roleSpinner = createSpinner("Detecting your role...");
+    try {
+      roleSpinner.update("Checking GitHub CLI and auth...");
+      const ghInstalled = await checkGhInstalled();
+      if (ghInstalled && await checkGhAuth()) {
+        roleSpinner.update("Inspecting repository relationship (fork/permissions)...");
+        const isFork = await isRepoFork();
+        if (isFork === true) {
+          detectedRole = "contributor";
+          detectionSource = "gh CLI (fork detected)";
+        } else if (isFork === false) {
+          const repoInfo = await getCurrentRepoInfo();
+          if (repoInfo) {
+            const perms = await checkRepoPermissions(repoInfo.owner, repoInfo.repo);
+            if (perms?.admin || perms?.push) {
+              detectedRole = "maintainer";
+              detectionSource = "gh CLI (admin/push permissions)";
+            }
           }
         }
       }
-    }
-    if (detectedRole === null) {
-      if (remotes.includes("upstream")) {
-        detectedRole = "contributor";
-        detectionSource = "heuristic (upstream remote exists)";
-      } else if (remotes.includes("origin") && remotes.length === 1) {
-        detectedRole = "maintainer";
-        detectionSource = "heuristic (only origin remote)";
+      if (detectedRole === null) {
+        roleSpinner.update("Analyzing git remotes...");
+        if (remotes.includes("upstream")) {
+          detectedRole = "contributor";
+          detectionSource = "heuristic (upstream remote exists)";
+        } else if (remotes.includes("origin") && remotes.length === 1) {
+          detectedRole = "maintainer";
+          detectionSource = "heuristic (only origin remote)";
+        }
       }
+      roleSpinner.success("Role detection complete.");
+    } catch {
+      roleSpinner.fail("Role detection failed; falling back to manual selection.");
+      detectedRole = null;
+      detectionSource = "";
     }
     if (detectedRole === null) {
       const roleChoice = await selectPrompt("What is your role in this project?", [
@@ -2742,16 +2818,20 @@ var setup_default = defineCommand7({
       }
     }
     const defaultConfig = getDefaultConfig();
-    const mainBranch = await inputPrompt("Main branch name", defaultConfig.mainBranch);
+    info(pc10.dim("Tip: press Enter to keep the default branch name shown in each prompt."));
+    const mainBranchDefault = defaultConfig.mainBranch;
+    const mainBranch = await inputPrompt(`Main branch name (default: ${mainBranchDefault} — press Enter to keep)`, mainBranchDefault);
     let devBranch;
     if (hasDevBranch(workflow)) {
       const defaultDev = workflow === "git-flow" ? "develop" : "dev";
-      devBranch = await inputPrompt("Dev/develop branch name", defaultDev);
+      devBranch = await inputPrompt(`Dev/develop branch name (default: ${defaultDev} — press Enter to keep)`, defaultDev);
     }
-    const originRemote = await inputPrompt("Origin remote name", defaultConfig.origin);
+    const originRemoteDefault = defaultConfig.origin;
+    const originRemote = await inputPrompt(`Origin remote name (default: ${originRemoteDefault} — press Enter to keep)`, originRemoteDefault);
     let upstreamRemote = defaultConfig.upstream;
     if (detectedRole === "contributor") {
-      upstreamRemote = await inputPrompt("Upstream remote name", defaultConfig.upstream);
+      const upstreamRemoteDefault = defaultConfig.upstream;
+      upstreamRemote = await inputPrompt(`Upstream remote name (default: ${upstreamRemoteDefault} — press Enter to keep)`, upstreamRemoteDefault);
       if (!remotes.includes(upstreamRemote)) {
         warn(`Remote "${upstreamRemote}" not found.`);
         const originUrl = await getRemoteUrl(originRemote);
@@ -2799,9 +2879,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])}`);
@@ -2815,6 +2894,17 @@ var setup_default = defineCommand7({
     info(`Origin: ${pc10.bold(config.origin)}${config.role === "contributor" ? ` | Upstream: ${pc10.bold(config.upstream)}` : ""}`);
   }
 });
+function logConfigSummary(config) {
+  info(`Workflow: ${pc10.bold(WORKFLOW_DESCRIPTIONS[config.workflow])}`);
+  info(`Convention: ${pc10.bold(CONVENTION_DESCRIPTIONS[config.commitConvention])}`);
+  info(`Role: ${pc10.bold(config.role)}`);
+  if (config.devBranch) {
+    info(`Main: ${pc10.bold(config.mainBranch)} | Dev: ${pc10.bold(config.devBranch)}`);
+  } else {
+    info(`Main: ${pc10.bold(config.mainBranch)}`);
+  }
+  info(`Origin: ${pc10.bold(config.origin)}${config.role === "contributor" ? ` | Upstream: ${pc10.bold(config.upstream)}` : ""}`);
+}
 
 // src/commands/start.ts
 import { defineCommand as defineCommand8 } from "citty";

package/package.json

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