contribute-now 0.6.2-dev.38e14f5 → 0.6.2-dev.3d69403

package/dist/index.js

@@ -10103,12 +10103,12 @@ async function multiSelectPrompt(message, choices) {
 init_dist();
 var CONVENTIONAL_COMMIT_SYSTEM_PROMPT = `Git commit message generator. Format: <type>[!][(<scope>)]: <description>
 Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert
-Rules: breaking (!) only for feat/fix/refactor/perf; imperative mood; max 72 chars; lowercase start; scope optional camelCase/kebab-case. Return ONLY the message line.
+Rules: breaking (!) only for feat/fix/refactor/perf; imperative mood; max 72 chars; lowercase start; scope optional camelCase/kebab-case. Do NOT use backticks, quotes, or markdown formatting around filenames, functions, or identifiers. Return ONLY the message line.
 Examples: feat: add user auth | fix(auth): resolve token expiry | feat!: redesign auth API`;
 var CLEAN_COMMIT_SYSTEM_PROMPT = `Git commit message generator. EXACT format: <emoji> <type>[!][ (<scope>)]: <description>
 Spacing: EMOJI SPACE TYPE [SPACE OPENPAREN SCOPE CLOSEPAREN] COLON SPACE DESCRIPTION
 Types: \uD83D\uDCE6 new, \uD83D\uDD27 update, \uD83D\uDDD1️ remove, \uD83D\uDD12 security, ⚙️ setup, ☕ chore, \uD83E\uDDEA test, \uD83D\uDCD6 docs, \uD83D\uDE80 release
-Rules: breaking (!) only for new/update/remove/security; imperative mood; max 72 chars; lowercase start; scope optional. Return ONLY the message line.
+Rules: breaking (!) only for new/update/remove/security; imperative mood; max 72 chars; lowercase start; scope optional. Do NOT use backticks, quotes, or markdown formatting around filenames, functions, or identifiers. Return ONLY the message line.
 Correct: \uD83D\uDCE6 new: add user auth | \uD83D\uDD27 update (api): improve error handling | ⚙️ setup (ci): configure github actions
 WRONG: ⚙️setup(ci): ... | \uD83D\uDD27 update(api): ... ← always space before scope parenthesis`;
 function getGroupingSystemPrompt(convention) {
@@ -10133,6 +10133,7 @@ Rules:
 - Each group should represent ONE logical change
 - Every file must appear in exactly one group
 - Commit messages must follow the convention, be concise, imperative, max 72 chars
+- Do not use backticks, quotes, or markdown formatting in commit messages
 - Order groups so foundational changes come first (types, utils) and consumers come after
 - Return ONLY the JSON array, nothing else`;
 }
@@ -10351,6 +10352,9 @@ function extractJson(raw) {
   }
   return text;
 }
+function sanitizeGeneratedCommitMessage(message) {
+  return message.replace(/`+/g, "").replace(/\s+/g, " ").trim();
+}
 async function generateCommitMessage(diff, stagedFiles, model, convention = "clean-commit", context) {
   try {
     const isLarge = stagedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD;
@@ -10368,7 +10372,7 @@ Files (${stagedFiles.length}): ${stagedFiles.join(", ")}
 Diff:
 ${diffContent}${multiFileHint}${squashHint}`;
     const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model, isLarge ? COPILOT_LONG_TIMEOUT_MS : COPILOT_TIMEOUT_MS);
-    return result?.trim() ?? null;
+    return result ? sanitizeGeneratedCommitMessage(result) : null;
   } catch {
     return null;
   }
@@ -10415,6 +10419,40 @@ ${conflictDiff.slice(0, 4000)}`;
     return null;
   }
 }
+function normalizeCommitGroups(changedFiles, groups) {
+  const changedSet = new Set(changedFiles);
+  const assignedFiles = new Set;
+  const unknownFiles = new Set;
+  const duplicateFiles = new Set;
+  const normalizedGroups = groups.map((group) => {
+    const uniqueFiles = new Set;
+    const files = [];
+    for (const file of group.files) {
+      if (!changedSet.has(file)) {
+        unknownFiles.add(file);
+        continue;
+      }
+      if (uniqueFiles.has(file) || assignedFiles.has(file)) {
+        duplicateFiles.add(file);
+        continue;
+      }
+      uniqueFiles.add(file);
+      assignedFiles.add(file);
+      files.push(file);
+    }
+    return {
+      ...group,
+      files
+    };
+  }).filter((group) => group.files.length > 0);
+  const unassignedFiles = changedFiles.filter((file) => !assignedFiles.has(file));
+  return {
+    groups: normalizedGroups,
+    unknownFiles: [...unknownFiles],
+    duplicateFiles: [...duplicateFiles],
+    unassignedFiles
+  };
+}
 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);
@@ -10455,7 +10493,10 @@ ${diffContent}${largeHint}`;
       throw new Error("AI returned groups with invalid structure (missing files or message)");
     }
   }
-  return groups;
+  return groups.map((group) => ({
+    ...group,
+    message: sanitizeGeneratedCommitMessage(group.message)
+  }));
 }
 async function generateCommitGroupsInBatches(files, diffs, model, convention = "clean-commit") {
   const batchSize = BATCH_CONFIG.FALLBACK_BATCH_SIZE;
@@ -10490,7 +10531,11 @@ NOTE: Processing batch ${batchNum}/${totalBatches} of a large changeset. Group o
             const batchFileSet = new Set(batchFiles);
             const filteredFiles = group.files.filter((f3) => batchFileSet.has(f3));
             if (filteredFiles.length > 0) {
-              allGroups.push({ ...group, files: filteredFiles });
+              allGroups.push({
+                ...group,
+                files: filteredFiles,
+                message: sanitizeGeneratedCommitMessage(group.message)
+              });
             }
           }
         }
@@ -10533,7 +10578,7 @@ ${diffContent}`;
       return groups;
     return groups.map((g3, i2) => ({
       files: g3.files,
-      message: typeof parsed[i2]?.message === "string" ? parsed[i2].message : g3.message
+      message: typeof parsed[i2]?.message === "string" ? sanitizeGeneratedCommitMessage(parsed[i2].message) : g3.message
     }));
   } catch {
     return groups;
@@ -10550,7 +10595,7 @@ Files: ${files.join(", ")}
 Diff:
 ${diffContent}`;
     const result = await callCopilot(getCommitSystemPrompt(convention), userMessage, model);
-    return result?.trim() ?? null;
+    return result ? sanitizeGeneratedCommitMessage(result) : null;
   } catch {
     return null;
   }
@@ -10986,17 +11031,24 @@ var CONVENTION_FORMAT_HINTS = {
   conventional: [
     "Format: <type>[!][(<scope>)]: <description>",
     "Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore, revert",
-    "Examples: feat: add login page | fix(auth): resolve token expiry | docs: update README"
+    "Examples: feat: add login page | fix(auth): resolve token expiry | docs: update README",
+    "Do not use backticks or markdown formatting in the message."
   ],
   "clean-commit": [
     "Format: <emoji> <type>[!][(<scope>)]: <description>",
     "Types: \uD83D\uDCE6 new | \uD83D\uDD27 update | \uD83D\uDDD1️ remove | \uD83D\uDD12 security | ⚙️ setup | ☕ chore | \uD83E\uDDEA test | \uD83D\uDCD6 docs | \uD83D\uDE80 release",
-    "Examples: \uD83D\uDCE6 new: user auth | \uD83D\uDD27 update (api): improve errors | ⚙️ setup (ci): add workflow"
+    "Examples: \uD83D\uDCE6 new: user auth | \uD83D\uDD27 update (api): improve errors | ⚙️ setup (ci): add workflow",
+    "Do not use backticks or markdown formatting in the message."
   ]
 };
+function hasUnsupportedCommitMessageChars(message) {
+  return message.includes("`");
+}
 function validateCommitMessage(message, convention) {
   if (convention === "none")
     return true;
+  if (hasUnsupportedCommitMessageChars(message))
+    return false;
   if (convention === "clean-commit")
     return CLEAN_COMMIT_PATTERN.test(message);
   if (convention === "conventional")
@@ -11008,6 +11060,7 @@ function getValidationError(convention) {
     return [];
   return [
     `Commit message does not follow ${CONVENTION_LABELS[convention]} format.`,
+    "Do not use backticks or markdown formatting in commit messages.",
     ...CONVENTION_FORMAT_HINTS[convention]
   ];
 }
@@ -11200,6 +11253,15 @@ ${import_picocolors8.default.bold("Changed files:")}`);
     success(`Committed: ${import_picocolors8.default.bold(finalMessage)}`);
   }
 });
+function getFallbackGroupMessage(convention) {
+  if (convention === "conventional") {
+    return "chore: commit remaining changes";
+  }
+  if (convention === "clean-commit") {
+    return "☕ chore: commit remaining changes";
+  }
+  return "commit remaining changes";
+}
 async function runGroupCommit(model, config) {
   const [copilotError, changedFiles] = await Promise.all([
     checkCopilotAvailable(),
@@ -11237,15 +11299,25 @@ ${import_picocolors8.default.bold("Changed files:")}`);
     error("AI could not produce commit groups. Try committing files manually.");
     process.exit(1);
   }
-  const changedSet = new Set(changedFiles);
-  for (const group of groups) {
-    const invalid = group.files.filter((f3) => !changedSet.has(f3));
-    if (invalid.length > 0) {
-      warn(`AI suggested unknown file(s): ${invalid.join(", ")} — removed from group.`);
-    }
-    group.files = group.files.filter((f3) => changedSet.has(f3));
+  const normalized = normalizeCommitGroups(changedFiles, groups);
+  if (normalized.unknownFiles.length > 0) {
+    warn(`AI suggested unknown file(s): ${normalized.unknownFiles.join(", ")} — removed from groups.`);
+  }
+  if (normalized.duplicateFiles.length > 0) {
+    warn(`AI assigned duplicate file(s) across groups: ${normalized.duplicateFiles.join(", ")} — keeping the first assignment only.`);
+  }
+  let validGroups = normalized.groups;
+  if (normalized.unassignedFiles.length > 0) {
+    warn(`AI left ${normalized.unassignedFiles.length} file(s) ungrouped: ${normalized.unassignedFiles.join(", ")}. Creating a fallback group.`);
+    const fallbackMessage = await regenerateGroupMessage(normalized.unassignedFiles, diffs, model, config.commitConvention) ?? getFallbackGroupMessage(config.commitConvention);
+    validGroups = [
+      ...validGroups,
+      {
+        files: normalized.unassignedFiles,
+        message: fallbackMessage
+      }
+    ];
   }
-  let validGroups = groups.filter((g3) => g3.files.length > 0);
   if (validGroups.length === 0) {
     error("No valid groups remain after validation. Try committing files manually.");
     process.exit(1);
@@ -11291,7 +11363,17 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
   if (commitAll) {
     for (let i2 = 0;i2 < validGroups.length; i2++) {
       const group = validGroups[i2];
-      const stageResult = await stageFiles(group.files);
+      const remainingChangedFiles = new Set(await getChangedFiles());
+      const stageableFiles = group.files.filter((file) => remainingChangedFiles.has(file));
+      const skippedFiles = group.files.filter((file) => !remainingChangedFiles.has(file));
+      if (skippedFiles.length > 0) {
+        warn(`Group ${i2 + 1} file(s) no longer have changes: ${skippedFiles.join(", ")}`);
+      }
+      if (stageableFiles.length === 0) {
+        warn(`Skipped group ${i2 + 1}: no files remain to commit.`);
+        continue;
+      }
+      const stageResult = await stageFiles(stageableFiles);
       if (stageResult.exitCode !== 0) {
         error(`Failed to stage group ${i2 + 1}: ${stageResult.stderr}`);
         continue;
@@ -11300,7 +11382,7 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
       if (commitResult.exitCode !== 0) {
         const detail = (commitResult.stderr || commitResult.stdout).trim();
         error(`Failed to commit group ${i2 + 1}: ${detail}`);
-        await unstageFiles(group.files);
+        await unstageFiles(stageableFiles);
         continue;
       }
       committed++;
@@ -11360,7 +11442,18 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
             continue;
           }
         }
-        const stageResult = await stageFiles(group.files);
+        const remainingChangedFiles = new Set(await getChangedFiles());
+        const stageableFiles = group.files.filter((file) => remainingChangedFiles.has(file));
+        const skippedFiles = group.files.filter((file) => !remainingChangedFiles.has(file));
+        if (skippedFiles.length > 0) {
+          warn(`Group ${i2 + 1} file(s) no longer have changes: ${skippedFiles.join(", ")}`);
+        }
+        if (stageableFiles.length === 0) {
+          warn(`Skipped group ${i2 + 1}: no files remain to commit.`);
+          actionDone = true;
+          continue;
+        }
+        const stageResult = await stageFiles(stageableFiles);
         if (stageResult.exitCode !== 0) {
           error(`Failed to stage group ${i2 + 1}: ${stageResult.stderr}`);
           actionDone = true;
@@ -11370,7 +11463,7 @@ ${import_picocolors8.default.bold(`AI suggested ${validGroups.length} commit gro
         if (commitResult.exitCode !== 0) {
           const detail = (commitResult.stderr || commitResult.stdout).trim();
           error(`Failed to commit group ${i2 + 1}: ${detail}`);
-          await unstageFiles(group.files);
+          await unstageFiles(stageableFiles);
           actionDone = true;
           continue;
         }
@@ -11395,7 +11488,7 @@ var import_picocolors9 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.6.2-dev.38e14f5",
+  version: "0.6.2-dev.3d69403",
   description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {
@@ -11806,13 +11899,13 @@ esac
 
 # Detect available package runner
 if command -v contrib >/dev/null 2>&1; then
-  contrib validate "$commit_msg"
+  contrib validate --file "$commit_msg_file"
 elif command -v bunx >/dev/null 2>&1; then
-  bunx contrib validate "$commit_msg"
+  bunx contrib validate --file "$commit_msg_file"
 elif command -v pnpx >/dev/null 2>&1; then
-  pnpx contrib validate "$commit_msg"
+  pnpx contrib validate --file "$commit_msg_file"
 elif command -v npx >/dev/null 2>&1; then
-  npx contrib validate "$commit_msg"
+  npx contrib validate --file "$commit_msg_file"
 else
   echo "Warning: No package runner found. Skipping commit message validation."
   exit 0
@@ -12965,16 +13058,27 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
   if (!message) {
     const copilotError = await checkCopilotAvailable();
     if (!copilotError) {
-      const spinner = createSpinner("Generating AI commit message for squash merge...");
-      const [stagedDiff, stagedFiles] = await Promise.all([getStagedDiff(), getStagedFiles()]);
-      const aiMsg = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit", "squash-merge");
-      if (aiMsg) {
-        message = aiMsg;
-        spinner.success("AI commit message generated.");
-        console.log(`
+      while (!message) {
+        const spinner = createSpinner("Generating AI commit message for squash merge...");
+        const [stagedDiff, stagedFiles] = await Promise.all([getStagedDiff(), getStagedFiles()]);
+        const aiMsg = await generateCommitMessage(stagedDiff, stagedFiles, options?.model, options?.convention ?? "clean-commit", "squash-merge");
+        if (aiMsg) {
+          message = aiMsg;
+          spinner.success("AI commit message generated.");
+          console.log(`
   ${import_picocolors16.default.dim("AI suggestion:")} ${import_picocolors16.default.bold(import_picocolors16.default.cyan(message))}`);
-      } else {
+          break;
+        }
         spinner.fail("AI did not return a commit message.");
+        const retryAction = await selectPrompt("AI could not generate a commit message. What would you like to do?", ["Try again with AI", "Write manually", "Cancel"]);
+        if (retryAction === "Try again with AI") {
+          continue;
+        }
+        if (retryAction === "Cancel") {
+          warn("Squash merge commit cancelled.");
+          process.exit(0);
+        }
+        break;
       }
     } else {
       warn(`AI unavailable: ${copilotError}`);
@@ -13004,7 +13108,7 @@ async function performSquashMerge(origin, baseBranch, featureBranch, options) {
   ${import_picocolors16.default.dim("AI suggestion:")} ${import_picocolors16.default.bold(import_picocolors16.default.cyan(regen))}`);
         } else {
           spinner.fail("Regeneration failed.");
-          finalMsg = await inputPrompt("Enter commit message");
+          continue;
         }
       } else {
         finalMsg = await inputPrompt("Enter commit message");
@@ -14040,6 +14144,7 @@ ${import_picocolors19.default.bold("\uD83D\uDCA1 AI Conflict Resolution Guidance
 
 // src/commands/validate.ts
 var import_picocolors20 = __toESM(require_picocolors(), 1);
+import { readFileSync as readFileSync5 } from "node:fs";
 var validate_default = defineCommand({
   meta: {
     name: "validate",
@@ -14049,7 +14154,11 @@ var validate_default = defineCommand({
     message: {
       type: "positional",
       description: "The commit message to validate",
-      required: true
+      required: false
+    },
+    file: {
+      type: "string",
+      description: "Path to a commit message file; only the first line is validated"
     }
   },
   async run({ args }) {
@@ -14063,7 +14172,11 @@ var validate_default = defineCommand({
       info('Commit convention is set to "none". All messages are accepted.');
       process.exit(0);
     }
-    const message = args.message;
+    const message = args.file ? readFileSync5(args.file, "utf-8").split(/\r?\n/, 1)[0] ?? "" : args.message;
+    if (!message) {
+      error("No commit message provided. Pass a message or use --file <path>.");
+      process.exit(1);
+    }
     if (validateCommitMessage(message, convention)) {
       success(`Valid ${CONVENTION_LABELS[convention]} message.`);
       process.exit(0);

package/package.json

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