✨ feat: enhance CLI with model selection and help

✨ feat: enhance CLI with model selection and help

✨ Features:
  - Added support for specifying AI model in commit command
  - Introduced a help command for detailed usage instructions

🐛 Bug Fixes:
  - Ensured average cost calculation defaults to 0.0 if not present

📝 Documentation:
  - Updated help text to reflect new commands and options

Enhanced CLI functionality with new model options and comprehensive help.

Author: Arakiss

commitloom/__main__.py

@@ -18,6 +18,8 @@
 
 from .cli import console
 from .cli.cli_handler import CommitLoom
+from . import __version__
+from .config.settings import config
 
 
 def handle_error(error: BaseException) -> None:
@@ -30,6 +32,7 @@ def handle_error(error: BaseException) -> None:
 
 @click.group()
 @click.option("-d", "--debug", is_flag=True, help="Enable debug logging")
+@click.version_option(version=__version__, prog_name="CommitLoom")
 @click.pass_context
 def cli(ctx, debug: bool) -> None:
     """Create structured git commits with AI-generated messages."""
@@ -43,8 +46,14 @@ def cli(ctx, debug: bool) -> None:
 @cli.command(help="Generate an AI-powered commit message and commit your changes")
 @click.option("-y", "--yes", is_flag=True, help="Skip all confirmation prompts")
 @click.option("-c", "--combine", is_flag=True, help="Combine all changes into a single commit")
+@click.option(
+    "-m", 
+    "--model", 
+    type=click.Choice(list(config.model_costs.keys())), 
+    help=f"Specify the AI model to use (default: {config.default_model})"
+)
 @click.pass_context
-def commit(ctx, yes: bool, combine: bool) -> None:
+def commit(ctx, yes: bool, combine: bool, model: str | None) -> None:
     """Generate commit message and commit changes."""
     debug = ctx.obj.get("DEBUG", False)
 
@@ -56,6 +65,12 @@ def commit(ctx, yes: bool, combine: bool) -> None:
 
         # Initialize with test_mode
         loom = CommitLoom(test_mode=test_mode, api_key=api_key if api_key else None)
+        
+        # Set custom model if specified
+        if model:
+            os.environ["COMMITLOOM_MODEL"] = model
+            console.print_info(f"Using model: {model}")
+            
         loom.run(auto_commit=yes, combine_commits=combine, debug=debug)
     except (KeyboardInterrupt, Exception) as e:
         handle_error(e)
@@ -79,18 +94,51 @@ def stats(ctx) -> None:
         sys.exit(1)
 
 
+@cli.command(help="Display detailed help information")
+def help() -> None:
+    """Display detailed help information about CommitLoom."""
+    help_text = f"""
+[bold cyan]CommitLoom v{__version__}[/bold cyan]
+[italic]Weave perfect git commits with AI-powered intelligence[/italic]
+
+[bold]Basic Usage:[/bold]
+  loom                   Run the default commit command
+  loom commit            Generate commit message for staged changes
+  loom commit -y         Skip confirmation prompts
+  loom commit -c         Combine all changes into a single commit
+  loom commit -m MODEL   Specify AI model to use
+  loom stats             Show usage statistics
+  loom --version         Display version information
+  loom help              Show this help message
+
+[bold]Available Models:[/bold]
+  {', '.join(config.model_costs.keys())}
+  Default: {config.default_model}
+
+[bold]Environment Setup:[/bold]
+  1. Set OPENAI_API_KEY in your environment or in a .env file
+  2. Stage your changes with 'git add'
+  3. Run 'loom' to generate and apply commit messages
+
+[bold]Documentation:[/bold]
+  Full documentation: https://github.com/Arakiss/commitloom#readme
+    """
+    console.console.print(help_text)
+
+
 # For backwards compatibility, default to commit command if no subcommand provided
 def main() -> None:
     """Entry point for the CLI."""
-    # Check if the first argument is a known command, if not, insert 'commit'
-    known_commands = ['commit', 'stats']
-
-    if len(sys.argv) > 1 and not sys.argv[1].startswith('-') and sys.argv[1] not in known_commands:
+    known_commands = ['commit', 'stats', 'help']
+    commit_options = ['-y', '--yes', '-c', '--combine', '-m', '--model']
+    
+    # If no arguments or only options without a command, add 'commit' as the default command
+    if len(sys.argv) == 1 or (len(sys.argv) > 1 and sys.argv[1].startswith('-')):
+        # Insert 'commit' as the first argument
+        sys.argv.insert(1, 'commit')
+    # If the first argument is not a known command and not an option, insert 'commit'
+    elif len(sys.argv) > 1 and not sys.argv[1].startswith('-') and sys.argv[1] not in known_commands:
         sys.argv.insert(1, 'commit')
-
-    # If no arguments provided, add 'commit' as the default command
-    if len(sys.argv) == 1:
-        sys.argv.append('commit')
 
     cli(obj={})
 

commitloom/cli/cli_handler.py

@@ -371,7 +371,7 @@ def stats_command(self) -> None:
             if "avg_commits_per_day" in stats:
                 avg_commits = stats["avg_commits_per_day"]
                 console.console.print(f"  • Average commits per day: {avg_commits:.2f}")
-                avg_cost = stats["avg_cost_per_day"]
+                avg_cost = stats.get("avg_cost_per_day", 0.0)
                 console.console.print(f"  • Average cost per day: €{avg_cost:.4f}")
 
         # Display repository stats if available
@@ -403,7 +403,8 @@ def stats_command(self) -> None:
                 for model, model_data in model_stats.items():
                     console.console.print(f"  • {model}:")
                     console.console.print(f"    - Total tokens: {model_data.get('tokens', 0):,}")
-                    console.console.print(f"    - Total cost: €{model_data.get('cost', 0.0):.4f}")
+                    cost = model_data.get('cost', 0.0)
+                    console.console.print(f"    - Total cost: €{cost:.4f}")
                     avg_tokens = model_data.get("avg_tokens_per_commit", 0.0)
                     console.console.print(f"    - Avg tokens per commit: {avg_tokens:.1f}")
 

commitloom/services/ai_service.py

@@ -29,9 +29,10 @@ def from_api_usage(
         completion_tokens = usage["completion_tokens"]
         total_tokens = usage["total_tokens"]
 
-        # Calculate costs
-        input_cost = (prompt_tokens / 1_000_000) * config.model_costs[model].input
-        output_cost = (completion_tokens / 1_000_000) * config.model_costs[model].output
+        # Calculate costs - convert from per million tokens to actual cost
+        # These costs are in EUR per 1M tokens, so we divide by 1M to get cost per token
+        input_cost = (prompt_tokens / 1_000) * config.model_costs[model].input
+        output_cost = (completion_tokens / 1_000) * config.model_costs[model].output
         total_cost = input_cost + output_cost
 
         return cls(