commitbot 0.5.2

A CLI assistant that generates commit and PR messages from your diffs using LLMs.
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
use crate::{git, Cli};
use git::detect_repo_id;
use serde::Deserialize;
use std::collections::HashMap;
use std::env;
use std::fs;
use std::path::{Path, PathBuf};

/// Final resolved configuration for commitbot.
#[derive(Debug, Clone)]
pub struct Config {
    pub provider: String,
    pub openai_api_key: Option<String>,
    pub base_url: Option<String>,
    pub model: String,
    pub max_concurrent_requests: usize,
    pub stream: bool,
}

impl Config {
    /// Build the final config from CLI flags, environment, TOML file, and defaults.
    ///
    /// Precedence (highest to lowest):
    ///   1. CLI flags
    ///   2. Env vars
    ///   3. Per-repo table in config file (e.g. ["mikegarde/commitbot"])
    ///   4. [default] table in config file
    ///   5. Hardcoded defaults
    pub fn from_sources(cli: &Cli) -> Self {
        let r = ConfigResolver::new(cli);

        let provider = r.get_string("provider", "openai").to_lowercase();
        let model = r.get_string("model", "gpt-5-nano");

        // secrets: logged as <set>/<unset>
        let openai_api_key = r.get_secret_opt_string("openai_api_key");

        // optional
        let base_url = r.get_opt_string("base_url");

        let max_concurrent_requests = r.get_usize("max_concurrent_requests", 4);
        let stream = r.get_bool("stream", true);

        // Cleanup: trim stray quotes if any upstream included them
        let provider = provider.trim_matches('"').to_string();
        let model = model.trim_matches('"').to_string();
        let openai_api_key = openai_api_key.map(|s| s.trim_matches('"').to_string());
        let base_url = base_url.map(|s| s.trim_matches('"').to_string());

        if provider == "openai" && openai_api_key.is_none() {
            panic!("OPENAI_API_KEY must be set via CLI, env var, or config file for provider=openai");
        }

        Config {
            provider,
            model,
            openai_api_key,
            base_url,
            max_concurrent_requests,
            stream,
        }
    }
}

#[derive(Debug, Default, Deserialize, Clone)]
struct FileConfig {
    pub provider: Option<String>,
    pub model: Option<String>,
    pub openai_api_key: Option<String>,
    #[serde(alias = "url")]
    pub base_url: Option<String>,
    pub max_concurrent_requests: Option<usize>,
    pub stream: Option<bool>,
}

/// Root of the TOML file:
/// - [default]
/// - ["owner/repo"] tables flattened into `repos`
#[derive(Debug, Default, Deserialize)]
struct FileConfigRoot {
    pub default: Option<FileConfig>,

    #[serde(flatten)]
    pub repos: HashMap<String, FileConfig>,
}

#[derive(Debug, Clone, Copy)]
enum ValueSource {
    Hardcoded,
    FileDefault,
    FileRepo,
    Env,
    Cli,
}

fn source_label(s: ValueSource) -> &'static str {
    match s {
        ValueSource::Cli => "cli",
        ValueSource::Env => "env",
        ValueSource::FileRepo => "file:[repo]",
        ValueSource::FileDefault => "file:[default]",
        ValueSource::Hardcoded => "hardcoded",
    }
}

struct ConfigResolver<'a> {
    cli: &'a Cli,
    repo_id: Option<String>,
    file_default: FileConfig,
    file_repo: FileConfig,
}

impl<'a> ConfigResolver<'a> {
    pub fn new(cli: &'a Cli) -> Self {
        // config file string (cli > env > default string)
        let config_file_to_use: String = cli
            .config
            .clone()
            .or_else(|| env::var("COMMITBOT_CONFIG").ok())
            .unwrap_or_else(|| "~/.config/commitbot.toml".to_string());

        let config_path = expand_tilde_to_path(&config_file_to_use);
        log::debug!("Config File: {}", config_path.display());

        let root = load_file_config_from_path(&config_path);

        let repo_id = detect_repo_id();
        log::debug!("Repo ID: {:?}", repo_id);

        let file_default = root.default.clone().unwrap_or_default();
        let file_repo = repo_id
            .as_deref()
            .and_then(|id| root.repos.get(id))
            .cloned()
            .unwrap_or_default();

        if let Some(id) = repo_id.as_deref() {
            log::debug!("Repo table present: {}", root.repos.contains_key(id));
        }

        Self {
            cli,
            repo_id,
            file_default,
            file_repo,
        }
    }

    fn env_key_for(&self, key: &str) -> Option<&'static str> {
        match key {
            "provider" => Some("COMMITBOT_PROVIDER"),
            "model" => Some("COMMITBOT_MODEL"),
            "openai_api_key" => Some("OPENAI_API_KEY"),
            "base_url" => Some("COMMITBOT_BASE_URL"),
            "max_concurrent_requests" => Some("COMMITBOT_MAX_CONCURRENT_REQUESTS"),
            "stream" => Some("COMMITBOT_STREAM"),
            _ => None,
        }
    }

    // ---- FILE SOURCES ----

    fn file_string(&self, key: &str, repo: bool) -> Option<String> {
        let cfg = if repo { &self.file_repo } else { &self.file_default };
        match key {
            "provider" => cfg.provider.clone(),
            "model" => cfg.model.clone(),
            "openai_api_key" => cfg.openai_api_key.clone(),
            "base_url" => cfg.base_url.clone(),
            _ => None,
        }
    }

    fn file_usize(&self, key: &str, repo: bool) -> Option<usize> {
        let cfg = if repo { &self.file_repo } else { &self.file_default };
        match key {
            "max_concurrent_requests" => cfg.max_concurrent_requests,
            _ => None,
        }
    }

    fn file_bool(&self, key: &str, repo: bool) -> Option<bool> {
        let cfg = if repo { &self.file_repo } else { &self.file_default };
        match key {
            "stream" => cfg.stream,
            _ => None,
        }
    }

    // ---- ENV SOURCES ----

    fn env_string(&self, key: &str) -> Option<String> {
        let env_key = self.env_key_for(key)?;
        env::var(env_key).ok()
    }

    fn env_usize(&self, key: &str) -> Option<usize> {
        let env_key = self.env_key_for(key)?;
        env::var(env_key).ok().and_then(|s| s.parse::<usize>().ok())
    }

    fn env_bool(&self, key: &str) -> Option<bool> {
        let env_key = self.env_key_for(key)?;
        env::var(env_key).ok().and_then(|s| s.parse::<bool>().ok())
    }

    // Expectation for a stream flag:
    //   - `--no-stream` present => stream = Some(false)
    //   - absent                => stream = None (file/env/default wins)
    fn cli_string(&self, key: &str) -> Option<String> {
        match key {
            "provider" => self.cli.provider.clone(),
            "model" => self.cli.model.clone(),
            "openai_api_key" => self.cli.api_key.clone(),
            "base_url" => self.cli.url.clone(),
            _ => None,
        }
    }

    fn cli_usize(&self, key: &str) -> Option<usize> {
        match key {
            "max_concurrent_requests" => self.cli.max,
            _ => None,
        }
    }

    fn cli_bool(&self, key: &str) -> Option<bool> {
        match key {
            "stream" => self.cli.no_stream.then_some(false),
            _ => None,
        }
    }

    fn log_decision<T: std::fmt::Debug>(&self, key: &str, value: &T, src: ValueSource) {
        if let Some(env_key) = self.env_key_for(key) {
            log::debug!(
                "Config: {} = {:?} (source={}, env={})",
                key,
                value,
                source_label(src),
                env_key
            );
        } else {
            log::debug!(
                "Config: {} = {:?} (source={})",
                key,
                value,
                source_label(src)
            );
        }
    }

    fn log_decision_secret_opt_string(&self, key: &str, present: bool, src: ValueSource) {
        let printable = if present { "<set>" } else { "<unset>" };
        if let Some(env_key) = self.env_key_for(key) {
            log::debug!(
                "Config: {} = {} (source={}, env={})",
                key,
                printable,
                source_label(src),
                env_key
            );
        } else {
            log::debug!(
                "Config: {} = {} (source={})",
                key,
                printable,
                source_label(src)
            );
        }
    }

    /// Resolve a required string.
    pub fn get_string(&self, key: &str, default: &str) -> String {
        let mut value = default.to_string();
        let mut src = ValueSource::Hardcoded;

        if let Some(v) = self.file_string(key, false) {
            value = v;
            src = ValueSource::FileDefault;
        }
        if let Some(v) = self.file_string(key, true) {
            value = v;
            src = ValueSource::FileRepo;
        }
        if let Some(v) = self.env_string(key) {
            value = v;
            src = ValueSource::Env;
        }
        if let Some(v) = self.cli_string(key) {
            value = v;
            src = ValueSource::Cli;
        }

        self.log_decision(key, &value, src);
        value
    }

    /// Resolve an optional string (None if not set anywhere).
    pub fn get_opt_string(&self, key: &str) -> Option<String> {
        let mut value: Option<String> = None;
        let mut src = ValueSource::Hardcoded;

        if let Some(v) = self.file_string(key, false) {
            value = Some(v);
            src = ValueSource::FileDefault;
        }
        if let Some(v) = self.file_string(key, true) {
            value = Some(v);
            src = ValueSource::FileRepo;
        }
        if let Some(v) = self.env_string(key) {
            value = Some(v);
            src = ValueSource::Env;
        }
        if let Some(v) = self.cli_string(key) {
            value = Some(v);
            src = ValueSource::Cli;
        }

        self.log_decision(key, &value, src);
        value
    }

    /// Resolve an optional secret string; logs <set>/<unset> only.
    pub fn get_secret_opt_string(&self, key: &str) -> Option<String> {
        let mut value: Option<String> = None;
        let mut src = ValueSource::Hardcoded;

        if let Some(v) = self.file_string(key, false) {
            value = Some(v);
            src = ValueSource::FileDefault;
        }
        if let Some(v) = self.file_string(key, true) {
            value = Some(v);
            src = ValueSource::FileRepo;
        }
        if let Some(v) = self.env_string(key) {
            value = Some(v);
            src = ValueSource::Env;
        }
        if let Some(v) = self.cli_string(key) {
            value = Some(v);
            src = ValueSource::Cli;
        }

        self.log_decision_secret_opt_string(key, value.is_some(), src);
        value
    }

    /// Resolve a usize.
    pub fn get_usize(&self, key: &str, default: usize) -> usize {
        let mut value = default;
        let mut src = ValueSource::Hardcoded;

        if let Some(v) = self.file_usize(key, false) {
            value = v;
            src = ValueSource::FileDefault;
        }
        if let Some(v) = self.file_usize(key, true) {
            value = v;
            src = ValueSource::FileRepo;
        }
        if let Some(v) = self.env_usize(key) {
            value = v;
            src = ValueSource::Env;
        }
        if let Some(v) = self.cli_usize(key) {
            value = v;
            src = ValueSource::Cli;
        }

        self.log_decision(key, &value, src);
        value
    }

    /// Resolve a bool.
    pub fn get_bool(&self, key: &str, default: bool) -> bool {
        let mut value = default;
        let mut src = ValueSource::Hardcoded;

        if let Some(v) = self.file_bool(key, false) {
            value = v;
            src = ValueSource::FileDefault;
        }
        if let Some(v) = self.file_bool(key, true) {
            value = v;
            src = ValueSource::FileRepo;
        }
        if let Some(v) = self.env_bool(key) {
            value = v;
            src = ValueSource::Env;
        }
        if let Some(v) = self.cli_bool(key) {
            value = v;
            src = ValueSource::Cli;
        }

        self.log_decision(key, &value, src);
        value
    }

    #[allow(dead_code)]
    pub fn repo_id(&self) -> Option<&str> {
        self.repo_id.as_deref()
    }
}

fn expand_tilde_to_path(s: &str) -> PathBuf {
    if let (Some(rest), Some(home)) = (s.strip_prefix("~/"), env::var_os("HOME")) {
        return PathBuf::from(home).join(rest);
    }
    PathBuf::from(s)
}

fn load_file_config_from_path(path: &Path) -> FileConfigRoot {
    if !path.exists() {
        log::warn!("Config file not found: {}", path.display());
        return FileConfigRoot::default();
    }

    let data = match fs::read_to_string(path) {
        Ok(s) => s,
        Err(err) => {
            log::warn!("Failed to read config file {}: {}", path.display(), err);
            return FileConfigRoot::default();
        }
    };

    match toml::from_str::<FileConfigRoot>(&data) {
        Ok(cfg) => cfg,
        Err(err) => {
            log::warn!("Invalid TOML in {}: {}", path.display(), err);
            FileConfigRoot::default()
        }
    }
}