refactor: split git suggestion helpers

Separate commit-message prompting, PR-title prompting, shared LLM requests, and title parsing so each suggestion flow can evolve independently.

Made-with: Cursor

Author: haasonsaas

TODO.md

@@ -83,7 +83,7 @@
 - [x] `src/commands/feedback_eval/input/conversion.rs`: split review-session conversion from label normalization helpers.
 - [x] `src/commands/pr.rs`: separate summary-only flow, full review flow, and comment-posting orchestration.
 - [x] `src/commands/pr/gh.rs`: carve PR resolution, diff fetching, and metadata fetching.
-- [ ] `src/commands/git/suggest.rs`: split commit-message prompting from PR-title prompting and response extraction.
+- [x] `src/commands/git/suggest.rs`: split commit-message prompting from PR-title prompting and response extraction.
 - [ ] `src/commands/review/command.rs`: split review/check/compare entrypoints if they keep diverging.
 - [ ] `src/commands/misc/feedback/command.rs`: separate file loading/ID normalization from store persistence.
 - [ ] `src/commands/misc/feedback/apply.rs`: split acceptance/rejection counters from store mutation helpers.

src/commands/git/suggest.rs

@@ -1,128 +1,11 @@
-use anyhow::Result;
-
-use crate::adapters;
-use crate::config;
-use crate::core;
-
-pub(super) async fn suggest_commit_message(config: config::Config) -> Result<()> {
-    let git = core::GitIntegration::new(".")?;
-    let diff_content = git.get_staged_diff()?;
-
-    if diff_content.is_empty() {
-        println!("No staged changes found. Stage your changes with 'git add' first.");
-        return Ok(());
-    }
-
-    let model_config = config.to_model_config_for_role(config::ModelRole::Fast);
-    let adapter = adapters::llm::create_adapter(&model_config)?;
-
-    let (system_prompt, user_prompt) =
-        core::CommitPromptBuilder::build_commit_prompt(&diff_content);
-
-    let request = adapters::llm::LLMRequest {
-        system_prompt,
-        user_prompt,
-        temperature: Some(0.3),
-        max_tokens: Some(500),
-        response_schema: None,
-    };
-
-    let response = adapter.complete(request).await?;
-    let commit_message = core::CommitPromptBuilder::extract_commit_message(&response.content);
-
-    println!("\nSuggested commit message:");
-    println!("{}", commit_message);
-
-    if commit_message.len() > 72 {
-        println!(
-            "\n⚠️  Warning: Commit message exceeds 72 characters ({})",
-            commit_message.len()
-        );
-    }
-
-    Ok(())
-}
-
-pub(super) async fn suggest_pr_title(config: config::Config) -> Result<()> {
-    let git = core::GitIntegration::new(".")?;
-    let base_branch = git
-        .get_default_branch()
-        .unwrap_or_else(|_| "main".to_string());
-    let diff_content = git.get_branch_diff(&base_branch)?;
-
-    if diff_content.is_empty() {
-        println!("No changes found compared to {} branch.", base_branch);
-        return Ok(());
-    }
-
-    let model_config = config.to_model_config_for_role(config::ModelRole::Fast);
-    let adapter = adapters::llm::create_adapter(&model_config)?;
-
-    let (system_prompt, user_prompt) =
-        core::CommitPromptBuilder::build_pr_title_prompt(&diff_content);
-
-    let request = adapters::llm::LLMRequest {
-        system_prompt,
-        user_prompt,
-        temperature: Some(0.3),
-        max_tokens: Some(200),
-        response_schema: None,
-    };
-
-    let response = adapter.complete(request).await?;
-    let title = extract_title_from_response(&response.content);
-
-    println!("\nSuggested PR title:");
-    println!("{}", title);
-
-    if title.len() > 65 {
-        println!(
-            "\n⚠️  Warning: PR title exceeds 65 characters ({})",
-            title.len()
-        );
-    }
-
-    Ok(())
-}
-
-fn extract_title_from_response(content: &str) -> String {
-    if let Some(start) = content.find("<title>") {
-        let after_tag = start + 7;
-        if let Some(end) = content[after_tag..].find("</title>") {
-            content[after_tag..after_tag + end].trim().to_string()
-        } else {
-            content.trim().to_string()
-        }
-    } else {
-        content
-            .lines()
-            .find(|line| !line.trim().is_empty())
-            .unwrap_or("")
-            .trim()
-            .to_string()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_extract_title_normal() {
-        let content = "<title>Fix login bug</title>";
-        assert_eq!(extract_title_from_response(content), "Fix login bug");
-    }
-
-    #[test]
-    fn test_extract_title_malformed_closing_before_opening() {
-        let content = "Some text</title> more <title>Real Title</title>";
-        let title = extract_title_from_response(content);
-        assert!(!title.is_empty());
-    }
-
-    #[test]
-    fn test_extract_title_no_tags() {
-        let content = "Just a plain title\nSecond line";
-        assert_eq!(extract_title_from_response(content), "Just a plain title");
-    }
-}
+#[path = "suggest/commit.rs"]
+mod commit;
+#[path = "suggest/pr_title.rs"]
+mod pr_title;
+#[path = "suggest/request.rs"]
+mod request;
+#[path = "suggest/response.rs"]
+mod response;
+
+pub(super) use commit::suggest_commit_message;
+pub(super) use pr_title::suggest_pr_title;

src/commands/git/suggest/commit.rs

@@ -0,0 +1,33 @@
+use anyhow::Result;
+
+use crate::config;
+use crate::core;
+
+use super::request::complete_suggestion;
+
+pub(in super::super) async fn suggest_commit_message(config: config::Config) -> Result<()> {
+    let git = core::GitIntegration::new(".")?;
+    let diff_content = git.get_staged_diff()?;
+
+    if diff_content.is_empty() {
+        println!("No staged changes found. Stage your changes with 'git add' first.");
+        return Ok(());
+    }
+
+    let (system_prompt, user_prompt) =
+        core::CommitPromptBuilder::build_commit_prompt(&diff_content);
+    let response = complete_suggestion(&config, system_prompt, user_prompt, 500).await?;
+    let commit_message = core::CommitPromptBuilder::extract_commit_message(&response);
+
+    println!("\nSuggested commit message:");
+    println!("{}", commit_message);
+
+    if commit_message.len() > 72 {
+        println!(
+            "\nWarning: Commit message exceeds 72 characters ({})",
+            commit_message.len()
+        );
+    }
+
+    Ok(())
+}

src/commands/git/suggest/pr_title.rs

@@ -0,0 +1,37 @@
+use anyhow::Result;
+
+use crate::config;
+use crate::core;
+
+use super::request::complete_suggestion;
+use super::response::extract_title_from_response;
+
+pub(in super::super) async fn suggest_pr_title(config: config::Config) -> Result<()> {
+    let git = core::GitIntegration::new(".")?;
+    let base_branch = git
+        .get_default_branch()
+        .unwrap_or_else(|_| "main".to_string());
+    let diff_content = git.get_branch_diff(&base_branch)?;
+
+    if diff_content.is_empty() {
+        println!("No changes found compared to {} branch.", base_branch);
+        return Ok(());
+    }
+
+    let (system_prompt, user_prompt) =
+        core::CommitPromptBuilder::build_pr_title_prompt(&diff_content);
+    let response = complete_suggestion(&config, system_prompt, user_prompt, 200).await?;
+    let title = extract_title_from_response(&response);
+
+    println!("\nSuggested PR title:");
+    println!("{}", title);
+
+    if title.len() > 65 {
+        println!(
+            "\nWarning: PR title exceeds 65 characters ({})",
+            title.len()
+        );
+    }
+
+    Ok(())
+}

src/commands/git/suggest/request.rs

@@ -0,0 +1,24 @@
+use anyhow::Result;
+
+use crate::adapters;
+use crate::config;
+
+pub(super) async fn complete_suggestion(
+    config: &config::Config,
+    system_prompt: String,
+    user_prompt: String,
+    max_tokens: usize,
+) -> Result<String> {
+    let model_config = config.to_model_config_for_role(config::ModelRole::Fast);
+    let adapter = adapters::llm::create_adapter(&model_config)?;
+    let request = adapters::llm::LLMRequest {
+        system_prompt,
+        user_prompt,
+        temperature: Some(0.3),
+        max_tokens: Some(max_tokens),
+        response_schema: None,
+    };
+
+    let response = adapter.complete(request).await?;
+    Ok(response.content)
+}

src/commands/git/suggest/response.rs

@@ -0,0 +1,41 @@
+pub(super) fn extract_title_from_response(content: &str) -> String {
+    if let Some(start) = content.find("<title>") {
+        let after_tag = start + 7;
+        if let Some(end) = content[after_tag..].find("</title>") {
+            content[after_tag..after_tag + end].trim().to_string()
+        } else {
+            content.trim().to_string()
+        }
+    } else {
+        content
+            .lines()
+            .find(|line| !line.trim().is_empty())
+            .unwrap_or("")
+            .trim()
+            .to_string()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_extract_title_normal() {
+        let content = "<title>Fix login bug</title>";
+        assert_eq!(extract_title_from_response(content), "Fix login bug");
+    }
+
+    #[test]
+    fn test_extract_title_malformed_closing_before_opening() {
+        let content = "Some text</title> more <title>Real Title</title>";
+        let title = extract_title_from_response(content);
+        assert!(!title.is_empty());
+    }
+
+    #[test]
+    fn test_extract_title_no_tags() {
+        let content = "Just a plain title\nSecond line";
+        assert_eq!(extract_title_from_response(content), "Just a plain title");
+    }
+}