commic 1.0.0 → 1.0.2

package/src/orchestrator/MainOrchestrator.ts

@@ -32,14 +32,31 @@ export class MainOrchestrator {
       const repositoryPath = options.path || '.';
       const repository = await this.findAndValidateRepository(repositoryPath);
 
+      // Step 2.5: Stage all changes
+      await this.stageAllChanges(repository.rootPath);
+
       // Step 3: Get Git diff
       const diff = await this.getGitDiff(repository.rootPath);
 
       // Step 4: Generate commit suggestions
-      const suggestions = await this.generateSuggestions(config, diff);
+      let suggestions = await this.generateSuggestions(config, diff);
+      let customInstruction: string | undefined;
+
+      // Step 5: Let user select a commit message (with regenerate option)
+      let selectedIndex = await this.uiManager.promptForCommitSelection(suggestions);
 
-      // Step 5: Let user select a commit message
-      const selectedIndex = await this.uiManager.promptForCommitSelection(suggestions);
+      // Handle regenerate with prompt loop
+      while (selectedIndex === -2) {
+        // Get custom instruction from user
+        customInstruction = await this.uiManager.promptForCustomInstruction();
+
+        // Regenerate suggestions with custom instruction
+        this.uiManager.newLine();
+        suggestions = await this.generateSuggestions(config, diff, customInstruction);
+
+        // Prompt again with new suggestions
+        selectedIndex = await this.uiManager.promptForCommitSelection(suggestions);
+      }
 
       // Handle cancellation
       if (selectedIndex === -1) {
@@ -47,10 +64,7 @@ export class MainOrchestrator {
         return;
       }
 
-      // Step 6: Stage changes if needed
-      await this.stageChangesIfNeeded(repository.rootPath, diff);
-
-      // Step 7: Execute commit
+      // Step 6: Execute commit (changes already staged)
       const commitHash = await this.executeCommit(
         repository.rootPath,
         suggestions[selectedIndex].message
@@ -181,18 +195,19 @@ export class MainOrchestrator {
    * Generate commit message suggestions using AI
    * @param config Configuration with API key
    * @param diff Git diff
+   * @param customInstruction Optional custom instruction for regeneration
    * @returns Array of suggestions
    */
-  private async generateSuggestions(config: Config, diff: any) {
+  private async generateSuggestions(config: Config, diff: any, customInstruction?: string) {
     this.uiManager.newLine();
     this.uiManager.showSectionHeader('🤖 AI Generation');
-    this.uiManager.showAIGenerationInfo(config.model, 4);
+    this.uiManager.showAIGenerationInfo(config.model);
 
     const spinner = this.uiManager.showLoading('   Generating commit messages...');
 
     try {
       const aiService = new AIService(config.apiKey, config.model);
-      const suggestions = await aiService.generateCommitMessages(diff, 4);
+      const suggestions = await aiService.generateCommitMessages(diff, customInstruction);
 
       spinner.succeed(`   Generated ${suggestions.length} suggestions`);
       this.uiManager.newLine();
@@ -205,22 +220,18 @@ export class MainOrchestrator {
   }
 
   /**
-   * Stage changes if there are unstaged changes
+   * Stage all changes in the repository
    * @param repoPath Repository root path
-   * @param diff Git diff
    */
-  private async stageChangesIfNeeded(repoPath: string, diff: any): Promise<void> {
-    if (diff.unstaged && diff.unstaged.length > 0) {
+  private async stageAllChanges(repoPath: string): Promise<void> {
+    const spinner = this.uiManager.showLoading('Staging all changes...');
+    try {
+      await this.gitService.stageAll(repoPath);
+      spinner.succeed('All changes staged');
       this.uiManager.newLine();
-      const spinner = this.uiManager.showLoading('Staging changes...');
-      try {
-        await this.gitService.stageAll(repoPath);
-        spinner.succeed('Changes staged');
-        this.uiManager.newLine();
-      } catch (error) {
-        spinner.fail('Failed to stage changes');
-        throw error;
-      }
+    } catch (error) {
+      spinner.fail('Failed to stage changes');
+      throw error;
     }
   }
 

package/src/ui/UIManager.ts

@@ -241,14 +241,11 @@ export class UIManager {
   /**
    * Display AI generation info
    * @param model Model name being used
-   * @param suggestionCount Number of suggestions generated
    */
-  showAIGenerationInfo(model: string, suggestionCount: number): void {
+  showAIGenerationInfo(model: string): void {
     console.log(this.colors.muted(`   🤖 Model: ${chalk.cyan.bold(model)}`));
     console.log(
-      this.colors.muted(
-        `   📝 Generating ${chalk.cyan.bold(suggestionCount)} commit message suggestions...`
-      )
+      this.colors.muted(`   📝 Generating ${chalk.cyan.bold(5)} commit message suggestions...`)
     );
     console.log();
   }
@@ -291,7 +288,7 @@ export class UIManager {
         name: 'model',
         message: 'Select Gemini model:',
         choices: models.map((model) => {
-          if (model === 'gemini-2.5-flash') {
+          if (model === 'gemini-3-flash-preview') {
             return {
               name: `${model} ${chalk.gray('(stable)')}`,
               value: model,
@@ -359,6 +356,13 @@ export class UIManager {
       };
     });
 
+    // Add regenerate with prompt option
+    choices.push({
+      name: chalk.cyan('🔄 Regenerate with prompt'),
+      value: -2,
+      short: 'Regenerate',
+    });
+
     // Add cancel option
     choices.push({
       name: chalk.red("✖ Cancel (don't commit)"),
@@ -377,8 +381,8 @@ export class UIManager {
       },
     ]);
 
-    // Show preview of selected message if not cancelled
-    if (answer.selection !== -1) {
+    // Show preview of selected message if not cancelled and not regenerate
+    if (answer.selection !== -1 && answer.selection !== -2) {
       this.newLine();
       this.showSectionHeader('✅ Selected commit message');
       console.log();
@@ -417,4 +421,26 @@ export class UIManager {
 
     return answer.confirmed;
   }
+
+  /**
+   * Prompt user for custom instruction to regenerate commit messages
+   * @returns Custom instruction string or empty string if cancelled
+   */
+  async promptForCustomInstruction(): Promise<string> {
+    const answer = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'instruction',
+        message: 'Enter your instruction for regenerating commit messages:',
+        validate: (input: string) => {
+          if (!input || input.trim().length === 0) {
+            return 'Instruction cannot be empty';
+          }
+          return true;
+        },
+      },
+    ]);
+
+    return answer.instruction.trim();
+  }
 }