commit-agent-cli 0.2.1 → 0.2.2

package/README.md

@@ -1,7 +1,5 @@
 # commit-agent-cli
 
-> AI-powered git commit message generator using Claude Sonnet 4.5 / Opus 4.5 or Google Gemini and LangGraph
-
 Generate intelligent, context-aware commit messages by simply typing `commit`.
 
 ## Quick Start
@@ -27,7 +25,7 @@ You'll be prompted to:
 
 ## Features
 
-Powered by Claude Sonnet 4.5 / Opus 4.5 or Google Gemini, this tool autonomously explores your codebase to generate intelligent commit messages with full transparency into its reasoning process. Supports customizable commit styles with secure local configuration storage and the ability to switch between AI providers at any time.
+Powered by Claude and Gemini, this tool intelligently explores your codebase to generate clear, context-aware commit messages with full transparency. Enjoy customizable commit styles, secure local configuration, and seamless switching between AI providers.
 
 ## Documentation
 

package/dist/index.js

@@ -100,7 +100,7 @@ var require_picocolors = __commonJS({
 
 // src/index.ts
 import "dotenv/config";
-import { intro, outro, text, spinner, isCancel, cancel, note, select } from "@clack/prompts";
+import { intro, outro, text, spinner, isCancel, cancel, note, select, multiselect } from "@clack/prompts";
 
 // src/git.ts
 import { execa } from "execa";
@@ -154,6 +154,50 @@ async function isGitRepository() {
     return false;
   }
 }
+async function getStagedFiles() {
+  const { stdout } = await execa("git", ["diff", "--cached", "--name-only"], {
+    reject: false
+  });
+  return stdout ? stdout.split("\n").filter(Boolean) : [];
+}
+async function getUnstagedFiles() {
+  const { stdout } = await execa("git", ["diff", "--name-only"], {
+    reject: false
+  });
+  return stdout ? stdout.split("\n").filter(Boolean) : [];
+}
+async function getUntrackedFiles() {
+  const { stdout } = await execa("git", ["ls-files", "--others", "--exclude-standard"], {
+    reject: false
+  });
+  return stdout ? stdout.split("\n").filter(Boolean) : [];
+}
+async function getRecentCommits(count = 5) {
+  const { stdout } = await execa("git", ["log", `-${count}`, "--pretty=format:%h|%s"], {
+    reject: false
+  });
+  if (!stdout) return [];
+  return stdout.split("\n").map((line) => {
+    const [hash, ...messageParts] = line.split("|");
+    return { hash, message: messageParts.join("|") };
+  });
+}
+async function getStagedStats() {
+  const { stdout: stats } = await execa("git", ["diff", "--cached", "--stat"], {
+    reject: false
+  });
+  if (!stats) return { files: 0, insertions: 0, deletions: 0 };
+  const match = stats.match(/(\d+) files? changed(?:, (\d+) insertions?\(\+\))?(?:, (\d+) deletions?\(-\))?/);
+  return {
+    files: match ? parseInt(match[1]) : 0,
+    insertions: match && match[2] ? parseInt(match[2]) : 0,
+    deletions: match && match[3] ? parseInt(match[3]) : 0
+  };
+}
+async function stageFiles(files) {
+  if (files.length === 0) return;
+  await execa("git", ["add", ...files]);
+}
 
 // src/agent.ts
 import { ChatAnthropic } from "@langchain/anthropic";
@@ -445,6 +489,7 @@ import updateNotifier from "update-notifier";
 import { readFileSync } from "fs";
 import { fileURLToPath } from "url";
 import { dirname, join as joinPath } from "path";
+import { execa as execa3 } from "execa";
 import { homedir } from "os";
 import { join as join2 } from "path";
 import { readFile as readFile2, writeFile } from "fs/promises";
@@ -578,6 +623,43 @@ async function promptForApiKey(provider) {
     return key;
   }
 }
+async function showGuidedStaging() {
+  const s = spinner();
+  s.start("Checking for unstaged and untracked files...");
+  const [unstaged, untracked] = await Promise.all([
+    getUnstagedFiles(),
+    getUntrackedFiles()
+  ]);
+  s.stop("Files found.");
+  const allFiles = [
+    ...unstaged.map((f) => ({ file: f, status: "modified" })),
+    ...untracked.map((f) => ({ file: f, status: "untracked" }))
+  ];
+  if (allFiles.length === 0) {
+    note("No changes to stage. Make some changes first!", "No Changes");
+    return false;
+  }
+  note(`Found ${allFiles.length} file(s) with changes`, "Available Files");
+  const selectedFiles = await multiselect({
+    message: "Select files to stage (Space to select, Enter to continue):",
+    options: allFiles.map(({ file, status }) => ({
+      value: file,
+      label: `${file} (${status})`
+    })),
+    required: false
+  });
+  if (isCancel(selectedFiles)) {
+    return false;
+  }
+  if (!selectedFiles || selectedFiles.length === 0) {
+    note('No files selected. You can run "git add <files>" manually.', "Skipped");
+    return false;
+  }
+  s.start("Staging selected files...");
+  await stageFiles(selectedFiles);
+  s.stop(`Staged ${selectedFiles.length} file(s).`);
+  return true;
+}
 async function showSettingsMenu(currentConfig2) {
   const providerLabel = currentConfig2.provider === "anthropic" ? "Anthropic (Claude)" : "Google (Gemini)";
   const modelName = currentConfig2.provider === "anthropic" ? ANTHROPIC_MODELS[currentConfig2.model] || currentConfig2.model : GOOGLE_MODELS[currentConfig2.model] || currentConfig2.model;
@@ -772,14 +854,116 @@ async function main() {
     note(`Preferences saved! You can change these anytime in the settings menu.`, "Setup Complete");
   }
   const s = spinner();
-  s.start("Analyzing staged changes...");
-  const diff = await getStagedDiffSmart();
+  s.start("Checking staged changes...");
+  let diff = await getStagedDiffSmart();
   if (!diff) {
     s.stop("No staged changes found.");
-    cancel('Please stage your changes using "git add" first.');
-    process.exit(0);
+    const shouldStage = await select({
+      message: "No staged changes. Would you like to stage files now?",
+      options: [
+        { value: true, label: "Yes, show me files to stage" },
+        { value: false, label: "No, I'll stage manually" }
+      ],
+      initialValue: true
+    });
+    if (isCancel(shouldStage) || !shouldStage) {
+      cancel('Please stage your changes using "git add" first.');
+      process.exit(0);
+    }
+    const staged = await showGuidedStaging();
+    if (!staged) {
+      cancel("No files were staged. Exiting.");
+      process.exit(0);
+    }
+    s.start("Analyzing staged changes...");
+    diff = await getStagedDiffSmart();
+    if (!diff) {
+      s.stop("Still no staged changes.");
+      cancel("Something went wrong. Please try again.");
+      process.exit(0);
+    }
   }
   s.stop("Changes detected.");
+  const stats = await getStagedStats();
+  const stagedFiles = await getStagedFiles();
+  let previewMessage = import_picocolors.default.cyan(`${stats.files} file(s) changed`);
+  if (stats.insertions > 0) previewMessage += import_picocolors.default.green(`, ${stats.insertions} insertion(s)`);
+  if (stats.deletions > 0) previewMessage += import_picocolors.default.red(`, ${stats.deletions} deletion(s)`);
+  previewMessage += "\n" + stagedFiles.map((f) => `  \u2022 ${f}`).join("\n");
+  note(previewMessage, "Changes Summary");
+  const recentCommits = await getRecentCommits(5);
+  if (recentCommits.length > 0) {
+    const commitsMessage = recentCommits.map((c) => `  ${import_picocolors.default.dim(c.hash)} ${c.message}`).join("\n");
+    note(commitsMessage, "Recent Commits");
+  }
+  const [unstaged, untracked] = await Promise.all([
+    getUnstagedFiles(),
+    getUntrackedFiles()
+  ]);
+  if (unstaged.length > 0 || untracked.length > 0) {
+    const unstagedCount = unstaged.length + untracked.length;
+    const warningMessage = `You have ${unstagedCount} unstaged file(s):
+` + [...unstaged.map((f) => `  \u2022 ${f} (modified)`), ...untracked.map((f) => `  \u2022 ${f} (untracked)`)].join("\n");
+    note(import_picocolors.default.yellow(warningMessage), import_picocolors.default.yellow("\u26A0 Unstaged Changes"));
+    const includeUnstaged = await select({
+      message: "Include these files in this commit?",
+      options: [
+        { value: false, label: "No, continue with current staging" },
+        { value: true, label: "Yes, let me select which ones" }
+      ],
+      initialValue: false
+    });
+    if (!isCancel(includeUnstaged) && includeUnstaged) {
+      const additionalFiles = await multiselect({
+        message: "Select additional files to stage:",
+        options: [
+          ...unstaged.map((f) => ({ value: f, label: `${f} (modified)` })),
+          ...untracked.map((f) => ({ value: f, label: `${f} (untracked)` }))
+        ],
+        required: false
+      });
+      if (!isCancel(additionalFiles) && additionalFiles && additionalFiles.length > 0) {
+        s.start("Staging additional files...");
+        await stageFiles(additionalFiles);
+        diff = await getStagedDiffSmart();
+        s.stop("Additional files staged.");
+      }
+    }
+  }
+  const totalChanges = stats.insertions + stats.deletions;
+  if (stats.files >= 10 || totalChanges >= 500) {
+    const largeChangesetMessage = import_picocolors.default.yellow(
+      `\u26A0 Large changeset detected (${stats.files} files, ${totalChanges} changes)
+Consider splitting into smaller, focused commits for better review.`
+    );
+    note(largeChangesetMessage, import_picocolors.default.yellow("Large Changeset Warning"));
+    const proceedWithLarge = await select({
+      message: "How would you like to proceed?",
+      options: [
+        { value: "continue", label: "Continue with all changes" },
+        { value: "reselect", label: "Let me re-select files to commit" },
+        { value: "cancel", label: "Cancel and stage manually" }
+      ],
+      initialValue: "continue"
+    });
+    if (isCancel(proceedWithLarge) || proceedWithLarge === "cancel") {
+      cancel('Cancelled. Use "git add" to stage specific files.');
+      process.exit(0);
+    }
+    if (proceedWithLarge === "reselect") {
+      await execa3("git", ["reset", "HEAD"]);
+      const restaged = await showGuidedStaging();
+      if (!restaged) {
+        cancel("No files were staged. Exiting.");
+        process.exit(0);
+      }
+      diff = await getStagedDiffSmart();
+      if (!diff) {
+        cancel("No staged changes. Exiting.");
+        process.exit(0);
+      }
+    }
+  }
   let commitMessage = "";
   let confirmed = false;
   let userFeedback = void 0;
@@ -854,13 +1038,16 @@ async function main() {
     }
     const formattedMessage = wrappedLines.map((line) => import_picocolors.default.cyan(line)).join("\n");
     note(formattedMessage, import_picocolors.default.bold("Proposed Commit Message"));
+    const isMultiLine = commitMessage.includes("\n");
+    const actionOptions = [
+      { value: "commit", label: "Yes, commit" },
+      ...isMultiLine ? [] : [{ value: "edit", label: "Edit message" }],
+      { value: "regenerate", label: "Regenerate" },
+      { value: "settings", label: "Change settings" }
+    ];
     const action = await select({
       message: "Do you want to use this message?",
-      options: [
-        { value: "commit", label: "Yes, commit" },
-        { value: "regenerate", label: "No, regenerate" },
-        { value: "settings", label: "Change settings" }
-      ]
+      options: actionOptions
     });
     if (isCancel(action)) {
       cancel("Operation cancelled.");
@@ -868,6 +1055,34 @@ async function main() {
     }
     if (action === "commit") {
       confirmed = true;
+    } else if (action === "edit") {
+      const editedMessage = await text({
+        message: "Edit your commit message:",
+        initialValue: commitMessage,
+        validate: (value) => {
+          if (!value || value.trim() === "") return "Commit message cannot be empty";
+        }
+      });
+      if (isCancel(editedMessage)) {
+        continue;
+      }
+      commitMessage = editedMessage;
+      const editedFormattedMessage = editedMessage.split("\n").map((line) => import_picocolors.default.cyan(line)).join("\n");
+      note(editedFormattedMessage, import_picocolors.default.bold("Edited Commit Message"));
+      const confirmEdited = await select({
+        message: "Use this edited message?",
+        options: [
+          { value: true, label: "Yes, commit" },
+          { value: false, label: "No, go back" }
+        ],
+        initialValue: true
+      });
+      if (isCancel(confirmEdited)) {
+        continue;
+      }
+      if (confirmEdited) {
+        confirmed = true;
+      }
     } else if (action === "settings") {
       const settingsResult = await showSettingsMenu(config);
       if (settingsResult) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "commit-agent-cli",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "AI-powered git commit CLI using LangGraph and Claude 4.5 or Gemini",
     "main": "dist/index.js",
     "types": "./dist/index.d.ts",