Merge pull request #224 from tak-bro/feature/update-error

Feature/update error

Author: tak-bro

README.md

@@ -78,25 +78,24 @@ _aicommit2_ automatically generates commit messages using AI. It supports [Git](
 - **[Git Hook Integration](#git-hooks)**: Can be used as a prepare-commit-msg hook
 - **[Custom Prompt](#custom-prompt-template)**: Supports user-defined system prompt templates
 
-## Supported providers
-
-### Cloud AI Services
-
-- [OpenAI](docs/providers/openai.md)
-- [Anthropic Claude](docs/providers/anthropic.md)
-- [Gemini](docs/providers/gemini.md)
-- [Mistral & Codestral](docs/providers/mistral.md)
-- [Cohere](docs/providers/cohere.md)
-- [Groq](docs/providers/groq.md)
-- [Perplexity](docs/providers/perplexity.md)
-- [DeepSeek](docs/providers/deepseek.md)
-- [GitHub Models](docs/providers/github-models.md)
-- [Amazon Bedrock](docs/providers/bedrock.md)
-- [OpenAI API Compatibility](docs/providers/compatible.md)
-
-### Local AI Services
-
-- [Ollama](docs/providers/ollama.md)
+## Supported Providers
+
+| Provider | Default Model | Documentation |
+|----------|---------------|---------------|
+| OpenAI | `gpt-4o-mini` | [Guide](docs/providers/openai.md) |
+| Anthropic | `claude-sonnet-4-20250514` | [Guide](docs/providers/anthropic.md) |
+| Gemini | `gemini-3-flash-preview` | [Guide](docs/providers/gemini.md) |
+| Mistral | `mistral-small-latest` | [Guide](docs/providers/mistral.md) |
+| Codestral | `codestral-latest` | [Guide](docs/providers/mistral.md) |
+| Cohere | `command-a-03-2025` | [Guide](docs/providers/cohere.md) |
+| Groq | `llama-3.3-70b-versatile` | [Guide](docs/providers/groq.md) |
+| Perplexity | `sonar` | [Guide](docs/providers/perplexity.md) |
+| DeepSeek | `deepseek-chat` | [Guide](docs/providers/deepseek.md) |
+| GitHub Models | `gpt-4o-mini` | [Guide](docs/providers/github-models.md) |
+| Bedrock | `anthropic.claude-haiku-4-5-20251001-v1:0` | [Guide](docs/providers/bedrock.md) |
+| Ollama | *(user configured)* | [Guide](docs/providers/ollama.md) |
+
+> 📘 For OpenAI-compatible APIs, see [Compatibility Guide](docs/providers/compatible.md)
 
 ## Setup
 
@@ -362,48 +361,47 @@ aicommit2 --all # or -a
 
 #### CLI Options
 
+Run `aicommit2 --help` to see all available options grouped by category.
+
+##### Message Options
+
 - `--locale` or `-l`: Locale to use for the generated commit messages (default: **en**)
-- `--all` or `-a`: Automatically stage changes in tracked files for the commit (default: **false**)
-- `--type` or `-t`: Git commit message format (default: **conventional**). It supports [`conventional`](https://conventionalcommits.org/) and [`gitmoji`](https://gitmoji.dev/)
-- `--confirm` or `-y`: Skip confirmation when committing after message generation (default: **false**)
-- `--clipboard` or `-c`: Copy the selected message to the clipboard (default: **false**).
-  - If you give this option, **_aicommit2_ will not commit**.
-- `--dry-run` or `-d`: Generate commit message without committing (default: **false**).
-  - Outputs the generated message without executing a commit.
-  - Useful for reviewing messages before manual commit (e.g., with GitHub Desktop).
-  - Can be combined with `--clipboard` to copy the message for use in other tools.
-- `--edit` or `-e`: Open the AI-generated commit message in your default editor for modification (default: **false**)
-  - Opens the message in the editor specified by `$VISUAL`, `$EDITOR`, or platform default
-  - Works with both Git and Jujutsu repositories
-  - Allows fine-tuning of AI-generated messages before committing
 - `--generate` or `-g`: Number of messages to generate (default: **1**)
   - **Warning**: This uses more tokens, meaning it costs more.
-- `--exclude` or `-x`: Files to exclude from AI analysis
+- `--type` or `-t`: Git commit message format (default: **conventional**). It supports [`conventional`](https://conventionalcommits.org/) and [`gitmoji`](https://gitmoji.dev/)
+- `--prompt` or `-p`: Custom prompt to fine-tune the AI generation
 - `--include-body` or `-i`: Force include commit body in all generated messages (default: **false**)
-  - When enabled, all commit messages will include a detailed body section
-  - Useful for providing more context in commit messages
-- `--auto-select` or `-s`: Automatically select the commit message when only one AI model is configured (default: **false**)
-  - When enabled and only one AI provider is configured, the generated message is automatically selected
-  - Also skips the confirmation prompt for a seamless experience
-  - Has no effect when multiple AI providers are configured
-- `--disable-lowercase`: Disable automatic lowercase conversion of commit messages (default: **false**)
-  - Preserves the original casing of commit types and descriptions
-  - Useful when working with custom commit conventions that require specific casing
-- `--hook-mode`: Run as a Git hook, typically used with [`prepare-commit-msg` hook](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks#_committing_workflow_hooks) hook (default: **false**)
-  - This mode is automatically enabled when running through the Git hook system
-  - See [Git Hooks](#git-hooks) section for more details
-- `--pre-commit`: Run in [pre-commit](https://pre-commit.com/) framework mode (default: **false**)
-  - This option is specifically for use with the pre-commit framework
-  - See [Integration with pre-commit framework](#integration-with-pre-commit-framework) section for setup instructions
-- `--verbose` or `-v`: Enable verbose logging for enhanced debugging output (default: **false**)
-  - When enabled, shows detailed log messages including readline errors and other diagnostic information
-  - Useful for troubleshooting issues or understanding the tool's internal operations
-  - Can also be set via config: `aicommit2 config set logLevel=verbose`
+
+##### Behavior
+
+- `--all` or `-a`: Automatically stage changes in tracked files for the commit (default: **false**)
+- `--confirm` or `-y`: Skip confirmation when committing after message generation (default: **false**)
+- `--auto-select` or `-s`: Automatically select when only one message is generated (default: **false**)
+- `--edit` or `-e`: Open the AI-generated commit message in your default editor (default: **false**)
+- `--clipboard` or `-c`: Copy the selected message to the clipboard (default: **false**)
+  - If you give this option, **_aicommit2_ will not commit**.
+- `--dry-run` or `-d`: Generate commit message without committing (default: **false**)
+  - Useful for reviewing messages before manual commit (e.g., with GitHub Desktop)
 - `--output` or `-o`: Output format for non-interactive mode (default: **none**)
-  - Use `--output json` for JSON Lines format (one JSON object per line)
-  - Outputs `{"subject":"...","body":"..."}` for each generated message
-  - Designed for integration with tools like [LazyGit](#lazygit)
-  - Skips TUI and exits after outputting messages
+  - Use `--output json` for [LazyGit](#lazygit) integration
+
+##### VCS Selection
+
+- `--git`: Force use Git (overrides auto-detection)
+- `--yadm`: Force use YADM (overrides auto-detection)
+- `--jj`: Force use Jujutsu (overrides auto-detection)
+- `--jj-auto-new`: Run `jj new` after `jj describe` (default: **false**)
+
+##### Hook Integration
+
+- `--hook-mode`: Run as a Git hook with [`prepare-commit-msg`](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks#_committing_workflow_hooks) (default: **false**)
+- `--pre-commit`: Run in [pre-commit](https://pre-commit.com/) framework mode (default: **false**)
+
+##### Formatting & Debug
+
+- `--exclude` or `-x`: Files to exclude from AI analysis
+- `--disable-lowercase`: Preserve original casing of commit messages (default: **false**)
+- `--verbose` or `-v`: Enable verbose logging for debugging (default: **false**)
 
 Examples:
 
@@ -424,6 +422,38 @@ aicommit2 -d -c
 aicommit2 --verbose # or -v
 ```
 
+#### Commands
+
+In addition to the main commit message generation, aicommit2 provides several utility commands:
+
+| Command | Description |
+|---------|-------------|
+| `aicommit2 config` | Manage configuration (get, set, list, del) |
+| `aicommit2 doctor` | Check health status of AI providers |
+| `aicommit2 stats` | View usage statistics and performance metrics |
+| `aicommit2 hook` | Install/uninstall Git prepare-commit-msg hook |
+| `aicommit2 log` | Manage log files |
+| `aicommit2 github-login` | Login to GitHub for GitHub Models access |
+
+```bash
+# Configuration management
+aicommit2 config set OPENAI.key=<your-key>
+aicommit2 config get OPENAI
+aicommit2 config list
+
+# Health check
+aicommit2 doctor
+
+# Statistics
+aicommit2 stats
+aicommit2 stats -d 7    # Last 7 days
+aicommit2 stats clear   # Clear all stats
+
+# Git hook
+aicommit2 hook install
+aicommit2 hook uninstall
+```
+
 ## Integrations
 
 ### LazyGit
@@ -600,6 +630,65 @@ aicommit2 hook uninstall
 
 Or manually delete the `.git/hooks/prepare-commit-msg` file.
 
+### Health Check
+
+Use the `doctor` command to check the status of your configured AI providers:
+
+```bash
+aicommit2 doctor
+```
+
+Example output:
+
+```
+🩺 AICommit2 Health Check
+
+Providers:
+  ✅ OPENAI         API key configured
+  ✅ OLLAMA         Running (Host: http://localhost:11434)
+  ⏭️ ANTHROPIC      Not configured
+  ⚠️ GEMINI         API key configured
+
+Summary: 2 healthy, 0 error, 1 warning, 1 skipped
+```
+
+Status icons:
+- ✅ **Healthy**: Provider is properly configured
+- ⚠️ **Warning**: Provider has issues (e.g., Ollama not running)
+- ❌ **Error**: Provider configuration has errors
+- ⏭️ **Skipped**: Provider is not configured
+
+### Statistics
+
+Use the `stats` command to view AI request statistics and performance metrics:
+
+```bash
+aicommit2 stats
+```
+
+Example output:
+
+```
+📊 AICommit2 Statistics
+   Period: 2/10/2026 - 3/10/2026
+
+Overview:
+  Total requests:     126
+  Success rate:       97.6%
+  Avg response time:  2.1s
+
+Provider Usage:
+  OPENAI         ████████████████████   78 (62%)    2.2s  100%
+  ANTHROPIC      ██████████░░░░░░░░░░   30 (24%)    2.5s   93%
+  GEMINI         ████░░░░░░░░░░░░░░░░   18 (14%)    1.6s  100%
+```
+
+Options:
+- `aicommit2 stats -d 7` - Show statistics for the last 7 days
+- `aicommit2 stats clear` - Clear all statistics
+
+Statistics are stored locally at `~/.config/aicommit2/stats.json`. Use `aicommit2 stats clear` to reset.
+
 ## Configuration
 
 aicommit2 supports configuration via command-line arguments, environment variables, and a configuration file. Settings are resolved in the following order of precedence:
@@ -744,7 +833,7 @@ aicommit2 config set \
   maxTokens=1024 \
   temperature=0.7 \
   OPENAI.key="sk-..." OPENAI.model="gpt-4o-mini" OPENAI.temperature=0.5 \
-  ANTHROPIC.key="sk-..." ANTHROPIC.model="claude-3-5-haiku-20241022" ANTHROPIC.maxTokens=2000 \
+  ANTHROPIC.key="sk-..." ANTHROPIC.model="claude-sonnet-4-20250514" ANTHROPIC.maxTokens=2000 \
   MISTRAL.key="your-key" MISTRAL.model="mistral-small-latest"  \
   OLLAMA.model="llama3.2" OLLAMA.numCtx=4096 OLLAMA.watchMode=true
 ```

src/cli.ts

@@ -3,13 +3,16 @@ import { cli } from 'cleye';
 import pkg from '../package.json';
 import aicommit2 from './commands/aicommit2.js';
 import configCommand from './commands/config.js';
+import { doctorCommand } from './commands/doctor.js';
 import githubLoginCommand from './commands/github-login.js';
 import hookCommand, { isCalledFromGitHook } from './commands/hook.js';
 import logCommand from './commands/log.js';
 import preCommitHook from './commands/pre-commit-hook.js';
 import prepareCommitMessageHook from './commands/prepare-commit-msg-hook.js';
+import { statsCommand } from './commands/stats.js';
 import watchGit from './commands/watch-git.js';
 import { RawConfig, getConfig } from './utils/config.js';
+import { renderGroupedHelp } from './utils/help-renderer.js';
 import { initializeLogger, logger } from './utils/logger.js';
 
 const rawArgv = process.argv.slice(2);
@@ -144,10 +147,11 @@ cli(
             },
         },
 
-        commands: [configCommand, githubLoginCommand, hookCommand, logCommand],
+        commands: [configCommand, doctorCommand, githubLoginCommand, hookCommand, logCommand, statsCommand],
 
         help: {
             description,
+            render: renderGroupedHelp,
         },
 
         ignoreArgv: type => type === 'unknown-flag' || type === 'argument',

src/commands/aicommit2.ts

@@ -18,7 +18,8 @@ import {
     commitMsgLoader,
     emptyCodeReview,
 } from '../managers/reactive-prompt.manager.js';
-import { ModelName, RawConfig, getConfig } from '../utils/config.js';
+import { ModelName, RawConfig, applyDisableLowerCaseToConfig, applyIncludeBodyToConfig, getConfig } from '../utils/config.js';
+import { ErrorCode, ErrorMessages } from '../utils/error-messages.js';
 import { KnownError, handleCliError } from '../utils/error.js';
 import { validateSystemPrompt } from '../utils/prompt.js';
 import { CommitOptions, assertGitRepo, getBranchName, getStagedDiff, getVCSName, commitChanges as vcsCommitChanges } from '../utils/vcs.js';
@@ -90,19 +91,11 @@ export default async (
 
         const shouldIncludeBody = includeBody === true || config.includeBody === true;
         if (shouldIncludeBody) {
-            Object.keys(config).forEach(key => {
-                if (typeof config[key] === 'object' && config[key] !== null && 'includeBody' in config[key]) {
-                    (config[key] as any).includeBody = true;
-                }
-            });
+            applyIncludeBodyToConfig(config);
         }
 
         if (disableLowerCase) {
-            Object.keys(config).forEach(key => {
-                if (typeof config[key] === 'object' && config[key] !== null && 'disableLowerCase' in config[key]) {
-                    (config[key] as any).disableLowerCase = true;
-                }
-            });
+            applyDisableLowerCaseToConfig(config);
         }
 
         await validateSystemPrompt(config);
@@ -118,22 +111,9 @@ export default async (
 
         if (!staged) {
             const vcsName = await getVCSName();
-            let errorMessage = 'No staged changes found.';
-
-            if (vcsName === 'yadm') {
-                errorMessage += '\n\nStage your changes with: yadm add <file>';
-                errorMessage += '\nOr stage tracked file modifications: aicommit2 --all';
-                errorMessage += '\n\nNote: The --all flag only stages already-tracked files (YADM best practice).';
-                errorMessage += '\nTo track new dotfiles, explicitly add them first: yadm add <file>';
-            } else if (vcsName === 'git') {
-                errorMessage += '\n\nStage your changes with: git add <file>';
-                errorMessage += '\nOr automatically stage all changes: aicommit2 --all';
-            } else if (vcsName === 'jujutsu') {
-                errorMessage += '\n\nJujutsu automatically tracks all changes in the working copy.';
-                errorMessage += '\nMake some changes to your files and try again.';
-            }
-
-            throw new KnownError(errorMessage);
+            throw new KnownError(ErrorMessages.noStagedChanges(vcsName), {
+                code: ErrorCode.NO_STAGED_CHANGES,
+            });
         }
 
         if (!isJsonMode) {
@@ -142,7 +122,9 @@ export default async (
 
         const availableAIs = getAvailableAIs(config, 'commit');
         if (availableAIs.length === 0) {
-            throw new KnownError('Please set at least one API key via the `aicommit2 config set` command');
+            throw new KnownError(ErrorMessages.noApiKeysConfigured(), {
+                code: ErrorCode.MISSING_API_KEY,
+            });
         }
 
         const branchName = await getBranchName();
@@ -170,7 +152,9 @@ export default async (
             selectedCommitMessage = await openEditor(selectedCommitMessage);
 
             if (!selectedCommitMessage.trim()) {
-                throw new KnownError('Commit message cannot be empty');
+                throw new KnownError(ErrorMessages.emptyCommitMessage(), {
+                    code: ErrorCode.EMPTY_COMMIT_MESSAGE,
+                });
             }
 
             consoleManager.printSuccess('Commit message edited successfully!');