contribute-now 0.3.0 → 0.4.0-dev.6151897

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]);
 }
@@ -946,6 +970,68 @@ function withTimeout(promise, ms) {
 }
 var COPILOT_TIMEOUT_MS = 30000;
 var COPILOT_LONG_TIMEOUT_MS = 90000;
+var BATCH_CONFIG = {
+  LARGE_CHANGESET_THRESHOLD: 15,
+  COMPACT_PER_FILE_CHARS: 300,
+  MAX_COMPACT_PAYLOAD: 1e4,
+  FALLBACK_BATCH_SIZE: 15
+};
+function parseDiffByFile(rawDiff) {
+  const sections = new Map;
+  const headerPattern = /^diff --git a\/(.+?) b\//gm;
+  const positions = [];
+  for (let match = headerPattern.exec(rawDiff);match !== null; match = headerPattern.exec(rawDiff)) {
+    positions.push({ file: match[1], start: match.index });
+  }
+  for (let i = 0;i < positions.length; i++) {
+    const { file, start } = positions[i];
+    const end = i + 1 < positions.length ? positions[i + 1].start : rawDiff.length;
+    sections.set(file, rawDiff.slice(start, end));
+  }
+  return sections;
+}
+function extractDiffStats(diffSection) {
+  let added = 0;
+  let removed = 0;
+  for (const line of diffSection.split(`
+`)) {
+    if (line.startsWith("+") && !line.startsWith("+++"))
+      added++;
+    if (line.startsWith("-") && !line.startsWith("---"))
+      removed++;
+  }
+  return { added, removed };
+}
+function createCompactDiff(files, rawDiff, maxTotalChars = BATCH_CONFIG.MAX_COMPACT_PAYLOAD) {
+  if (files.length === 0)
+    return "";
+  const diffSections = parseDiffByFile(rawDiff);
+  const perFileBudget = Math.min(BATCH_CONFIG.COMPACT_PER_FILE_CHARS, Math.floor(maxTotalChars / files.length));
+  const parts = [];
+  for (const file of files) {
+    const section = diffSections.get(file);
+    if (section) {
+      const stats = extractDiffStats(section);
+      const header = `[${file}] (+${stats.added}/-${stats.removed})`;
+      if (section.length <= perFileBudget) {
+        parts.push(`${header}
+${section}`);
+      } else {
+        const truncated = section.slice(0, perFileBudget - header.length - 20);
+        parts.push(`${header}
+${truncated}
+...(truncated)`);
+      }
+    } else {
+      parts.push(`[${file}] (new/binary file — no diff available)`);
+    }
+  }
+  const result = parts.join(`
+
+`);
+  return result.length > maxTotalChars ? `${result.slice(0, maxTotalChars - 15)}
+...(truncated)` : result;
+}
 async function checkCopilotAvailable() {
   try {
     const client = await getManagedClient();
@@ -1046,16 +1132,18 @@ function extractJson(raw) {
 }
 async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit") {
   try {
+    const isLarge = stagedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
     const multiFileHint = stagedFiles.length > 1 ? `
 
 IMPORTANT: Multiple files are staged. Generate ONE commit message that captures the high-level purpose of ALL changes together. Focus on the overall intent, not individual file changes. Be specific but concise — do not list every file.` : "";
+    const diffContent = isLarge ? createCompactDiff(stagedFiles, diff) : diff.slice(0, 4000);
     const userMessage = `Generate a commit message for these staged changes:
 
-Files: ${stagedFiles.join(", ")}
+Files (${stagedFiles.length}): ${stagedFiles.join(", ")}
 
 Diff:
-${diff.slice(0, 4000)}${multiFileHint}`;
-    const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
+${diffContent}${multiFileHint}`;
+    const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model, isLarge ? COPILOT_LONG_TIMEOUT_MS : COPILOT_TIMEOUT_MS);
     return result?.trim() ?? null;
   } catch {
     return null;
@@ -1104,16 +1192,23 @@ ${conflictDiff.slice(0, 4000)}`;
   }
 }
 async function generateCommitGroups(files, diffs, model, convention = "clean-commit") {
+  const isLarge = files.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
+  const diffContent = isLarge ? createCompactDiff(files, diffs) : diffs.slice(0, 6000);
+  const largeHint = isLarge ? `
+
+NOTE: This is a large changeset (${files.length} files). Compact diffs are provided for every file. Focus on creating well-organized logical groups.` : "";
   const userMessage = `Group these changed files into logical atomic commits:
 
 Files:
 ${files.join(`
 `)}
 
-Diffs (truncated):
-${diffs.slice(0, 6000)}`;
+Diffs:
+${diffContent}${largeHint}`;
   const result = await callCopilot(getGroupingSystemPrompt(convention), userMessage, model, COPILOT_LONG_TIMEOUT_MS);
   if (!result) {
+    if (isLarge)
+      return generateCommitGroupsInBatches(files, diffs, model, convention);
     throw new Error("AI returned an empty response");
   }
   const cleaned = extractJson(result);
@@ -1121,10 +1216,14 @@ ${diffs.slice(0, 6000)}`;
   try {
     parsed = JSON.parse(cleaned);
   } catch {
+    if (isLarge)
+      return generateCommitGroupsInBatches(files, diffs, model, convention);
     throw new Error(`AI response is not valid JSON. Raw start: "${result.slice(0, 120)}..."`);
   }
   const groups = parsed;
   if (!Array.isArray(groups) || groups.length === 0) {
+    if (isLarge)
+      return generateCommitGroupsInBatches(files, diffs, model, convention);
     throw new Error("AI response was not a valid JSON array of commit groups");
   }
   for (const group of groups) {
@@ -1134,7 +1233,51 @@ ${diffs.slice(0, 6000)}`;
   }
   return groups;
 }
+async function generateCommitGroupsInBatches(files, diffs, model, convention = "clean-commit") {
+  const batchSize = BATCH_CONFIG.FALLBACK_BATCH_SIZE;
+  const allGroups = [];
+  const diffSections = parseDiffByFile(diffs);
+  for (let i = 0;i < files.length; i += batchSize) {
+    const batchFiles = files.slice(i, i + batchSize);
+    const batchDiff = batchFiles.map((f) => diffSections.get(f) ?? "").filter(Boolean).join(`
+`);
+    const batchDiffContent = batchFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD ? createCompactDiff(batchFiles, batchDiff) : batchDiff.slice(0, 6000);
+    const batchNum = Math.floor(i / batchSize) + 1;
+    const totalBatches = Math.ceil(files.length / batchSize);
+    const userMessage = `Group these changed files into logical atomic commits:
+
+Files:
+${batchFiles.join(`
+`)}
+
+Diffs:
+${batchDiffContent}
+
+NOTE: Processing batch ${batchNum}/${totalBatches} of a large changeset. Group only the files listed above.`;
+    try {
+      const result = await callCopilot(getGroupingSystemPrompt(convention), userMessage, model, COPILOT_LONG_TIMEOUT_MS);
+      if (!result)
+        continue;
+      const cleaned = extractJson(result);
+      const parsed = JSON.parse(cleaned);
+      if (Array.isArray(parsed)) {
+        for (const group of parsed) {
+          if (Array.isArray(group.files) && typeof group.message === "string") {
+            allGroups.push(group);
+          }
+        }
+      }
+    } catch {}
+  }
+  if (allGroups.length === 0) {
+    throw new Error("AI could not group any files even with batch processing");
+  }
+  return allGroups;
+}
 async function regenerateAllGroupMessages(groups, diffs, model, convention = "clean-commit") {
+  const totalFiles = groups.reduce((sum, g) => sum + g.files.length, 0);
+  const isLarge = totalFiles >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
+  const diffContent = isLarge ? createCompactDiff(groups.flatMap((g) => g.files), diffs) : diffs.slice(0, 6000);
   const groupSummary = groups.map((g, i) => `Group ${i + 1}: [${g.files.join(", ")}]`).join(`
 `);
   const userMessage = `Regenerate ONLY the commit messages for these pre-defined file groups. Do NOT change the file groupings.
@@ -1142,8 +1285,8 @@ async function regenerateAllGroupMessages(groups, diffs, model, convention = "cl
 Groups:
 ${groupSummary}
 
-Diffs (truncated):
-${diffs.slice(0, 6000)}`;
+Diffs:
+${diffContent}`;
   const result = await callCopilot(getGroupingSystemPrompt(convention), userMessage, model, COPILOT_LONG_TIMEOUT_MS);
   if (!result)
     return groups;
@@ -1162,12 +1305,14 @@ ${diffs.slice(0, 6000)}`;
 }
 async function regenerateGroupMessage(files, diffs, model, convention = "clean-commit") {
   try {
+    const isLarge = files.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
+    const diffContent = isLarge ? createCompactDiff(files, diffs) : diffs.slice(0, 4000);
     const userMessage = `Generate a single commit message for these files:
 
 Files: ${files.join(", ")}
 
 Diff:
-${diffs.slice(0, 4000)}`;
+${diffContent}`;
     const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
     return result?.trim() ?? null;
   } catch {
@@ -1725,7 +1870,8 @@ ${pc6.bold("Changed files:")}`);
         warn(`AI unavailable: ${copilotError}`);
         warn("Falling back to manual commit message entry.");
       } else {
-        const spinner = createSpinner("Generating commit message with AI...");
+        const spinnerMsg = stagedFiles.length >= 15 ? `Generating commit message with AI (${stagedFiles.length} files — using optimized batching)...` : "Generating commit message with AI...";
+        const spinner = createSpinner(spinnerMsg);
         commitMessage = await generateCommitMessage(diff, stagedFiles, args.model, config.commitConvention);
         if (commitMessage) {
           spinner.success("AI commit message generated.");
@@ -1816,7 +1962,7 @@ ${pc6.bold("Changed files:")}`);
   for (const f of changedFiles) {
     console.log(`  ${pc6.dim("•")} ${f}`);
   }
-  const spinner = createSpinner(`Asking AI to group ${changedFiles.length} file(s) into logical commits...`);
+  const spinner = createSpinner(changedFiles.length >= 15 ? `Asking AI to group ${changedFiles.length} file(s) into logical commits (using optimized batching)...` : `Asking AI to group ${changedFiles.length} file(s) into logical commits...`);
   const diffs = await getFullDiffForFiles(changedFiles);
   if (!diffs.trim()) {
     spinner.stop();
@@ -1994,7 +2140,7 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.3.0",
+  version: "0.4.0-dev.6151897",
   description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   type: "module",
   bin: {
@@ -2653,6 +2799,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",
@@ -2664,6 +2844,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",
@@ -2693,31 +2887,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?", [
@@ -2735,16 +2940,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);
@@ -2792,9 +3001,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])}`);
@@ -2808,6 +3016,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";
@@ -2897,6 +3116,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.6151897",
   "description": "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
   "type": "module",
   "bin": {