committer-cli 0.1.1

Fast AI-powered git commit message generator
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
//! Committer - AI-powered git commit message generator.
//!
//! Committer uses LLMs via OpenRouter to generate conventional commit messages
//! from staged changes, with features like:
//!
//! - **Streaming output**: Watch messages generate token-by-token
//! - **Branch intelligence**: Detects misaligned branches and suggests alternatives
//! - **Interactive editing**: Edit messages before committing
//! - **Smart diff handling**: Filters noise and truncates large diffs
//! - **PR generation**: Create pull requests with AI-generated descriptions
//!
//! # Modules
//!
//! - [`api`]: OpenRouter API integration
//! - [`branch`]: Branch analysis and naming
//! - [`cli`]: Command-line interface
//! - [`config`]: Configuration management
//! - [`git`]: Git operations
//! - [`pr`]: Pull request generation
//! - [`ui`]: User interaction prompts
//!
//! # Quick Start
//!
//! ```bash
//! export OPENROUTER_API_KEY="sk-or-..."
//! git add .
//! committer
//! ```

use clap::Parser;
use console::{style, Term};
use indicatif::{ProgressBar, ProgressStyle};
use reqwest::Client;
use std::io::Write;
use tokio::process::Command;

mod api;
mod branch;
mod cli;
mod config;
mod git;
mod pr;
mod ui;

use api::stream_commit_message;
use branch::{
    analyze_branch_alignment, generate_branch_suggestion, generate_fallback_branch, BranchAction,
};
use cli::{Cli, Commands, ConfigAction};
use config::{config_path, get_api_key, load_config, save_config};
use git::{
    create_and_switch_branch, get_current_branch, get_git_diff, get_recent_commits,
    get_staged_files, run_git_commit, stage_all_changes,
};
use pr::handle_pr_command;
use ui::{prompt_branch_action, prompt_commit, CommitAction};

// ============================================================================
// Main
// ============================================================================

#[tokio::main(flavor = "current_thread")]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
    let cli = Cli::parse();
    let mut config = load_config();

    // Handle subcommands
    if let Some(command) = cli.command {
        match command {
            Commands::Config { action } => {
                match action {
                    ConfigAction::Show => {
                        println!("{}", style("Configuration").bold());
                        println!("  {} {}", style("file:").dim(), config_path().display());
                        println!();
                        let bool_style = |v: bool| {
                            if v {
                                style("true").green()
                            } else {
                                style("false").dim()
                            }
                        };
                        println!(
                            "  {} {}",
                            style("auto_commit:").cyan(),
                            bool_style(config.auto_commit)
                        );
                        println!(
                            "  {} {}",
                            style("commit_after_branch:").cyan(),
                            bool_style(config.commit_after_branch)
                        );
                        println!(
                            "  {} {}",
                            style("verbose:").cyan(),
                            bool_style(config.verbose)
                        );
                        println!(
                            "  {} {}",
                            style("model:").cyan(),
                            style(&config.model).yellow()
                        );
                        println!(
                            "  {} {}",
                            style("api_key:").cyan(),
                            if std::env::var("OPENROUTER_API_KEY").is_ok() {
                                style("[set via env]").green()
                            } else {
                                style("[not set]").red()
                            }
                        );
                    }
                    ConfigAction::AutoCommit { value } => {
                        config.auto_commit = value.parse().unwrap_or(false);
                        save_config(&config)?;
                        let val_style = if config.auto_commit {
                            style("true").green()
                        } else {
                            style("false").dim()
                        };
                        println!(
                            "{} {} set to {}",
                            style("").green(),
                            style("auto_commit").cyan(),
                            val_style
                        );
                    }
                    ConfigAction::CommitAfterBranch { value } => {
                        config.commit_after_branch = value.parse().unwrap_or(false);
                        save_config(&config)?;
                        let val_style = if config.commit_after_branch {
                            style("true").green()
                        } else {
                            style("false").dim()
                        };
                        println!(
                            "{} {} set to {}",
                            style("").green(),
                            style("commit_after_branch").cyan(),
                            val_style
                        );
                    }
                    ConfigAction::Model { value } => {
                        config.model = value;
                        save_config(&config)?;
                        println!(
                            "{} {} set to {}",
                            style("").green(),
                            style("model").cyan(),
                            style(&config.model).yellow()
                        );
                    }
                    ConfigAction::Verbose { value } => {
                        config.verbose = value.parse().unwrap_or(false);
                        save_config(&config)?;
                        let val_style = if config.verbose {
                            style("true").green()
                        } else {
                            style("false").dim()
                        };
                        println!(
                            "{} {} set to {}",
                            style("").green(),
                            style("verbose").cyan(),
                            val_style
                        );
                    }
                }
                return Ok(());
            }
            Commands::Pr(args) => {
                return handle_pr_command(args, &config).await;
            }
        }
    }

    // Get API key
    let api_key = match get_api_key() {
        Some(key) => key,
        None => {
            println!("{} No API key found", style("").red());
            println!(
                "  {} Set OPENROUTER_API_KEY environment variable",
                style("").dim()
            );
            std::process::exit(1);
        }
    };

    // Stage all changes if requested
    if cli.all {
        stage_all_changes().await?;
    }

    // Determine verbose mode (CLI flag overrides config)
    let verbose = cli.verbose || config.verbose;

    // Get diff and file list in parallel
    let (diff_result, files_result) =
        tokio::join!(get_git_diff(true, verbose), get_staged_files(verbose));

    let diff = diff_result?;
    let files = files_result?;

    if diff.trim().is_empty() {
        // Check if there are any unstaged or untracked changes
        let status_output = Command::new("git")
            .args(["status", "--porcelain"])
            .output()
            .await?;

        let status = String::from_utf8_lossy(&status_output.stdout);

        if status.trim().is_empty() {
            println!("{} Nothing to commit", style("").green());
            std::process::exit(0);
        } else {
            println!("{} No staged changes", style("").yellow());
            println!("  {} Use 'git add' or --all", style("").dim());
            std::process::exit(1);
        }
    }

    // Determine which model to use
    let model = cli.model.as_ref().unwrap_or(&config.model);

    // Create HTTP client
    let client = Client::builder().build()?;

    // Stream the commit message with spinner
    let term = Term::stdout();
    let _ = term.hide_cursor();

    let spinner = ProgressBar::new_spinner();
    spinner.set_style(
        ProgressStyle::default_spinner()
            .tick_strings(&["", "", "", "", "", "", "", "", "", ""])
            .template("{spinner:.cyan} Generating commit message...")
            .unwrap(),
    );
    spinner.enable_steady_tick(std::time::Duration::from_millis(80));

    // Ensure spinner renders before starting API call
    std::io::stdout().flush().ok();

    let message_result =
        stream_commit_message(&client, &api_key, model, &diff, &files, &spinner, verbose, cli.oneline).await;

    let _ = term.show_cursor();
    let message = message_result?;

    if message.is_empty() {
        spinner.finish_and_clear();
        println!("{} Empty commit message generated", style("").red());
        std::process::exit(1);
    }

    // Track if branch was already handled via --branch or --auto-branch flags
    let mut branch_already_handled = false;

    if cli.branch || cli.auto_branch {
        let current_branch = get_current_branch().await?;
        let recent_commits = get_recent_commits(5).await.unwrap_or_default();

        let _ = term.hide_cursor();

        let branch_spinner = ProgressBar::new_spinner();
        branch_spinner.set_style(
            ProgressStyle::default_spinner()
                .tick_strings(&["", "", "", "", "", "", "", "", "", ""])
                .template("{spinner:.cyan} Analyzing branch alignment...")
                .unwrap(),
        );
        branch_spinner.enable_steady_tick(std::time::Duration::from_millis(120));

        let analysis = analyze_branch_alignment(
            &client,
            &api_key,
            model,
            &current_branch,
            &message,
            &files,
            &recent_commits,
        )
        .await?;

        branch_spinner.finish_and_clear();
        let _ = term.show_cursor();

        if verbose {
            eprintln!("[Branch Analysis]: {}\n", analysis.reason);
        }

        if !analysis.matches {
            let suggested = analysis
                .suggested_branch
                .unwrap_or_else(|| generate_fallback_branch(&message));

            if cli.auto_branch || cli.yes {
                println!(
                    "{} Branch '{}' → '{}' ({})",
                    style("").cyan(),
                    style(&current_branch).dim(),
                    style(&suggested).green(),
                    style(&analysis.reason).dim()
                );
                create_and_switch_branch(&suggested).await?;
                branch_already_handled = true;
            } else {
                match prompt_branch_action(&current_branch, &suggested, &analysis.reason, true) {
                    BranchAction::Create(name) => {
                        create_and_switch_branch(&name).await?;
                        println!(
                            "{} Switched to branch '{}'",
                            style("").green(),
                            style(&name).green()
                        );
                        branch_already_handled = true;
                    }
                    BranchAction::Skip => {
                        println!(
                            "{} Continuing on '{}'",
                            style("").dim(),
                            style(&current_branch).dim()
                        );
                        branch_already_handled = true;
                    }
                }
            }
        }
    }

    if cli.dry_run {
        return Ok(());
    }

    if cli.yes || config.auto_commit {
        run_git_commit(&message).await?;
        println!("{} Committed", style("").green());
    } else {
        let mut show_branch_option = !branch_already_handled;
        let mut current_message = message.clone();

        loop {
            match prompt_commit(&current_message, show_branch_option) {
                CommitAction::Commit(final_message) => {
                    run_git_commit(&final_message).await?;
                    println!("{} Committed", style("").green());
                    break;
                }
                CommitAction::Cancel => {
                    println!("{} Cancelled", style("").dim());
                    break;
                }
                CommitAction::CreateBranch(msg) => {
                    current_message = msg;

                    let _ = term.hide_cursor();

                    let branch_spinner = ProgressBar::new_spinner();
                    branch_spinner.set_style(
                        ProgressStyle::default_spinner()
                            .tick_strings(&["", "", "", "", "", "", "", "", "", ""])
                            .template("{spinner:.cyan} Generating branch name...")
                            .unwrap(),
                    );
                    branch_spinner.enable_steady_tick(std::time::Duration::from_millis(120));

                    let suggested = match generate_branch_suggestion(
                        &client,
                        &api_key,
                        model,
                        &current_message,
                    )
                    .await
                    {
                        Ok(name) => name,
                        Err(_) => generate_fallback_branch(&current_message),
                    };

                    branch_spinner.finish_and_clear();
                    let _ = term.show_cursor();

                    let current_branch = get_current_branch().await.unwrap_or_default();
                    println!(
                        "{} Suggested branch: {}",
                        style("🌿").green(),
                        style(&suggested).green()
                    );
                    println!();

                    let branch_created =
                        match prompt_branch_action(&current_branch, &suggested, "", false) {
                            BranchAction::Create(name) => {
                                create_and_switch_branch(&name).await?;
                                println!(
                                    "{} Switched to branch '{}'",
                                    style("").green(),
                                    style(&name).green()
                                );
                                true
                            }
                            BranchAction::Skip => {
                                println!(
                                    "{} Continuing on '{}'",
                                    style("").dim(),
                                    style(&current_branch).dim()
                                );
                                false
                            }
                        };

                    // Auto-commit if config enabled and branch was created
                    if config.commit_after_branch && branch_created {
                        run_git_commit(&current_message).await?;
                        println!("{} Committed", style("").green());
                        break;
                    }

                    println!();
                    println!("{}", current_message);

                    // Disable branch option for next iteration
                    show_branch_option = false;
                }
            }
        }
    }

    Ok(())
}