gigi-cli 1.0.1

Gigi — A Claude Code-like AI coding assistant CLI in Rust
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

use anyhow::Result;
use colored::*;

use crate::agent::Agent;

// =============================================================================
// /commit — Generate a commit message and commit staged changes
// =============================================================================

pub async fn handle(agent: &mut Agent, args: &str) -> Result<()> {
    println!("{}", "Generating commit message...".dimmed());

    // Get the git diff of staged changes (or all changes if nothing staged)
    let diff_result = agent
        .tools
        .execute(
            "bash",
            serde_json::json!({
                "command": "git diff --cached --stat && echo '---DIFF---' && git diff --cached"
            }),
        )
        .await?;

    let diff_content = extract_stdout_stderr(&diff_result.content);

    if diff_content.contains("nothing to commit") || diff_content.trim().is_empty() {
        // Try unstaged changes
        let unstaged = agent
            .tools
            .execute(
                "bash",
                serde_json::json!({
                    "command": "git diff --stat"
                }),
            )
        .await?;

        let unstaged_content = extract_stdout_stderr(&unstaged.content);

        if unstaged_content.trim().is_empty() {
            println!("{}", "No changes to commit.".yellow());
            return Ok(());
        }

        println!(
            "{}",
            "No staged changes. Stage your changes first with 'git add'.".yellow()
        );
        return Ok(());
    }

    // Ask the AI to generate a commit message
    let prompt = if args.is_empty() {
        format!(
            "Based on the following git diff, write a concise and descriptive commit message \
             following conventional commits format (e.g., feat:, fix:, refactor:). \
             Only output the commit message, nothing else.\n\n{}",
            diff_content
        )
    } else {
        format!(
            "Write a git commit message for the following changes. \
             The user wants to emphasize: {}\n\nDiff:\n{}",
            args, diff_content
        )
    };

    agent.run_turn(&prompt).await?;

    let commit_message = agent
        .session
        .messages
        .last()
        .and_then(|m| m.text())
        .unwrap_or("")
        .trim()
        .to_string();

    if commit_message.is_empty() {
        println!("{}", "Error: No commit message generated by the AI.".red());
        return Ok(());
    }

    let clean_message = commit_message
        .trim_matches('`')
        .trim_matches('"')
        .trim_matches('\'')
        .trim();

    print!("Would you like to commit with this message? (y/N): ");
    use std::io::Write;
    let _ = std::io::stdout().flush();
    let mut user_input = String::new();
    if std::io::stdin().read_line(&mut user_input).is_ok() {
        let response = user_input.trim().to_lowercase();
        if response == "y" || response == "yes" {
            println!("{}", "Committing changes...".dimmed());
            let output = std::process::Command::new("git")
                .args(["commit", "-m", clean_message])
                .output();
            match output {
                Ok(out) => {
                    let stdout = String::from_utf8_lossy(&out.stdout);
                    let stderr = String::from_utf8_lossy(&out.stderr);
                    if out.status.success() {
                        println!("{}", "✓ Committed successfully!".green());
                        if !stdout.trim().is_empty() {
                            println!("{}", stdout.trim());
                        }
                    } else {
                        println!("{}", "✗ Git commit failed:".red());
                        if !stdout.trim().is_empty() {
                            println!("{}", stdout.trim());
                        }
                        if !stderr.trim().is_empty() {
                            println!("{}", stderr.trim().red());
                        }
                    }
                }
                Err(e) => {
                    println!("{}", format!("✗ Failed to execute git command: {}", e).red());
                }
            }
        } else {
            println!("{}", "Commit cancelled.".yellow());
        }
    }

    Ok(())
}

fn extract_stdout_stderr(content: &str) -> String {
    if let Ok(val) = serde_json::from_str::<serde_json::Value>(content) {
        let stdout = val["stdout"].as_str().unwrap_or("");
        let stderr = val["stderr"].as_str().unwrap_or("");
        if !stdout.is_empty() && !stderr.is_empty() {
            format!("{}\n{}", stdout, stderr)
        } else if !stdout.is_empty() {
            stdout.to_string()
        } else {
            stderr.to_string()
        }
    } else {
        content.to_string()
    }
}