contribute-now 0.4.0-dev.d48d9e6 → 0.4.0-dev.ff615ec

package/README.md

@@ -64,7 +64,7 @@ bun install -g contribute-now
 ## Prerequisites
 
 - **[Git](https://git-scm.com/)** — required
-- **[GitHub CLI](https://cli.github.com)** (`gh`) — optional; enables role auto-detection and PR creation
+- **[GitHub CLI](https://cli.github.com)** (`gh`) — recommended; required for PR creation, role detection, and merge status checks
 - **[GitHub Copilot](https://github.com/features/copilot)** — optional; enables AI features
 
 ---
@@ -129,10 +129,13 @@ Stage your changes and create a validated, AI-generated commit message matching
 contrib commit                     # AI-generated message
 contrib commit --no-ai             # manual entry, still validated
 contrib commit --model gpt-4.1    # specific AI model
+contrib commit --group             # AI groups changes into atomic commits
 ```
 
 After the AI generates a message, you can **accept**, **edit**, **regenerate**, or **write manually**. Messages are always validated against your convention — with a soft warning if they don't match (you can still commit).
 
+**Group commit mode** (`--group`): AI analyzes all staged and unstaged changes, groups related files into logical atomic commits, and generates a commit message for each group. Great for splitting a large set of changes into clean, reviewable commits.
+
 ---
 
 ### `contrib update`
@@ -180,6 +183,55 @@ contrib status
 
 ---
 
+### `contrib doctor`
+
+Diagnose the contribute-now CLI environment and configuration. Checks tools, dependencies, config, git state, fork setup, workflow, and environment.
+
+```bash
+contrib doctor          # pretty-printed report
+contrib doctor --json   # machine-readable JSON output
+```
+
+Checks include:
+- CLI version and runtime (Bun/Node)
+- git and GitHub CLI availability and authentication
+- `.contributerc.json` validity and `.gitignore` status
+- Git repo state (uncommitted changes, lock files, shallow clone)
+- Fork and remote configuration
+- Workflow and branch setup
+
+---
+
+### `contrib log`
+
+Show a colorized, workflow-aware commit log with graph visualization.
+
+```bash
+contrib log                # last 20 commits with graph
+contrib log -n 50          # last 50 commits
+contrib log --all          # all branches
+contrib log --no-graph     # flat view without graph lines
+contrib log -b feature/x   # log for a specific branch
+```
+
+Protected branches (main, dev) are highlighted, and the current branch is color-coded for quick orientation.
+
+---
+
+### `contrib branch`
+
+List branches with workflow-aware labels and tracking status.
+
+```bash
+contrib branch             # local branches
+contrib branch --all       # local + remote branches
+contrib branch --remote    # remote branches only
+```
+
+Branches are annotated with workflow labels (e.g., base, dev, feature) and tracking info (upstream, gone, no remote).
+
+---
+
 ### `contrib hook`
 
 Install or uninstall a `commit-msg` git hook that validates every commit against your configured convention — no Husky or lint-staged needed.
@@ -210,8 +262,9 @@ contrib validate "added stuff"                   # exit 1
 All AI features are powered by **GitHub Copilot** via `@github/copilot-sdk` and are entirely **optional** — every command has a manual fallback.
 
 | Command | AI Feature | Fallback |
-|---------|------------|---------|
+|---------|------------|----------|
 | `commit` | Generate commit message from staged diff | Type manually |
+| `commit --group` | Group related changes into atomic commits | Manual staging + commit |
 | `start` | Suggest branch name from natural language | Prefix picker + manual |
 | `update` | Conflict resolution guidance | Standard git instructions |
 | `submit` | Generate PR title and body | `gh pr create --fill` or manual |

package/dist/index.js

@@ -978,15 +978,21 @@ var BATCH_CONFIG = {
 };
 function parseDiffByFile(rawDiff) {
   const sections = new Map;
-  const headerPattern = /^diff --git a\/(.+?) b\//gm;
+  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 });
+    const aFile = match[1];
+    const bFile = match[2] ?? aFile;
+    positions.push({ aFile, bFile, start: match.index });
   }
   for (let i = 0;i < positions.length; i++) {
-    const { file, start } = positions[i];
+    const { aFile, bFile, start } = positions[i];
     const end = i + 1 < positions.length ? positions[i + 1].start : rawDiff.length;
-    sections.set(file, rawDiff.slice(start, end));
+    const section = rawDiff.slice(start, end);
+    sections.set(aFile, section);
+    if (bFile && bFile !== aFile) {
+      sections.set(bFile, section);
+    }
   }
   return sections;
 }
@@ -1017,10 +1023,15 @@ function createCompactDiff(files, rawDiff, maxTotalChars = BATCH_CONFIG.MAX_COMP
         parts.push(`${header}
 ${section}`);
       } else {
-        const truncated = section.slice(0, perFileBudget - header.length - 20);
-        parts.push(`${header}
+        const availableForBody = perFileBudget - header.length - 20;
+        if (availableForBody <= 0) {
+          parts.push(header);
+        } else {
+          const truncated = section.slice(0, availableForBody);
+          parts.push(`${header}
 ${truncated}
 ...(truncated)`);
+        }
       }
     } else {
       parts.push(`[${file}] (new/binary file — no diff available)`);
@@ -1263,12 +1274,24 @@ NOTE: Processing batch ${batchNum}/${totalBatches} of a large changeset. Group o
       if (Array.isArray(parsed)) {
         for (const group of parsed) {
           if (Array.isArray(group.files) && typeof group.message === "string") {
-            allGroups.push(group);
+            const batchFileSet = new Set(batchFiles);
+            const filteredFiles = group.files.filter((f) => batchFileSet.has(f));
+            if (filteredFiles.length > 0) {
+              allGroups.push({ ...group, files: filteredFiles });
+            }
           }
         }
       }
     } catch {}
   }
+  const groupedFiles = new Set(allGroups.flatMap((g) => g.files));
+  const ungrouped = files.filter((f) => !groupedFiles.has(f));
+  if (ungrouped.length > 0) {
+    allGroups.push({
+      files: ungrouped,
+      message: `chore: update ${ungrouped.length} remaining file${ungrouped.length !== 1 ? "s" : ""}`
+    });
+  }
   if (allGroups.length === 0) {
     throw new Error("AI could not group any files even with batch processing");
   }
@@ -1870,7 +1893,7 @@ ${pc6.bold("Changed files:")}`);
         warn(`AI unavailable: ${copilotError}`);
         warn("Falling back to manual commit message entry.");
       } else {
-        const spinnerMsg = stagedFiles.length >= 15 ? `Generating commit message with AI (${stagedFiles.length} files — using optimized batching)...` : "Generating commit message with AI...";
+        const spinnerMsg = stagedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD ? `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) {
@@ -1962,7 +1985,7 @@ ${pc6.bold("Changed files:")}`);
   for (const f of changedFiles) {
     console.log(`  ${pc6.dim("•")} ${f}`);
   }
-  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 spinner = createSpinner(changedFiles.length >= BATCH_CONFIG.LARGE_CHANGESET_THRESHOLD ? `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();
@@ -2140,8 +2163,8 @@ import pc7 from "picocolors";
 // package.json
 var package_default = {
   name: "contribute-now",
-  version: "0.4.0-dev.d48d9e6",
-  description: "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
+  version: "0.4.0-dev.ff615ec",
+  description: "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   type: "module",
   bin: {
     contrib: "dist/index.js",
@@ -2827,6 +2850,9 @@ async function shouldContinueSetupWithExistingConfig(options) {
     onWarn("Found .contributerc.json but it appears invalid.");
     const shouldContinue = await confirm2("Continue setup and overwrite invalid config?");
     if (!shouldContinue) {
+      if (ensureIgnored()) {
+        onInfo("Added .contributerc.json to .gitignore to avoid committing personal config.");
+      }
       onInfo("Keeping existing file. Run setup again when ready to repair it.");
       return false;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "contribute-now",
-  "version": "0.4.0-dev.d48d9e6",
-  "description": "Git workflow CLI for squash-merge two-branch models. Keeps dev in sync with main after squash merges.",
+  "version": "0.4.0-dev.ff615ec",
+  "description": "Developer CLI that automates git workflows — branching, syncing, committing, and PRs — with multi-workflow and commit convention support.",
   "type": "module",
   "bin": {
     "contrib": "dist/index.js",