turbocommit 3.2.1

A CLI tool to create commit messages with OpenAI GPT-5.6 for Git and Jujutsu (JJ) repositories
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
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
use crate::config::{Config, REASONING_EFFORTS, VERBOSITY_LEVELS};
use crate::model;
use crate::openai::count_token;
use colored::Colorize;
use std::str::FromStr;
use std::{cmp, env, process};

#[derive(Debug, Clone)]
pub struct Options {
    pub n: i32,
    pub msg: String,
    pub model: model::Model,
    pub auto_commmit: bool,
    pub check_version_only: bool,
    pub api_endpoint: String,
    pub system_msg: Option<String>,
    pub disable_auto_update_check: bool,
    pub api_key: Option<String>,
    pub reasoning_effort: Option<String>,
    pub verbosity: Option<String>,
    pub debug: bool,
    pub debug_file: Option<String>,
    pub debug_context: bool,
    pub always_select_files: bool,
    pub config_file: Option<String>,
    pub amend: bool,
    // Jujutsu VCS specific options
    pub jj_revision: Option<String>,
    pub jj_rewrite: bool,
}

impl From<&Config> for Options {
    fn from(config: &Config) -> Self {
        Self {
            n: config.default_number_of_choices,
            msg: String::new(),
            model: config.model.clone(),
            auto_commmit: false,
            check_version_only: false,
            api_endpoint: config.api_endpoint.clone(),
            system_msg: None,
            disable_auto_update_check: config.disable_auto_update_check,
            api_key: None,
            reasoning_effort: Some(config.reasoning_effort.clone()),
            verbosity: Some(config.verbosity.clone()),
            debug: false,
            debug_file: None,
            debug_context: false,
            always_select_files: false,
            config_file: None,
            amend: false,
            jj_revision: None,
            jj_rewrite: config.jj_rewrite_default,
        }
    }
}

impl Options {
    pub fn new<I>(args: I, conf: &Config) -> Self
    where
        I: Iterator<Item = String>,
    {
        let mut opts = Self::from(conf);
        let mut iter = args.skip(1);
        let mut msg = String::new();

        while let Some(arg) = iter.next() {
            match arg.as_str() {
                "-n" => {
                    if let Some(n) = iter.next() {
                        opts.n = n.parse().map_or_else(
                            |_| {
                                println!(
                                    "{} {}",
                                    "Could not parse n.".red(),
                                    "Please enter an integer.".bright_black()
                                );
                                process::exit(1);
                            },
                            |n| cmp::max(1, n),
                        );
                    }
                }
                "-m" | "--model" => {
                    if let Some(model) = iter.next() {
                        opts.model = match model::Model::from_str(&model) {
                            Ok(model) => model,
                            Err(err) => {
                                println!(
                                    "{} {}",
                                    format!("Could not parse model: {}", err).red(),
                                    "Please enter a valid model.".bright_black()
                                );
                                process::exit(1);
                            }
                        };
                    }
                }
                "-a" | "--auto-commit" => {
                    opts.auto_commmit = true;
                    opts.n = 1;
                }
                "--amend" => {
                    opts.amend = true;
                }
                "--check-version" => {
                    opts.check_version_only = true;
                }
                "--api-endpoint" => {
                    if let Some(endpoint) = iter.next() {
                        opts.api_endpoint = endpoint;
                    }
                }
                "--system-msg-file" => {
                    if let Some(path) = iter.next() {
                        match std::fs::read_to_string(&path) {
                            Ok(content) => opts.system_msg = Some(content),
                            Err(err) => {
                                println!(
                                    "{} {}",
                                    format!("Could not read system message file: {}", err).red(),
                                    "Please provide a valid file path.".bright_black()
                                );
                                process::exit(1);
                            }
                        }
                    }
                }
                "--disable-auto-update-check" => {
                    opts.disable_auto_update_check = true;
                }
                "--api-key" => {
                    if let Some(key) = iter.next() {
                        opts.api_key = Some(key);
                    }
                }
                "-e" | "--reasoning-effort" => {
                    if let Some(effort) = iter.next() {
                        if !REASONING_EFFORTS.contains(&effort.as_str()) {
                            println!(
                                "{} {}",
                                format!("Invalid reasoning effort: {effort}").red(),
                                format!("Valid values: {}", REASONING_EFFORTS.join(", "))
                                    .bright_black()
                            );
                            process::exit(1);
                        }
                        opts.reasoning_effort = Some(effort);
                    }
                }
                "-v" | "--verbosity" => {
                    if let Some(level) = iter.next() {
                        if !VERBOSITY_LEVELS.contains(&level.as_str()) {
                            println!(
                                "{} {}",
                                format!("Invalid verbosity: {level}").red(),
                                format!("Valid values: {}", VERBOSITY_LEVELS.join(", "))
                                    .bright_black()
                            );
                            process::exit(1);
                        }
                        opts.verbosity = Some(level);
                    }
                }
                "-d" | "--debug" => {
                    opts.debug = true;
                }
                "--debug-file" => {
                    if let Some(path) = iter.next() {
                        opts.debug_file = Some(path);
                        opts.debug = true;
                    }
                }
                "--debug-context" => {
                    opts.debug_context = true;
                }
                "--select-files" => {
                    opts.always_select_files = true;
                }
                "-c" | "--config" => {
                    if let Some(path) = iter.next() {
                        opts.config_file = Some(path);
                    }
                }
                "-r" | "--revision" => {
                    if let Some(rev) = iter.next() {
                        opts.jj_revision = Some(rev);
                    }
                }
                "--rw" => {
                    opts.jj_rewrite = !opts.jj_rewrite;
                }
                "-h" | "--help" => help(),
                "--version" => {
                    println!("turbocommit version {}", env!("CARGO_PKG_VERSION").purple());
                    process::exit(0);
                }
                _ => {
                    if arg.starts_with('-') {
                        println!(
                            "{} {} {}",
                            "Unknown option: ".red(),
                            arg.purple().bold(),
                            "\nPlease use -h or --help for help.".bright_black()
                        );
                        process::exit(1);
                    }
                    msg.push_str(&arg);
                    msg.push(' ');
                }
            }
        }
        if !msg.is_empty() {
            opts.msg = format!("User instruction: {}", msg.trim());
        }
        opts
    }
}

fn help() {
    println!("{}", "    __             __".red());
    println!("{}", "   / /___  _______/ /_  ____".red());
    println!("{}", "  / __/ / / / ___/ __ \\/ __ \\".yellow());
    println!("{}", " / /_/ /_/ / /  / /_/ / /_/ /".green());
    println!(
        "{}{}",
        " \\__/\\__,_/_/  /_.___/\\____/       ".blue(),
        "_ __".purple()
    );
    println!("{}", "   _________  ____ ___  ____ ___  (_) /_".purple());
    println!("{}", "  / ___/ __ \\/ __ `__ \\/ __ `__ \\/ / __/".red());
    println!("{}", " / /__/ /_/ / / / / / / / / / / / / /_".yellow());
    println!("{}", " \\___/\\____/_/ /_/ /_/_/ /_/ /_/_/\\__/".green());

    println!("\nUsage: turbocommit [options] [message]\n");
    println!(
        "{}",
        "NOTE: turboCommit supports the GPT-5.6 family"
            .yellow()
            .bold()
    );
    println!(
        "{}\n",
        "Luna is the default; Terra, Sol, and the gpt-5.6 Sol alias are available".bright_black()
    );
    println!("Options:");
    println!("  -n <n>   Number of choices to generate (default: 3)\n");
    println!("  -m <m>   Model to use (default: gpt-5.6-luna)\n  --model <m>");
    println!("           Values: gpt-5.6-luna, gpt-5.6-terra, gpt-5.6-sol, gpt-5.6\n");
    println!("  -a, --auto-commit  Automatically generate and commit a single message\n");
    println!("  --amend  Amend the last commit with the generated message\n");
    println!("  --check-version  Check for updates and exit\n");
    println!("  --api-endpoint <url>  Set the API endpoint URL\n");
    println!("  --system-msg-file <path>  Load the developer instruction from a file\n");
    println!("  --disable-auto-update-check  Disable automatic update checks\n");
    println!("  --api-key <key>  Set the API key\n");
    println!("  -e, --reasoning-effort <effort>  Set the reasoning effort level\n");
    println!(
        "                              Values: none, low (default), medium, high, xhigh, max\n"
    );
    println!("                              Use 'none' to disable reasoning features\n");
    println!("  -v, --verbosity <level>  Set output verbosity level (default: medium)\n");
    println!("                      Values: low, medium, high\n");
    println!("  -d, --debug  Enable debug mode (shows request/response info and token usage)\n");
    println!("  --debug-file <path>  Write detailed debug logs to specified file (overwrites existing file)\n");
    println!("                       Use '-' to write to stdout instead of a file\n");
    println!("  --debug-context  Log all message contents being sent to the AI\n");
    println!("  --select-files  Always prompt for file selection, regardless of token count\n");
    println!("  -c, --config <path>  Set the config file path\n");
    println!("  -r, --revision <rev>  Set the Jujutsu revision to describe (default: current working directory)\n");
    println!("  --rw  Toggle rewrite mode (inverts config default)\n");
    println!("Anything else will be concatenated into an extra message given to the AI\n");
    println!("You can change these defaults and the developer instruction (`system_msg`) in the config file created on first run:\n{}",
        home::home_dir().unwrap_or_else(|| "".into()).join(".turbocommit.yaml").display());
    println!(
        "To restore the default developer instruction, delete `system_msg` from the config file.\n"
    );
    println!(
        "\nThe developer instruction is about ~{} tokens long",
        format!(
            "{}",
            count_token(&crate::config::Config::default().system_msg).unwrap_or(0)
        )
        .green()
    );
    process::exit(1);
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::config::Config;

    #[test]
    fn test_options_from_config() {
        let config = Config::default();
        let options = Options::from(&config);

        assert_eq!(options.n, config.default_number_of_choices);
        assert_eq!(options.model, config.model);
        assert_eq!(options.reasoning_effort, Some(config.reasoning_effort));
        assert_eq!(options.verbosity, Some(config.verbosity));
    }

    #[test]
    fn test_options_new() {
        let config = Config::default();
        let args = vec![
            "turbocommit",
            "-n",
            "3",
            "--model",
            "gpt-5.6-terra",
            "--reasoning-effort",
            "medium",
            "--verbosity",
            "high",
            "test",
            "commit",
        ];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);

        assert_eq!(options.n, 3);
        assert_eq!(options.model.0, "gpt-5.6-terra");
        assert_eq!(options.reasoning_effort, Some("medium".to_string()));
        assert_eq!(options.verbosity, Some("high".to_string()));
        assert_eq!(options.msg, "User instruction: test commit");
    }

    #[test]
    fn test_extended_gpt56_reasoning_efforts() {
        let config = Config::default();

        for effort in ["xhigh", "max"] {
            let args = vec!["turbocommit", "--reasoning-effort", effort];
            let args = args.into_iter().map(String::from).collect::<Vec<String>>();
            let options = Options::new(args.into_iter(), &config);
            assert_eq!(options.reasoning_effort.as_deref(), Some(effort));
        }
    }

    #[test]
    fn test_debug_mode() {
        let config = Config::default();
        let args = vec!["turbocommit", "-d", "--model", "gpt-5.6-sol"];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);

        assert!(options.debug);
        assert_eq!(options.model.0, "gpt-5.6-sol");
    }

    #[test]
    fn test_debug_file_options() {
        let config = Config::default();

        // Test debug file to a path
        let args = vec!["turbocommit", "--debug-file", "debug.log"];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);

        assert!(options.debug); // Debug mode should be enabled
        assert_eq!(options.debug_file, Some("debug.log".to_string()));

        // Test debug file to stdout with "-"
        let args = vec!["turbocommit", "--debug-file", "-"];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);

        assert!(options.debug);
        assert_eq!(options.debug_file, Some("-".to_string()));

        // Test debug mode without file
        let args = vec!["turbocommit", "-d"];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);

        assert!(options.debug);
        assert_eq!(options.debug_file, None);
    }

    #[test]
    fn test_reasoning_none_mode() {
        let config = Config::default();
        let args = vec![
            "turbocommit",
            "--reasoning-effort",
            "none",
            "--model",
            "gpt-5.6-luna",
        ];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);

        assert_eq!(options.reasoning_effort, Some("none".to_string()));
        assert_eq!(options.model.0, "gpt-5.6-luna");
    }

    #[test]
    fn test_verbosity_option() {
        let config = Config::default();

        // Test low verbosity
        let args = vec![
            "turbocommit",
            "--verbosity",
            "low",
            "--model",
            "gpt-5.6-luna",
        ];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);
        assert_eq!(options.verbosity, Some("low".to_string()));

        // Test high verbosity
        let args = vec![
            "turbocommit",
            "--verbosity",
            "high",
            "--model",
            "gpt-5.6-luna",
        ];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);
        assert_eq!(options.verbosity, Some("high".to_string()));
    }

    #[test]
    fn test_short_options_for_reasoning_and_verbosity() {
        let config = Config::default();
        let args = vec![
            "turbocommit",
            "-e",
            "high",
            "-v",
            "low",
            "--model",
            "gpt-5.6",
        ];
        let args = args.into_iter().map(String::from).collect::<Vec<String>>();
        let options = Options::new(args.into_iter(), &config);

        assert_eq!(options.reasoning_effort, Some("high".to_string()));
        assert_eq!(options.verbosity, Some("low".to_string()));
        assert_eq!(options.model.0, "gpt-5.6");
    }

    #[test]
    fn test_invalid_model_rejected() {
        let _config = Config::default();
        // This should fail during parsing when model validation is enforced
        // The test expects the program to exit with an error
        // Note: This test would need to be run in a subprocess to catch the exit
    }
}