Merge pull request #9 from MikeGarde/interactive

Add interactive file classification workflow with staged prompts

Author: MikeGarde

Cargo.lock

@@ -15,6 +15,7 @@ categories = ["command-line-utilities", "development-tools", "text-processing"]
 [dependencies]
 anyhow = "1.0"
 clap = { version = "4.5", features = ["derive", "env"] }
+crossterm = "0.29"
 dirs = "6.0.0"
 reqwest = { version = "0.12", features = ["json", "blocking"] }
 serde = { version = "1", features = ["derive"] }

Cargo.toml

@@ -0,0 +1,72 @@
+use clap::{ArgGroup, Parser, Subcommand};
+
+/// CLI options
+#[derive(Parser, Debug)]
+#[command(
+    name = "commitbot",
+    version,
+    about = "LLM-assisted Git commit message generator"
+)]
+#[command(group(
+    ArgGroup::new("model_group")
+        .args(["model", "no_model"])
+        .multiple(false)
+))]
+pub struct Cli {
+    /// Interactive mode: classify each file and do per-file summaries
+    #[arg(long, global = true)]
+    pub ask: bool,
+
+    /// If set, write the generated message into .git/COMMIT_EDITMSG (no commit is created)
+    #[arg(short = 'w', long, global = true)]
+    pub apply: bool,
+
+    /// Stage all changes before generating the commit message
+    #[arg(short, long, global = true)]
+    pub stage: bool,
+
+    /// Debug mode: log prompts, responses, token usage
+    #[arg(long, global = true)]
+    pub debug: bool,
+
+    /// Model name to use (e.g. gpt-4o-mini). If 'none', acts like --no-model.
+    #[arg(short, long, global = true)]
+    pub model: Option<String>,
+
+    /// Disable model calls; return dummy responses instead
+    #[arg(long, global = true)]
+    pub no_model: bool,
+
+    /// API key (otherwise uses OPENAI_API_KEY env var)
+    #[arg(short = 'k', long, env = "OPENAI_API_KEY", global = true)]
+    pub api_key: Option<String>,
+
+    /// Optional: a brief human description of the ticket (for commit/PR summaries)
+    #[arg(long, global = true)]
+    pub ticket_summary: Option<String>,
+
+    /// Subcommand (e.g. 'pr')
+    #[command(subcommand)]
+    pub command: Option<Command>,
+}
+
+/// Subcommands, e.g. `commitbot pr develop`
+#[derive(Subcommand, Debug)]
+pub enum Command {
+    /// Generate a Pull Request description by summarizing commit or PR messages
+    Pr {
+        /// Base branch to compare against (e.g. main or develop)
+        base: String,
+
+        /// Optional feature/source branch; defaults to current branch if omitted
+        from: Option<String>,
+
+        /// Force using PR-oriented grouping (PR numbers) instead of commits
+        #[arg(long = "pr")]
+        pr_mode: bool,
+
+        /// Force using commit-by-commit mode instead of PR grouping
+        #[arg(long = "commit")]
+        commit_mode: bool,
+    },
+}

src/cli_args.rs

@@ -7,6 +7,7 @@ use std::path::PathBuf;
 /// Final resolved configuration for commitbot.
 #[derive(Debug, Clone)]
 pub struct Config {
+    pub openai_api_key: String,
     pub model: String,
 }
 
@@ -22,21 +23,29 @@ impl Config {
         let file_cfg = load_file_config().unwrap_or_default();
 
         let model_cli = cli.model.clone();
+        let api_key_cli = cli.api_key.clone();
         let model_env = env::var("COMMITBOT_MODEL").ok();
+        let api_key_env = env::var("OPENAI_API_KEY").ok();
 
         let model = model_cli
             .or(model_env)
             .or(file_cfg.model)
             .unwrap_or_else(|| "gpt-5-nano".to_string());
 
-        Config { model }
+        let openai_api_key = api_key_cli
+            .or(api_key_env)
+            .or(file_cfg.openai_api_key)
+            .expect("OPENAI_API_KEY must be set via env var or CLI");
+
+        Config { model, openai_api_key }
     }
 }
 
 #[derive(Debug, Default, Deserialize)]
 struct FileConfig {
     /// Default model to use when not provided via CLI or env.
     pub model: Option<String>,
+    pub openai_api_key: Option<String>,
 }
 
 /// Return `~/.config/commitbot.toml`