contribute-now 0.6.1-staging.82b7b78 → 0.6.2-dev.313af88

package/dist/index.js

@@ -10415,6 +10415,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);
@@ -11200,6 +11234,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 +11280,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 +11344,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 +11363,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 +11423,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 +11444,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 +11469,7 @@ var import_picocolors9 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.6.1-staging.82b7b78",
+  version: "0.6.2-dev.313af88",
   description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contribute-now",
-  "version": "0.6.1-staging.82b7b78",
+  "version": "0.6.2-dev.313af88",
   "description": "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   "type": "module",
   "bin": {