fix(llm): 修复 Kimi API temperature 参数配置

.gitignore

@@ -21,3 +21,5 @@ test_output/
 
 # Config (for development)
 config.toml
+.claude/
+CLAUDE.md

CHANGELOG.md

@@ -9,6 +9,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 暂无。
 
+## [0.3.1] - 2026-06-01
+
+### ✨ 新功能
+- 按文件重要性对暂存差异排序，优先处理核心变更
+- DeepSeek 新增 reasoning 推理模式支持
+- LLM 统一思考模式配置，支持显式启用/禁用思考状态
+- 新增 `thinking.rs` 思考状态管理模块
+
+### 🐞 错误修复
+- 修复 Kimi 返回信息的读取错误
+- 修复 DeepSeek 和 Kimi 流式响应的解析问题
+
+### 📚 文档
+- 新增 ROADMAP.md 项目路线图文档
+
+### 🔧 其他变更
+- LLM 模块大规模重构，所有提供商（Anthropic、DeepSeek、Kimi、Ollama、OpenAI、OpenRouter）适配流式响应处理
+- 代码格式化并优化导入顺序
+- 清理大量未使用的变量、方法及结构体警告
+- 清理构建输出日志文件
+- 重新编号 LLM 系统提示规则
+- i18n 多语言消息格式修复
+- 各命令模块（commit、tag、changelog、config、profile、init）持续优化
+
 ## [0.1.11] - 2026-03-23
 
 ### ✨ 新功能

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "quicommit"
-version = "0.2.0"
+version = "0.3.1"
 edition = "2024"
 authors = ["Sidney Zhang <zly@lyzhang.me>"]
 description = "A powerful Git assistant tool with AI-powered commit/tag/changelog generation(alpha version)"
@@ -33,7 +33,7 @@ git2 = "0.20.3"
 which = "6.0"
 
 # HTTP client for LLM APIs
-reqwest = { version = "0.12", features = ["json", "rustls-tls"], default-features = false }
+reqwest = { version = "0.12", features = ["json", "rustls-tls", "stream"], default-features = false }
 tokio = { version = "1.35", features = ["full"] }
 
 # Error handling
@@ -57,6 +57,7 @@ sha2 = "0.10"
 hex = "0.4"
 textwrap = "0.16"
 async-trait = "0.1"
+futures-util = "0.3"
 serde_json = "1.0"
 atty = "0.2"
 
@@ -85,7 +86,7 @@ wiremock = "0.6"
 [profile.release]
 opt-level = "s"
 lto = "thin"
-codegen-units = 2
+codegen-units = 1
 panic = "abort"
 strip = true
 debug = false

RAODMAP.md

@@ -0,0 +1,128 @@
+# QuiCommit Roadmap
+
+## 已完成 ✅
+
+- [x] 基础 Git 操作（commit、tag、changelog）
+- [x] AI 驱动提交信息生成（Conventional Commits / commitlint 格式）
+- [x] 多 LLM 提供商支持：Ollama、OpenAI、Anthropic、Kimi、DeepSeek、OpenRouter
+- [x] 多 Git Profile 管理（SSH 密钥 + GPG 签名）
+- [x] 语义化版本自动升级与 AI 发布说明
+- [x] Keep a Changelog 格式自动生成
+- [x] 系统密钥环安全存储 API Key
+- [x] 敏感数据加密存储（AES-GCM + Argon2）
+- [x] 交互式 CLI 预览与确认
+- [x] 7 种语言国际化支持
+- [x] 配置导出/导入（支持加密保护）
+- [x] Profile Token 管理（PAT 等）
+
+---
+
+## 进行中 🚧
+
+暂无。
+
+---
+
+## 计划中 📋
+
+### 1. Git 凭证管理器
+
+将 Git 凭证管理集成到 QuiCommit 中，统一管理 HTTPS 仓库的身份认证。
+
+- [ ] **Git Credential Helper 集成**
+  - 实现 `git credential-store` / `git-credential-libsecret` 等标准的 credential helper 协议
+  - 支持 `quicommit credential get|store|erase` 子命令
+  - 与系统密钥环无缝对接，复用已有的 `KeyringManager`
+
+- [ ] **凭证管理 CLI**
+  - `quicommit credential list` — 列出所有已存储的凭证
+  - `quicommit credential add` — 手动添加凭证（用户名 + 密码/Token）
+  - `quicommit credential remove` — 删除指定凭证
+  - `quicommit credential status` — 查看凭证管理状态
+
+- [ ] **跨平台支持**
+  - Windows：集成 Windows Credential Manager
+  - macOS：集成 Keychain
+  - Linux：通过 Secret Service / D-Bus 对接 GNOME Keyring / KWallet
+
+- [ ] **安全增强**
+  - 支持 PAT（Personal Access Token）按 scope / 有效期管理
+  - 支持凭证过期检查和自动提醒
+
+---
+
+### 2. 新增模型支持
+
+扩展 LLM 提供商和模型覆盖范围，满足更多场景和偏好。
+
+- [x] **新增 DeepSeek 最新模型**
+  - 支持 `deepseek-chat`（DeepSeek-V3）
+  - 支持 `deepseek-reasoner`（DeepSeek-R1）
+  - 支持 `deepseek-v4`
+
+- [ ] **新增国内模型提供商**
+  - 通义千问 (Qwen) — 阿里云 DashScope API
+  - 文心一言 (ERNIE) — 百度千帆 API
+  - 智谱 GLM — ChatGLM API
+  - 百川 (Baichuan) — Baichuan API
+
+- [ ] **新增国际模型提供商**
+  - Google Gemini API
+  - Mistral AI API
+  - Cohere API
+  - Groq (LPU 推理加速)
+
+- [ ] **本地模型扩展**
+  - 支持 llama.cpp 服务端（兼容 OpenAI API 格式）
+  - 支持 vLLM 部署的模型
+  - 本地模型推荐列表与一键配置向导
+
+- [ ] **模型能力适配**
+  - 不同模型的 token 限制自适应
+  - 模型特定的 prompt 模板优化
+  - 支持 function calling / tool use（用于复杂生成场景）
+
+---
+
+### 3. 生成体验优化
+
+提升 AI 生成提交信息、标签说明和变更日志时的用户体验。
+
+- [x] **流式输出与实时反馈**
+  - 支持 SSE（Server-Sent Events）流式生成
+  - 终端打字机效果实时显示生成内容
+  - 流式生成过程中支持 `Ctrl+C` 中断
+
+- [ ] **生成质量提升**
+  - 基于 commitlint 规则的后校验与自动修正
+  - 支持 Few-shot 示例引导（用户可自定义示例库）
+  - 生成结果的置信度评分与多候选方案
+
+- [ ] **Diff 上下文增强**
+  - 智能 diff 摘要（大改动时自动压缩关键信息）
+  - 支持 `.gitattributes` 排除/包含规则
+  - 按文件类型分组生成更精准的提交描述
+
+- [ ] **交互式编辑增强**
+  - 生成后支持内联编辑（类似 `git rebase -i` 体验）
+  - 支持重新生成指定部分（如 scope、description）
+  - 历史提交信息学习与风格适配
+
+- [ ] **批量操作支持**
+  - 批量生成多个 commit（分组暂存区变更）
+  - `--dry-run` 预览模式（只生成本地查看，不写 Git）
+
+- [ ] **性能优化**
+  - API 请求并发优化（多个模型同时生成候选）
+  - 本地缓存常用 prompt 模板
+  - 减少不必要的 diff 计算
+
+---
+
+## 长远规划 🌟
+
+- [ ] **VS Code 扩展** — 在 IDE 内直接使用 QuiCommit
+- [ ] **GitHub Action / GitLab CI 集成** — 自动化 PR 标题和描述生成
+- [ ] **团队协作** — 共享 commit 风格配置、prompt 模板库
+- [ ] **Web Dashboard** — 可视化管理多仓库的 Git 活动与 AI 生成统计
+- [ ] **插件系统** — 允许社区贡献自定义 LLM 提供商和生成策略

build.rs

@@ -1,10 +1,11 @@
 use std::env;
 
-
 fn main() {
     // Only generate completions when explicitly requested
     if env::var("GENERATE_COMPLETIONS").is_ok() {
-        println!("cargo:warning=To generate shell completions, run: cargo run --bin quicommit -- completions");
+        println!(
+            "cargo:warning=To generate shell completions, run: cargo run --bin quicommit -- completions"
+        );
     }
 
     // Rerun if build.rs changes

src/commands/changelog.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use chrono::Utc;
 use clap::Parser;
 use colored::Colorize;
@@ -8,7 +8,7 @@ use std::path::PathBuf;
 use crate::config::{Language, manager::ConfigManager};
 use crate::generator::ContentGenerator;
 use crate::git::find_repo;
-use crate::git::{changelog::*, CommitInfo};
+use crate::git::{CommitInfo, changelog::*};
 use crate::i18n::{Messages, translate_changelog_category};
 
 /// Generate changelog
@@ -55,6 +55,10 @@ pub struct ChangelogCommand {
     #[arg(long)]
     dry_run: bool,
 
+    /// Enable thinking mode for this changelog (override config)
+    #[arg(long)]
+    think: bool,
+
     /// Skip interactive prompts
     #[arg(short = 'y', long)]
     yes: bool,
@@ -74,8 +78,9 @@ impl ChangelogCommand {
 
         // Initialize changelog if requested
         if self.init {
-            let path = self.output.as_ref()
+            let path = self
-                .map(|p| p.clone())
+                .output
+                .clone()
                 .unwrap_or_else(|| PathBuf::from(&config.changelog.path));
 
             init_changelog(&path)?;
@@ -84,8 +89,9 @@ impl ChangelogCommand {
         }
 
         // Determine output path
-        let output_path = self.output.as_ref()
+        let output_path = self
-            .map(|p| p.clone())
+            .output
+            .clone()
             .unwrap_or_else(|| PathBuf::from(&config.changelog.path));
 
         // Determine format
@@ -94,7 +100,10 @@ impl ChangelogCommand {
             Some("keep") | Some("keep-a-changelog") => ChangelogFormat::KeepAChangelog,
             Some("custom") => ChangelogFormat::Custom,
             None => ChangelogFormat::KeepAChangelog,
-            Some(f) => bail!("Unknown format: {}. Use: keep-a-changelog, github-releases", f),
+            Some(f) => bail!(
+                "Unknown format: {}. Use: keep-a-changelog, github-releases",
+                f
+            ),
         };
 
         // Get version
@@ -148,7 +157,7 @@ impl ChangelogCommand {
             println!("{}", "─".repeat(60));
 
             let confirm = Confirm::new()
-                .with_prompt(&messages.write_to_file(&format!("{:?}", output_path)))
+                .with_prompt(messages.write_to_file(&format!("{:?}", output_path)))
                 .default(true)
                 .interact()?;
 
@@ -208,8 +217,10 @@ impl ChangelogCommand {
 
         println!("{}", messages.ai_generating_changelog());
 
-        let generator = ContentGenerator::new(&manager).await?;
+        let generator = ContentGenerator::new_with_think(&manager, self.think).await?;
-        generator.generate_changelog_entry(version, commits, language).await
+        generator
+            .generate_changelog_entry(version, commits, language)
+            .await
     }
 
     fn generate_with_template(
@@ -237,12 +248,13 @@ impl ChangelogCommand {
     }
 
     fn translate_changelog_categories(&self, changelog: &str, language: Language) -> String {
-        let translated = changelog
+        changelog
             .lines()
             .map(|line| {
                 if line.starts_with("## ") || line.starts_with("### ") {
                     let category = line.trim_start_matches("## ").trim_start_matches("### ");
-                    let translated_category = translate_changelog_category(category, language, false);
+                    let translated_category =
+                        translate_changelog_category(category, language, false);
                     if line.starts_with("## ") {
                         format!("## {}", translated_category)
                     } else {
@@ -253,7 +265,6 @@ impl ChangelogCommand {
                 }
             })
             .collect::<Vec<_>>()
-            .join("\n");
+            .join("\n")
-        translated
     }
 }

src/commands/commit.rs

@@ -1,14 +1,14 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use clap::Parser;
 use colored::Colorize;
 use dialoguer::{Confirm, Input, Select};
 use std::path::PathBuf;
 
-use crate::config::{Language, manager::ConfigManager};
 use crate::config::CommitFormat;
+use crate::config::{Language, manager::ConfigManager};
 use crate::generator::ContentGenerator;
-use crate::git::{find_repo, GitRepo};
 use crate::git::commit::{CommitBuilder, create_date_commit_message};
+use crate::git::{GitRepo, find_repo};
 use crate::i18n::Messages;
 use crate::utils::validators::get_commit_types;
 
@@ -71,6 +71,10 @@ pub struct CommitCommand {
     #[arg(long)]
     no_verify: bool,
 
+    /// Enable thinking mode for this commit (override config)
+    #[arg(short = 't', long)]
+    think: bool,
+
     /// Skip interactive prompts
     #[arg(short = 'y', long)]
     yes: bool,
@@ -179,14 +183,22 @@ impl CommitCommand {
 
         let result = if self.amend {
             if self.dry_run {
-                println!("\n{} {}", messages.dry_run(), "- commit not amended.".yellow());
+                println!(
+                    "\n{} {}",
+                    messages.dry_run(),
+                    "- commit not amended.".yellow()
+                );
                 return Ok(());
             }
             self.amend_commit(&repo, &commit_message)?;
             None
         } else {
             if self.dry_run {
-                println!("\n{} {}", messages.dry_run(), "- commit not created.".yellow());
+                println!(
+                    "\n{} {}",
+                    messages.dry_run(),
+                    "- commit not created.".yellow()
+                );
                 return Ok(());
             }
             CommitBuilder::new()
@@ -196,9 +208,13 @@ impl CommitCommand {
         };
 
         if let Some(commit_oid) = result {
-            println!("{} {}", messages.commit_created().green().bold(), commit_oid.to_string()[..8].to_string().cyan());
+            println!(
+                "{} {}",
+                messages.commit_created().green().bold(),
+                commit_oid.to_string()[..8].to_string().cyan()
+            );
         } else {
-            println!("{} {}", messages.commit_amended().green().bold(), "successfully");
+            println!("{} successfully", messages.commit_amended().green().bold());
         }
 
         // Push after commit if requested or ask user
@@ -228,8 +244,9 @@ impl CommitCommand {
     }
 
     fn create_manual_commit(&self, format: CommitFormat) -> Result<String> {
-        let description = self.message.clone()
+        let description = self.message.clone().ok_or_else(|| {
-            .ok_or_else(|| anyhow::anyhow!("Description required for manual commit. Use -m <message>"))?;
+            anyhow::anyhow!("Description required for manual commit. Use -m <message>")
+        })?;
 
         // Try to extract commit type from message if not provided
         let commit_type = if let Some(ref ct) = self.commit_type {
@@ -255,10 +272,16 @@ impl CommitCommand {
         builder.build_message()
     }
 
-    async fn generate_commit(&self, repo: &GitRepo, format: CommitFormat, messages: &Messages) -> Result<String> {
+    async fn generate_commit(
+        &self,
+        repo: &GitRepo,
+        format: CommitFormat,
+        messages: &Messages,
+    ) -> Result<String> {
         let manager = ConfigManager::new()?;
 
-        let generator = ContentGenerator::new(&manager).await
+        let generator = ContentGenerator::new_with_think(&manager, self.think)
+            .await
             .context("Failed to initialize LLM. Use --manual for manual commit.")?;
 
         println!("{}", messages.ai_analyzing());
@@ -266,15 +289,23 @@ impl CommitCommand {
         let language = manager.get_language().unwrap_or(Language::English);
 
         let generated = if self.yes {
-            generator.generate_commit_from_repo(repo, format, language).await?
+            generator
+                .generate_commit_from_repo(repo, format, language)
+                .await?
         } else {
-            generator.generate_commit_interactive(repo, format, language).await?
+            generator
+                .generate_commit_interactive(repo, format, language)
+                .await?
         };
 
         Ok(generated.to_conventional())
     }
 
-    async fn create_interactive_commit(&self, format: CommitFormat, messages: &Messages) -> Result<String> {
+    async fn create_interactive_commit(
+        &self,
+        format: CommitFormat,
+        messages: &Messages,
+    ) -> Result<String> {
         let types = get_commit_types(format == CommitFormat::Commitlint);
 
         // Select type
@@ -358,7 +389,8 @@ impl CommitCommand {
                     "GPG signing failed. Please check:\n\
                      1. GPG signing key is configured (git config --get user.signingkey)\n\
                      2. GPG agent is running\n\
-                     3. You can sign commits manually (try: git commit --amend -S)".to_string()
+                     3. You can sign commits manually (try: git commit --amend -S)"
+                        .to_string()
                 } else {
                     stdout.to_string()
                 }

src/commands/init.rs

@@ -4,11 +4,11 @@ use colored::Colorize;
 use dialoguer::{Confirm, Input, Select};
 use std::path::PathBuf;
 
-use crate::config::{GitProfile, Language};
 use crate::config::manager::ConfigManager;
 use crate::config::profile::{GpgConfig, SshConfig};
+use crate::config::{GitProfile, Language};
 use crate::i18n::Messages;
-use crate::utils::keyring::{get_supported_providers, get_default_model, provider_needs_api_key};
+use crate::utils::keyring::{get_default_model, get_supported_providers, provider_needs_api_key};
 use crate::utils::validators::validate_email;
 
 /// Initialize quicommit configuration
@@ -28,9 +28,8 @@ impl InitCommand {
         let messages = Messages::new(Language::English);
         println!("{}", messages.initializing().bold().cyan());
 
-        let config_path = config_path.unwrap_or_else(|| {
+        let config_path =
-            crate::config::AppConfig::default_path().unwrap()
+            config_path.unwrap_or_else(|| crate::config::AppConfig::default_path().unwrap());
-        });
 
         if config_path.exists() && !self.reset {
             if !self.yes {
@@ -44,7 +43,10 @@ impl InitCommand {
                     return Ok(());
                 }
             } else {
-                println!("{}", "Configuration already exists. Use --reset to overwrite.".yellow());
+                println!(
+                    "{}",
+                    "Configuration already exists. Use --reset to overwrite.".yellow()
+                );
                 return Ok(());
             }
         }
@@ -80,14 +82,14 @@ impl InitCommand {
     async fn quick_setup(&self, manager: &mut ConfigManager) -> Result<()> {
         let git_config = git2::Config::open_default()?;
 
-        let user_name = git_config.get_string("user.name").unwrap_or_else(|_| "User".to_string());
+        let user_name = git_config
-        let user_email = git_config.get_string("user.email").unwrap_or_else(|_| "user@example.com".to_string());
+            .get_string("user.name")
+            .unwrap_or_else(|_| "User".to_string());
+        let user_email = git_config
+            .get_string("user.email")
+            .unwrap_or_else(|_| "user@example.com".to_string());
 
-        let profile = GitProfile::new(
+        let profile = GitProfile::new("default".to_string(), user_name, user_email);
-            "default".to_string(),
-            user_name,
-            user_email,
-        );
 
         manager.add_profile("default".to_string(), profile)?;
         manager.set_default_profile(Some("default".to_string()))?;
@@ -102,7 +104,7 @@ impl InitCommand {
         println!("\n{}", messages.setup_profile().bold());
 
         println!("\n{}", messages.select_output_language().bold());
-        let languages = vec![
+        let languages = [
             Language::English,
             Language::Chinese,
             Language::Japanese,
@@ -111,11 +113,11 @@ impl InitCommand {
             Language::French,
             Language::German,
         ];
-        let language_names: Vec<String> = languages.iter().map(|l| l.display_name().to_string()).collect();
+        let language_names: Vec<String> = languages
-        let language_idx = Select::new()
+            .iter()
-            .items(&language_names)
+            .map(|l| l.display_name().to_string())
-            .default(0)
+            .collect();
-            .interact()?;
+        let language_idx = Select::new().items(&language_names).default(0).interact()?;
 
         let selected_language = languages[language_idx];
         manager.set_output_language(selected_language.to_code().to_string());
@@ -129,11 +131,13 @@ impl InitCommand {
 
         let git_config = git2::Config::open_default().ok();
 
-        let default_name = git_config.as_ref()
+        let default_name = git_config
+            .as_ref()
             .and_then(|c| c.get_string("user.name").ok())
             .unwrap_or_default();
 
-        let default_email = git_config.as_ref()
+        let default_email = git_config
+            .as_ref()
             .and_then(|c| c.get_string("user.email").ok())
             .unwrap_or_default();
 
@@ -145,9 +149,7 @@ impl InitCommand {
         let user_email: String = Input::new()
             .with_prompt(messages.git_user_email())
             .default(default_email)
-            .validate_with(|input: &String| {
+            .validate_with(|input: &String| validate_email(input).map_err(|e| e.to_string()))
-                validate_email(input).map_err(|e| e.to_string())
-            })
             .interact_text()?;
 
         let description: String = Input::new()
@@ -161,9 +163,11 @@ impl InitCommand {
             .interact()?;
 
         let organization = if is_work {
-            Some(Input::new()
+            Some(
+                Input::new()
                     .with_prompt(messages.organization_name())
-                .interact_text()?)
+                    .interact_text()?,
+            )
         } else {
             None
         };
@@ -190,11 +194,7 @@ impl InitCommand {
             None
         };
 
-        let mut profile = GitProfile::new(
+        let mut profile = GitProfile::new(profile_name.clone(), user_name, user_email);
-            profile_name.clone(),
-            user_name,
-            user_email,
-        );
 
         if !description.is_empty() {
             profile.description = Some(description);
@@ -216,7 +216,7 @@ impl InitCommand {
             "Anthropic Claude",
             "Kimi (Moonshot AI)",
             "DeepSeek",
-            "OpenRouter"
+            "OpenRouter",
         ];
 
         let provider_idx = Select::new()
@@ -231,17 +231,26 @@ impl InitCommand {
         let keyring_available = keyring.is_available();
 
         if !keyring_available {
-            println!("\n{}", "⚠ Keyring is not available on this system.".yellow());
+            println!(
+                "\n{}",
+                "⚠ Keyring is not available on this system.".yellow()
+            );
             println!("{}", keyring.get_status_message().yellow());
         }
 
         let api_key = if provider_needs_api_key(&provider) {
             let env_key = std::env::var("QUICOMMIT_API_KEY")
-                .or_else(|_| std::env::var(format!("QUICOMMIT_{}_API_KEY", provider.to_uppercase())))
+                .or_else(|_| {
+                    std::env::var(format!("QUICOMMIT_{}_API_KEY", provider.to_uppercase()))
+                })
                 .ok();
 
             if let Some(_key) = env_key {
-                println!("\n{} {}", "✓".green(), "Found API key in environment variable.".green());
+                println!(
+                    "\n{} {}",
+                    "✓".green(),
+                    "Found API key in environment variable.".green()
+                );
                 None
             } else if keyring_available {
                 let prompt = match provider.as_str() {
@@ -253,12 +262,13 @@ impl InitCommand {
                     _ => "API Key",
                 };
 
-                let key: String = Input::new()
+                let key: String = Input::new().with_prompt(prompt).interact_text()?;
-                    .with_prompt(prompt)
-                    .interact_text()?;
                 Some(key)
             } else {
-                println!("\n{}", "Please set the QUICOMMIT_API_KEY environment variable.".yellow());
+                println!(
+                    "\n{}",
+                    "Please set the QUICOMMIT_API_KEY environment variable.".yellow()
+                );
                 None
             }
         } else {
@@ -284,9 +294,7 @@ impl InitCommand {
                 .interact()?;
 
             if use_custom_url {
-                let url: String = Input::new()
+                let url: String = Input::new().with_prompt("Base URL").interact_text()?;
-                    .with_prompt("Base URL")
-                    .interact_text()?;
                 Some(url)
             } else {
                 None
@@ -297,11 +305,15 @@ impl InitCommand {
         manager.set_llm_model(model);
         manager.set_llm_base_url(base_url);
 
-        if let Some(key) = api_key {
+        if let Some(key) = api_key
-            if provider_needs_api_key(&provider) {
+            && provider_needs_api_key(&provider)
+        {
             manager.set_api_key(&key)?;
-                println!("\n{} {}", "✓".green(), "API key stored securely in system keyring.".green());
+            println!(
-            }
+                "\n{} {}",
+                "✓".green(),
+                "API key stored securely in system keyring.".green()
+            );
         }
 
         Ok(())

src/commands/profile.rs

@@ -1,12 +1,12 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::{Parser, Subcommand};
 use colored::Colorize;
 use dialoguer::{Confirm, Input, Select};
 use std::path::PathBuf;
 
 use crate::config::manager::ConfigManager;
-use crate::config::{GitProfile, TokenConfig, TokenType};
 use crate::config::profile::{GpgConfig, SshConfig};
+use crate::config::{GitProfile, TokenConfig, TokenType};
 use crate::git::find_repo;
 use crate::utils::validators::validate_profile_name;
 
@@ -127,18 +127,35 @@ impl ProfileCommand {
     pub async fn execute(&self, config_path: Option<PathBuf>) -> Result<()> {
         match &self.command {
             Some(ProfileSubcommand::Add) => self.add_profile(&config_path).await,
-            Some(ProfileSubcommand::Remove { name }) => self.remove_profile(name, &config_path).await,
+            Some(ProfileSubcommand::Remove { name }) => {
+                self.remove_profile(name, &config_path).await
+            }
             Some(ProfileSubcommand::List) => self.list_profiles(&config_path).await,
-            Some(ProfileSubcommand::Show { name }) => self.show_profile(name.as_deref(), &config_path).await,
+            Some(ProfileSubcommand::Show { name }) => {
+                self.show_profile(name.as_deref(), &config_path).await
+            }
             Some(ProfileSubcommand::Edit { name }) => self.edit_profile(name, &config_path).await,
-            Some(ProfileSubcommand::SetDefault { name }) => self.set_default(name, &config_path).await,
+            Some(ProfileSubcommand::SetDefault { name }) => {
+                self.set_default(name, &config_path).await
+            }
             Some(ProfileSubcommand::SetRepo { name }) => self.set_repo(name, &config_path).await,
-            Some(ProfileSubcommand::Apply { name, global }) => self.apply_profile(name.as_deref(), *global, &config_path).await,
+            Some(ProfileSubcommand::Apply { name, global }) => {
+                self.apply_profile(name.as_deref(), *global, &config_path)
+                    .await
+            }
             Some(ProfileSubcommand::Switch) => self.switch_profile(&config_path).await,
-            Some(ProfileSubcommand::Copy { from, to }) => self.copy_profile(from, to, &config_path).await,
+            Some(ProfileSubcommand::Copy { from, to }) => {
-            Some(ProfileSubcommand::Token { token_command }) => self.handle_token_command(token_command, &config_path).await,
+                self.copy_profile(from, to, &config_path).await
-            Some(ProfileSubcommand::Check { name }) => self.check_profile(name.as_deref(), &config_path).await,
+            }
-            Some(ProfileSubcommand::Stats { name }) => self.show_stats(name.as_deref(), &config_path).await,
+            Some(ProfileSubcommand::Token { token_command }) => {
+                self.handle_token_command(token_command, &config_path).await
+            }
+            Some(ProfileSubcommand::Check { name }) => {
+                self.check_profile(name.as_deref(), &config_path).await
+            }
+            Some(ProfileSubcommand::Stats { name }) => {
+                self.show_stats(name.as_deref(), &config_path).await
+            }
             None => self.list_profiles(&config_path).await,
         }
     }
@@ -158,18 +175,14 @@ impl ProfileCommand {
 
         let name: String = Input::new()
             .with_prompt("Profile name")
-            .validate_with(|input: &String| {
+            .validate_with(|input: &String| validate_profile_name(input).map_err(|e| e.to_string()))
-                validate_profile_name(input).map_err(|e| e.to_string())
-            })
             .interact_text()?;
 
         if manager.has_profile(&name) {
             bail!("Profile '{}' already exists", name);
         }
 
-        let user_name: String = Input::new()
+        let user_name: String = Input::new().with_prompt("Git user name").interact_text()?;
-            .with_prompt("Git user name")
-            .interact_text()?;
 
         let user_email: String = Input::new()
             .with_prompt("Git user email")
@@ -189,9 +202,7 @@ impl ProfileCommand {
             .interact()?;
 
         let organization = if is_work {
-            Some(Input::new()
+            Some(Input::new().with_prompt("Organization").interact_text()?)
-                .with_prompt("Organization")
-                .interact_text()?)
         } else {
             None
         };
@@ -234,7 +245,11 @@ impl ProfileCommand {
         manager.add_profile(name.clone(), profile)?;
         manager.save()?;
 
-        println!("{} Profile '{}' added successfully", "✓".green(), name.cyan());
+        println!(
+            "{} Profile '{}' added successfully",
+            "✓".green(),
+            name.cyan()
+        );
 
         if manager.default_profile().is_none() {
             let set_default = Confirm::new()
@@ -260,7 +275,10 @@ impl ProfileCommand {
         }
 
         let confirm = Confirm::new()
-            .with_prompt(&format!("Are you sure you want to remove profile '{}'?", name))
+            .with_prompt(format!(
+                "Are you sure you want to remove profile '{}'?",
+                name
+            ))
             .default(false)
             .interact()?;
 
@@ -274,7 +292,11 @@ impl ProfileCommand {
         manager.remove_profile(name)?;
         manager.save()?;
 
-        println!("{} Profile '{}' removed (including all stored tokens)", "✓".green(), name);
+        println!(
+            "{} Profile '{}' removed (including all stored tokens)",
+            "✓".green(),
+            name
+        );
 
         Ok(())
     }
@@ -299,8 +321,16 @@ impl ProfileCommand {
             let profile = manager.get_profile(name).unwrap();
             let is_default = default.map(|d| d == name).unwrap_or(false);
 
-            let marker = if is_default { "●".green() } else { "○".dimmed() };
+            let marker = if is_default {
-            let work_marker = if profile.is_work { " [work]".yellow() } else { "".normal() };
+                "●".green()
+            } else {
+                "○".dimmed()
+            };
+            let work_marker = if profile.is_work {
+                " [work]".yellow()
+            } else {
+                "".normal()
+            };
 
             println!("{} {}{}", marker, name.cyan().bold(), work_marker);
             println!("   {} <{}>", profile.user_name, profile.user_email);
@@ -316,11 +346,19 @@ impl ProfileCommand {
                 println!("   {} GPG configured", "🔒".to_string().dimmed());
             }
             if profile.has_tokens() {
-                println!("   {} {} token(s)", "🔐".to_string().dimmed(), profile.tokens.len());
+                println!(
+                    "   {} {} token(s)",
+                    "🔐".to_string().dimmed(),
+                    profile.tokens.len()
+                );
             }
 
             if let Some(ref usage) = profile.usage.last_used {
-                println!("   {} Last used: {}", "📊".to_string().dimmed(), usage.dimmed());
+                println!(
+                    "   {} Last used: {}",
+                    "📊".to_string().dimmed(),
+                    usage.dimmed()
+                );
             }
 
             println!();
@@ -333,16 +371,17 @@ impl ProfileCommand {
         let manager = self.get_manager(config_path)?;
 
         match find_repo(std::env::current_dir()?.as_path()) {
-            Ok(repo) => {
+            Ok(repo) => self.show_repo_status(&repo, &manager, name).await,
-                self.show_repo_status(&repo, &manager, name).await
+            Err(_) => self.show_global_status(&manager, name).await,
-            }
-            Err(_) => {
-                self.show_global_status(&manager, name).await
-            }
         }
     }
 
-    async fn show_repo_status(&self, repo: &crate::git::GitRepo, manager: &ConfigManager, name: Option<&str>) -> Result<()> {
+    async fn show_repo_status(
+        &self,
+        repo: &crate::git::GitRepo,
+        manager: &ConfigManager,
+        name: Option<&str>,
+    ) -> Result<()> {
         use crate::git::MergedUserConfig;
 
         let merged_config = MergedUserConfig::from_repo(repo.inner())?;
@@ -352,7 +391,10 @@ impl ProfileCommand {
         println!("{}", "─".repeat(60));
         println!("Repository: {}", repo_path.cyan());
 
-        println!("\n{}", "Git User Configuration (merged local/global):".bold());
+        println!(
+            "\n{}",
+            "Git User Configuration (merged local/global):".bold()
+        );
         println!("{}", "─".repeat(60));
 
         self.print_config_entry("User name", &merged_config.name);
@@ -375,19 +417,41 @@ impl ProfileCommand {
         match (&matching_profile, repo_profile_name) {
             (Some(profile), Some(mapped_name)) => {
                 if profile.name == *mapped_name {
-                    println!("{} Profile '{}' is mapped to this repository", "✓".green(), profile.name.cyan());
+                    println!(
+                        "{} Profile '{}' is mapped to this repository",
+                        "✓".green(),
+                        profile.name.cyan()
+                    );
                     println!("  This repository's git config matches the saved profile.");
                 } else {
-                    println!("{} Profile '{}' matches current config", "✓".green(), profile.name.cyan());
+                    println!(
-                    println!("  But repository is mapped to different profile: {}", mapped_name.yellow());
+                        "{} Profile '{}' matches current config",
+                        "✓".green(),
+                        profile.name.cyan()
+                    );
+                    println!(
+                        "  But repository is mapped to different profile: {}",
+                        mapped_name.yellow()
+                    );
                 }
             }
             (Some(profile), None) => {
-                println!("{} Profile '{}' matches current config", "✓".green(), profile.name.cyan());
+                println!(
-                println!("  {} This repository is not mapped to any profile.", "ℹ".yellow());
+                    "{} Profile '{}' matches current config",
+                    "✓".green(),
+                    profile.name.cyan()
+                );
+                println!(
+                    "  {} This repository is not mapped to any profile.",
+                    "ℹ".yellow()
+                );
             }
             (None, Some(mapped_name)) => {
-                println!("{} Repository is mapped to profile '{}'", "⚠".yellow(), mapped_name.cyan());
+                println!(
+                    "{} Repository is mapped to profile '{}'",
+                    "⚠".yellow(),
+                    mapped_name.cyan()
+                );
                 println!("  But current git config does not match this profile!");
 
                 if let Some(mapped_profile) = manager.get_profile(mapped_name) {
@@ -417,14 +481,18 @@ impl ProfileCommand {
                 }
 
                 if merged_config.is_complete() {
-                    println!("\n  {} Would you like to save this identity as a new profile?", "💡".yellow());
+                    println!(
+                        "\n  {} Would you like to save this identity as a new profile?",
+                        "💡".yellow()
+                    );
                     let save = Confirm::new()
                         .with_prompt("Save current git identity as new profile?")
                         .default(true)
                         .interact()?;
 
                     if save {
-                        self.save_current_identity_as_profile(&merged_config, manager).await?;
+                        self.save_current_identity_as_profile(&merged_config, manager)
+                            .await?;
                     }
                 }
             }
@@ -432,7 +500,10 @@ impl ProfileCommand {
 
         if let Some(profile_name) = name {
             if let Some(profile) = manager.get_profile(profile_name) {
-                println!("\n{}", format!("Requested Profile: {}", profile_name).bold());
+                println!(
+                    "\n{}",
+                    format!("Requested Profile: {}", profile_name).bold()
+                );
                 println!("{}", "─".repeat(60));
                 self.print_profile_details(profile);
             } else {
@@ -486,8 +557,16 @@ impl ProfileCommand {
             Some(value) => {
                 println!("{} {}: {}", source_indicator, label, value);
                 if entry.local_value.is_some() && entry.global_value.is_some() {
-                    println!("    {} local: {}", "├".dimmed(), entry.local_value.as_ref().unwrap());
+                    println!(
-                    println!("    {} global: {}", "└".dimmed(), entry.global_value.as_ref().unwrap());
+                        "    {} local: {}",
+                        "├".dimmed(),
+                        entry.local_value.as_ref().unwrap()
+                    );
+                    println!(
+                        "    {} global: {}",
+                        "└".dimmed(),
+                        entry.global_value.as_ref().unwrap()
+                    );
                 }
             }
             None => {
@@ -504,7 +583,14 @@ impl ProfileCommand {
             println!("Description: {}", desc);
         }
 
-        println!("Work profile: {}", if profile.is_work { "yes".yellow() } else { "no".normal() });
+        println!(
+            "Work profile: {}",
+            if profile.is_work {
+                "yes".yellow()
+            } else {
+                "no".normal()
+            }
+        );
 
         if let Some(ref org) = profile.organization {
             println!("Organization: {}", org);
@@ -543,7 +629,11 @@ impl ProfileCommand {
         }
     }
 
-    async fn save_current_identity_as_profile(&self, merged_config: &crate::git::MergedUserConfig, manager: &ConfigManager) -> Result<()> {
+    async fn save_current_identity_as_profile(
+        &self,
+        merged_config: &crate::git::MergedUserConfig,
+        manager: &ConfigManager,
+    ) -> Result<()> {
         let config_path = manager.path().to_path_buf();
         let mut manager = ConfigManager::with_path(&config_path)?;
 
@@ -557,14 +647,15 @@ impl ProfileCommand {
         let profile_name: String = Input::new()
             .with_prompt("Profile name")
             .default(default_name)
-            .validate_with(|input: &String| {
+            .validate_with(|input: &String| validate_profile_name(input).map_err(|e| e.to_string()))
-                validate_profile_name(input).map_err(|e| e.to_string())
-            })
             .interact_text()?;
 
         if manager.has_profile(&profile_name) {
             let overwrite = Confirm::new()
-                .with_prompt(&format!("Profile '{}' already exists. Overwrite?", profile_name))
+                .with_prompt(format!(
+                    "Profile '{}' already exists. Overwrite?",
+                    profile_name
+                ))
                 .default(false)
                 .interact()?;
             if !overwrite {
@@ -575,7 +666,7 @@ impl ProfileCommand {
 
         let description: String = Input::new()
             .with_prompt("Description (optional)")
-            .default(format!("Imported from existing git config"))
+            .default("Imported from existing git config".to_string())
             .allow_empty(true)
             .interact_text()?;
 
@@ -585,9 +676,7 @@ impl ProfileCommand {
             .interact()?;
 
         let organization = if is_work {
-            Some(Input::new()
+            Some(Input::new().with_prompt("Organization").interact_text()?)
-                .with_prompt("Organization")
-                .interact_text()?)
         } else {
             None
         };
@@ -635,7 +724,11 @@ impl ProfileCommand {
         manager.add_profile(profile_name.clone(), profile)?;
         manager.save()?;
 
-        println!("{} Profile '{}' saved successfully", "✓".green(), profile_name.cyan());
+        println!(
+            "{} Profile '{}' saved successfully",
+            "✓".green(),
+            profile_name.cyan()
+        );
 
         let set_default = Confirm::new()
             .with_prompt("Set as default profile?")
@@ -645,7 +738,11 @@ impl ProfileCommand {
         if set_default {
             manager.set_default_profile(Some(profile_name.clone()))?;
             manager.save()?;
-            println!("{} Set '{}' as default profile", "✓".green(), profile_name.cyan());
+            println!(
+                "{} Set '{}' as default profile",
+                "✓".green(),
+                profile_name.cyan()
+            );
         }
 
         Ok(())
@@ -654,7 +751,8 @@ impl ProfileCommand {
     async fn edit_profile(&self, name: &str, config_path: &Option<PathBuf>) -> Result<()> {
         let mut manager = self.get_manager(config_path)?;
 
-        let profile = manager.get_profile(name)
+        let profile = manager
+            .get_profile(name)
             .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", name))?
             .clone();
 
@@ -711,31 +809,47 @@ impl ProfileCommand {
         manager.set_repo_profile(repo_path.clone(), name.to_string())?;
 
         // Get the profile and apply it to the repository
-        let profile = manager.get_profile(name)
+        let profile = manager
+            .get_profile(name)
             .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", name))?;
 
         profile.apply_to_repo(repo.inner())?;
         manager.record_profile_usage(name, Some(repo_path))?;
         manager.save()?;
 
-        println!("{} Set '{}' for current repository", "✓".green(), name.cyan());
+        println!(
-        println!("{} Applied profile '{}' to current repository", "✓".green(), name.cyan());
+            "{} Set '{}' for current repository",
+            "✓".green(),
+            name.cyan()
+        );
+        println!(
+            "{} Applied profile '{}' to current repository",
+            "✓".green(),
+            name.cyan()
+        );
 
         Ok(())
     }
 
-    async fn apply_profile(&self, name: Option<&str>, global: bool, config_path: &Option<PathBuf>) -> Result<()> {
+    async fn apply_profile(
+        &self,
+        name: Option<&str>,
+        global: bool,
+        config_path: &Option<PathBuf>,
+    ) -> Result<()> {
         let mut manager = self.get_manager(config_path)?;
 
         let profile_name = if let Some(n) = name {
             n.to_string()
         } else {
-            manager.default_profile_name()
+            manager
+                .default_profile_name()
                 .ok_or_else(|| anyhow::anyhow!("No default profile set"))?
                 .clone()
         };
 
-        let profile = manager.get_profile(&profile_name)
+        let profile = manager
+            .get_profile(&profile_name)
             .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", profile_name))?
             .clone();
 
@@ -748,11 +862,19 @@ impl ProfileCommand {
 
         if global {
             profile.apply_global()?;
-            println!("{} Applied profile '{}' globally", "✓".green(), profile.name.cyan());
+            println!(
+                "{} Applied profile '{}' globally",
+                "✓".green(),
+                profile.name.cyan()
+            );
         } else {
             let repo = find_repo(std::env::current_dir()?.as_path())?;
             profile.apply_to_repo(repo.inner())?;
-            println!("{} Applied profile '{}' to current repository", "✓".green(), profile.name.cyan());
+            println!(
+                "{} Applied profile '{}' to current repository",
+                "✓".green(),
+                profile.name.cyan()
+            );
         }
 
         manager.record_profile_usage(&profile_name, repo_path)?;
@@ -764,7 +886,8 @@ impl ProfileCommand {
     async fn switch_profile(&self, config_path: &Option<PathBuf>) -> Result<()> {
         let mut manager = self.get_manager(config_path)?;
 
-        let profiles: Vec<String> = manager.list_profiles()
+        let profiles: Vec<String> = manager
+            .list_profiles()
             .into_iter()
             .map(|s| s.to_string())
             .collect();
@@ -798,17 +921,24 @@ impl ProfileCommand {
                 .interact()?;
 
             if apply {
-                self.apply_profile(Some(selected), false, config_path).await?;
+                self.apply_profile(Some(selected), false, config_path)
+                    .await?;
             }
         }
 
         Ok(())
     }
 
-    async fn copy_profile(&self, from: &str, to: &str, config_path: &Option<PathBuf>) -> Result<()> {
+    async fn copy_profile(
+        &self,
+        from: &str,
+        to: &str,
+        config_path: &Option<PathBuf>,
+    ) -> Result<()> {
         let mut manager = self.get_manager(config_path)?;
 
-        let source = manager.get_profile(from)
+        let source = manager
+            .get_profile(from)
             .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", from))?
             .clone();
 
@@ -821,20 +951,38 @@ impl ProfileCommand {
         manager.add_profile(to.to_string(), new_profile)?;
         manager.save()?;
 
-        println!("{} Copied profile '{}' to '{}'", "✓".green(), from, to.cyan());
+        println!(
+            "{} Copied profile '{}' to '{}'",
+            "✓".green(),
+            from,
+            to.cyan()
+        );
 
         Ok(())
     }
 
-    async fn handle_token_command(&self, cmd: &TokenSubcommand, config_path: &Option<PathBuf>) -> Result<()> {
+    async fn handle_token_command(
+        &self,
+        cmd: &TokenSubcommand,
+        config_path: &Option<PathBuf>,
+    ) -> Result<()> {
         match cmd {
-            TokenSubcommand::Add { profile, service } => self.add_token(profile, service, config_path).await,
+            TokenSubcommand::Add { profile, service } => {
-            TokenSubcommand::Remove { profile, service } => self.remove_token(profile, service, config_path).await,
+                self.add_token(profile, service, config_path).await
+            }
+            TokenSubcommand::Remove { profile, service } => {
+                self.remove_token(profile, service, config_path).await
+            }
             TokenSubcommand::List { profile } => self.list_tokens(profile, config_path).await,
         }
     }
 
-    async fn add_token(&self, profile_name: &str, service: &str, config_path: &Option<PathBuf>) -> Result<()> {
+    async fn add_token(
+        &self,
+        profile_name: &str,
+        service: &str,
+        config_path: &Option<PathBuf>,
+    ) -> Result<()> {
         let mut manager = self.get_manager(config_path)?;
 
         if !manager.has_profile(profile_name) {
@@ -842,14 +990,19 @@ impl ProfileCommand {
         }
 
         if !manager.keyring().is_available() {
-            bail!("Keyring is not available. Cannot store PAT securely. Please ensure your system keyring is accessible.");
+            bail!(
+                "Keyring is not available. Cannot store PAT securely. Please ensure your system keyring is accessible."
+            );
         }
 
-        println!("{}", format!("\nAdd token to profile '{}'", profile_name).bold());
+        println!(
+            "{}",
+            format!("\nAdd token to profile '{}'", profile_name).bold()
+        );
         println!("{}", "─".repeat(40));
 
         let token_value: String = Input::new()
-            .with_prompt(&format!("Token for {}", service))
+            .with_prompt(format!("Token for {}", service))
             .interact_text()?;
 
         let token_type_options = vec!["Personal", "OAuth", "Deploy", "App"];
@@ -882,12 +1035,22 @@ impl ProfileCommand {
         manager.add_token_to_profile(profile_name, service.to_string(), token)?;
         manager.save()?;
 
-        println!("{} Token for '{}' added to profile '{}' (stored securely in keyring)", "✓".green(), service.cyan(), profile_name);
+        println!(
+            "{} Token for '{}' added to profile '{}' (stored securely in keyring)",
+            "✓".green(),
+            service.cyan(),
+            profile_name
+        );
 
         Ok(())
     }
 
-    async fn remove_token(&self, profile_name: &str, service: &str, config_path: &Option<PathBuf>) -> Result<()> {
+    async fn remove_token(
+        &self,
+        profile_name: &str,
+        service: &str,
+        config_path: &Option<PathBuf>,
+    ) -> Result<()> {
         let mut manager = self.get_manager(config_path)?;
 
         if !manager.has_profile(profile_name) {
@@ -895,7 +1058,10 @@ impl ProfileCommand {
         }
 
         let confirm = Confirm::new()
-            .with_prompt(&format!("Remove token '{}' from profile '{}'?", service, profile_name))
+            .with_prompt(format!(
+                "Remove token '{}' from profile '{}'?",
+                service, profile_name
+            ))
             .default(false)
             .interact()?;
 
@@ -907,7 +1073,12 @@ impl ProfileCommand {
         manager.remove_token_from_profile(profile_name, service)?;
         manager.save()?;
 
-        println!("{} Token '{}' removed from profile '{}' (deleted from keyring)", "✓".green(), service, profile_name);
+        println!(
+            "{} Token '{}' removed from profile '{}' (deleted from keyring)",
+            "✓".green(),
+            service,
+            profile_name
+        );
 
         Ok(())
     }
@@ -915,15 +1086,23 @@ impl ProfileCommand {
     async fn list_tokens(&self, profile_name: &str, config_path: &Option<PathBuf>) -> Result<()> {
         let manager = self.get_manager(config_path)?;
 
-        let profile = manager.get_profile(profile_name)
+        let profile = manager
+            .get_profile(profile_name)
             .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", profile_name))?;
 
         if profile.tokens.is_empty() {
-            println!("{} No tokens configured for profile '{}'", "ℹ".yellow(), profile_name);
+            println!(
+                "{} No tokens configured for profile '{}'",
+                "ℹ".yellow(),
+                profile_name
+            );
             return Ok(());
         }
 
-        println!("{}", format!("\nTokens for profile '{}':", profile_name).bold());
+        println!(
+            "{}",
+            format!("\nTokens for profile '{}':", profile_name).bold()
+        );
         println!("{}", "─".repeat(40));
 
         for (service, token) in &profile.tokens {
@@ -934,7 +1113,12 @@ impl ProfileCommand {
                 format!("[{}]", "not stored".yellow())
             };
 
-            println!("{} {} ({})", service.cyan().bold(), status, token.token_type);
+            println!(
+                "{} {} ({})",
+                service.cyan().bold(),
+                status,
+                token.token_type
+            );
             if let Some(ref desc) = token.description {
                 println!("  {}", desc);
             }
@@ -952,7 +1136,8 @@ impl ProfileCommand {
         let profile_name = if let Some(n) = name {
             n.to_string()
         } else {
-            manager.default_profile_name()
+            manager
+                .default_profile_name()
                 .ok_or_else(|| anyhow::anyhow!("No default profile set"))?
                 .clone()
         };
@@ -960,13 +1145,26 @@ impl ProfileCommand {
         let repo = find_repo(std::env::current_dir()?.as_path())?;
         let comparison = manager.check_profile_config(&profile_name, repo.inner())?;
 
-        println!("{}", format!("\nChecking profile '{}' against git configuration", profile_name).bold());
+        println!(
+            "{}",
+            format!(
+                "\nChecking profile '{}' against git configuration",
+                profile_name
+            )
+            .bold()
+        );
         println!("{}", "─".repeat(60));
 
         if comparison.matches {
-            println!("{} Profile configuration matches git settings", "✓".green().bold());
+            println!(
+                "{} Profile configuration matches git settings",
+                "✓".green().bold()
+            );
         } else {
-            println!("{} Profile configuration differs from git settings", "✗".red().bold());
+            println!(
+                "{} Profile configuration differs from git settings",
+                "✗".red().bold()
+            );
             println!("\n{}", "Differences:".bold());
 
             for diff in &comparison.differences {
@@ -983,7 +1181,8 @@ impl ProfileCommand {
         let manager = self.get_manager(config_path)?;
 
         if let Some(n) = name {
-            let profile = manager.get_profile(n)
+            let profile = manager
+                .get_profile(n)
                 .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", n))?;
 
             self.show_single_profile_stats(profile);
@@ -1048,9 +1247,7 @@ impl ProfileCommand {
     }
 
     async fn setup_gpg_interactive(&self) -> Result<GpgConfig> {
-        let key_id: String = Input::new()
+        let key_id: String = Input::new().with_prompt("GPG key ID").interact_text()?;
-            .with_prompt("GPG key ID")
-            .interact_text()?;
 
         Ok(GpgConfig {
             key_id,
@@ -1061,9 +1258,16 @@ impl ProfileCommand {
         })
     }
 
-    async fn setup_token_interactive(&self, profile: &mut GitProfile, manager: &ConfigManager) -> Result<()> {
+    async fn setup_token_interactive(
+        &self,
+        profile: &mut GitProfile,
+        manager: &ConfigManager,
+    ) -> Result<()> {
         if !manager.keyring().is_available() {
-            println!("{} Keyring is not available. Cannot store PAT securely.", "⚠".yellow());
+            println!(
+                "{} Keyring is not available. Cannot store PAT securely.",
+                "⚠".yellow()
+            );
             let continue_anyway = Confirm::new()
                 .with_prompt("Continue without secure token storage?")
                 .default(false)
@@ -1077,9 +1281,7 @@ impl ProfileCommand {
             .with_prompt("Service name (e.g., github, gitlab)")
             .interact_text()?;
 
-        let token_value: String = Input::new()
+        let token_value: String = Input::new().with_prompt("Token value").interact_text()?;
-            .with_prompt("Token value")
-            .interact_text()?;
 
         let token = TokenConfig::new(TokenType::Personal);
 

src/commands/tag.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
 use colored::Colorize;
 use dialoguer::{Confirm, Input, Select};
@@ -6,11 +6,11 @@ use semver::Version;
 use std::path::PathBuf;
 
 use crate::config::{Language, manager::ConfigManager};
-use crate::git::{find_repo, GitRepo};
 use crate::generator::ContentGenerator;
 use crate::git::tag::{
-    bump_version, get_latest_version, suggest_version_bump, TagBuilder, VersionBump,
+    TagBuilder, VersionBump, bump_version, get_latest_version, suggest_version_bump,
 };
+use crate::git::{GitRepo, find_repo};
 use crate::i18n::Messages;
 
 /// Generate and create Git tags
@@ -56,6 +56,10 @@ pub struct TagCommand {
     #[arg(long)]
     dry_run: bool,
 
+    /// Enable thinking mode for this tag (override config)
+    #[arg(short = 't', long)]
+    think: bool,
+
     /// Skip interactive prompts
     #[arg(short = 'y', long)]
     yes: bool,
@@ -79,8 +83,8 @@ impl TagCommand {
         } else if let Some(bump_str) = &self.bump {
             // Calculate bumped version
             let prefix = &config.tag.version_prefix;
-            let latest = get_latest_version(&repo, prefix)?
+            let latest =
-                .unwrap_or_else(|| Version::new(0, 0, 0));
+                get_latest_version(&repo, prefix)?.unwrap_or_else(|| Version::new(0, 0, 0));
 
             let bump = VersionBump::from_str(bump_str)?;
             let new_version = bump_version(&latest, bump, None);
@@ -88,11 +92,18 @@ impl TagCommand {
             format!("{}{}", prefix, new_version)
         } else {
             // Interactive mode
-            self.select_version_interactive(&repo, &config.tag.version_prefix, &messages).await?
+            self.select_version_interactive(&repo, &config.tag.version_prefix, &messages)
+                .await?
         };
 
         // Validate tag name (if it looks like a version)
-        if tag_name.starts_with('v') || tag_name.chars().next().map(|c| c.is_ascii_digit()).unwrap_or(false) {
+        if tag_name.starts_with('v')
+            || tag_name
+                .chars()
+                .next()
+                .map(|c| c.is_ascii_digit())
+                .unwrap_or(false)
+        {
             let version_str = tag_name.trim_start_matches('v');
             if let Err(e) = crate::utils::validators::validate_semver(version_str) {
                 println!("{}: {}", "Warning".yellow(), e);
@@ -116,7 +127,10 @@ impl TagCommand {
         } else if let Some(msg) = &self.message {
             Some(msg.clone())
         } else if self.generate || (config.tag.auto_generate && !self.yes) {
-            Some(self.generate_tag_message(&repo, &tag_name, &messages).await?)
+            Some(
+                self.generate_tag_message(&repo, &tag_name, &messages)
+                    .await?,
+            )
         } else if !self.yes {
             Some(self.input_message_interactive(&tag_name, &messages)?)
         } else {
@@ -184,7 +198,12 @@ impl TagCommand {
         Ok(())
     }
 
-    async fn select_version_interactive(&self, repo: &GitRepo, prefix: &str, messages: &Messages) -> Result<String> {
+    async fn select_version_interactive(
+        &self,
+        repo: &GitRepo,
+        prefix: &str,
+        messages: &Messages,
+    ) -> Result<String> {
         loop {
             let latest = get_latest_version(repo, prefix)?;
 
@@ -216,11 +235,18 @@ impl TagCommand {
                     // Auto-detect
                     let commits = repo.get_commits(50)?;
                     let bump = suggest_version_bump(&commits);
-                    let version = latest.as_ref()
+                    let version = latest
+                        .as_ref()
                         .map(|v| bump_version(v, bump, None))
                         .unwrap_or_else(|| Version::new(0, 1, 0));
 
-                    println!("{} {:?} → {}{}", messages.suggested_bump(), bump, prefix, version);
+                    println!(
+                        "{} {:?} → {}{}",
+                        messages.suggested_bump(),
+                        bump,
+                        prefix,
+                        version
+                    );
 
                     let confirm = Confirm::new()
                         .with_prompt(messages.use_this_version())
@@ -233,19 +259,22 @@ impl TagCommand {
                     // User rejected, continue the loop
                 }
                 1 => {
-                    let version = latest.as_ref()
+                    let version = latest
+                        .as_ref()
                         .map(|v| bump_version(v, VersionBump::Major, None))
                         .unwrap_or_else(|| Version::new(1, 0, 0));
                     return Ok(format!("{}{}", prefix, version));
                 }
                 2 => {
-                    let version = latest.as_ref()
+                    let version = latest
+                        .as_ref()
                         .map(|v| bump_version(v, VersionBump::Minor, None))
                         .unwrap_or_else(|| Version::new(0, 1, 0));
                     return Ok(format!("{}{}", prefix, version));
                 }
                 3 => {
-                    let version = latest.as_ref()
+                    let version = latest
+                        .as_ref()
                         .map(|v| bump_version(v, VersionBump::Patch, None))
                         .unwrap_or_else(|| Version::new(0, 0, 1));
                     return Ok(format!("{}{}", prefix, version));
@@ -268,7 +297,12 @@ impl TagCommand {
         }
     }
 
-    async fn generate_tag_message(&self, repo: &GitRepo, version: &str, messages: &Messages) -> Result<String> {
+    async fn generate_tag_message(
+        &self,
+        repo: &GitRepo,
+        version: &str,
+        messages: &Messages,
+    ) -> Result<String> {
         let manager = ConfigManager::new()?;
         let language = manager.get_language().unwrap_or(Language::English);
 
@@ -285,8 +319,10 @@ impl TagCommand {
 
         println!("{}", messages.ai_generating_tag(commits.len()));
 
-        let generator = ContentGenerator::new(&manager).await?;
+        let generator = ContentGenerator::new_with_think(&manager, self.think).await?;
-        generator.generate_tag_message(version, &commits, language).await
+        generator
+            .generate_tag_message(version, &commits, language)
+            .await
     }
 
     fn input_message_interactive(&self, version: &str, messages: &Messages) -> Result<String> {

src/config/manager.rs

@@ -1,6 +1,8 @@
 use super::{AppConfig, GitProfile, TokenConfig};
-use crate::utils::keyring::{KeyringManager, get_default_base_url, get_default_model, provider_needs_api_key};
+use crate::utils::keyring::{
-use anyhow::{bail, Context, Result};
+    KeyringManager, get_default_base_url, get_default_model, provider_needs_api_key,
+};
+use anyhow::{Context, Result, bail};
 // use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 
@@ -136,11 +138,11 @@ impl ConfigManager {
 
     /// Set default profile
     pub fn set_default_profile(&mut self, name: Option<String>) -> Result<()> {
-        if let Some(ref n) = name {
+        if let Some(ref n) = name
-            if !self.config.profiles.contains_key(n) {
+            && !self.config.profiles.contains_key(n)
+        {
             bail!("Profile '{}' does not exist", n);
         }
-        }
         self.config.default_profile = name;
         self.modified = true;
         Ok(())
@@ -178,7 +180,12 @@ impl ConfigManager {
     // Token management
 
     /// Add a token to a profile (stores token in keyring)
-    pub fn add_token_to_profile(&mut self, profile_name: &str, service: String, token: TokenConfig) -> Result<()> {
+    pub fn add_token_to_profile(
+        &mut self,
+        profile_name: &str,
+        service: String,
+        token: TokenConfig,
+    ) -> Result<()> {
         if !self.config.profiles.contains_key(profile_name) {
             bail!("Profile '{}' does not exist", profile_name);
         }
@@ -192,18 +199,26 @@ impl ConfigManager {
     }
 
     /// Store a PAT token in keyring for a profile
-    pub fn store_pat_for_profile(&self, profile_name: &str, service: &str, token_value: &str) -> Result<()> {
+    pub fn store_pat_for_profile(
-        let profile = self.get_profile(profile_name)
+        &self,
+        profile_name: &str,
+        service: &str,
+        token_value: &str,
+    ) -> Result<()> {
+        let profile = self
+            .get_profile(profile_name)
             .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", profile_name))?;
 
         let user_email = &profile.user_email;
 
-        self.keyring.store_pat(profile_name, user_email, service, token_value)
+        self.keyring
+            .store_pat(profile_name, user_email, service, token_value)
     }
 
     /// Get a PAT token from keyring for a profile
     pub fn get_pat_for_profile(&self, profile_name: &str, service: &str) -> Result<Option<String>> {
-        let profile = self.get_profile(profile_name)
+        let profile = self
+            .get_profile(profile_name)
             .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", profile_name))?;
 
         let user_email = &profile.user_email;
@@ -227,14 +242,33 @@ impl ConfigManager {
             bail!("Profile '{}' does not exist", profile_name);
         }
 
-        let user_email = self.config.profiles.get(profile_name).unwrap().user_email.clone();
+        let user_email = self
-        let services: Vec<String> = self.config.profiles.get(profile_name).unwrap().tokens.keys().cloned().collect();
+            .config
+            .profiles
+            .get(profile_name)
+            .unwrap()
+            .user_email
+            .clone();
+        let services: Vec<String> = self
+            .config
+            .profiles
+            .get(profile_name)
+            .unwrap()
+            .tokens
+            .keys()
+            .cloned()
+            .collect();
 
         if !services.contains(&service.to_string()) {
-            bail!("Token for service '{}' not found in profile '{}'", service, profile_name);
+            bail!(
+                "Token for service '{}' not found in profile '{}'",
+                service,
+                profile_name
+            );
         }
 
-        self.keyring.delete_pat(profile_name, &user_email, service)?;
+        self.keyring
+            .delete_pat(profile_name, &user_email, service)?;
 
         if let Some(profile) = self.config.profiles.get_mut(profile_name) {
             profile.remove_token(service);
@@ -250,7 +284,8 @@ impl ConfigManager {
             let user_email = &profile.user_email;
             let services: Vec<String> = profile.tokens.keys().cloned().collect();
 
-            self.keyring.delete_all_pats_for_profile(profile_name, user_email, &services)?;
+            self.keyring
+                .delete_all_pats_for_profile(profile_name, user_email, &services)?;
         }
         Ok(())
     }
@@ -302,14 +337,24 @@ impl ConfigManager {
     // }
 
     /// Check and compare profile with git configuration
-    pub fn check_profile_config(&self, profile_name: &str, repo: &git2::Repository) -> Result<super::ProfileComparison> {
+    pub fn check_profile_config(
-        let profile = self.get_profile(profile_name)
+        &self,
+        profile_name: &str,
+        repo: &git2::Repository,
+    ) -> Result<super::ProfileComparison> {
+        let profile = self
+            .get_profile(profile_name)
             .ok_or_else(|| anyhow::anyhow!("Profile '{}' not found", profile_name))?;
         profile.compare_with_git_config(repo)
     }
 
     /// Find a profile that matches the given user config (name, email, signing_key)
-    pub fn find_matching_profile(&self, user_name: &str, user_email: &str, signing_key: Option<&str>) -> Option<&GitProfile> {
+    pub fn find_matching_profile(
+        &self,
+        user_name: &str,
+        user_email: &str,
+        signing_key: Option<&str>,
+    ) -> Option<&GitProfile> {
         for profile in self.config.profiles.values() {
             let name_match = profile.user_name == user_name;
             let email_match = profile.user_email == user_email;
@@ -329,7 +374,9 @@ impl ConfigManager {
 
     /// Find profiles that partially match (same name or same email)
     pub fn find_partial_matches(&self, user_name: &str, user_email: &str) -> Vec<&GitProfile> {
-        self.config.profiles.values()
+        self.config
+            .profiles
+            .values()
             .filter(|p| p.user_name == user_name || p.user_email == user_email)
             .collect()
     }
@@ -384,7 +431,11 @@ impl ConfigManager {
     /// Get API key from configured storage method
     pub fn get_api_key(&self) -> Option<String> {
         // First try environment variables (always checked)
-        if let Some(key) = self.keyring.get_api_key(&self.config.llm.provider).unwrap_or(None) {
+        if let Some(key) = self
+            .keyring
+            .get_api_key(&self.config.llm.provider)
+            .unwrap_or(None)
+        {
             return Some(key);
         }
 
@@ -401,20 +452,29 @@ impl ConfigManager {
         match self.config.llm.api_key_storage.as_str() {
             "keyring" => {
                 if !self.keyring.is_available() {
-                    bail!("Keyring is not available. Set QUICOMMIT_API_KEY environment variable instead or change api_key_storage to 'config'.");
+                    bail!(
+                        "Keyring is not available. Set QUICOMMIT_API_KEY environment variable instead or change api_key_storage to 'config'."
+                    );
+                }
+                self.keyring
+                    .store_api_key(&self.config.llm.provider, api_key)
             }
-                self.keyring.store_api_key(&self.config.llm.provider, api_key)
-            },
             "config" => {
                 // We can't modify self.config here since self is immutable
                 // This will be handled by the caller updating the config
                 Ok(())
-            },
+            }
             "environment" => {
-                bail!("API key storage set to 'environment'. Please set QUICOMMIT_{}_API_KEY environment variable.", self.config.llm.provider.to_uppercase());
+                bail!(
-            },
+                    "API key storage set to 'environment'. Please set QUICOMMIT_{}_API_KEY environment variable.",
+                    self.config.llm.provider.to_uppercase()
+                );
+            }
             _ => {
-                bail!("Invalid API key storage method: {}", self.config.llm.api_key_storage);
+                bail!(
+                    "Invalid API key storage method: {}",
+                    self.config.llm.api_key_storage
+                );
             }
         }
     }
@@ -426,16 +486,19 @@ impl ConfigManager {
                 if self.keyring.is_available() {
                     self.keyring.delete_api_key(&self.config.llm.provider)?;
                 }
-            },
+            }
             "config" => {
                 // We can't modify self.config here since self is immutable
                 // This will be handled by the caller updating the config
-            },
+            }
             "environment" => {
                 // Environment variables are not managed by the app
-            },
+            }
             _ => {
-                bail!("Invalid API key storage method: {}", self.config.llm.api_key_storage);
+                bail!(
+                    "Invalid API key storage method: {}",
+                    self.config.llm.api_key_storage
+                );
             }
         }
         Ok(())
@@ -448,7 +511,12 @@ impl ConfigManager {
         }
 
         // Check environment variables
-        if self.keyring.get_api_key(&self.config.llm.provider).unwrap_or(None).is_some() {
+        if self
+            .keyring
+            .get_api_key(&self.config.llm.provider)
+            .unwrap_or(None)
+            .is_some()
+        {
             return true;
         }
 
@@ -576,14 +644,12 @@ impl ConfigManager {
 
     /// Export configuration to TOML string
     pub fn export(&self) -> Result<String> {
-        toml::to_string_pretty(&self.config)
+        toml::to_string_pretty(&self.config).context("Failed to serialize config")
-            .context("Failed to serialize config")
     }
 
     /// Import configuration from TOML string
     pub fn import(&mut self, toml_str: &str) -> Result<()> {
-        self.config = toml::from_str(toml_str)
+        self.config = toml::from_str(toml_str).context("Failed to parse config")?;
-            .context("Failed to parse config")?;
         self.modified = true;
         Ok(())
     }

src/config/mod.rs

@@ -7,10 +7,7 @@ use std::path::{Path, PathBuf};
 pub mod manager;
 pub mod profile;
 
-pub use profile::{
+pub use profile::{GitProfile, ProfileComparison, TokenConfig, TokenType};
-    GitProfile, TokenConfig, TokenType,
-    ProfileComparison
-};
 
 /// Application configuration
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -110,6 +107,14 @@ pub struct LlmConfig {
     /// API key (stored in config for fallback, encrypted if encrypt_sensitive is true)
     #[serde(default)]
     pub api_key: Option<String>,
+
+    /// Enable thinking/reasoning mode (deepseek, kimi, anthropic)
+    #[serde(default)]
+    pub thinking_enabled: bool,
+
+    /// Budget tokens for thinking mode (Anthropic Claude 4)
+    #[serde(default)]
+    pub thinking_budget_tokens: Option<u32>,
 }
 
 fn default_api_key_storage() -> String {
@@ -127,6 +132,8 @@ impl Default for LlmConfig {
             timeout: default_timeout(),
             api_key_storage: default_api_key_storage(),
             api_key: None,
+            thinking_enabled: false,
+            thinking_budget_tokens: None,
         }
     }
 }
@@ -484,8 +491,7 @@ impl AppConfig {
 
     /// Save configuration to file
     pub fn save(&self, path: &Path) -> Result<()> {
-        let content = toml::to_string_pretty(self)
+        let content = toml::to_string_pretty(self).context("Failed to serialize config")?;
-            .context("Failed to serialize config")?;
 
         if let Some(parent) = path.parent() {
             fs::create_dir_all(parent)
@@ -500,8 +506,7 @@ impl AppConfig {
 
     /// Get default config path
     pub fn default_path() -> Result<PathBuf> {
-        let config_dir = dirs::config_dir()
+        let config_dir = dirs::config_dir().context("Could not find config directory")?;
-            .context("Could not find config directory")?;
         Ok(config_dir.join("quicommit").join("config.toml"))
     }
 

src/config/profile.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
@@ -120,8 +120,7 @@ impl GitProfile {
     /// Get signing key (from GPG config or direct)
     pub fn signing_key(&self) -> Option<&str> {
         self.signing_key
-            .as_ref()
+            .as_deref()
-            .map(|s| s.as_str())
             .or_else(|| self.gpg.as_ref().map(|g| g.key_id.as_str()))
     }
 
@@ -175,19 +174,20 @@ impl GitProfile {
             }
         }
 
-        if let Some(ref ssh) = self.ssh {
+        if let Some(ref ssh) = self.ssh
-            if let Some(ref key_path) = ssh.private_key_path {
+            && let Some(ref key_path) = ssh.private_key_path
+        {
             let path_str = key_path.display().to_string();
             #[cfg(target_os = "windows")]
             {
-                    config.set_str("core.sshCommand", 
+                config.set_str(
-                        &format!("ssh -i \"{}\"", path_str.replace('\\', "/")))?;
+                    "core.sshCommand",
+                    &format!("ssh -i \"{}\"", path_str.replace('\\', "/")),
+                )?;
             }
             #[cfg(not(target_os = "windows"))]
             {
-                    config.set_str("core.sshCommand", 
+                config.set_str("core.sshCommand", &format!("ssh -i '{}'", path_str))?;
-                        &format!("ssh -i '{}'", path_str))?;
-                }
             }
         }
 
@@ -213,19 +213,20 @@ impl GitProfile {
             }
         }
 
-        if let Some(ref ssh) = self.ssh {
+        if let Some(ref ssh) = self.ssh
-            if let Some(ref key_path) = ssh.private_key_path {
+            && let Some(ref key_path) = ssh.private_key_path
+        {
             let path_str = key_path.display().to_string();
             #[cfg(target_os = "windows")]
             {
-                    config.set_str("core.sshCommand", 
+                config.set_str(
-                        &format!("ssh -i \"{}\"", path_str.replace('\\', "/")))?;
+                    "core.sshCommand",
+                    &format!("ssh -i \"{}\"", path_str.replace('\\', "/")),
+                )?;
             }
             #[cfg(not(target_os = "windows"))]
             {
-                    config.set_str("core.sshCommand", 
+                config.set_str("core.sshCommand", &format!("ssh -i '{}'", path_str))?;
-                        &format!("ssh -i '{}'", path_str))?;
-                }
             }
         }
 
@@ -264,8 +265,9 @@ impl GitProfile {
             });
         }
 
-        if let Some(profile_key) = self.signing_key() {
+        if let Some(profile_key) = self.signing_key()
-            if git_signing_key.as_deref() != Some(profile_key) {
+            && git_signing_key.as_deref() != Some(profile_key)
+        {
             comparison.matches = false;
             comparison.differences.push(ConfigDifference {
                 key: "user.signingkey".to_string(),
@@ -273,14 +275,13 @@ impl GitProfile {
                 git_value: git_signing_key.unwrap_or_else(|| "<not set>".to_string()),
             });
         }
-        }
 
         Ok(comparison)
     }
 }
 
 /// Profile settings
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct ProfileSettings {
     /// Automatically sign commits
     #[serde(default)]
@@ -307,19 +308,6 @@ pub struct ProfileSettings {
     pub commit_template: Option<String>,
 }
 
-impl Default for ProfileSettings {
-    fn default() -> Self {
-        Self {
-            auto_sign_commits: false,
-            auto_sign_tags: false,
-            default_commit_format: None,
-            repo_patterns: vec![],
-            llm_provider: None,
-            commit_template: None,
-        }
-    }
-}
-
 /// SSH configuration
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SshConfig {
@@ -349,17 +337,17 @@ pub struct SshConfig {
 impl SshConfig {
     /// Validate SSH configuration
     pub fn validate(&self) -> Result<()> {
-        if let Some(ref path) = self.private_key_path {
+        if let Some(ref path) = self.private_key_path
-            if !path.exists() {
+            && !path.exists()
+        {
             bail!("SSH private key does not exist: {:?}", path);
         }
-        }
 
-        if let Some(ref path) = self.public_key_path {
+        if let Some(ref path) = self.public_key_path
-            if !path.exists() {
+            && !path.exists()
+        {
             bail!("SSH public key does not exist: {:?}", path);
         }
-        }
 
         Ok(())
     }
@@ -495,7 +483,9 @@ impl TokenConfig {
 /// Token type
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
+#[derive(Default)]
 pub enum TokenType {
+    #[default]
     None,
     Personal,
     OAuth,
@@ -503,12 +493,6 @@ pub enum TokenType {
     App,
 }
 
-impl Default for TokenType {
-    fn default() -> Self {
-        Self::None
-    }
-}
-
 impl std::fmt::Display for TokenType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
@@ -638,9 +622,15 @@ impl GitProfileBuilder {
     }
 
     pub fn build(self) -> Result<GitProfile> {
-        let name = self.name.ok_or_else(|| anyhow::anyhow!("Name is required"))?;
+        let name = self
-        let user_name = self.user_name.ok_or_else(|| anyhow::anyhow!("User name is required"))?;
+            .name
-        let user_email = self.user_email.ok_or_else(|| anyhow::anyhow!("User email is required"))?;
+            .ok_or_else(|| anyhow::anyhow!("Name is required"))?;
+        let user_name = self
+            .user_name
+            .ok_or_else(|| anyhow::anyhow!("User name is required"))?;
+        let user_email = self
+            .user_email
+            .ok_or_else(|| anyhow::anyhow!("User email is required"))?;
 
         Ok(GitProfile {
             name,

src/generator/mod.rs

@@ -1,5 +1,5 @@
-use crate::config::{CommitFormat, Language};
 use crate::config::manager::ConfigManager;
+use crate::config::{CommitFormat, Language};
 use crate::git::{CommitInfo, GitRepo};
 use crate::llm::{GeneratedCommit, LlmClient};
 use anyhow::{Context, Result};
@@ -12,7 +12,31 @@ pub struct ContentGenerator {
 impl ContentGenerator {
     /// Create new content generator
     pub async fn new(manager: &ConfigManager) -> Result<Self> {
-        let llm_client = LlmClient::from_config(manager).await?;
+        Self::new_with_think(manager, false).await
+    }
+
+    /// Create new content generator with thinking override
+    pub async fn new_with_think(manager: &ConfigManager, think_override: bool) -> Result<Self> {
+        let mut thinking_enabled = if think_override {
+            true
+        } else {
+            manager.config().llm.thinking_enabled
+        };
+
+        // Validate thinking support per provider
+        if thinking_enabled {
+            let provider = manager.llm_provider();
+            if !Self::supports_thinking(provider) {
+                eprintln!(
+                    "Warning: Provider '{}' does not support thinking mode. \
+                     Disabling thinking for this invocation.",
+                    provider
+                );
+                thinking_enabled = false;
+            }
+        }
+
+        let llm_client = LlmClient::from_config_with_think(manager, thinking_enabled).await?;
 
         if !llm_client.is_available().await {
             anyhow::bail!("LLM provider '{}' is not available", manager.llm_provider());
@@ -21,6 +45,10 @@ impl ContentGenerator {
         Ok(Self { llm_client })
     }
 
+    fn supports_thinking(provider: &str) -> bool {
+        matches!(provider, "deepseek" | "kimi" | "anthropic" | "openai")
+    }
+
     /// Generate commit message from diff
     pub async fn generate_commit_message(
         &self,
@@ -37,7 +65,9 @@ impl ContentGenerator {
             diff.to_string()
         };
 
-        self.llm_client.generate_commit_message(&truncated_diff, format, language).await
+        self.llm_client
+            .generate_commit_message(&truncated_diff, format, language)
+            .await
     }
 
     /// Generate commit message from repository changes
@@ -47,7 +77,8 @@ impl ContentGenerator {
         format: CommitFormat,
         language: Language,
     ) -> Result<GeneratedCommit> {
-        let diff = repo.get_staged_diff_sorted()
+        let diff = repo
+            .get_staged_diff_sorted()
             .context("Failed to get staged diff")?;
 
         if diff.is_empty() {
@@ -64,12 +95,12 @@ impl ContentGenerator {
         commits: &[CommitInfo],
         language: Language,
     ) -> Result<String> {
-        let commit_messages: Vec<String> = commits
+        let commit_messages: Vec<String> =
-            .iter()
+            commits.iter().map(|c| c.subject().to_string()).collect();
-            .map(|c| c.subject().to_string())
-            .collect();
 
-        self.llm_client.generate_tag_message(version, &commit_messages, language).await
+        self.llm_client
+            .generate_tag_message(version, &commit_messages, language)
+            .await
     }
 
     /// Generate changelog entry
@@ -87,7 +118,9 @@ impl ContentGenerator {
             })
             .collect();
 
-        self.llm_client.generate_changelog_entry(version, &typed_commits, language).await
+        self.llm_client
+            .generate_changelog_entry(version, &typed_commits, language)
+            .await
     }
 
     /// Generate changelog from repository
@@ -104,7 +137,8 @@ impl ContentGenerator {
             repo.get_commits(50)?
         };
 
-        self.generate_changelog_entry(version, &commits, language).await
+        self.generate_changelog_entry(version, &commits, language)
+            .await
     }
 
     /// Interactive commit generation with user feedback
@@ -131,7 +165,9 @@ impl ContentGenerator {
 
         // Generate initial commit
         println!("\nGenerating commit message...");
-        let mut generated = self.generate_commit_message(&diff, format, language).await?;
+        let mut generated = self
+            .generate_commit_message(&diff, format, language)
+            .await?;
 
         loop {
             println!("\n{}", "─".repeat(60));
@@ -157,7 +193,9 @@ impl ContentGenerator {
                 0 => return Ok(generated),
                 1 => {
                     println!("Regenerating...");
-                    generated = self.generate_commit_message(&diff, format, language).await?;
+                    generated = self
+                        .generate_commit_message(&diff, format, language)
+                        .await?;
                 }
                 2 => {
                     let edited = crate::utils::editor::edit_content(&generated.to_conventional())?;
@@ -209,9 +247,13 @@ pub mod fallback {
             f.ends_with(".rs") || f.ends_with(".py") || f.ends_with(".js") || f.ends_with(".ts")
         });
 
-        let has_docs = files.iter().any(|f| f.ends_with(".md") || f.contains("README"));
+        let has_docs = files
+            .iter()
+            .any(|f| f.ends_with(".md") || f.contains("README"));
 
-        let has_tests = files.iter().any(|f| f.contains("test") || f.contains("spec"));
+        let has_tests = files
+            .iter()
+            .any(|f| f.contains("test") || f.contains("spec"));
 
         if has_tests {
             "test: update tests".to_string()

src/git/changelog.rs

@@ -95,9 +95,7 @@ impl ChangelogGenerator {
             ChangelogFormat::GitHubReleases => {
                 self.generate_github_releases(version, date, commits)
             }
-            ChangelogFormat::Custom => {
+            ChangelogFormat::Custom => self.generate_custom(version, date, commits),
-                self.generate_custom(version, date, commits)
-            }
         }
     }
 
@@ -234,7 +232,7 @@ impl ChangelogGenerator {
         _date: DateTime<Utc>,
         commits: &[CommitInfo],
     ) -> Result<String> {
-        let mut output = format!("## What's Changed\n\n");
+        let mut output = "## What's Changed\n\n".to_string();
 
         // Group by type
         let mut features = vec![];
@@ -357,7 +355,12 @@ impl ChangelogGenerator {
     }
 
     fn format_commit_github(&self, commit: &CommitInfo) -> String {
-        format!("- {} by @{} in {}\n", commit.subject(), commit.author, &commit.short_id)
+        format!(
+            "- {} by @{} in {}\n",
+            commit.subject(),
+            commit.author,
+            &commit.short_id
+        )
     }
 
     fn group_commits<'a>(&self, commits: &'a [CommitInfo]) -> HashMap<String, Vec<&'a CommitInfo>> {
@@ -380,8 +383,7 @@ impl Default for ChangelogGenerator {
 
 /// Read existing changelog
 pub fn read_changelog(path: &Path) -> Result<String> {
-    fs::read_to_string(path)
+    fs::read_to_string(path).with_context(|| format!("Failed to read changelog: {:?}", path))
-        .with_context(|| format!("Failed to read changelog: {:?}", path))
 }
 
 /// Initialize new changelog file
@@ -413,11 +415,7 @@ pub fn generate_from_history(
 }
 
 /// Update version links in changelog
-pub fn update_version_links(
+pub fn update_version_links(changelog: &str, version: &str, compare_url: &str) -> String {
-    changelog: &str,
-    version: &str,
-    compare_url: &str,
-) -> String {
     // Add version link at the end of changelog
     format!("{}\n[{}]: {}\n", changelog, version, compare_url)
 }
@@ -427,20 +425,19 @@ pub fn parse_versions(changelog: &str) -> Vec<(String, String)> {
     let mut versions = vec![];
 
     for line in changelog.lines() {
-        if line.starts_with("## [") {
+        if line.starts_with("## [")
-            if let Some(start) = line.find('[') {
+            && let Some(start) = line.find('[')
-                if let Some(end) = line.find(']') {
+            && let Some(end) = line.find(']')
+        {
             let version = &line[start + 1..end];
-                    if version != "Unreleased" {
+            if version != "Unreleased"
-                        if let Some(date_start) = line.find(" - ") {
+                && let Some(date_start) = line.find(" - ")
+            {
                 let date = &line[date_start + 3..].trim();
                 versions.push((version.to_string(), date.to_string()));
             }
         }
     }
-            }
-        }
-    }
 
     versions
 }

src/git/commit.rs

@@ -1,5 +1,5 @@
 use super::GitRepo;
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use chrono::Local;
 
 /// Commit builder for creating commits
@@ -119,10 +119,14 @@ impl CommitBuilder {
             return Ok(msg.clone());
         }
 
-        let commit_type = self.commit_type.as_ref()
+        let commit_type = self
+            .commit_type
+            .as_ref()
             .ok_or_else(|| anyhow::anyhow!("Commit type is required"))?;
 
-        let description = self.description.as_ref()
+        let description = self
+            .description
+            .as_ref()
             .ok_or_else(|| anyhow::anyhow!("Description is required"))?;
 
         let message = match self.format {
@@ -194,7 +198,8 @@ impl CommitBuilder {
                     "GPG signing failed. Please check:\n\
                      1. GPG signing key is configured (git config --get user.signingkey)\n\
                      2. GPG agent is running\n\
-                     3. You can sign commits manually (try: git commit --amend -S)".to_string()
+                     3. You can sign commits manually (try: git commit --amend -S)"
+                        .to_string()
                 } else {
                     stdout.to_string()
                 }
@@ -241,12 +246,19 @@ pub fn suggest_commit_type(diff: &str) -> Vec<&'static str> {
     }
 
     // Check for configuration files
-    if diff.contains("config") || diff.contains(".json") || diff.contains(".yaml") || diff.contains(".toml") {
+    if diff.contains("config")
+        || diff.contains(".json")
+        || diff.contains(".yaml")
+        || diff.contains(".toml")
+    {
         suggestions.push("chore");
     }
 
     // Check for dependencies
-    if diff.contains("Cargo.toml") || diff.contains("package.json") || diff.contains("requirements.txt") {
+    if diff.contains("Cargo.toml")
+        || diff.contains("package.json")
+        || diff.contains("requirements.txt")
+    {
         suggestions.push("build");
     }
 
@@ -303,11 +315,12 @@ pub fn parse_commit_message(message: &str) -> ParsedCommit {
                 continue;
             }
 
-            if line.starts_with("BREAKING CHANGE:") || 
+            if line.starts_with("BREAKING CHANGE:")
-               line.starts_with("Closes") || 
+                || line.starts_with("Closes")
-               line.starts_with("Fixes") ||
+                || line.starts_with("Fixes")
-               line.starts_with("Refs") ||
+                || line.starts_with("Refs")
-               line.starts_with("Co-authored-by:") {
+                || line.starts_with("Co-authored-by:")
+            {
                 in_footer = true;
             }
 
@@ -322,8 +335,16 @@ pub fn parse_commit_message(message: &str) -> ParsedCommit {
             commit_type,
             scope,
             description: Some(description.to_string()),
-            body: if body_lines.is_empty() { None } else { Some(body_lines.join("\n")) },
+            body: if body_lines.is_empty() {
-            footer: if footer_lines.is_empty() { None } else { Some(footer_lines.join("\n")) },
+                None
+            } else {
+                Some(body_lines.join("\n"))
+            },
+            footer: if footer_lines.is_empty() {
+                None
+            } else {
+                Some(footer_lines.join("\n"))
+            },
             breaking,
         };
     }

src/git/mod.rs

@@ -1,31 +1,29 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
-use git2::{Repository, Signature, StatusOptions, Config, Oid, ObjectType};
+use git2::{Config, ObjectType, Oid, Repository, Signature, StatusOptions};
-use std::path::{Path, PathBuf, Component};
 use std::collections::HashMap;
-use tempfile;
+use std::path::{Component, Path, PathBuf};
 
 pub mod changelog;
 pub mod commit;
 pub mod tag;
 
-
 fn normalize_path_for_git2(path: &Path) -> PathBuf {
     let mut normalized = path.to_path_buf();
 
     #[cfg(target_os = "windows")]
     {
         let path_str = path.to_string_lossy();
-        if path_str.starts_with(r"\\?\") {
+        if path_str.starts_with(r"\\?\")
-            if let Some(stripped) = path_str.strip_prefix(r"\\?\") {
+            && let Some(stripped) = path_str.strip_prefix(r"\\?\")
+        {
             normalized = PathBuf::from(stripped);
         }
-        }
+        if path_str.starts_with(r"\\?\UNC\")
-        if path_str.starts_with(r"\\?\UNC\") {
+            && let Some(stripped) = path_str.strip_prefix(r"\\?\UNC\")
-            if let Some(stripped) = path_str.strip_prefix(r"\\?\UNC\") {
+        {
             normalized = PathBuf::from(format!(r"\\{}", stripped));
         }
     }
-    }
 
     normalized
 }
@@ -37,8 +35,7 @@ fn get_absolute_path<P: AsRef<Path>>(path: P) -> Result<PathBuf> {
         return Ok(normalize_path_for_git2(path));
     }
 
-    let current_dir = std::env::current_dir()
+    let current_dir = std::env::current_dir().with_context(|| "Failed to get current directory")?;
-        .with_context(|| "Failed to get current directory")?;
 
     let absolute = current_dir.join(path);
     Ok(normalize_path_for_git2(&absolute))
@@ -75,7 +72,7 @@ fn try_open_repo_with_git2(path: &Path) -> Result<Repository> {
     let discover_opts = git2::RepositoryOpenFlags::empty();
     let ceiling_dirs: [&str; 0] = [];
 
-    let repo = Repository::open_ext(&normalized, discover_opts, &ceiling_dirs)
+    let repo = Repository::open_ext(&normalized, discover_opts, ceiling_dirs)
         .or_else(|_| Repository::discover(&normalized))
         .or_else(|_| Repository::open(&normalized));
 
@@ -84,7 +81,7 @@ fn try_open_repo_with_git2(path: &Path) -> Result<Repository> {
 
 fn try_open_repo_with_git_cli(path: &Path) -> Result<Repository> {
     let output = std::process::Command::new("git")
-        .args(&["rev-parse", "--show-toplevel"])
+        .args(["rev-parse", "--show-toplevel"])
         .current_dir(path)
         .output()
         .context("Failed to execute git command")?;
@@ -179,10 +176,8 @@ impl GitRepo {
         let absolute_path = get_absolute_path(path)?;
         let resolved_path = resolve_path_without_canonicalize(&absolute_path);
 
-        let repo = try_open_repo_with_git2(&resolved_path)
+        let repo = try_open_repo_with_git2(&resolved_path).or_else(|git2_err| {
-            .or_else(|git2_err| {
+            try_open_repo_with_git_cli(&resolved_path).map_err(|cli_err| {
-                try_open_repo_with_git_cli(&resolved_path)
-                    .map_err(|cli_err| {
                 let diagnosis = diagnose_repo_issue(&resolved_path);
                 anyhow::anyhow!(
                     "Failed to open git repository:\n\
@@ -198,12 +193,15 @@ impl GitRepo {
                             2. Run: git status (to verify git works)\n\
                             3. Run: git config --global --add safe.directory \"*\"\n\
                             4. Check file permissions",
-                            git2_err, cli_err, diagnosis
+                    git2_err,
+                    cli_err,
+                    diagnosis
                 )
             })
         })?;
 
-        let repo_path = repo.workdir()
+        let repo_path = repo
+            .workdir()
             .map(|p| p.to_path_buf())
             .unwrap_or_else(|| resolved_path.clone());
 
@@ -249,7 +247,11 @@ impl GitRepo {
     pub fn get_user_name(&self) -> Result<String> {
         self.get_config("user.name")?
             .or_else(|| std::env::var("GIT_AUTHOR_NAME").ok())
-            .ok_or_else(|| anyhow::anyhow!("User name not configured. Set it with: git config user.name \"Your Name\""))
+            .ok_or_else(|| {
+                anyhow::anyhow!(
+                    "User name not configured. Set it with: git config user.name \"Your Name\""
+                )
+            })
     }
 
     /// Get the configured user email
@@ -261,7 +263,8 @@ impl GitRepo {
 
     /// Get the configured GPG signing key
     pub fn get_signing_key(&self) -> Result<Option<String>> {
-        Ok(self.get_config("user.signingkey")?
+        Ok(self
+            .get_config("user.signingkey")?
             .or_else(|| std::env::var("GIT_SIGNING_KEY").ok()))
     }
 
@@ -289,11 +292,7 @@ impl GitRepo {
             return Ok(program);
         }
 
-        let default_gpg = if cfg!(windows) {
+        let default_gpg = if cfg!(windows) { "gpg.exe" } else { "gpg" };
-            "gpg.exe"
-        } else {
-            "gpg"
-        };
 
         Ok(default_gpg.to_string())
     }
@@ -302,10 +301,13 @@ impl GitRepo {
     pub fn create_signature(&self) -> Result<Signature<'_>> {
         let name = self.get_user_name()?;
         let email = self.get_user_email()?;
-        let time = git2::Time::new(std::time::SystemTime::now()
+        let time = git2::Time::new(
+            std::time::SystemTime::now()
                 .duration_since(std::time::UNIX_EPOCH)
                 .unwrap()
-            .as_secs() as i64, 0);
+                .as_secs() as i64,
+            0,
+        );
         Signature::new(&name, &email, &time).map_err(Into::into)
     }
 
@@ -330,7 +332,7 @@ impl GitRepo {
     pub fn get_staged_diff(&self) -> Result<String> {
         // Use git CLI to get staged diff for better compatibility
         let output = std::process::Command::new("git")
-            .args(&["diff", "--cached"])
+            .args(["diff", "--cached"])
             .current_dir(&self.path)
             .output()
             .with_context(|| "Failed to get staged diff with git command")?;
@@ -385,9 +387,7 @@ impl GitRepo {
         });
 
         // Combine sorted diffs
-        let sorted_diff: String = file_diffs.into_iter()
+        let sorted_diff: String = file_diffs.into_iter().map(|(_, diff)| diff).collect();
-            .map(|(_, diff)| diff)
-            .collect();
 
         Ok(sorted_diff)
     }
@@ -415,20 +415,31 @@ fn extract_file_from_diff_line(line: &str) -> String {
 fn file_importance_score(filename: &str) -> i32 {
     // Priority list for important file types
     let important_extensions = [
-        ".rs", ".py", ".js", ".ts", ".tsx", ".jsx", ".go", ".java", ".cpp", ".c", ".rust",
+        ".rs", ".py", ".js", ".ts", ".tsx", ".jsx", ".go", ".java", ".cpp", ".c", ".rust", ".vue",
-        ".vue", ".svelte", ".html", ".css", ".scss", ".sass", ".less",
+        ".svelte", ".html", ".css", ".scss", ".sass", ".less",
     ];
 
     // Config files that are important but less than source code
     let config_files = [
-        "Cargo.toml", "package.json", "go.mod", "go.sum", "pom.xml",
+        "Cargo.toml",
-        "Makefile", "CMakeLists.txt", "build.gradle", "gradle.properties",
+        "package.json",
+        "go.mod",
+        "go.sum",
+        "pom.xml",
+        "Makefile",
+        "CMakeLists.txt",
+        "build.gradle",
+        "gradle.properties",
     ];
 
     // Lock files - lowest priority
     let lock_files = [
-        "Cargo.lock", "package-lock.json", "yarn.lock", "pnpm-lock.yaml",
+        "Cargo.lock",
-        "Gemfile.lock", "composer.lock",
+        "package-lock.json",
+        "yarn.lock",
+        "pnpm-lock.yaml",
+        "Gemfile.lock",
+        "composer.lock",
     ];
 
     // Check lock files first (lowest priority)
@@ -501,20 +512,23 @@ impl GitRepo {
 
     /// Get list of staged files
     pub fn get_staged_files(&self) -> Result<Vec<String>> {
-        let statuses = self.repo.statuses(Some(
+        let statuses = self
-            StatusOptions::new()
+            .repo
-                .include_untracked(false),
+            .statuses(Some(StatusOptions::new().include_untracked(false)))?;
-        ))?;
 
         let mut files = vec![];
         for entry in statuses.iter() {
             let status = entry.status();
-            if status.is_index_new() || status.is_index_modified() || status.is_index_deleted() || status.is_index_renamed() || status.is_index_typechange() {
+            if (status.is_index_new()
-                if let Some(path) = entry.path() {
+                || status.is_index_modified()
+                || status.is_index_deleted()
+                || status.is_index_renamed()
+                || status.is_index_typechange())
+                && let Some(path) = entry.path()
+            {
                 files.push(path.to_string());
             }
         }
-        }
 
         Ok(files)
     }
@@ -542,7 +556,7 @@ impl GitRepo {
     pub fn stage_all(&self) -> Result<()> {
         // Use git command for reliable staging (handles all edge cases)
         let output = std::process::Command::new("git")
-            .args(&["add", "-A"])
+            .args(["add", "-A"])
             .current_dir(&self.path)
             .output()
             .with_context(|| "Failed to stage changes with git command")?;
@@ -626,7 +640,7 @@ impl GitRepo {
         std::fs::write(temp_file.path(), message)?;
 
         let output = std::process::Command::new("git")
-            .args(&["commit", "-S", "-F", temp_file.path().to_str().unwrap()])
+            .args(["commit", "-S", "-F", temp_file.path().to_str().unwrap()])
             .current_dir(&self.path)
             .output()?;
 
@@ -639,7 +653,8 @@ impl GitRepo {
                     "GPG signing failed. Please check:\n\
                      1. GPG signing key is configured (git config --get user.signingkey)\n\
                      2. GPG agent is running\n\
-                     3. You can sign commits manually (try: git commit -S -m 'test')".to_string()
+                     3. You can sign commits manually (try: git commit -S -m 'test')"
+                        .to_string()
                 } else {
                     stdout.to_string()
                 }
@@ -659,7 +674,8 @@ impl GitRepo {
         let head = self.repo.head()?;
 
         if head.is_branch() {
-            let name = head.shorthand()
+            let name = head
+                .shorthand()
                 .ok_or_else(|| anyhow::anyhow!("Invalid branch name"))?;
             Ok(name.to_string())
         } else {
@@ -670,7 +686,8 @@ impl GitRepo {
     /// Get current commit hash (short)
     pub fn current_commit_short(&self) -> Result<String> {
         let head = self.repo.head()?;
-        let oid = head.target()
+        let oid = head
+            .target()
             .ok_or_else(|| anyhow::anyhow!("No target for HEAD"))?;
         Ok(oid.to_string()[..8].to_string())
     }
@@ -678,7 +695,8 @@ impl GitRepo {
     /// Get current commit hash (full)
     pub fn current_commit(&self) -> Result<String> {
         let head = self.repo.head()?;
-        let oid = head.target()
+        let oid = head
+            .target()
             .ok_or_else(|| anyhow::anyhow!("No target for HEAD"))?;
         Ok(oid.to_string())
     }
@@ -777,13 +795,7 @@ impl GitRepo {
             if sign {
                 self.create_signed_tag_with_git2(name, msg, &sig, target.id())?;
             } else {
-                self.repo.tag(
+                self.repo.tag(name, target.as_object(), &sig, msg, false)?;
-                    name,
-                    target.as_object(),
-                    &sig,
-                    msg,
-                    false,
-                )?;
             }
         } else {
             self.repo.tag(
@@ -799,9 +811,15 @@ impl GitRepo {
     }
 
     /// Create signed tag using git CLI
-    fn create_signed_tag_with_git2(&self, name: &str, message: &str, _signature: &Signature, _target_id: Oid) -> Result<()> {
+    fn create_signed_tag_with_git2(
+        &self,
+        name: &str,
+        message: &str,
+        _signature: &Signature,
+        _target_id: Oid,
+    ) -> Result<()> {
         let output = std::process::Command::new("git")
-            .args(&["tag", "-s", name, "-m", message])
+            .args(["tag", "-s", name, "-m", message])
             .current_dir(&self.path)
             .output()?;
 
@@ -814,7 +832,12 @@ impl GitRepo {
     }
 
     /// Create GPG signature for arbitrary content
-    fn create_gpg_signature_for_content(&self, _content: &str, _gpg_program: &str, _signing_key: &str) -> Result<String> {
+    fn create_gpg_signature_for_content(
+        &self,
+        _content: &str,
+        _gpg_program: &str,
+        _signing_key: &str,
+    ) -> Result<String> {
         Ok(String::new())
     }
 
@@ -827,7 +850,7 @@ impl GitRepo {
     /// Push to remote
     pub fn push(&self, remote: &str, refspec: &str) -> Result<()> {
         let output = std::process::Command::new("git")
-            .args(&["push", remote, refspec])
+            .args(["push", remote, refspec])
             .current_dir(&self.path)
             .output()?;
 
@@ -842,7 +865,8 @@ impl GitRepo {
     /// Get remote URL
     pub fn get_remote_url(&self, remote: &str) -> Result<String> {
         let remote_obj = self.repo.find_remote(remote)?;
-        let url = remote_obj.url()
+        let url = remote_obj
+            .url()
             .ok_or_else(|| anyhow::anyhow!("Remote has no URL"))?;
         Ok(url.to_string())
     }
@@ -856,7 +880,7 @@ impl GitRepo {
     pub fn status_summary(&self) -> Result<StatusSummary> {
         // Use git CLI for more reliable status detection
         let output = std::process::Command::new("git")
-            .args(&["status", "--porcelain"])
+            .args(["status", "--porcelain"])
             .current_dir(&self.path)
             .output()
             .with_context(|| "Failed to get status with git command")?;
@@ -893,9 +917,10 @@ impl GitRepo {
                 }
 
                 // Conflicted files (both columns are U or DD, AA, etc.)
-                if (index_status == 'U' || worktree_status == 'U') ||
+                if (index_status == 'U' || worktree_status == 'U')
-                   (index_status == 'A' && worktree_status == 'A') ||
+                    || (index_status == 'A' && worktree_status == 'A')
-                   (index_status == 'D' && worktree_status == 'D') {
+                    || (index_status == 'D' && worktree_status == 'D')
+                {
                     conflicted += 1;
                 }
             }
@@ -1015,20 +1040,19 @@ pub fn find_repo<P: AsRef<Path>>(start_path: P) -> Result<GitRepo> {
     }
 
     if let Ok(output) = std::process::Command::new("git")
-        .args(&["rev-parse", "--show-toplevel"])
+        .args(["rev-parse", "--show-toplevel"])
         .current_dir(&resolved_start)
         .output()
+        && output.status.success()
     {
-        if output.status.success() {
         let stdout = String::from_utf8_lossy(&output.stdout);
         let git_root = stdout.trim();
-            if !git_root.is_empty() {
+        if !git_root.is_empty()
-                if let Ok(repo) = GitRepo::open(git_root) {
+            && let Ok(repo) = GitRepo::open(git_root)
+        {
             return Ok(repo);
         }
     }
-        }
-    }
 
     let diagnosis = diagnose_repo_issue(&resolved_start);
 
@@ -1245,7 +1269,10 @@ impl MergedUserConfig {
     }
 
     pub fn has_local_overrides(&self) -> bool {
-        self.name.is_local() || self.email.is_local() || self.signing_key.is_local() || self.ssh_command.is_local()
+        self.name.is_local()
+            || self.email.is_local()
+            || self.signing_key.is_local()
+            || self.ssh_command.is_local()
     }
 }
 
@@ -1272,23 +1299,38 @@ impl UserConfig {
             diffs.push(ConfigDiff {
                 key: "user.name".to_string(),
                 left: self.name.clone().unwrap_or_else(|| "<not set>".to_string()),
-                right: other.name.clone().unwrap_or_else(|| "<not set>".to_string()),
+                right: other
+                    .name
+                    .clone()
+                    .unwrap_or_else(|| "<not set>".to_string()),
             });
         }
 
         if self.email != other.email {
             diffs.push(ConfigDiff {
                 key: "user.email".to_string(),
-                left: self.email.clone().unwrap_or_else(|| "<not set>".to_string()),
+                left: self
-                right: other.email.clone().unwrap_or_else(|| "<not set>".to_string()),
+                    .email
+                    .clone()
+                    .unwrap_or_else(|| "<not set>".to_string()),
+                right: other
+                    .email
+                    .clone()
+                    .unwrap_or_else(|| "<not set>".to_string()),
             });
         }
 
         if self.signing_key != other.signing_key {
             diffs.push(ConfigDiff {
                 key: "user.signingkey".to_string(),
-                left: self.signing_key.clone().unwrap_or_else(|| "<not set>".to_string()),
+                left: self
-                right: other.signing_key.clone().unwrap_or_else(|| "<not set>".to_string()),
+                    .signing_key
+                    .clone()
+                    .unwrap_or_else(|| "<not set>".to_string()),
+                right: other
+                    .signing_key
+                    .clone()
+                    .unwrap_or_else(|| "<not set>".to_string()),
             });
         }
 

src/git/tag.rs

@@ -1,5 +1,5 @@
 use super::GitRepo;
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use semver::Version;
 
 /// Tag builder for creating tags
@@ -69,9 +69,7 @@ impl TagBuilder {
 
     /// Build tag message
     pub fn build_message(&self) -> Result<String> {
-        let message = self.message.as_ref()
+        let message = self.message.as_ref().cloned().unwrap_or_else(|| {
-            .cloned()
-            .unwrap_or_else(|| {
             let name = self.name.as_deref().unwrap_or("unknown");
             format!("Release {}", name)
         });
@@ -81,7 +79,9 @@ impl TagBuilder {
 
     /// Execute tag creation
     pub fn execute(&self, repo: &GitRepo) -> Result<()> {
-        let name = self.name.as_ref()
+        let name = self
+            .name
+            .as_ref()
             .ok_or_else(|| anyhow::anyhow!("Tag name is required"))?;
 
         if !self.force {
@@ -136,7 +136,10 @@ impl VersionBump {
             "minor" => Ok(Self::Minor),
             "patch" => Ok(Self::Patch),
             "prerelease" | "pre" => Ok(Self::Prerelease),
-            _ => bail!("Invalid version bump: {}. Use: major, minor, patch, prerelease", s),
+            _ => bail!(
+                "Invalid version bump: {}. Use: major, minor, patch, prerelease",
+                s
+            ),
         }
     }
 
@@ -187,7 +190,10 @@ pub fn suggest_version_bump(commits: &[super::CommitInfo]) -> VersionBump {
     for commit in commits {
         let msg = commit.message.to_lowercase();
 
-        if msg.contains("breaking change") || msg.contains("breaking-change") || msg.contains("breaking_change") {
+        if msg.contains("breaking change")
+            || msg.contains("breaking-change")
+            || msg.contains("breaking_change")
+        {
             has_breaking = true;
         }
 
@@ -283,7 +289,7 @@ pub fn delete_tag(repo: &GitRepo, name: &str, remote: Option<&str>) -> Result<()
 
         let refspec = format!(":refs/tags/{}", name);
         let output = Command::new("git")
-            .args(&["push", remote, &refspec])
+            .args(["push", remote, &refspec])
             .current_dir(repo.path())
             .output()?;
 

src/i18n/messages.rs

@@ -267,7 +267,9 @@ impl Messages {
             Language::Chinese => "没有可提交的更改。工作树是干净的。",
             Language::Japanese => "コミットする変更がありません。作業ツリーはクリーンです。",
             Language::Korean => "커밋할 변경 사항이 없습니다. 작업 트리가 깨끗합니다.",
-            Language::Spanish => "No hay cambios para hacer commit. El árbol de trabajo está limpio.",
+            Language::Spanish => {
+                "No hay cambios para hacer commit. El árbol de trabajo está limpio."
+            }
             Language::French => "Aucun changement à commiter. L'arbre de travail est propre.",
             Language::German => "Keine Änderungen zum Committen. Arbeitsbaum ist sauber.",
         }
@@ -289,11 +291,19 @@ impl Messages {
         match self.language {
             Language::English => "No files staged. Auto-staging all changes...",
             Language::Chinese => "没有暂存文件。自动暂存所有更改...",
-            Language::Japanese => "ステージされたファイルがありません。すべての変更を自動ステージ中...",
+            Language::Japanese => {
+                "ステージされたファイルがありません。すべての変更を自動ステージ中..."
+            }
             Language::Korean => "스테이징된 파일이 없습니다. 모든 변경 사항을 자동 스테이징 중...",
-            Language::Spanish => "No hay archivos preparados. Preparando automáticamente todos los cambios...",
+            Language::Spanish => {
-            Language::French => "Aucun fichier indexé. Indexation automatique de tous les changements...",
+                "No hay archivos preparados. Preparando automáticamente todos los cambios..."
-            Language::German => "Keine Dateien bereitgestellt. Alle Änderungen werden automatisch bereitgestellt...",
+            }
+            Language::French => {
+                "Aucun fichier indexé. Indexation automatique de tous les changements..."
+            }
+            Language::German => {
+                "Keine Dateien bereitgestellt. Alle Änderungen werden automatisch bereitgestellt..."
+            }
         }
     }
 
@@ -359,12 +369,23 @@ impl Messages {
 
     pub fn ai_generating_tag(&self, count: usize) -> String {
         match self.language {
-            Language::English => format!("🤖 AI is generating tag message from {} commits...", count),
+            Language::English => {
+                format!("🤖 AI is generating tag message from {} commits...", count)
+            }
             Language::Chinese => format!("🤖 AI 正在从 {} 个提交生成标签消息...", count),
-            Language::Japanese => format!("🤖 AIが{}個のコミットからタグメッセージを生成しています...", count),
+            Language::Japanese => format!(
+                "🤖 AIが{}個のコミットからタグメッセージを生成しています...",
+                count
+            ),
             Language::Korean => format!("🤖 AI가 {}개의 커밋에서 태그 메시지를 생성 중...", count),
-            Language::Spanish => format!("🤖 La IA está generando mensaje de etiqueta desde {} commits...", count),
+            Language::Spanish => format!(
-            Language::French => format!("🤖 L'IA génère le message d'étiquette à partir de {} commits...", count),
+                "🤖 La IA está generando mensaje de etiqueta desde {} commits...",
+                count
+            ),
+            Language::French => format!(
+                "🤖 L'IA génère le message d'étiquette à partir de {} commits...",
+                count
+            ),
             Language::German => format!("🤖 KI generiert Tag-Nachricht aus {} Commits...", count),
         }
     }

src/i18n/translator.rs

@@ -7,7 +7,11 @@ pub struct Translator {
 }
 
 impl Translator {
-    pub fn new(language: Language, keep_types_english: bool, keep_changelog_types_english: bool) -> Self {
+    pub fn new(
+        language: Language,
+        keep_types_english: bool,
+        keep_changelog_types_english: bool,
+    ) -> Self {
         Self {
             language,
             keep_types_english,
@@ -227,7 +231,11 @@ pub fn translate_commit_type(commit_type: &str, language: Language, keep_english
     translator.translate_commit_type(commit_type)
 }
 
-pub fn translate_changelog_category(category: &str, language: Language, keep_english: bool) -> String {
+pub fn translate_changelog_category(
+    category: &str,
+    language: Language,
+    keep_english: bool,
+) -> String {
     let translator = Translator::new(language, true, keep_english);
     translator.translate_changelog_category(category)
 }

src/llm/anthropic.rs

@@ -1,7 +1,9 @@
-use super::{create_http_client, LlmProvider};
+use super::thinking::ThinkingStateManager;
-use anyhow::{bail, Context, Result};
+use super::{LlmProvider, create_http_client};
+use anyhow::{Context, Result, bail};
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
+use std::sync::Arc;
 use std::time::Duration;
 
 /// Anthropic Claude API client
@@ -9,6 +11,12 @@ pub struct AnthropicClient {
     api_key: String,
     model: String,
     client: reqwest::Client,
+    thinking_enabled: bool,
+    thinking_budget_tokens: u32,
+    max_tokens: u32,
+    temperature: f32,
+    top_p: Option<f32>,
+    thinking_state: Option<Arc<ThinkingStateManager>>,
 }
 
 #[derive(Debug, Serialize)]
@@ -17,24 +25,59 @@ struct MessagesRequest {
     max_tokens: u32,
     #[serde(skip_serializing_if = "Option::is_none")]
     temperature: Option<f32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    top_p: Option<f32>,
     messages: Vec<AnthropicMessage>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    system: Option<String>,
+    system: Option<Vec<SystemContent>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    thinking: Option<ThinkingConfig>,
+    stream: bool,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Clone)]
+struct SystemContent {
+    #[serde(rename = "type")]
+    content_type: String,
+    text: String,
+}
+
+#[derive(Debug, Serialize)]
+struct ThinkingConfig {
+    #[serde(rename = "type")]
+    thinking_type: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    budget_tokens: Option<u32>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
 struct AnthropicMessage {
     role: String,
-    content: String,
+    content: AnthropicContent,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[serde(untagged)]
+enum AnthropicContent {
+    Text(String),
+    Blocks(Vec<ContentBlock>),
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+struct ContentBlock {
+    #[serde(rename = "type")]
+    content_type: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    text: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
 struct MessagesResponse {
-    content: Vec<ContentBlock>,
+    content: Vec<ResponseContentBlock>,
 }
 
 #[derive(Debug, Deserialize)]
-struct ContentBlock {
+struct ResponseContentBlock {
     #[serde(rename = "type")]
     content_type: String,
     text: String,
@@ -52,8 +95,57 @@ struct AnthropicError {
     message: String,
 }
 
+// --- Streaming SSE event structures ---
+
+#[derive(Debug, Deserialize)]
+struct SseEvent {
+    #[serde(rename = "type")]
+    event_type: String,
+    #[serde(default)]
+    message: Option<SseMessage>,
+    #[serde(default)]
+    index: Option<u32>,
+    #[serde(default)]
+    content_block: Option<SseContentBlock>,
+    #[serde(default)]
+    delta: Option<SseDelta>,
+    #[serde(default)]
+    usage: Option<SseUsage>,
+}
+
+#[derive(Debug, Deserialize)]
+struct SseMessage {
+    #[serde(default)]
+    content: Option<Vec<SseContentBlock>>,
+}
+
+#[derive(Debug, Deserialize)]
+struct SseContentBlock {
+    #[serde(rename = "type")]
+    content_type: String,
+    #[serde(default)]
+    thinking: Option<String>,
+    #[serde(default)]
+    text: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct SseDelta {
+    #[serde(rename = "type")]
+    delta_type: Option<String>,
+    #[serde(default)]
+    thinking: Option<String>,
+    #[serde(default)]
+    text: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct SseUsage {
+    #[serde(default)]
+    output_tokens: Option<u32>,
+}
+
 impl AnthropicClient {
-    /// Create new Anthropic client
     pub fn new(api_key: &str, model: &str) -> Result<Self> {
         let client = create_http_client(Duration::from_secs(60))?;
 
@@ -61,22 +153,54 @@ impl AnthropicClient {
             api_key: api_key.to_string(),
             model: model.to_string(),
             client,
+            thinking_enabled: false,
+            thinking_budget_tokens: 1024,
+            max_tokens: 500,
+            temperature: 0.7,
+            top_p: None,
+            thinking_state: None,
         })
     }
 
-    /// Set timeout
     pub fn with_timeout(mut self, timeout: Duration) -> Result<Self> {
         self.client = create_http_client(timeout)?;
         Ok(self)
     }
 
-    /// List available models
+    pub fn with_thinking(mut self, enabled: bool) -> Self {
+        self.thinking_enabled = enabled;
+        self
+    }
+
+    pub fn with_thinking_budget_tokens(mut self, budget_tokens: u32) -> Self {
+        self.thinking_budget_tokens = budget_tokens;
+        self
+    }
+
+    pub fn with_max_tokens(mut self, max_tokens: u32) -> Self {
+        self.max_tokens = max_tokens;
+        self
+    }
+
+    pub fn with_temperature(mut self, temperature: f32) -> Self {
+        self.temperature = temperature;
+        self
+    }
+
+    pub fn with_top_p(mut self, top_p: f32) -> Self {
+        self.top_p = Some(top_p);
+        self
+    }
+
+    pub fn with_thinking_state(mut self, state: Arc<ThinkingStateManager>) -> Self {
+        self.thinking_state = Some(state);
+        self
+    }
+
     pub async fn list_models(&self) -> Result<Vec<String>> {
-        // Anthropic doesn't have a models API endpoint, return predefined list
         Ok(ANTHROPIC_MODELS.iter().map(|&m| m.to_string()).collect())
     }
 
-    /// Validate API key
     pub async fn validate_key(&self) -> Result<bool> {
         let url = "https://api.anthropic.com/v1/messages";
 
@@ -84,14 +208,18 @@ impl AnthropicClient {
             model: self.model.clone(),
             max_tokens: 5,
             temperature: Some(0.0),
+            top_p: None,
             messages: vec![AnthropicMessage {
                 role: "user".to_string(),
-                content: "Hi".to_string(),
+                content: AnthropicContent::Text("Hi".to_string()),
             }],
             system: None,
+            thinking: None,
+            stream: false,
         };
 
-        let response = self.client
+        let response = self
+            .client
             .post(url)
             .header("x-api-key", &self.api_key)
             .header("anthropic-version", "2023-06-01")
@@ -124,25 +252,28 @@ impl LlmProvider for AnthropicClient {
     async fn generate(&self, prompt: &str) -> Result<String> {
         let messages = vec![AnthropicMessage {
             role: "user".to_string(),
-            content: prompt.to_string(),
+            content: AnthropicContent::Text(prompt.to_string()),
         }];
 
-        self.messages_request(messages, None).await
+        self.messages_request_with_retry(messages, None).await
     }
 
     async fn generate_with_system(&self, system: &str, user: &str) -> Result<String> {
         let messages = vec![AnthropicMessage {
             role: "user".to_string(),
-            content: user.to_string(),
+            content: AnthropicContent::Text(user.to_string()),
         }];
 
         let system = if system.is_empty() {
             None
         } else {
-            Some(system.to_string())
+            Some(vec![SystemContent {
+                content_type: "text".to_string(),
+                text: system.to_string(),
+            }])
         };
 
-        self.messages_request(messages, system).await
+        self.messages_request_with_retry(messages, system).await
     }
 
     async fn is_available(&self) -> bool {
@@ -155,22 +286,84 @@ impl LlmProvider for AnthropicClient {
 }
 
 impl AnthropicClient {
+    async fn messages_request_with_retry(
+        &self,
+        messages: Vec<AnthropicMessage>,
+        system: Option<Vec<SystemContent>>,
+    ) -> Result<String> {
+        let mut last_error = None;
+
+        for attempt in 1..=3 {
+            match self
+                .messages_request(messages.clone(), system.clone())
+                .await
+            {
+                Ok(result) => return Ok(result),
+                Err(e) => {
+                    let err_msg = e.to_string();
+                    let is_retryable = err_msg.contains("timeout")
+                        || err_msg.contains("connection")
+                        || err_msg.contains("temporary")
+                        || err_msg.contains("5")
+                            && (err_msg.contains("500")
+                                || err_msg.contains("502")
+                                || err_msg.contains("503")
+                                || err_msg.contains("504"));
+
+                    if !is_retryable || attempt == 3 {
+                        last_error = Some(e);
+                        break;
+                    }
+
+                    tokio::time::sleep(Duration::from_millis(500 * 2u64.pow(attempt - 1))).await;
+                }
+            }
+        }
+
+        Err(last_error.unwrap_or_else(|| anyhow::anyhow!("Request failed after retries")))
+    }
+
     async fn messages_request(
         &self,
         messages: Vec<AnthropicMessage>,
-        system: Option<String>,
+        system: Option<Vec<SystemContent>>,
+    ) -> Result<String> {
+        if self.thinking_enabled {
+            self.streaming_messages_request(messages, system).await
+        } else {
+            self.non_streaming_messages_request(messages, system).await
+        }
+    }
+
+    async fn non_streaming_messages_request(
+        &self,
+        messages: Vec<AnthropicMessage>,
+        system: Option<Vec<SystemContent>>,
     ) -> Result<String> {
         let url = "https://api.anthropic.com/v1/messages";
 
-        let request = MessagesRequest {
+        let temperature = if self.temperature == 0.0 {
-            model: self.model.clone(),
+            None
-            max_tokens: 500,
+        } else {
-            temperature: Some(0.7),
+            Some(self.temperature)
-            messages,
-            system,
         };
 
-        let response = self.client
+        let request = MessagesRequest {
+            model: self.model.clone(),
+            max_tokens: self.max_tokens,
+            temperature,
+            top_p: self.top_p,
+            messages,
+            system,
+            thinking: Some(ThinkingConfig {
+                thinking_type: "disabled".to_string(),
+                budget_tokens: None,
+            }),
+            stream: false,
+        };
+
+        let response = self
+            .client
             .post(url)
             .header("x-api-key", &self.api_key)
             .header("anthropic-version", "2023-06-01")
@@ -185,9 +378,12 @@ impl AnthropicClient {
         if !status.is_success() {
             let text = response.text().await.unwrap_or_default();
 
-            // Try to parse error
             if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
-                bail!("Anthropic API error: {} ({})", error.error.message, error.error.error_type);
+                bail!(
+                    "Anthropic API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
             }
 
             bail!("Anthropic API error: {} - {}", status, text);
@@ -198,16 +394,183 @@ impl AnthropicClient {
             .await
             .context("Failed to parse Anthropic response")?;
 
-        result.content
+        result
+            .content
             .into_iter()
             .find(|c| c.content_type == "text")
             .map(|c| c.text.trim().to_string())
+            .filter(|s| !s.is_empty())
             .ok_or_else(|| anyhow::anyhow!("No text response from Anthropic"))
     }
+
+    /// Streaming request for thinking mode, filters thinking content blocks
+    async fn streaming_messages_request(
+        &self,
+        messages: Vec<AnthropicMessage>,
+        system: Option<Vec<SystemContent>>,
+    ) -> Result<String> {
+        let url = "https://api.anthropic.com/v1/messages";
+
+        let thinking = ThinkingConfig {
+            thinking_type: "enabled".to_string(),
+            budget_tokens: Some(self.thinking_budget_tokens),
+        };
+
+        // max_tokens must exceed budget_tokens
+        let max_tokens = (self.max_tokens).max(self.thinking_budget_tokens + 100);
+
+        let request = MessagesRequest {
+            model: self.model.clone(),
+            max_tokens,
+            temperature: None, // must be omitted for thinking mode
+            top_p: None,
+            messages,
+            system,
+            thinking: Some(thinking),
+            stream: true,
+        };
+
+        let response = self
+            .client
+            .post(url)
+            .header("x-api-key", &self.api_key)
+            .header("anthropic-version", "2023-06-01")
+            .header("Content-Type", "application/json")
+            .header("Accept", "text/event-stream")
+            .json(&request)
+            .send()
+            .await
+            .context("Failed to send streaming request to Anthropic")?;
+
+        let status = response.status();
+
+        if !status.is_success() {
+            let text = response.text().await.unwrap_or_default();
+
+            if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
+                bail!(
+                    "Anthropic API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
+            }
+
+            bail!("Anthropic API error: {} - {}", status, text);
+        }
+
+        let mut content_buffer = String::new();
+        let mut in_thinking = false;
+        let mut has_reasoning = false;
+        let mut has_content = false;
+
+        let thinking_state = self.thinking_state.as_ref();
+
+        let mut byte_stream = response.bytes_stream();
+        let mut line_buffer = String::new();
+
+        use futures_util::StreamExt;
+
+        while let Some(chunk) = byte_stream.next().await {
+            let chunk = chunk.context("Failed to read streaming response chunk")?;
+            let chunk_str =
+                String::from_utf8(chunk.to_vec()).context("Invalid UTF-8 in stream chunk")?;
+
+            line_buffer.push_str(&chunk_str);
+
+            while let Some(line_end) = line_buffer.find('\n') {
+                let line = line_buffer[..line_end].trim().to_string();
+                line_buffer = line_buffer[line_end + 1..].to_string();
+
+                if line.is_empty() {
+                    continue;
+                }
+
+                // Parse SSE event line
+                if let Some(data) = line.strip_prefix("data: ") {
+                    if let Ok(event) = serde_json::from_str::<SseEvent>(data) {
+                        match event.event_type.as_str() {
+                            "content_block_start" => {
+                                if let Some(ref block) = event.content_block {
+                                    if block.content_type == "thinking" {
+                                        in_thinking = true;
+                                        if !has_reasoning {
+                                            has_reasoning = true;
+                                            if let Some(state) = thinking_state {
+                                                state.start_thinking();
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            "content_block_delta" => {
+                                if let Some(ref delta) = event.delta {
+                                    // Thinking delta - ignore content but track state
+                                    if delta.thinking.is_some() {
+                                        continue;
+                                    }
+
+                                    // Text delta - collect
+                                    if in_thinking && delta.text.is_some() {
+                                        // Transition from thinking to text
+                                        if let Some(state) = thinking_state {
+                                            state.end_thinking();
+                                        }
+                                        in_thinking = false;
+                                    }
+                                    if let Some(ref text) = delta.text
+                                        && !text.is_empty()
+                                    {
+                                        has_content = true;
+                                        content_buffer.push_str(text);
+                                    }
+                                }
+                            }
+                            "content_block_stop" => {
+                                if in_thinking {
+                                    if let Some(state) = thinking_state {
+                                        state.end_thinking();
+                                    }
+                                    in_thinking = false;
+                                }
+                            }
+                            _ => {}
+                        }
+                    }
+                }
+            }
+        }
+
+        // Ensure thinking state is ended
+        if let Some(state) = thinking_state {
+            state.end_thinking();
+        }
+
+        let result = content_buffer.trim().to_string();
+
+        if result.is_empty() {
+            if has_reasoning && !has_content {
+                bail!(
+                    "Anthropic returned thinking content but no final answer. \
+                     The model may have entered an incomplete thinking state. \
+                     Please try again or disable thinking mode."
+                );
+            }
+            bail!(
+                "No response from Anthropic. \
+                 If thinking mode is enabled, try disabling it or ensure the model supports it."
+            );
+        }
+
+        Ok(result)
+    }
 }
 
-/// Available Anthropic models
+/// Available Anthropic models (Claude 4 series with extended thinking)
 pub const ANTHROPIC_MODELS: &[&str] = &[
+    "claude-opus-4-7",
+    "claude-sonnet-4-6",
+    "claude-haiku-4-5",
+    // Legacy models
     "claude-3-opus-20240229",
     "claude-3-sonnet-20240229",
     "claude-3-haiku-20240307",
@@ -216,7 +579,6 @@ pub const ANTHROPIC_MODELS: &[&str] = &[
     "claude-instant-1.2",
 ];
 
-/// Check if a model name is valid
 pub fn is_valid_model(model: &str) -> bool {
     ANTHROPIC_MODELS.contains(&model)
 }
@@ -226,8 +588,68 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_model_validation() {
+    fn test_model_validation_claude4() {
+        assert!(is_valid_model("claude-opus-4-7"));
+        assert!(is_valid_model("claude-sonnet-4-6"));
+        assert!(is_valid_model("claude-haiku-4-5"));
         assert!(is_valid_model("claude-3-sonnet-20240229"));
         assert!(!is_valid_model("invalid-model"));
     }
+
+    #[test]
+    fn test_thinking_config_serialization() {
+        let config = ThinkingConfig {
+            thinking_type: "enabled".to_string(),
+            budget_tokens: Some(2048),
+        };
+        let json = serde_json::to_string(&config).unwrap();
+        assert!(json.contains(r#""type":"enabled""#));
+        assert!(json.contains(r#""budget_tokens":2048"#));
+    }
+
+    #[test]
+    fn test_thinking_config_disabled_serialization() {
+        let config = ThinkingConfig {
+            thinking_type: "disabled".to_string(),
+            budget_tokens: None,
+        };
+        let json = serde_json::to_string(&config).unwrap();
+        assert_eq!(json, r#"{"type":"disabled"}"#);
+    }
+
+    #[test]
+    fn test_system_content_serialization() {
+        let content = SystemContent {
+            content_type: "text".to_string(),
+            text: "You are helpful.".to_string(),
+        };
+        let json = serde_json::to_string(&content).unwrap();
+        assert!(json.contains(r#""type":"text""#));
+    }
+
+    #[test]
+    fn test_sse_event_parsing_content_block_start() {
+        let json = r#"{"type":"content_block_start","index":0,"content_block":{"type":"thinking","thinking":""}}"#;
+        let event: SseEvent = serde_json::from_str(json).unwrap();
+        assert_eq!(event.event_type, "content_block_start");
+        assert_eq!(event.content_block.unwrap().content_type, "thinking");
+    }
+
+    #[test]
+    fn test_sse_event_parsing_text_delta() {
+        let json = r#"{"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":"Hello"}}"#;
+        let event: SseEvent = serde_json::from_str(json).unwrap();
+        assert_eq!(event.event_type, "content_block_delta");
+        assert_eq!(event.delta.unwrap().text, Some("Hello".to_string()));
+    }
+
+    #[test]
+    fn test_anthropic_content_text() {
+        let msg = AnthropicMessage {
+            role: "user".to_string(),
+            content: AnthropicContent::Text("Hello".to_string()),
+        };
+        let json = serde_json::to_string(&msg).unwrap();
+        assert!(json.contains(r#""content":"Hello""#));
+    }
 }

src/llm/deepseek.rs

@@ -1,7 +1,9 @@
-use super::{create_http_client, LlmProvider};
+use super::thinking::ThinkingStateManager;
-use anyhow::{bail, Context, Result};
+use super::{LlmProvider, create_http_client};
+use anyhow::{Context, Result, bail};
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
+use std::sync::Arc;
 use std::time::Duration;
 
 /// DeepSeek API client
@@ -10,6 +12,11 @@ pub struct DeepSeekClient {
     api_key: String,
     model: String,
     client: reqwest::Client,
+    thinking_enabled: bool,
+    reasoning_effort: Option<String>,
+    max_tokens: u32,
+    temperature: f32,
+    thinking_state: Option<Arc<ThinkingStateManager>>,
 }
 
 #[derive(Debug, Serialize)]
@@ -20,13 +27,31 @@ struct ChatCompletionRequest {
     max_tokens: Option<u32>,
     #[serde(skip_serializing_if = "Option::is_none")]
     temperature: Option<f32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    top_p: Option<f32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    presence_penalty: Option<f32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    frequency_penalty: Option<f32>,
     stream: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    thinking: Option<ThinkingConfig>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    reasoning_effort: Option<String>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize)]
+struct ThinkingConfig {
+    #[serde(rename = "type")]
+    thinking_type: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct Message {
     role: String,
     content: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    reasoning_content: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -37,6 +62,31 @@ struct ChatCompletionResponse {
 #[derive(Debug, Deserialize)]
 struct Choice {
     message: Message,
+    #[serde(default)]
+    reasoning_content: Option<String>,
+}
+
+// --- Streaming response structures ---
+
+#[derive(Debug, Deserialize)]
+struct StreamChunk {
+    choices: Vec<StreamChoice>,
+}
+
+#[derive(Debug, Deserialize)]
+struct StreamChoice {
+    delta: StreamDelta,
+    #[serde(default)]
+    finish_reason: Option<String>,
+    index: Option<u32>,
+}
+
+#[derive(Debug, Deserialize, Default)]
+struct StreamDelta {
+    #[serde(default)]
+    content: Option<String>,
+    #[serde(default)]
+    reasoning_content: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -52,41 +102,73 @@ struct ApiError {
 }
 
 impl DeepSeekClient {
-    /// Create new DeepSeek client
     pub fn new(api_key: &str, model: &str) -> Result<Self> {
-        let client = create_http_client(Duration::from_secs(60))?;
+        let client = create_http_client(Duration::from_secs(300))?;
 
         Ok(Self {
-            base_url: "https://api.deepseek.com/v1".to_string(),
+            base_url: "https://api.deepseek.com".to_string(),
             api_key: api_key.to_string(),
             model: model.to_string(),
             client,
+            thinking_enabled: false,
+            reasoning_effort: None,
+            max_tokens: 500,
+            temperature: 0.7,
+            thinking_state: None,
         })
     }
 
-    /// Create with custom base URL
     pub fn with_base_url(api_key: &str, model: &str, base_url: &str) -> Result<Self> {
-        let client = create_http_client(Duration::from_secs(60))?;
+        let client = create_http_client(Duration::from_secs(300))?;
 
         Ok(Self {
             base_url: base_url.trim_end_matches('/').to_string(),
             api_key: api_key.to_string(),
             model: model.to_string(),
             client,
+            thinking_enabled: false,
+            reasoning_effort: None,
+            max_tokens: 500,
+            temperature: 0.7,
+            thinking_state: None,
         })
     }
 
-    /// Set timeout
     pub fn with_timeout(mut self, timeout: Duration) -> Result<Self> {
         self.client = create_http_client(timeout)?;
         Ok(self)
     }
 
-    /// List available models
+    pub fn with_thinking(mut self, enabled: bool) -> Self {
+        self.thinking_enabled = enabled;
+        self
+    }
+
+    pub fn with_reasoning_effort(mut self, effort: Option<String>) -> Self {
+        self.reasoning_effort = effort;
+        self
+    }
+
+    pub fn with_max_tokens(mut self, max_tokens: u32) -> Self {
+        self.max_tokens = max_tokens;
+        self
+    }
+
+    pub fn with_temperature(mut self, temperature: f32) -> Self {
+        self.temperature = temperature;
+        self
+    }
+
+    pub fn with_thinking_state(mut self, state: Arc<ThinkingStateManager>) -> Self {
+        self.thinking_state = Some(state);
+        self
+    }
+
     pub async fn list_models(&self) -> Result<Vec<String>> {
         let url = format!("{}/models", self.base_url);
 
-        let response = self.client
+        let response = self
+            .client
             .get(&url)
             .header("Authorization", format!("Bearer {}", self.api_key))
             .send()
@@ -101,11 +183,11 @@ impl DeepSeekClient {
 
         #[derive(Deserialize)]
         struct ModelsResponse {
-            data: Vec<Model>,
+            data: Vec<ModelId>,
         }
 
         #[derive(Deserialize)]
-        struct Model {
+        struct ModelId {
             id: String,
         }
 
@@ -117,7 +199,6 @@ impl DeepSeekClient {
         Ok(result.data.into_iter().map(|m| m.id).collect())
     }
 
-    /// Validate API key
     pub async fn validate_key(&self) -> Result<bool> {
         match self.list_models().await {
             Ok(_) => Ok(true),
@@ -136,14 +217,13 @@ impl DeepSeekClient {
 #[async_trait]
 impl LlmProvider for DeepSeekClient {
     async fn generate(&self, prompt: &str) -> Result<String> {
-        let messages = vec![
+        let messages = vec![Message {
-            Message {
             role: "user".to_string(),
             content: prompt.to_string(),
-            },
+            reasoning_content: None,
-        ];
+        }];
 
-        self.chat_completion(messages).await
+        self.chat_completion_with_retry(messages).await
     }
 
     async fn generate_with_system(&self, system: &str, user: &str) -> Result<String> {
@@ -153,15 +233,17 @@ impl LlmProvider for DeepSeekClient {
             messages.push(Message {
                 role: "system".to_string(),
                 content: system.to_string(),
+                reasoning_content: None,
             });
         }
 
         messages.push(Message {
             role: "user".to_string(),
             content: user.to_string(),
+            reasoning_content: None,
         });
 
-        self.chat_completion(messages).await
+        self.chat_completion_with_retry(messages).await
     }
 
     async fn is_available(&self) -> bool {
@@ -174,22 +256,102 @@ impl LlmProvider for DeepSeekClient {
 }
 
 impl DeepSeekClient {
+    async fn chat_completion_with_retry(&self, messages: Vec<Message>) -> Result<String> {
+        let mut last_error = None;
+
+        for attempt in 1..=3 {
+            match self.chat_completion(messages.clone()).await {
+                Ok(result) => return Ok(result),
+                Err(e) => {
+                    let err_msg = e.to_string();
+                    // 网络临时错误才重试
+                    let is_retryable = err_msg.contains("timeout")
+                        || err_msg.contains("connection")
+                        || err_msg.contains("temporary")
+                        || err_msg.contains("5")
+                            && (err_msg.contains("500")
+                                || err_msg.contains("502")
+                                || err_msg.contains("503")
+                                || err_msg.contains("504"));
+
+                    if !is_retryable || attempt == 3 {
+                        last_error = Some(e);
+                        break;
+                    }
+
+                    // 指数退避
+                    tokio::time::sleep(Duration::from_millis(500 * 2u64.pow(attempt - 1))).await;
+                }
+            }
+        }
+
+        Err(last_error.unwrap_or_else(|| anyhow::anyhow!("Request failed after retries")))
+    }
+
     async fn chat_completion(&self, messages: Vec<Message>) -> Result<String> {
         let url = format!("{}/chat/completions", self.base_url);
 
-        let request = ChatCompletionRequest {
+        let thinking = Some(ThinkingConfig {
-            model: self.model.clone(),
+            thinking_type: if self.thinking_enabled {
-            messages,
+                "enabled".to_string()
-            max_tokens: Some(500),
+            } else {
-            temperature: Some(0.7),
+                "disabled".to_string()
-            stream: false,
+            },
+        });
+
+        // 思考模式下，temperature/top_p 等参数不应传递
+        // 非思考模式下可以正常传递
+        let (temperature, max_tokens, top_p, presence_penalty, frequency_penalty) =
+            if self.thinking_enabled {
+                (None, Some(self.max_tokens), None, None, None)
+            } else {
+                (
+                    Some(self.temperature),
+                    Some(self.max_tokens),
+                    None,
+                    None,
+                    None,
+                )
             };
 
-        let response = self.client
+        let reasoning_effort = if self.thinking_enabled {
-            .post(&url)
+            self.reasoning_effort.clone()
+        } else {
+            None
+        };
+
+        let request = ChatCompletionRequest {
+            model: self.model.clone(),
+            messages: messages.clone(),
+            max_tokens,
+            temperature,
+            top_p,
+            presence_penalty,
+            frequency_penalty,
+            stream: self.thinking_enabled,
+            thinking,
+            reasoning_effort,
+        };
+
+        if self.thinking_enabled {
+            self.streaming_chat_completion(&url, &request).await
+        } else {
+            self.non_streaming_chat_completion(&url, &request).await
+        }
+    }
+
+    /// 非流式请求（非思考模式）
+    async fn non_streaming_chat_completion(
+        &self,
+        url: &str,
+        request: &ChatCompletionRequest,
+    ) -> Result<String> {
+        let response = self
+            .client
+            .post(url)
             .header("Authorization", format!("Bearer {}", self.api_key))
             .header("Content-Type", "application/json")
-            .json(&request)
+            .json(request)
             .send()
             .await
             .context("Failed to send request to DeepSeek")?;
@@ -199,9 +361,12 @@ impl DeepSeekClient {
         if !status.is_success() {
             let text = response.text().await.unwrap_or_default();
 
-            // Try to parse error
             if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
-                bail!("DeepSeek API error: {} ({})", error.error.message, error.error.error_type);
+                bail!(
+                    "DeepSeek API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
             }
 
             bail!("DeepSeek API error: {} - {}", status, text);
@@ -212,21 +377,170 @@ impl DeepSeekClient {
             .await
             .context("Failed to parse DeepSeek response")?;
 
-        result.choices
+        result
+            .choices
             .into_iter()
             .next()
             .map(|c| c.message.content.trim().to_string())
+            .filter(|s| !s.is_empty())
             .ok_or_else(|| anyhow::anyhow!("No response from DeepSeek"))
     }
+
+    /// 流式请求（思考模式），处理 reasoning_content 和 content
+    async fn streaming_chat_completion(
+        &self,
+        url: &str,
+        request: &ChatCompletionRequest,
+    ) -> Result<String> {
+        let response = self
+            .client
+            .post(url)
+            .header("Authorization", format!("Bearer {}", self.api_key))
+            .header("Content-Type", "application/json")
+            .header("Accept", "text/event-stream")
+            .json(request)
+            .send()
+            .await
+            .context("Failed to send streaming request to DeepSeek")?;
+
+        let status = response.status();
+
+        if !status.is_success() {
+            let text = response.text().await.unwrap_or_default();
+
+            if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
+                bail!(
+                    "DeepSeek API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
+            }
+
+            bail!("DeepSeek API error: {} - {}", status, text);
+        }
+
+        let mut content_buffer = String::new();
+        let mut has_reasoning = false;
+        let mut has_content = false;
+        let mut stream_ended = false;
+
+        let thinking_state = self.thinking_state.as_ref();
+
+        let mut byte_stream = response.bytes_stream();
+        let mut line_buffer = String::new();
+
+        use futures_util::StreamExt;
+
+        while let Some(chunk) = byte_stream.next().await {
+            let chunk = chunk.context("Failed to read streaming response chunk")?;
+            let chunk_str =
+                String::from_utf8(chunk.to_vec()).context("Invalid UTF-8 in stream chunk")?;
+
+            line_buffer.push_str(&chunk_str);
+
+            // 处理完整行
+            while let Some(line_end) = line_buffer.find('\n') {
+                let line = line_buffer[..line_end].trim().to_string();
+                line_buffer = line_buffer[line_end + 1..].to_string();
+
+                if line.is_empty() {
+                    continue;
+                }
+
+                // SSE 格式：data: {...} 或 data: [DONE]
+                if line == "data: [DONE]" {
+                    stream_ended = true;
+                    break;
+                }
+
+                if let Some(json_str) = line.strip_prefix("data: ") {
+                    match serde_json::from_str::<StreamChunk>(json_str) {
+                        Ok(chunk) => {
+                            for choice in &chunk.choices {
+                                // 处理 reasoning_content
+                                if let Some(ref reasoning) = choice.delta.reasoning_content
+                                    && !reasoning.is_empty()
+                                {
+                                    if !has_reasoning {
+                                        has_reasoning = true;
+                                        if let Some(state) = thinking_state {
+                                            state.start_thinking();
+                                        }
+                                    }
+                                    // reasoning_content 不对外输出，仅用于内部状态判断
+                                    continue;
+                                }
+
+                                // 处理 content
+                                if let Some(ref content) = choice.delta.content
+                                    && !content.is_empty()
+                                {
+                                    // reasoning 结束，content 开始出现时移除 thinking 标识
+                                    if has_reasoning
+                                        && !has_content
+                                        && let Some(state) = thinking_state
+                                    {
+                                        state.end_thinking();
+                                    }
+                                    has_content = true;
+                                    content_buffer.push_str(content);
+                                }
+
+                                // 检查 finish_reason
+                                if let Some(ref reason) = choice.finish_reason
+                                    && reason == "stop"
+                                {
+                                    stream_ended = true;
+                                }
+                            }
+                        }
+                        Err(_) => {
+                            // 忽略无法解析的行（可能是心跳或注释）
+                        }
+                    }
+                }
+            }
+
+            if stream_ended {
+                break;
+            }
+        }
+
+        // 确保思考状态已结束
+        if let Some(state) = thinking_state {
+            state.end_thinking();
+        }
+
+        let result = content_buffer.trim().to_string();
+
+        if result.is_empty() {
+            if has_reasoning && !has_content {
+                bail!(
+                    "DeepSeek returned reasoning content but no final answer. \
+                     The model may have entered an incomplete thinking state. \
+                     Please try again or disable thinking mode."
+                );
+            }
+            bail!(
+                "No response from DeepSeek. \
+                 If thinking mode is enabled, try disabling it or ensure the model supports it."
+            );
+        }
+
+        Ok(result)
+    }
 }
 
-/// Available DeepSeek models
+/// 可用 DeepSeek 模型列表
+/// deepseek-chat / deepseek-reasoner 将于 2026-07-24 停用，推荐使用 V4 系列
 pub const DEEPSEEK_MODELS: &[&str] = &[
+    "deepseek-v4-flash",
+    "deepseek-v4-pro",
+    // 兼容旧版模型 ID（将于 2026-07-24 停用）
     "deepseek-chat",
-    "deepseek-coder",
+    "deepseek-reasoner",
 ];
 
-/// Check if a model name is valid
 pub fn is_valid_model(model: &str) -> bool {
     DEEPSEEK_MODELS.contains(&model)
 }
@@ -236,8 +550,73 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_model_validation() {
+    fn test_model_validation_v4() {
+        assert!(is_valid_model("deepseek-v4-flash"));
+        assert!(is_valid_model("deepseek-v4-pro"));
         assert!(is_valid_model("deepseek-chat"));
+        assert!(is_valid_model("deepseek-reasoner"));
         assert!(!is_valid_model("invalid-model"));
+        assert!(!is_valid_model("deepseek-v3"));
+    }
+
+    #[test]
+    fn test_client_builder_defaults() {
+        let client = DeepSeekClient::new("test-key", "deepseek-v4-flash").unwrap();
+        assert!(!client.thinking_enabled);
+        assert_eq!(client.max_tokens, 500);
+        assert_eq!(client.temperature, 0.7);
+        assert!(client.reasoning_effort.is_none());
+        assert!(client.thinking_state.is_none());
+    }
+
+    #[test]
+    fn test_client_builder_with_thinking() {
+        let client = DeepSeekClient::new("test-key", "deepseek-v4-flash")
+            .unwrap()
+            .with_thinking(true)
+            .with_reasoning_effort(Some("high".to_string()))
+            .with_max_tokens(1000)
+            .with_temperature(0.5);
+
+        assert!(client.thinking_enabled);
+        assert_eq!(client.reasoning_effort, Some("high".to_string()));
+        assert_eq!(client.max_tokens, 1000);
+        assert_eq!(client.temperature, 0.5);
+    }
+
+    #[test]
+    fn test_thinking_config_serialization() {
+        let config = ThinkingConfig {
+            thinking_type: "enabled".to_string(),
+        };
+        let json = serde_json::to_string(&config).unwrap();
+        assert_eq!(json, r#"{"type":"enabled"}"#);
+    }
+
+    #[test]
+    fn test_message_serialization_without_reasoning() {
+        let msg = Message {
+            role: "user".to_string(),
+            content: "Hello".to_string(),
+            reasoning_content: None,
+        };
+        let json = serde_json::to_string(&msg).unwrap();
+        assert!(!json.contains("reasoning_content"));
+    }
+
+    #[test]
+    fn test_stream_delta_parsing() {
+        let json = r#"{"content":"Hello","reasoning_content":null}"#;
+        let delta: StreamDelta = serde_json::from_str(json).unwrap();
+        assert_eq!(delta.content, Some("Hello".to_string()));
+        assert!(delta.reasoning_content.is_none());
+    }
+
+    #[test]
+    fn test_stream_delta_reasoning_only() {
+        let json = r#"{"content":null,"reasoning_content":"Let me think..."}"#;
+        let delta: StreamDelta = serde_json::from_str(json).unwrap();
+        assert!(delta.content.is_none());
+        assert_eq!(delta.reasoning_content, Some("Let me think...".to_string()));
     }
 }

src/llm/kimi.rs

@@ -1,7 +1,9 @@
-use super::{create_http_client, LlmProvider};
+use super::thinking::ThinkingStateManager;
-use anyhow::{bail, Context, Result};
+use super::{LlmProvider, create_http_client};
+use anyhow::{Context, Result, bail};
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
+use std::sync::Arc;
 use std::time::Duration;
 
 /// Kimi API client (Moonshot AI)
@@ -10,6 +12,10 @@ pub struct KimiClient {
     api_key: String,
     model: String,
     client: reqwest::Client,
+    thinking_enabled: bool,
+    max_tokens: u32,
+    temperature: f32,
+    thinking_state: Option<Arc<ThinkingStateManager>>,
 }
 
 #[derive(Debug, Serialize)]
@@ -21,12 +27,22 @@ struct ChatCompletionRequest {
     #[serde(skip_serializing_if = "Option::is_none")]
     temperature: Option<f32>,
     stream: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    thinking: Option<ThinkingConfig>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize)]
+struct ThinkingConfig {
+    #[serde(rename = "type")]
+    thinking_type: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
 struct Message {
     role: String,
     content: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    reasoning_content: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -37,6 +53,31 @@ struct ChatCompletionResponse {
 #[derive(Debug, Deserialize)]
 struct Choice {
     message: Message,
+    #[serde(default)]
+    reasoning_content: Option<String>,
+}
+
+// --- Streaming response structures ---
+
+#[derive(Debug, Deserialize)]
+struct StreamChunk {
+    choices: Vec<StreamChoice>,
+}
+
+#[derive(Debug, Deserialize)]
+struct StreamChoice {
+    delta: StreamDelta,
+    #[serde(default)]
+    finish_reason: Option<String>,
+    index: Option<u32>,
+}
+
+#[derive(Debug, Deserialize, Default)]
+struct StreamDelta {
+    #[serde(default)]
+    content: Option<String>,
+    #[serde(default)]
+    reasoning_content: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -52,41 +93,66 @@ struct ApiError {
 }
 
 impl KimiClient {
-    /// Create new Kimi client
     pub fn new(api_key: &str, model: &str) -> Result<Self> {
-        let client = create_http_client(Duration::from_secs(60))?;
+        let client = create_http_client(Duration::from_secs(300))?;
 
         Ok(Self {
             base_url: "https://api.moonshot.cn/v1".to_string(),
             api_key: api_key.to_string(),
             model: model.to_string(),
             client,
+            thinking_enabled: false,
+            max_tokens: 500,
+            temperature: 1.0,
+            thinking_state: None,
         })
     }
 
-    /// Create with custom base URL
     pub fn with_base_url(api_key: &str, model: &str, base_url: &str) -> Result<Self> {
-        let client = create_http_client(Duration::from_secs(60))?;
+        let client = create_http_client(Duration::from_secs(300))?;
 
         Ok(Self {
             base_url: base_url.trim_end_matches('/').to_string(),
             api_key: api_key.to_string(),
             model: model.to_string(),
             client,
+            thinking_enabled: false,
+            max_tokens: 500,
+            temperature: 1.0,
+            thinking_state: None,
         })
     }
 
-    /// Set timeout
     pub fn with_timeout(mut self, timeout: Duration) -> Result<Self> {
         self.client = create_http_client(timeout)?;
         Ok(self)
     }
 
-    /// List available models
+    pub fn with_thinking(mut self, enabled: bool) -> Self {
+        self.thinking_enabled = enabled;
+        self
+    }
+
+    pub fn with_max_tokens(mut self, max_tokens: u32) -> Self {
+        self.max_tokens = max_tokens;
+        self
+    }
+
+    pub fn with_temperature(mut self, temperature: f32) -> Self {
+        self.temperature = temperature;
+        self
+    }
+
+    pub fn with_thinking_state(mut self, state: Arc<ThinkingStateManager>) -> Self {
+        self.thinking_state = Some(state);
+        self
+    }
+
     pub async fn list_models(&self) -> Result<Vec<String>> {
         let url = format!("{}/models", self.base_url);
 
-        let response = self.client
+        let response = self
+            .client
             .get(&url)
             .header("Authorization", format!("Bearer {}", self.api_key))
             .send()
@@ -101,11 +167,11 @@ impl KimiClient {
 
         #[derive(Deserialize)]
         struct ModelsResponse {
-            data: Vec<Model>,
+            data: Vec<ModelId>,
         }
 
         #[derive(Deserialize)]
-        struct Model {
+        struct ModelId {
             id: String,
         }
 
@@ -117,7 +183,6 @@ impl KimiClient {
         Ok(result.data.into_iter().map(|m| m.id).collect())
     }
 
-    /// Validate API key
     pub async fn validate_key(&self) -> Result<bool> {
         match self.list_models().await {
             Ok(_) => Ok(true),
@@ -136,14 +201,13 @@ impl KimiClient {
 #[async_trait]
 impl LlmProvider for KimiClient {
     async fn generate(&self, prompt: &str) -> Result<String> {
-        let messages = vec![
+        let messages = vec![Message {
-            Message {
             role: "user".to_string(),
             content: prompt.to_string(),
-            },
+            reasoning_content: None,
-        ];
+        }];
 
-        self.chat_completion(messages).await
+        self.chat_completion_with_retry(messages).await
     }
 
     async fn generate_with_system(&self, system: &str, user: &str) -> Result<String> {
@@ -153,15 +217,17 @@ impl LlmProvider for KimiClient {
             messages.push(Message {
                 role: "system".to_string(),
                 content: system.to_string(),
+                reasoning_content: None,
             });
         }
 
         messages.push(Message {
             role: "user".to_string(),
             content: user.to_string(),
+            reasoning_content: None,
         });
 
-        self.chat_completion(messages).await
+        self.chat_completion_with_retry(messages).await
     }
 
     async fn is_available(&self) -> bool {
@@ -174,22 +240,84 @@ impl LlmProvider for KimiClient {
 }
 
 impl KimiClient {
+    async fn chat_completion_with_retry(&self, messages: Vec<Message>) -> Result<String> {
+        let mut last_error = None;
+
+        for attempt in 1..=3 {
+            match self.chat_completion(messages.clone()).await {
+                Ok(result) => return Ok(result),
+                Err(e) => {
+                    let err_msg = e.to_string();
+                    let is_retryable = err_msg.contains("timeout")
+                        || err_msg.contains("connection")
+                        || err_msg.contains("temporary")
+                        || err_msg.contains("5")
+                            && (err_msg.contains("500")
+                                || err_msg.contains("502")
+                                || err_msg.contains("503")
+                                || err_msg.contains("504"));
+
+                    if !is_retryable || attempt == 3 {
+                        last_error = Some(e);
+                        break;
+                    }
+
+                    tokio::time::sleep(Duration::from_millis(500 * 2u64.pow(attempt - 1))).await;
+                }
+            }
+        }
+
+        Err(last_error.unwrap_or_else(|| anyhow::anyhow!("Request failed after retries")))
+    }
+
     async fn chat_completion(&self, messages: Vec<Message>) -> Result<String> {
         let url = format!("{}/chat/completions", self.base_url);
 
-        let request = ChatCompletionRequest {
+        let thinking = Some(ThinkingConfig {
-            model: self.model.clone(),
+            thinking_type: if self.thinking_enabled {
-            messages,
+                "enabled".to_string()
-            max_tokens: Some(500),
+            } else {
-            temperature: Some(0.7),
+                "disabled".to_string()
-            stream: false,
+            },
+        });
+
+        // Kimi API temperature 要求:
+        // - 思考模式: temperature 必须为 1.0
+        // - 非思考模式: temperature 必须为 0.6
+        let temperature = if self.thinking_enabled {
+            Some(1.0)
+        } else {
+            Some(0.6)
         };
 
-        let response = self.client
+        let request = ChatCompletionRequest {
-            .post(&url)
+            model: self.model.clone(),
+            messages: messages.clone(),
+            max_tokens: Some(self.max_tokens),
+            temperature,
+            stream: self.thinking_enabled,
+            thinking,
+        };
+
+        if self.thinking_enabled {
+            self.streaming_chat_completion(&url, &request).await
+        } else {
+            self.non_streaming_chat_completion(&url, &request).await
+        }
+    }
+
+    /// 非流式请求（非思考模式）
+    async fn non_streaming_chat_completion(
+        &self,
+        url: &str,
+        request: &ChatCompletionRequest,
+    ) -> Result<String> {
+        let response = self
+            .client
+            .post(url)
             .header("Authorization", format!("Bearer {}", self.api_key))
             .header("Content-Type", "application/json")
-            .json(&request)
+            .json(request)
             .send()
             .await
             .context("Failed to send request to Kimi")?;
@@ -199,9 +327,12 @@ impl KimiClient {
         if !status.is_success() {
             let text = response.text().await.unwrap_or_default();
 
-            // Try to parse error
             if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
-                bail!("Kimi API error: {} ({})", error.error.message, error.error.error_type);
+                bail!(
+                    "Kimi API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
             }
 
             bail!("Kimi API error: {} - {}", status, text);
@@ -212,22 +343,178 @@ impl KimiClient {
             .await
             .context("Failed to parse Kimi response")?;
 
-        result.choices
+        result
+            .choices
             .into_iter()
             .next()
-            .map(|c| c.message.content.trim().to_string())
+            .map(|c| {
+                let content = c.message.content.trim().to_string();
+                if content.is_empty() {
+                    c.reasoning_content
+                        .or(c.message.reasoning_content)
+                        .map(|r| r.trim().to_string())
+                        .unwrap_or_default()
+                } else {
+                    content
+                }
+            })
+            .filter(|s| !s.is_empty())
             .ok_or_else(|| anyhow::anyhow!("No response from Kimi"))
     }
+
+    /// 流式请求（思考模式），处理 reasoning_content 和 content
+    async fn streaming_chat_completion(
+        &self,
+        url: &str,
+        request: &ChatCompletionRequest,
+    ) -> Result<String> {
+        let response = self
+            .client
+            .post(url)
+            .header("Authorization", format!("Bearer {}", self.api_key))
+            .header("Content-Type", "application/json")
+            .header("Accept", "text/event-stream")
+            .json(request)
+            .send()
+            .await
+            .context("Failed to send streaming request to Kimi")?;
+
+        let status = response.status();
+
+        if !status.is_success() {
+            let text = response.text().await.unwrap_or_default();
+
+            if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
+                bail!(
+                    "Kimi API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
+            }
+
+            bail!("Kimi API error: {} - {}", status, text);
+        }
+
+        let mut content_buffer = String::new();
+        let mut has_reasoning = false;
+        let mut has_content = false;
+        let mut stream_ended = false;
+
+        let thinking_state = self.thinking_state.as_ref();
+
+        let mut byte_stream = response.bytes_stream();
+        let mut line_buffer = String::new();
+
+        use futures_util::StreamExt;
+
+        while let Some(chunk) = byte_stream.next().await {
+            let chunk = chunk.context("Failed to read streaming response chunk")?;
+            let chunk_str =
+                String::from_utf8(chunk.to_vec()).context("Invalid UTF-8 in stream chunk")?;
+
+            line_buffer.push_str(&chunk_str);
+
+            while let Some(line_end) = line_buffer.find('\n') {
+                let line = line_buffer[..line_end].trim().to_string();
+                line_buffer = line_buffer[line_end + 1..].to_string();
+
+                if line.is_empty() {
+                    continue;
+                }
+
+                if line == "data: [DONE]" {
+                    stream_ended = true;
+                    break;
+                }
+
+                if let Some(json_str) = line.strip_prefix("data: ") {
+                    match serde_json::from_str::<StreamChunk>(json_str) {
+                        Ok(chunk) => {
+                            for choice in &chunk.choices {
+                                if let Some(ref reasoning) = choice.delta.reasoning_content
+                                    && !reasoning.is_empty()
+                                {
+                                    if !has_reasoning {
+                                        has_reasoning = true;
+                                        if let Some(state) = thinking_state {
+                                            state.start_thinking();
+                                        }
+                                    }
+                                    continue;
+                                }
+
+                                if let Some(ref content) = choice.delta.content
+                                    && !content.is_empty()
+                                {
+                                    if has_reasoning
+                                        && !has_content
+                                        && let Some(state) = thinking_state
+                                    {
+                                        state.end_thinking();
+                                    }
+                                    has_content = true;
+                                    content_buffer.push_str(content);
+                                }
+
+                                if let Some(ref reason) = choice.finish_reason
+                                    && reason == "stop"
+                                {
+                                    stream_ended = true;
+                                }
+                            }
+                        }
+                        Err(_) => {
+                            // 忽略无法解析的行
+                        }
+                    }
+                }
+            }
+
+            if stream_ended {
+                break;
+            }
+        }
+
+        // 确保思考状态已结束
+        if let Some(state) = thinking_state {
+            state.end_thinking();
+        }
+
+        let result = content_buffer.trim().to_string();
+
+        if result.is_empty() {
+            if has_reasoning && !has_content {
+                bail!(
+                    "Kimi returned reasoning content but no final answer. \
+                     The model may have entered an incomplete thinking state. \
+                     Please try again or disable thinking mode."
+                );
+            }
+            bail!(
+                "No response from Kimi. \
+                 If thinking mode is enabled, try disabling it or ensure the model supports it."
+            );
+        }
+
+        Ok(result)
+    }
 }
 
-/// Available Kimi models
+/// 可用 Kimi 模型列表
 pub const KIMI_MODELS: &[&str] = &[
+    // K2 系列（推荐）
+    "kimi-k2.6",
+    "kimi-k2.5",
+    "kimi-k2-thinking",
+    "kimi-k2-thinking-turbo",
+    "kimi-k2-instruct",
+    "kimi-k2-instruct-0905",
+    // 兼容旧版模型 ID
     "moonshot-v1-8k",
     "moonshot-v1-32k",
     "moonshot-v1-128k",
 ];
 
-/// Check if a model name is valid
 pub fn is_valid_model(model: &str) -> bool {
     KIMI_MODELS.contains(&model)
 }
@@ -237,8 +524,64 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_model_validation() {
+    fn test_model_validation_k2() {
+        assert!(is_valid_model("kimi-k2.6"));
+        assert!(is_valid_model("kimi-k2.5"));
+        assert!(is_valid_model("kimi-k2-thinking"));
+        assert!(is_valid_model("kimi-k2-thinking-turbo"));
         assert!(is_valid_model("moonshot-v1-8k"));
+        assert!(is_valid_model("moonshot-v1-32k"));
+        assert!(is_valid_model("moonshot-v1-128k"));
         assert!(!is_valid_model("invalid-model"));
+        assert!(!is_valid_model("kimi-k1.5"));
+    }
+
+    #[test]
+    fn test_client_builder_defaults() {
+        let client = KimiClient::new("test-key", "kimi-k2.6").unwrap();
+        assert!(!client.thinking_enabled);
+        assert_eq!(client.max_tokens, 500);
+        assert_eq!(client.temperature, 1.0);
+        assert!(client.thinking_state.is_none());
+    }
+
+    #[test]
+    fn test_client_builder_with_thinking() {
+        let client = KimiClient::new("test-key", "kimi-k2.6")
+            .unwrap()
+            .with_thinking(true)
+            .with_max_tokens(1000)
+            .with_temperature(0.5);
+
+        assert!(client.thinking_enabled);
+        assert_eq!(client.max_tokens, 1000);
+        assert_eq!(client.temperature, 0.5);
+    }
+
+    #[test]
+    fn test_thinking_config_serialization() {
+        let config = ThinkingConfig {
+            thinking_type: "enabled".to_string(),
+        };
+        let json = serde_json::to_string(&config).unwrap();
+        assert_eq!(json, r#"{"type":"enabled"}"#);
+    }
+
+    #[test]
+    fn test_client_new_defaults() {
+        let client = KimiClient::new("test-key", "kimi-k2.6").unwrap();
+        assert_eq!(client.name(), "kimi");
+        assert!(!client.thinking_enabled);
+    }
+
+    #[test]
+    fn test_message_serialization() {
+        let msg = Message {
+            role: "user".to_string(),
+            content: "Hello".to_string(),
+            reasoning_content: None,
+        };
+        let json = serde_json::to_string(&msg).unwrap();
+        assert!(!json.contains("reasoning_content"));
     }
 }

src/llm/mod.rs

@@ -1,20 +1,21 @@
-use anyhow::{bail, Context, Result};
+use crate::config::Language;
+use anyhow::{Context, Result, bail};
 use async_trait::async_trait;
 use std::time::Duration;
-use crate::config::Language;
 
+pub mod anthropic;
+pub mod deepseek;
+pub mod kimi;
 pub mod ollama;
 pub mod openai;
-pub mod anthropic;
-pub mod kimi;
-pub mod deepseek;
 pub mod openrouter;
+pub mod thinking;
 
+pub use anthropic::AnthropicClient;
+pub use deepseek::DeepSeekClient;
+pub use kimi::KimiClient;
 pub use ollama::OllamaClient;
 pub use openai::OpenAiClient;
-pub use anthropic::AnthropicClient;
-pub use kimi::KimiClient;
-pub use deepseek::DeepSeekClient;
 pub use openrouter::OpenRouterClient;
 
 /// LLM provider trait
@@ -44,6 +45,7 @@ pub struct LlmClientConfig {
     pub max_tokens: u32,
     pub temperature: f32,
     pub timeout: Duration,
+    pub thinking_enabled: bool,
 }
 
 impl Default for LlmClientConfig {
@@ -52,6 +54,7 @@ impl Default for LlmClientConfig {
             max_tokens: 500,
             temperature: 0.7,
             timeout: Duration::from_secs(30),
+            thinking_enabled: false,
         }
     }
 }
@@ -59,11 +62,20 @@ impl Default for LlmClientConfig {
 impl LlmClient {
     /// Create LLM client from configuration manager
     pub async fn from_config(manager: &crate::config::manager::ConfigManager) -> Result<Self> {
+        Self::from_config_with_think(manager, manager.config().llm.thinking_enabled).await
+    }
+
+    /// Create LLM client from configuration with explicit thinking override
+    pub async fn from_config_with_think(
+        manager: &crate::config::manager::ConfigManager,
+        thinking_enabled: bool,
+    ) -> Result<Self> {
         let config = manager.config();
         let client_config = LlmClientConfig {
             max_tokens: config.llm.max_tokens,
             temperature: config.llm.temperature,
             timeout: Duration::from_secs(config.llm.timeout),
+            thinking_enabled,
         };
 
         let provider = config.llm.provider.as_str();
@@ -72,33 +84,99 @@ impl LlmClient {
         let api_key = manager.get_api_key();
 
         let provider: Box<dyn LlmProvider> = match provider {
-            "ollama" => {
+            "ollama" => Box::new(
-                Box::new(OllamaClient::new(&base_url, model))
+                OllamaClient::new(&base_url, model)
-            }
+                    .with_max_tokens(client_config.max_tokens)
+                    .with_temperature(client_config.temperature),
+            ),
             "openai" => {
-                let key = api_key.as_ref()
+                let key = api_key
+                    .as_ref()
                     .ok_or_else(|| anyhow::anyhow!("OpenAI API key not configured"))?;
-                Box::new(OpenAiClient::new(&base_url, key, model)?)
+                let thinking_state = if thinking_enabled {
+                    Some(thinking::create_console_thinking_state())
+                } else {
+                    None
+                };
+                let mut client = OpenAiClient::new(&base_url, key, model)?
+                    .with_thinking(thinking_enabled)
+                    .with_max_tokens(client_config.max_tokens)
+                    .with_temperature(client_config.temperature)
+                    .with_timeout(client_config.timeout)?;
+                if let Some(state) = thinking_state {
+                    client = client.with_thinking_state(state);
+                }
+                Box::new(client)
             }
             "anthropic" => {
-                let key = api_key.as_ref()
+                let key = api_key
+                    .as_ref()
                     .ok_or_else(|| anyhow::anyhow!("Anthropic API key not configured"))?;
-                Box::new(AnthropicClient::new(key, model)?)
+                let thinking_state = if thinking_enabled {
+                    Some(thinking::create_console_thinking_state())
+                } else {
+                    None
+                };
+                let budget = config.llm.thinking_budget_tokens.unwrap_or(1024);
+                let mut client = AnthropicClient::new(key, model)?
+                    .with_thinking(thinking_enabled)
+                    .with_thinking_budget_tokens(budget)
+                    .with_max_tokens(client_config.max_tokens)
+                    .with_temperature(client_config.temperature)
+                    .with_timeout(client_config.timeout)?;
+                if let Some(state) = thinking_state {
+                    client = client.with_thinking_state(state);
+                }
+                Box::new(client)
             }
             "kimi" => {
-                let key = api_key.as_ref()
+                let key = api_key
+                    .as_ref()
                     .ok_or_else(|| anyhow::anyhow!("Kimi API key not configured"))?;
-                Box::new(KimiClient::with_base_url(key, model, &base_url)?)
+                let thinking_state = if thinking_enabled {
+                    Some(thinking::create_console_thinking_state())
+                } else {
+                    None
+                };
+                let mut client = KimiClient::with_base_url(key, model, &base_url)?
+                    .with_thinking(thinking_enabled)
+                    .with_max_tokens(client_config.max_tokens)
+                    .with_temperature(client_config.temperature)
+                    .with_timeout(client_config.timeout)?;
+                if let Some(state) = thinking_state {
+                    client = client.with_thinking_state(state);
+                }
+                Box::new(client)
             }
             "deepseek" => {
-                let key = api_key.as_ref()
+                let key = api_key
+                    .as_ref()
                     .ok_or_else(|| anyhow::anyhow!("DeepSeek API key not configured"))?;
-                Box::new(DeepSeekClient::with_base_url(key, model, &base_url)?)
+                let thinking_state = if thinking_enabled {
+                    Some(thinking::create_console_thinking_state())
+                } else {
+                    None
+                };
+                let mut client = DeepSeekClient::with_base_url(key, model, &base_url)?
+                    .with_thinking(thinking_enabled)
+                    .with_max_tokens(client_config.max_tokens)
+                    .with_temperature(client_config.temperature)
+                    .with_timeout(client_config.timeout)?;
+                if let Some(state) = thinking_state {
+                    client = client.with_thinking_state(state);
+                }
+                Box::new(client)
             }
             "openrouter" => {
-                let key = api_key.as_ref()
+                let key = api_key
+                    .as_ref()
                     .ok_or_else(|| anyhow::anyhow!("OpenRouter API key not configured"))?;
-                Box::new(OpenRouterClient::with_base_url(key, model, &base_url)?)
+                Box::new(
+                    OpenRouterClient::with_base_url(key, model, &base_url)?
+                        .with_max_tokens(client_config.max_tokens)
+                        .with_temperature(client_config.temperature)
+                        .with_timeout(client_config.timeout)?,
+                )
             }
             _ => bail!("Unknown LLM provider: {}", provider),
         };
@@ -138,7 +216,10 @@ impl LlmClient {
         };
 
         let prompt = format!("{}{}", diff, language_instruction);
-        let response = self.provider.generate_with_system(system_prompt, &prompt).await?;
+        let response = self
+            .provider
+            .generate_with_system(system_prompt, &prompt)
+            .await?;
 
         self.parse_commit_response(&response, format)
     }
@@ -164,9 +245,14 @@ impl LlmClient {
             Language::English => "",
         };
 
-        let prompt = format!("Version: {}\n\nCommits:\n{}{}", version, commits_text, language_instruction);
+        let prompt = format!(
+            "Version: {}\n\nCommits:\n{}{}",
+            version, commits_text, language_instruction
+        );
 
-        self.provider.generate_with_system(system_prompt, &prompt).await
+        self.provider
+            .generate_with_system(system_prompt, &prompt)
+            .await
     }
 
     /// Generate changelog entry
@@ -195,9 +281,14 @@ impl LlmClient {
             Language::English => "",
         };
 
-        let prompt = format!("Version: {}\n\nCommits:\n{}{}", version, commits_text, language_instruction);
+        let prompt = format!(
+            "Version: {}\n\nCommits:\n{}{}",
+            version, commits_text, language_instruction
+        );
 
-        self.provider.generate_with_system(system_prompt, &prompt).await
+        self.provider
+            .generate_with_system(system_prompt, &prompt)
+            .await
     }
 
     /// Check if provider is available
@@ -206,35 +297,115 @@ impl LlmClient {
     }
 
     /// Parse commit response from LLM
-    fn parse_commit_response(&self, response: &str, format: crate::config::CommitFormat) -> Result<GeneratedCommit> {
+    fn parse_commit_response(
-        let lines: Vec<&str> = response.lines().collect();
+        &self,
+        response: &str,
+        format: crate::config::CommitFormat,
+    ) -> Result<GeneratedCommit> {
+        // Clean markdown code fences from the response
+        let cleaned = Self::strip_code_fences(response);
+
+        let lines: Vec<&str> = cleaned
+            .lines()
+            .map(|l| l.trim())
+            .filter(|l| !l.is_empty())
+            .collect();
 
         if lines.is_empty() {
-            bail!("Empty response from LLM");
+            let preview: String = response.chars().take(200).collect();
+            bail!(
+                "LLM returned empty or whitespace-only response. \
+                 Raw response preview: '{}'. \
+                 Hint: If using DeepSeek/Kimi with thinking enabled, \
+                 the model may have returned reasoning_content only. \
+                 Try disabling thinking mode or switching models.",
+                preview
+            );
         }
 
-        let first_line = lines[0];
+        // Find the line most likely to be the commit subject
+        let first_line = Self::find_commit_subject_line(&lines, format);
 
         // Parse based on format
         match format {
             crate::config::CommitFormat::Conventional => {
-                self.parse_conventional_commit(first_line, lines)
+                self.parse_conventional_commit(first_line, &lines, response)
             }
             crate::config::CommitFormat::Commitlint => {
-                self.parse_commitlint_commit(first_line, lines)
+                self.parse_commitlint_commit(first_line, &lines, response)
             }
         }
     }
 
+    /// Remove surrounding markdown code fences (```) from LLM output
+    fn strip_code_fences(response: &str) -> String {
+        let mut lines: Vec<&str> = response.lines().collect();
+
+        // Strip leading fence lines (``` or ```lang)
+        while lines.first().map_or(false, |l| l.trim().starts_with("```")) {
+            lines.remove(0);
+        }
+
+        // Strip trailing fence lines
+        while lines.last().map_or(false, |l| l.trim() == "```") {
+            lines.pop();
+        }
+
+        lines.join("\n")
+    }
+
+    /// Find the line that is most likely the commit subject among extracted lines
+    fn find_commit_subject_line<'a>(
+        lines: &[&'a str],
+        format: crate::config::CommitFormat,
+    ) -> &'a str {
+        let valid_types = crate::utils::validators::get_commit_types(matches!(
+            format,
+            crate::config::CommitFormat::Commitlint
+        ));
+
+        // First pass: line starting with a known type that also has proper syntax
+        // (e.g. "type:", "type(scope):", "type!:")
+        for &line in lines {
+            let trimmed = line.trim();
+            for &t in valid_types {
+                if let Some(rest) = trimmed.strip_prefix(t) {
+                    if rest.starts_with(':') || rest.starts_with('(') || rest.starts_with("!:") {
+                        return trimmed;
+                    }
+                }
+            }
+        }
+
+        // Second pass: any line containing a colon (generic "prefix: description")
+        for &line in lines {
+            if line.contains(':') {
+                return line.trim();
+            }
+        }
+
+        // Fallback: return the first line as-is
+        lines[0].trim()
+    }
+
     fn parse_conventional_commit(
         &self,
         first_line: &str,
-        lines: Vec<&str>,
+        lines: &[&str],
+        raw_response: &str,
     ) -> Result<GeneratedCommit> {
         // Parse: type(scope)!: description
         let parts: Vec<&str> = first_line.splitn(2, ':').collect();
         if parts.len() != 2 {
-            bail!("Invalid conventional commit format: missing colon");
+            let preview: String = raw_response.chars().take(300).collect();
+            bail!(
+                "Invalid conventional commit format: missing colon.\n\
+                 Parsed subject line: '{}'\n\
+                 Raw response preview: '{}'\n\
+                 Expected: <type>[optional scope]: <description>",
+                first_line,
+                preview
+            );
         }
 
         let type_part = parts[0];
@@ -257,7 +428,7 @@ impl LlmClient {
         };
 
         // Extract body and footer
-        let (body, footer) = self.extract_body_footer(&lines);
+        let (body, footer) = self.extract_body_footer(lines);
 
         Ok(GeneratedCommit {
             commit_type,
@@ -272,12 +443,21 @@ impl LlmClient {
     fn parse_commitlint_commit(
         &self,
         first_line: &str,
-        lines: Vec<&str>,
+        lines: &[&str],
+        raw_response: &str,
     ) -> Result<GeneratedCommit> {
         // Similar parsing but with commitlint rules
         let parts: Vec<&str> = first_line.splitn(2, ':').collect();
         if parts.len() != 2 {
-            bail!("Invalid commit format: missing colon");
+            let preview: String = raw_response.chars().take(300).collect();
+            bail!(
+                "Invalid commit format: missing colon.\n\
+                 Parsed subject line: '{}'\n\
+                 Raw response preview: '{}'\n\
+                 Expected: <type>[optional scope]: <subject>",
+                first_line,
+                preview
+            );
         }
 
         let type_part = parts[0];
@@ -323,7 +503,13 @@ impl LlmClient {
         }
 
         // Look for footer markers
-        let footer_markers = ["BREAKING CHANGE:", "Closes", "Fixes", "Refs", "Co-authored-by:"];
+        let footer_markers = [
+            "BREAKING CHANGE:",
+            "Closes",
+            "Fixes",
+            "Refs",
+            "Co-authored-by:",
+        ];
 
         let mut body_lines = vec![];
         let mut footer_lines = vec![];
@@ -403,17 +589,34 @@ pub(crate) fn create_http_client(timeout: Duration) -> Result<reqwest::Client> {
 }
 
 /// Get commit system prompt based on format and language
-fn get_commit_system_prompt(format: crate::config::CommitFormat, language: Language) -> &'static str {
+fn get_commit_system_prompt(
+    format: crate::config::CommitFormat,
+    language: Language,
+) -> &'static str {
     match (format, language) {
-        (crate::config::CommitFormat::Conventional, Language::Chinese) => CONVENTIONAL_COMMIT_SYSTEM_PROMPT_ZH,
+        (crate::config::CommitFormat::Conventional, Language::Chinese) => {
-        (crate::config::CommitFormat::Conventional, Language::Japanese) => CONVENTIONAL_COMMIT_SYSTEM_PROMPT_JA,
+            CONVENTIONAL_COMMIT_SYSTEM_PROMPT_ZH
-        (crate::config::CommitFormat::Conventional, Language::Korean) => CONVENTIONAL_COMMIT_SYSTEM_PROMPT_KO,
+        }
-        (crate::config::CommitFormat::Conventional, Language::Spanish) => CONVENTIONAL_COMMIT_SYSTEM_PROMPT_ES,
+        (crate::config::CommitFormat::Conventional, Language::Japanese) => {
-        (crate::config::CommitFormat::Conventional, Language::French) => CONVENTIONAL_COMMIT_SYSTEM_PROMPT_FR,
+            CONVENTIONAL_COMMIT_SYSTEM_PROMPT_JA
-        (crate::config::CommitFormat::Conventional, Language::German) => CONVENTIONAL_COMMIT_SYSTEM_PROMPT_DE,
+        }
+        (crate::config::CommitFormat::Conventional, Language::Korean) => {
+            CONVENTIONAL_COMMIT_SYSTEM_PROMPT_KO
+        }
+        (crate::config::CommitFormat::Conventional, Language::Spanish) => {
+            CONVENTIONAL_COMMIT_SYSTEM_PROMPT_ES
+        }
+        (crate::config::CommitFormat::Conventional, Language::French) => {
+            CONVENTIONAL_COMMIT_SYSTEM_PROMPT_FR
+        }
+        (crate::config::CommitFormat::Conventional, Language::German) => {
+            CONVENTIONAL_COMMIT_SYSTEM_PROMPT_DE
+        }
         (crate::config::CommitFormat::Conventional, _) => CONVENTIONAL_COMMIT_SYSTEM_PROMPT,
         (crate::config::CommitFormat::Commitlint, Language::Chinese) => COMMITLINT_SYSTEM_PROMPT_ZH,
-        (crate::config::CommitFormat::Commitlint, Language::Japanese) => COMMITLINT_SYSTEM_PROMPT_JA,
+        (crate::config::CommitFormat::Commitlint, Language::Japanese) => {
+            COMMITLINT_SYSTEM_PROMPT_JA
+        }
         (crate::config::CommitFormat::Commitlint, Language::Korean) => COMMITLINT_SYSTEM_PROMPT_KO,
         (crate::config::CommitFormat::Commitlint, Language::Spanish) => COMMITLINT_SYSTEM_PROMPT_ES,
         (crate::config::CommitFormat::Commitlint, Language::French) => COMMITLINT_SYSTEM_PROMPT_FR,
@@ -504,8 +707,7 @@ const CONVENTIONAL_COMMIT_SYSTEM_PROMPT_ZH: &str = r#"你是一个生成符合 C
 4. 不要大写首字母
 5. 结尾不要句号
 6. 如果更改特定于模块/组件，请包含作用域
-
+7. 仅输出提交消息，不要输出其他内容。
-仅输出提交消息，不要输出其他内容。
 "#;
 
 const CONVENTIONAL_COMMIT_SYSTEM_PROMPT_JA: &str = r#"あなたはConventional Commits仕様に従ったコミットメッセージを生成するアシスタントです。
@@ -534,8 +736,7 @@ const CONVENTIONAL_COMMIT_SYSTEM_PROMPT_JA: &str = r#"あなたはConventional C
 4. 先頭を大文字にしない
 5. 最後にピリオドを付けない
 6. 変更がモジュール/コンポーネントに固有の場合はスコープを含める
-
+7. コミットメッセージのみを出力し、それ以外は出力しないでください。
-コミットメッセージのみを出力し、それ以外は出力しないでください。
 "#;
 
 const CONVENTIONAL_COMMIT_SYSTEM_PROMPT_KO: &str = r#"당신은 Conventional Commits 사양에 따른 커밋 메시지를 생성하는 도우미입니다.
@@ -564,8 +765,7 @@ const CONVENTIONAL_COMMIT_SYSTEM_PROMPT_KO: &str = r#"당신은 Conventional Com
 4. 첫 글자 대문자화하지 않음
 5. 끝에 마침표 사용하지 않음
 6. 변경 사항이 모듈/구성 요소에 특정한 경우 범위 포함
-
+7. 커밋 메시지만 출력하고 다른 내용은 출력하지 마세요.
-커밋 메시지만 출력하고 다른 내용은 출력하지 마세요.
 "#;
 
 const CONVENTIONAL_COMMIT_SYSTEM_PROMPT_ES: &str = r#"Eres un asistente que genera mensajes de commit siguiendo la especificación Conventional Commits.
@@ -594,8 +794,7 @@ Reglas:
 4. No capitalices la primera letra
 5. Sin punto al final
 6. Incluye alcance si el cambio es específico de un módulo/componente
-
+7. Genera SOLO el mensaje de commit, nada más.
-Genera SOLO el mensaje de commit, nada más.
 "#;
 
 const CONVENTIONAL_COMMIT_SYSTEM_PROMPT_FR: &str = r#"Vous êtes un assistant qui génère des messages de commit suivant la spécification Conventional Commits.
@@ -624,8 +823,7 @@ Règles:
 4. Ne capitalisez pas la première lettre
 5. Pas de point à la fin
 6. Incluez la portée si le changement est spécifique à un module/composant
-
+7. Générez SEULEMENT le message de commit, rien d'autre.
-Générez SEULEMENT le message de commit, rien d'autre.
 "#;
 
 const CONVENTIONAL_COMMIT_SYSTEM_PROMPT_DE: &str = r#"Sie sind ein Assistent, der Commit-Nachrichten gemäß der Conventional Commits-Spezifikation generiert.
@@ -654,8 +852,7 @@ Regeln:
 4. Großschreiben Sie den ersten Buchstaben nicht
 5. Kein Punkt am Ende
 6. Fügen Sie einen Bereich ein, wenn die Änderung spezifisch für ein Modul/Komponente ist
-
+7. Geben Sie NUR die Commit-Nachricht aus, nichts anderes.
-Geben Sie NUR die Commit-Nachricht aus, nichts anderes.
 "#;
 
 const COMMITLINT_SYSTEM_PROMPT: &str = r#"You are a helpful assistant that generates commit messages following @commitlint/config-conventional.
@@ -672,8 +869,7 @@ Rules:
 3. Subject should be 4-100 characters
 4. Use imperative mood
 5. Be concise but descriptive
-
+6. Output ONLY the commit message, nothing else.
-Output ONLY the commit message, nothing else.
 "#;
 
 const COMMITLINT_SYSTEM_PROMPT_ZH: &str = r#"你是一个生成符合 @commitlint/config-conventional 规范的提交消息的助手。
@@ -690,8 +886,7 @@ const COMMITLINT_SYSTEM_PROMPT_ZH: &str = r#"你是一个生成符合 @commitlin
 3. 主题应为 4-100 个字符
 4. 使用祈使语气
 5. 简洁但描述性强
-
+6. 仅输出提交消息，不要输出其他额外内容。
-仅输出提交消息，不要输出其他内容。
 "#;
 
 const COMMITLINT_SYSTEM_PROMPT_JA: &str = r#"あなたは@commitlint/config-conventionalに従ったコミットメッセージを生成するアシスタントです。
@@ -708,8 +903,7 @@ git diffを分析し、コミットメッセージを生成してください。
 3. 件名は4-100文字である必要があります
 4. 命令形を使用してください
 5. 簡潔ですが説明的であること
-
+6. コミットメッセージのみを出力し、それ以外は出力しないでください。
-コミットメッセージのみを出力し、それ以外は出力しないでください。
 "#;
 
 const COMMITLINT_SYSTEM_PROMPT_KO: &str = r#"당신은 @commitlint/config-conventional에 따른 커밋 메시지를 생성하는 도우미입니다.
@@ -726,8 +920,7 @@ git diff를 분석하고 커밋 메시지를 생성하세요.
 3. 제목은 4-100자여야 합니다
 4. 명령형을 사용하세요
 5. 간결하지만 설명적이어야 합니다
-
+6. 커밋 메시지만 출력하고 다른 내용은 출력하지 마세요.
-커밋 메시지만 출력하고 다른 내용은 출력하지 마세요.
 "#;
 
 const COMMITLINT_SYSTEM_PROMPT_ES: &str = r#"Eres un asistente que genera mensajes de commit siguiendo @commitlint/config-conventional.
@@ -744,8 +937,7 @@ Reglas:
 3. El asunto debe tener 4-100 caracteres
 4. Usa modo imperativo
 5. Sé conciso pero descriptivo
-
+6. Genera SOLO el mensaje de commit, nada más.
-Genera SOLO el mensaje de commit, nada más.
 "#;
 
 const COMMITLINT_SYSTEM_PROMPT_FR: &str = r#"Vous êtes un assistant qui génère des messages de commit suivant @commitlint/config-conventional.
@@ -762,8 +954,7 @@ Règles:
 3. Le sujet doit avoir 4-100 caractères
 4. Utilisez le mode impératif
 5. Soyez concis mais descriptif
-
+6. Générez SEULEMENT le message de commit, rien d'autre.
-Générez SEULEMENT le message de commit, rien d'autre.
 "#;
 
 const COMMITLINT_SYSTEM_PROMPT_DE: &str = r#"Sie sind ein Assistent, der Commit-Nachrichten gemäß @commitlint/config-conventional generiert.
@@ -780,8 +971,7 @@ Regeln:
 3. Der Betreff sollte 4-100 Zeichen haben
 4. Verwenden Sie den Imperativ
 5. Seien Sie prägnant aber beschreibend
-
+6. Geben Sie NUR die Commit-Nachricht aus, nichts anderes.
-Geben Sie NUR die Commit-Nachricht aus, nichts anderes.
 "#;
 
 const TAG_MESSAGE_SYSTEM_PROMPT: &str = r#"You are a helpful assistant that generates git tag annotation messages.

src/llm/ollama.rs

@@ -1,4 +1,4 @@
-use super::{create_http_client, LlmProvider};
+use super::{LlmProvider, create_http_client};
 use anyhow::{Context, Result};
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
@@ -9,6 +9,9 @@ pub struct OllamaClient {
     base_url: String,
     model: String,
     client: reqwest::Client,
+    max_tokens: u32,
+    temperature: f32,
+    top_p: Option<f32>,
 }
 
 #[derive(Debug, Serialize)]
@@ -47,20 +50,37 @@ struct ModelInfo {
 impl OllamaClient {
     /// Create new Ollama client
     pub fn new(base_url: &str, model: &str) -> Self {
-        let client = create_http_client(Duration::from_secs(120))
+        let client =
-            .expect("Failed to create HTTP client");
+            create_http_client(Duration::from_secs(120)).expect("Failed to create HTTP client");
 
         Self {
             base_url: base_url.trim_end_matches('/').to_string(),
             model: model.to_string(),
             client,
+            max_tokens: 500,
+            temperature: 0.7,
+            top_p: None,
         }
     }
 
     /// Set timeout
     pub fn with_timeout(mut self, timeout: Duration) -> Self {
-        self.client = create_http_client(timeout)
+        self.client = create_http_client(timeout).expect("Failed to create HTTP client");
-            .expect("Failed to create HTTP client");
+        self
+    }
+
+    pub fn with_max_tokens(mut self, max_tokens: u32) -> Self {
+        self.max_tokens = max_tokens;
+        self
+    }
+
+    pub fn with_temperature(mut self, temperature: f32) -> Self {
+        self.temperature = temperature;
+        self
+    }
+
+    pub fn with_top_p(mut self, top_p: f32) -> Self {
+        self.top_p = Some(top_p);
         self
     }
 
@@ -68,7 +88,8 @@ impl OllamaClient {
     pub async fn list_models(&self) -> Result<Vec<String>> {
         let url = format!("{}/api/tags", self.base_url);
 
-        let response = self.client
+        let response = self
+            .client
             .get(&url)
             .send()
             .await
@@ -97,7 +118,8 @@ impl OllamaClient {
             "stream": false,
         });
 
-        let response = self.client
+        let response = self
+            .client
             .post(&url)
             .json(&request)
             .send()
@@ -143,12 +165,13 @@ impl LlmProvider for OllamaClient {
             system,
             stream: false,
             options: GenerationOptions {
-                temperature: Some(0.7),
+                temperature: Some(self.temperature),
-                num_predict: Some(500),
+                num_predict: Some(self.max_tokens),
             },
         };
 
-        let response = self.client
+        let response = self
+            .client
             .post(&url)
             .json(&request)
             .send()

src/llm/openai.rs

@@ -1,15 +1,23 @@
-use super::{create_http_client, LlmProvider};
+use super::thinking::ThinkingStateManager;
-use anyhow::{bail, Context, Result};
+use super::{LlmProvider, create_http_client};
+use anyhow::{Context, Result, bail};
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
+use std::sync::Arc;
 use std::time::Duration;
 
-/// OpenAI API client
+/// OpenAI API client with o-series reasoning support
 pub struct OpenAiClient {
     base_url: String,
     api_key: String,
     model: String,
     client: reqwest::Client,
+    thinking_enabled: bool,
+    reasoning_effort: Option<String>,
+    max_tokens: u32,
+    temperature: f32,
+    top_p: Option<f32>,
+    thinking_state: Option<Arc<ThinkingStateManager>>,
 }
 
 #[derive(Debug, Serialize)]
@@ -20,10 +28,14 @@ struct ChatCompletionRequest {
     max_tokens: Option<u32>,
     #[serde(skip_serializing_if = "Option::is_none")]
     temperature: Option<f32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    top_p: Option<f32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    reasoning_effort: Option<String>,
     stream: bool,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 struct Message {
     role: String,
     content: String,
@@ -39,6 +51,28 @@ struct Choice {
     message: Message,
 }
 
+// --- Streaming response structures ---
+
+#[derive(Debug, Deserialize)]
+struct StreamChunk {
+    choices: Vec<StreamChoice>,
+}
+
+#[derive(Debug, Deserialize)]
+struct StreamChoice {
+    delta: StreamDelta,
+    #[serde(default)]
+    finish_reason: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Default)]
+struct StreamDelta {
+    #[serde(default)]
+    content: Option<String>,
+    #[serde(default)]
+    reasoning_content: Option<String>,
+}
+
 #[derive(Debug, Deserialize)]
 struct ErrorResponse {
     error: ApiError,
@@ -61,20 +95,55 @@ impl OpenAiClient {
             api_key: api_key.to_string(),
             model: model.to_string(),
             client,
+            thinking_enabled: false,
+            reasoning_effort: None,
+            max_tokens: 500,
+            temperature: 0.7,
+            top_p: None,
+            thinking_state: None,
         })
     }
 
-    /// Set timeout
     pub fn with_timeout(mut self, timeout: Duration) -> Result<Self> {
         self.client = create_http_client(timeout)?;
         Ok(self)
     }
 
-    /// List available models
+    pub fn with_thinking(mut self, enabled: bool) -> Self {
+        self.thinking_enabled = enabled;
+        self
+    }
+
+    pub fn with_reasoning_effort(mut self, effort: Option<String>) -> Self {
+        self.reasoning_effort = effort;
+        self
+    }
+
+    pub fn with_max_tokens(mut self, max_tokens: u32) -> Self {
+        self.max_tokens = max_tokens;
+        self
+    }
+
+    pub fn with_temperature(mut self, temperature: f32) -> Self {
+        self.temperature = temperature;
+        self
+    }
+
+    pub fn with_top_p(mut self, top_p: f32) -> Self {
+        self.top_p = Some(top_p);
+        self
+    }
+
+    pub fn with_thinking_state(mut self, state: Arc<ThinkingStateManager>) -> Self {
+        self.thinking_state = Some(state);
+        self
+    }
+
     pub async fn list_models(&self) -> Result<Vec<String>> {
         let url = format!("{}/models", self.base_url);
 
-        let response = self.client
+        let response = self
+            .client
             .get(&url)
             .header("Authorization", format!("Bearer {}", self.api_key))
             .send()
@@ -105,7 +174,6 @@ impl OpenAiClient {
         Ok(result.data.into_iter().map(|m| m.id).collect())
     }
 
-    /// Validate API key
     pub async fn validate_key(&self) -> Result<bool> {
         match self.list_models().await {
             Ok(_) => Ok(true),
@@ -124,14 +192,12 @@ impl OpenAiClient {
 #[async_trait]
 impl LlmProvider for OpenAiClient {
     async fn generate(&self, prompt: &str) -> Result<String> {
-        let messages = vec![
+        let messages = vec![Message {
-            Message {
             role: "user".to_string(),
             content: prompt.to_string(),
-            },
+        }];
-        ];
 
-        self.chat_completion(messages).await
+        self.chat_completion_with_retry(messages).await
     }
 
     async fn generate_with_system(&self, system: &str, user: &str) -> Result<String> {
@@ -149,7 +215,7 @@ impl LlmProvider for OpenAiClient {
             content: user.to_string(),
         });
 
-        self.chat_completion(messages).await
+        self.chat_completion_with_retry(messages).await
     }
 
     async fn is_available(&self) -> bool {
@@ -162,18 +228,63 @@ impl LlmProvider for OpenAiClient {
 }
 
 impl OpenAiClient {
+    async fn chat_completion_with_retry(&self, messages: Vec<Message>) -> Result<String> {
+        let mut last_error = None;
+
+        for attempt in 1..=3 {
+            match self.chat_completion(messages.clone()).await {
+                Ok(result) => return Ok(result),
+                Err(e) => {
+                    let err_msg = e.to_string();
+                    let is_retryable = err_msg.contains("timeout")
+                        || err_msg.contains("connection")
+                        || err_msg.contains("temporary")
+                        || err_msg.contains("5")
+                            && (err_msg.contains("500")
+                                || err_msg.contains("502")
+                                || err_msg.contains("503")
+                                || err_msg.contains("504"));
+
+                    if !is_retryable || attempt == 3 {
+                        last_error = Some(e);
+                        break;
+                    }
+
+                    tokio::time::sleep(Duration::from_millis(500 * 2u64.pow(attempt - 1))).await;
+                }
+            }
+        }
+
+        Err(last_error.unwrap_or_else(|| anyhow::anyhow!("Request failed after retries")))
+    }
+
     async fn chat_completion(&self, messages: Vec<Message>) -> Result<String> {
+        if self.thinking_enabled {
+            self.streaming_chat_completion(messages).await
+        } else {
+            self.non_streaming_chat_completion(messages).await
+        }
+    }
+
+    async fn non_streaming_chat_completion(&self, messages: Vec<Message>) -> Result<String> {
         let url = format!("{}/chat/completions", self.base_url);
 
         let request = ChatCompletionRequest {
             model: self.model.clone(),
             messages,
-            max_tokens: Some(500),
+            max_tokens: Some(self.max_tokens),
-            temperature: Some(0.7),
+            temperature: Some(self.temperature),
+            top_p: self.top_p,
+            reasoning_effort: if is_reasoning_model(&self.model) {
+                Some("none".to_string())
+            } else {
+                None
+            },
             stream: false,
         };
 
-        let response = self.client
+        let response = self
+            .client
             .post(&url)
             .header("Authorization", format!("Bearer {}", self.api_key))
             .header("Content-Type", "application/json")
@@ -187,9 +298,12 @@ impl OpenAiClient {
         if !status.is_success() {
             let text = response.text().await.unwrap_or_default();
 
-            // Try to parse error
             if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
-                bail!("OpenAI API error: {} ({})", error.error.message, error.error.error_type);
+                bail!(
+                    "OpenAI API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
             }
 
             bail!("OpenAI API error: {} - {}", status, text);
@@ -200,12 +314,144 @@ impl OpenAiClient {
             .await
             .context("Failed to parse OpenAI response")?;
 
-        result.choices
+        result
+            .choices
             .into_iter()
             .next()
             .map(|c| c.message.content.trim().to_string())
+            .filter(|s| !s.is_empty())
             .ok_or_else(|| anyhow::anyhow!("No response from OpenAI"))
     }
+
+    /// Streaming request for reasoning mode, filters reasoning_content from output
+    async fn streaming_chat_completion(&self, messages: Vec<Message>) -> Result<String> {
+        let url = format!("{}/chat/completions", self.base_url);
+
+        // For reasoning/thinking mode, omit temperature and top_p
+        let request = ChatCompletionRequest {
+            model: self.model.clone(),
+            messages,
+            max_tokens: Some(self.max_tokens),
+            temperature: None,
+            top_p: None,
+            reasoning_effort: self.reasoning_effort.clone(),
+            stream: true,
+        };
+
+        let response = self
+            .client
+            .post(&url)
+            .header("Authorization", format!("Bearer {}", self.api_key))
+            .header("Content-Type", "application/json")
+            .header("Accept", "text/event-stream")
+            .json(&request)
+            .send()
+            .await
+            .context("Failed to send streaming request to OpenAI")?;
+
+        let status = response.status();
+
+        if !status.is_success() {
+            let text = response.text().await.unwrap_or_default();
+
+            if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
+                bail!(
+                    "OpenAI API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
+            }
+
+            bail!("OpenAI API error: {} - {}", status, text);
+        }
+
+        let mut content_buffer = String::new();
+        let mut has_reasoning = false;
+        let mut has_content = false;
+
+        let thinking_state = self.thinking_state.as_ref();
+
+        let mut byte_stream = response.bytes_stream();
+        let mut line_buffer = String::new();
+
+        use futures_util::StreamExt;
+
+        while let Some(chunk) = byte_stream.next().await {
+            let chunk = chunk.context("Failed to read streaming response chunk")?;
+            let chunk_str =
+                String::from_utf8(chunk.to_vec()).context("Invalid UTF-8 in stream chunk")?;
+
+            line_buffer.push_str(&chunk_str);
+
+            while let Some(line_end) = line_buffer.find('\n') {
+                let line = line_buffer[..line_end].trim().to_string();
+                line_buffer = line_buffer[line_end + 1..].to_string();
+
+                if line.is_empty() {
+                    continue;
+                }
+
+                if line == "data: [DONE]" {
+                    break;
+                }
+
+                if let Some(json_str) = line.strip_prefix("data: ") {
+                    if let Ok(chunk) = serde_json::from_str::<StreamChunk>(json_str) {
+                        for choice in &chunk.choices {
+                            // Handle reasoning_content (o-series)
+                            if let Some(ref reasoning) = choice.delta.reasoning_content
+                                && !reasoning.is_empty()
+                            {
+                                if !has_reasoning {
+                                    has_reasoning = true;
+                                    if let Some(state) = thinking_state {
+                                        state.start_thinking();
+                                    }
+                                }
+                                continue;
+                            }
+
+                            // Handle content
+                            if let Some(ref content) = choice.delta.content
+                                && !content.is_empty()
+                            {
+                                if has_reasoning
+                                    && !has_content
+                                    && let Some(state) = thinking_state
+                                {
+                                    state.end_thinking();
+                                }
+                                has_content = true;
+                                content_buffer.push_str(content);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if let Some(state) = thinking_state {
+            state.end_thinking();
+        }
+
+        let result = content_buffer.trim().to_string();
+
+        if result.is_empty() {
+            if has_reasoning && !has_content {
+                bail!(
+                    "OpenAI returned reasoning content but no final answer. \
+                     The model may have entered an incomplete reasoning state. \
+                     Please try again or disable thinking mode."
+                );
+            }
+            bail!(
+                "No response from OpenAI. \
+                 If thinking mode is enabled, try disabling it or ensure the model supports reasoning."
+            );
+        }
+
+        Ok(result)
+    }
 }
 
 /// Azure OpenAI client (extends OpenAI with Azure-specific config)
@@ -215,16 +461,16 @@ pub struct AzureOpenAiClient {
     deployment: String,
     api_version: String,
     client: reqwest::Client,
+    thinking_enabled: bool,
+    reasoning_effort: Option<String>,
+    max_tokens: u32,
+    temperature: f32,
+    top_p: Option<f32>,
+    thinking_state: Option<Arc<ThinkingStateManager>>,
 }
 
 impl AzureOpenAiClient {
-    /// Create new Azure OpenAI client
+    pub fn new(endpoint: &str, api_key: &str, deployment: &str, api_version: &str) -> Result<Self> {
-    pub fn new(
-        endpoint: &str,
-        api_key: &str,
-        deployment: &str,
-        api_version: &str,
-    ) -> Result<Self> {
         let client = create_http_client(Duration::from_secs(60))?;
 
         Ok(Self {
@@ -233,6 +479,12 @@ impl AzureOpenAiClient {
             deployment: deployment.to_string(),
             api_version: api_version.to_string(),
             client,
+            thinking_enabled: false,
+            reasoning_effort: None,
+            max_tokens: 500,
+            temperature: 0.7,
+            top_p: None,
+            thinking_state: None,
         })
     }
 
@@ -245,12 +497,15 @@ impl AzureOpenAiClient {
         let request = ChatCompletionRequest {
             model: self.deployment.clone(),
             messages,
-            max_tokens: Some(500),
+            max_tokens: Some(self.max_tokens),
-            temperature: Some(0.7),
+            temperature: Some(self.temperature),
+            top_p: self.top_p,
+            reasoning_effort: self.reasoning_effort.clone(),
             stream: false,
         };
 
-        let response = self.client
+        let response = self
+            .client
             .post(&url)
             .header("api-key", &self.api_key)
             .header("Content-Type", "application/json")
@@ -270,10 +525,12 @@ impl AzureOpenAiClient {
             .await
             .context("Failed to parse Azure OpenAI response")?;
 
-        result.choices
+        result
+            .choices
             .into_iter()
             .next()
             .map(|c| c.message.content.trim().to_string())
+            .filter(|s| !s.is_empty())
             .ok_or_else(|| anyhow::anyhow!("No response from Azure OpenAI"))
     }
 }
@@ -281,12 +538,10 @@ impl AzureOpenAiClient {
 #[async_trait]
 impl LlmProvider for AzureOpenAiClient {
     async fn generate(&self, prompt: &str) -> Result<String> {
-        let messages = vec![
+        let messages = vec![Message {
-            Message {
             role: "user".to_string(),
             content: prompt.to_string(),
-            },
+        }];
-        ];
 
         self.chat_completion(messages).await
     }
@@ -310,7 +565,6 @@ impl LlmProvider for AzureOpenAiClient {
     }
 
     async fn is_available(&self) -> bool {
-        // Simple check - try to make a minimal request
         let url = format!(
             "{}/openai/deployments/{}/chat/completions?api-version={}",
             self.endpoint, self.deployment, self.api_version
@@ -324,10 +578,13 @@ impl LlmProvider for AzureOpenAiClient {
             }],
             max_tokens: Some(5),
             temperature: Some(0.0),
+            top_p: None,
+            reasoning_effort: None,
             stream: false,
         };
 
-        match self.client
+        match self
+            .client
             .post(&url)
             .header("api-key", &self.api_key)
             .json(&request)
@@ -343,3 +600,60 @@ impl LlmProvider for AzureOpenAiClient {
         "azure-openai"
     }
 }
+
+/// Available OpenAI models (including o-series with reasoning)
+pub const OPENAI_MODELS: &[&str] = &[
+    "o4-mini",
+    "o3",
+    "o3-mini",
+    "o1",
+    "o1-mini",
+    "o1-pro",
+    "gpt-4.1",
+    "gpt-4.1-mini",
+    "gpt-4.1-nano",
+    "gpt-4o",
+    "gpt-4o-mini",
+    "gpt-4-turbo",
+    "gpt-4",
+    "gpt-3.5-turbo",
+];
+
+pub fn is_valid_model(model: &str) -> bool {
+    OPENAI_MODELS.contains(&model)
+}
+
+fn is_reasoning_model(model: &str) -> bool {
+    model.starts_with("o")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_model_validation_o_series() {
+        assert!(is_valid_model("o4-mini"));
+        assert!(is_valid_model("o3"));
+        assert!(is_valid_model("o1"));
+        assert!(is_valid_model("gpt-4o"));
+        assert!(is_valid_model("gpt-3.5-turbo"));
+        assert!(!is_valid_model("invalid-model"));
+    }
+
+    #[test]
+    fn test_stream_delta_reasoning_parsing() {
+        let json = r#"{"content":null,"reasoning_content":"Let me think..."}"#;
+        let delta: StreamDelta = serde_json::from_str(json).unwrap();
+        assert!(delta.content.is_none());
+        assert_eq!(delta.reasoning_content, Some("Let me think...".to_string()));
+    }
+
+    #[test]
+    fn test_stream_delta_content_parsing() {
+        let json = r#"{"content":"Hello","reasoning_content":null}"#;
+        let delta: StreamDelta = serde_json::from_str(json).unwrap();
+        assert_eq!(delta.content, Some("Hello".to_string()));
+        assert!(delta.reasoning_content.is_none());
+    }
+}

src/llm/openrouter.rs

@@ -1,5 +1,5 @@
-use super::{create_http_client, LlmProvider};
+use super::{LlmProvider, create_http_client};
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
@@ -10,6 +10,9 @@ pub struct OpenRouterClient {
     api_key: String,
     model: String,
     client: reqwest::Client,
+    max_tokens: u32,
+    temperature: f32,
+    top_p: Option<f32>,
 }
 
 #[derive(Debug, Serialize)]
@@ -61,6 +64,9 @@ impl OpenRouterClient {
             api_key: api_key.to_string(),
             model: model.to_string(),
             client,
+            max_tokens: 500,
+            temperature: 0.7,
+            top_p: None,
         })
     }
 
@@ -73,6 +79,9 @@ impl OpenRouterClient {
             api_key: api_key.to_string(),
             model: model.to_string(),
             client,
+            max_tokens: 500,
+            temperature: 0.7,
+            top_p: None,
         })
     }
 
@@ -82,11 +91,27 @@ impl OpenRouterClient {
         Ok(self)
     }
 
+    pub fn with_max_tokens(mut self, max_tokens: u32) -> Self {
+        self.max_tokens = max_tokens;
+        self
+    }
+
+    pub fn with_temperature(mut self, temperature: f32) -> Self {
+        self.temperature = temperature;
+        self
+    }
+
+    pub fn with_top_p(mut self, top_p: f32) -> Self {
+        self.top_p = Some(top_p);
+        self
+    }
+
     /// List available models
     pub async fn list_models(&self) -> Result<Vec<String>> {
         let url = format!("{}/models", self.base_url);
 
-        let response = self.client
+        let response = self
+            .client
             .get(&url)
             .header("Authorization", format!("Bearer {}", self.api_key))
             .header("HTTP-Referer", "https://quicommit.dev")
@@ -138,12 +163,10 @@ impl OpenRouterClient {
 #[async_trait]
 impl LlmProvider for OpenRouterClient {
     async fn generate(&self, prompt: &str) -> Result<String> {
-        let messages = vec![
+        let messages = vec![Message {
-            Message {
             role: "user".to_string(),
             content: prompt.to_string(),
-            },
+        }];
-        ];
 
         self.chat_completion(messages).await
     }
@@ -182,12 +205,13 @@ impl OpenRouterClient {
         let request = ChatCompletionRequest {
             model: self.model.clone(),
             messages,
-            max_tokens: Some(500),
+            max_tokens: Some(self.max_tokens),
-            temperature: Some(0.7),
+            temperature: Some(self.temperature),
             stream: false,
         };
 
-        let response = self.client
+        let response = self
+            .client
             .post(&url)
             .header("Authorization", format!("Bearer {}", self.api_key))
             .header("Content-Type", "application/json")
@@ -205,7 +229,11 @@ impl OpenRouterClient {
 
             // Try to parse error
             if let Ok(error) = serde_json::from_str::<ErrorResponse>(&text) {
-                bail!("OpenRouter API error: {} ({})", error.error.message, error.error.error_type);
+                bail!(
+                    "OpenRouter API error: {} ({})",
+                    error.error.message,
+                    error.error.error_type
+                );
             }
 
             bail!("OpenRouter API error: {} - {}", status, text);
@@ -216,7 +244,8 @@ impl OpenRouterClient {
             .await
             .context("Failed to parse OpenRouter response")?;
 
-        result.choices
+        result
+            .choices
             .into_iter()
             .next()
             .map(|c| c.message.content.trim().to_string())

src/llm/thinking.rs

@@ -0,0 +1,151 @@
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
+
+/// 统一的思考状态管理器，用于管理模型思考状态的显示与隐藏
+pub struct ThinkingStateManager {
+    is_thinking: AtomicBool,
+    on_start: Option<Box<dyn Fn() + Send + Sync>>,
+    on_end: Option<Box<dyn Fn() + Send + Sync>>,
+}
+
+impl ThinkingStateManager {
+    pub fn new() -> Self {
+        Self {
+            is_thinking: AtomicBool::new(false),
+            on_start: None,
+            on_end: None,
+        }
+    }
+
+    /// 设置思考开始回调
+    pub fn on_thinking_start<F: Fn() + Send + Sync + 'static>(mut self, callback: F) -> Self {
+        self.on_start = Some(Box::new(callback));
+        self
+    }
+
+    /// 设置思考结束回调
+    pub fn on_thinking_end<F: Fn() + Send + Sync + 'static>(mut self, callback: F) -> Self {
+        self.on_end = Some(Box::new(callback));
+        self
+    }
+
+    /// 开始思考状态
+    pub fn start_thinking(&self) {
+        if !self.is_thinking.load(Ordering::SeqCst) {
+            self.is_thinking.store(true, Ordering::SeqCst);
+            if let Some(ref cb) = self.on_start {
+                cb();
+            }
+        }
+    }
+
+    /// 结束思考状态
+    pub fn end_thinking(&self) {
+        if self.is_thinking.load(Ordering::SeqCst) {
+            self.is_thinking.store(false, Ordering::SeqCst);
+            if let Some(ref cb) = self.on_end {
+                cb();
+            }
+        }
+    }
+
+    /// 当前是否处于思考状态
+    pub fn is_thinking(&self) -> bool {
+        self.is_thinking.load(Ordering::SeqCst)
+    }
+}
+
+impl Default for ThinkingStateManager {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// 线程安全的思考状态管理器引用
+pub type SharedThinkingState = Arc<ThinkingStateManager>;
+
+/// 创建带有默认控制台输出的思考状态管理器
+/// 在思考开始时打印 "thinking..."，在思考结束时清除该标识
+pub fn create_console_thinking_state() -> SharedThinkingState {
+    Arc::new(
+        ThinkingStateManager::new()
+            .on_thinking_start(|| {
+                eprint!("\rthinking...");
+            })
+            .on_thinking_end(|| {
+                eprint!("\r          \r");
+            }),
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::Mutex;
+
+    #[test]
+    fn test_thinking_state_transitions() {
+        let manager = ThinkingStateManager::new();
+        assert!(!manager.is_thinking());
+
+        manager.start_thinking();
+        assert!(manager.is_thinking());
+
+        manager.end_thinking();
+        assert!(!manager.is_thinking());
+    }
+
+    #[test]
+    fn test_thinking_idempotent_start() {
+        let manager = ThinkingStateManager::new();
+        manager.start_thinking();
+        manager.start_thinking(); // 重复调用不应触发回调两次
+        assert!(manager.is_thinking());
+    }
+
+    #[test]
+    fn test_thinking_idempotent_end() {
+        let manager = ThinkingStateManager::new();
+        manager.end_thinking(); // 未开始时结束不应触发问题
+        assert!(!manager.is_thinking());
+    }
+
+    #[test]
+    fn test_thinking_callbacks() {
+        let events: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(Vec::new()));
+        let events_clone = events.clone();
+
+        let manager = ThinkingStateManager::new().on_thinking_start(move || {
+            events_clone.lock().unwrap().push("start".to_string());
+        });
+
+        let events_clone2 = events.clone();
+        let manager = manager.on_thinking_end(move || {
+            events_clone2.lock().unwrap().push("end".to_string());
+        });
+
+        manager.start_thinking();
+        manager.end_thinking();
+
+        let recorded = events.lock().unwrap();
+        assert_eq!(recorded.len(), 2);
+        assert_eq!(recorded[0], "start");
+        assert_eq!(recorded[1], "end");
+    }
+
+    #[test]
+    fn test_create_console_thinking_state() {
+        let state = create_console_thinking_state();
+        assert!(!state.is_thinking());
+        state.start_thinking();
+        assert!(state.is_thinking());
+        state.end_thinking();
+        assert!(!state.is_thinking());
+    }
+
+    #[test]
+    fn test_default() {
+        let manager = ThinkingStateManager::default();
+        assert!(!manager.is_thinking());
+    }
+}

src/main.rs

@@ -14,8 +14,8 @@ mod llm;
 mod utils;
 
 use commands::{
-    changelog::ChangelogCommand, commit::CommitCommand, config::ConfigCommand,
+    changelog::ChangelogCommand, commit::CommitCommand, config::ConfigCommand, init::InitCommand,
-    init::InitCommand, profile::ProfileCommand, tag::TagCommand,
+    profile::ProfileCommand, tag::TagCommand,
 };
 
 /// QuiCommit - AI-powered Git assistant

src/utils/crypto.rs

@@ -1,9 +1,9 @@
 use aes_gcm::{
-    aead::{Aead, KeyInit},
     Aes256Gcm, Nonce,
+    aead::{Aead, KeyInit},
 };
 use anyhow::{Context, Result};
-use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
+use base64::{Engine, engine::general_purpose::STANDARD as BASE64};
 use rand::Rng;
 use std::fs;
 use std::path::Path;
@@ -20,8 +20,7 @@ pub fn encrypt(data: &[u8], password: &str) -> Result<String> {
     rand::thread_rng().fill(&mut nonce_bytes);
 
     let key = derive_key(password, &salt)?;
-    let cipher = Aes256Gcm::new_from_slice(&key)
+    let cipher = Aes256Gcm::new_from_slice(&key).context("Failed to create cipher")?;
-        .context("Failed to create cipher")?;
     let nonce = Nonce::from_slice(&nonce_bytes);
 
     let encrypted = cipher
@@ -39,7 +38,8 @@ pub fn encrypt(data: &[u8], password: &str) -> Result<String> {
 
 /// Decrypt data with password
 pub fn decrypt(encrypted_data: &str, password: &str) -> Result<Vec<u8>> {
-    let data = BASE64.decode(encrypted_data)
+    let data = BASE64
+        .decode(encrypted_data)
         .context("Invalid base64 encoding")?;
 
     if data.len() < SALT_LEN + NONCE_LEN {
@@ -51,8 +51,7 @@ pub fn decrypt(encrypted_data: &str, password: &str) -> Result<Vec<u8>> {
     let encrypted = &data[SALT_LEN + NONCE_LEN..];
 
     let key = derive_key(password, salt)?;
-    let cipher = Aes256Gcm::new_from_slice(&key)
+    let cipher = Aes256Gcm::new_from_slice(&key).context("Failed to create cipher")?;
-        .context("Failed to create cipher")?;
     let nonce = Nonce::from_slice(nonce_bytes);
 
     let decrypted = cipher
@@ -64,7 +63,7 @@ pub fn decrypt(encrypted_data: &str, password: &str) -> Result<Vec<u8>> {
 
 /// Derive key from password using simple method
 fn derive_key(password: &str, salt: &[u8]) -> Result<[u8; KEY_LEN]> {
-    use sha2::{Sha256, Digest};
+    use sha2::{Digest, Sha256};
 
     let mut hasher = Sha256::new();
     hasher.update(salt);

src/utils/editor.rs

@@ -9,14 +9,11 @@ pub fn edit_content(initial_content: &str) -> Result<String> {
 
 /// Edit file in user's default editor
 pub fn edit_file(path: &Path) -> Result<String> {
-    let content = fs::read_to_string(path)
+    let content = fs::read_to_string(path).unwrap_or_default();
-        .unwrap_or_default();
 
-    let edited = edit::edit(&content)
+    let edited = edit::edit(&content).context("Failed to open editor")?;
-        .context("Failed to open editor")?;
 
-    fs::write(path, &edited)
+    fs::write(path, &edited).with_context(|| format!("Failed to write file: {:?}", path))?;
-        .with_context(|| format!("Failed to write file: {:?}", path))?;
 
     Ok(edited)
 }
@@ -29,8 +26,7 @@ pub fn edit_temp(initial_content: &str, extension: &str) -> Result<String> {
         .context("Failed to create temp file")?;
 
     let path = temp_file.path();
-    fs::write(path, initial_content)
+    fs::write(path, initial_content).context("Failed to write temp file")?;
-        .context("Failed to write temp file")?;
 
     edit_file(path)
 }
@@ -65,7 +61,6 @@ pub fn get_editor() -> String {
 /// Check if editor is available
 pub fn check_editor() -> Result<()> {
     let editor = get_editor();
-    which::which(&editor)
+    which::which(&editor).with_context(|| format!("Editor '{}' not found in PATH", editor))?;
-        .with_context(|| format!("Editor '{}' not found in PATH", editor))?;
     Ok(())
 }

src/utils/keyring.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use std::env;
 
 const SERVICE_NAME: &str = "quicommit";
@@ -78,18 +78,19 @@ impl KeyringManager {
         let entry = keyring::Entry::new(SERVICE_NAME, provider)
             .context("Failed to create keyring entry")?;
 
-        entry.set_password(api_key)
+        entry
+            .set_password(api_key)
             .context("Failed to store API key")?;
 
         Ok(())
     }
 
     pub fn get_api_key(&self, provider: &str) -> Result<Option<String>> {
-        if let Ok(key) = env::var(ENV_API_KEY) {
+        if let Ok(key) = env::var(ENV_API_KEY)
-            if !key.is_empty() {
+            && !key.is_empty()
+        {
             return Ok(Some(key));
         }
-        }
 
         if !self.is_available() {
             return Ok(None);
@@ -113,7 +114,8 @@ impl KeyringManager {
         let entry = keyring::Entry::new(SERVICE_NAME, provider)
             .context("Failed to create keyring entry")?;
 
-        entry.delete_credential()
+        entry
+            .delete_credential()
             .context("Failed to delete API key")?;
 
         Ok(())
@@ -127,7 +129,13 @@ impl KeyringManager {
         format!("{}/{}", PAT_SERVICE_PREFIX, profile_name)
     }
 
-    pub fn store_pat(&self, profile_name: &str, user_email: &str, service: &str, token: &str) -> Result<()> {
+    pub fn store_pat(
+        &self,
+        profile_name: &str,
+        user_email: &str,
+        service: &str,
+        token: &str,
+    ) -> Result<()> {
         if !self.is_available() {
             bail!("Keyring is not available on this system");
         }
@@ -138,15 +146,24 @@ impl KeyringManager {
         let entry = keyring::Entry::new(&keyring_service, &keyring_user)
             .context("Failed to create keyring entry for PAT")?;
 
-        entry.set_password(token)
+        entry
+            .set_password(token)
             .context("Failed to store PAT in keyring")?;
 
-        eprintln!("[DEBUG] PAT stored in keyring: service={}, user={}", keyring_service, keyring_user);
+        eprintln!(
+            "[DEBUG] PAT stored in keyring: service={}, user={}",
+            keyring_service, keyring_user
+        );
 
         Ok(())
     }
 
-    pub fn get_pat(&self, profile_name: &str, user_email: &str, service: &str) -> Result<Option<String>> {
+    pub fn get_pat(
+        &self,
+        profile_name: &str,
+        user_email: &str,
+        service: &str,
+    ) -> Result<Option<String>> {
         if !self.is_available() {
             return Ok(None);
         }
@@ -159,11 +176,17 @@ impl KeyringManager {
 
         match entry.get_password() {
             Ok(token) => {
-                eprintln!("[DEBUG] PAT retrieved from keyring: service={}, user={}", keyring_service, keyring_user);
+                eprintln!(
+                    "[DEBUG] PAT retrieved from keyring: service={}, user={}",
+                    keyring_service, keyring_user
+                );
                 Ok(Some(token))
             }
             Err(keyring::Error::NoEntry) => {
-                eprintln!("[DEBUG] PAT not found in keyring: service={}, user={}", keyring_service, keyring_user);
+                eprintln!(
+                    "[DEBUG] PAT not found in keyring: service={}, user={}",
+                    keyring_service, keyring_user
+                );
                 Ok(None)
             }
             Err(e) => Err(e.into()),
@@ -181,22 +204,36 @@ impl KeyringManager {
         let entry = keyring::Entry::new(&keyring_service, &keyring_user)
             .context("Failed to create keyring entry for PAT")?;
 
-        entry.delete_credential()
+        entry
+            .delete_credential()
             .context("Failed to delete PAT from keyring")?;
 
-        eprintln!("[DEBUG] PAT deleted from keyring: service={}, user={}", keyring_service, keyring_user);
+        eprintln!(
+            "[DEBUG] PAT deleted from keyring: service={}, user={}",
+            keyring_service, keyring_user
+        );
 
         Ok(())
     }
 
     pub fn has_pat(&self, profile_name: &str, user_email: &str, service: &str) -> bool {
-        self.get_pat(profile_name, user_email, service).unwrap_or(None).is_some()
+        self.get_pat(profile_name, user_email, service)
+            .unwrap_or(None)
+            .is_some()
     }
 
-    pub fn delete_all_pats_for_profile(&self, profile_name: &str, user_email: &str, services: &[String]) -> Result<()> {
+    pub fn delete_all_pats_for_profile(
+        &self,
+        profile_name: &str,
+        user_email: &str,
+        services: &[String],
+    ) -> Result<()> {
         for service in services {
             if let Err(e) = self.delete_pat(profile_name, user_email, service) {
-                eprintln!("[DEBUG] Failed to delete PAT for service '{}': {}", service, e);
+                eprintln!(
+                    "[DEBUG] Failed to delete PAT for service '{}': {}",
+                    service, e
+                );
             }
         }
         Ok(())
@@ -251,8 +288,8 @@ pub fn get_default_model(provider: &str) -> &'static str {
     match provider {
         "openai" => "gpt-4",
         "anthropic" => "claude-3-sonnet-20240229",
-        "kimi" => "moonshot-v1-8k",
+        "kimi" => "kimi-k2.6",
-        "deepseek" => "deepseek-chat",
+        "deepseek" => "deepseek-v4-flash",
         "openrouter" => "openai/gpt-3.5-turbo",
         "ollama" => "llama2",
         _ => "",
@@ -260,7 +297,14 @@ pub fn get_default_model(provider: &str) -> &'static str {
 }
 
 pub fn get_supported_providers() -> &'static [&'static str] {
-    &["ollama", "openai", "anthropic", "kimi", "deepseek", "openrouter"]
+    &[
+        "ollama",
+        "openai",
+        "anthropic",
+        "kimi",
+        "deepseek",
+        "openrouter",
+    ]
 }
 
 pub fn provider_needs_api_key(provider: &str) -> bool {
@@ -274,10 +318,19 @@ mod tests {
     #[test]
     fn test_get_default_base_url() {
         assert_eq!(get_default_base_url("openai"), "https://api.openai.com/v1");
-        assert_eq!(get_default_base_url("anthropic"), "https://api.anthropic.com/v1");
+        assert_eq!(
+            get_default_base_url("anthropic"),
+            "https://api.anthropic.com/v1"
+        );
         assert_eq!(get_default_base_url("kimi"), "https://api.moonshot.cn/v1");
-        assert_eq!(get_default_base_url("deepseek"), "https://api.deepseek.com/v1");
+        assert_eq!(
-        assert_eq!(get_default_base_url("openrouter"), "https://openrouter.ai/api/v1");
+            get_default_base_url("deepseek"),
+            "https://api.deepseek.com/v1"
+        );
+        assert_eq!(
+            get_default_base_url("openrouter"),
+            "https://openrouter.ai/api/v1"
+        );
         assert_eq!(get_default_base_url("ollama"), "http://localhost:11434");
     }
 

src/utils/validators.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use lazy_static::lazy_static;
 use regex::Regex;
 
@@ -121,7 +121,12 @@ pub fn validate_commitlint_commit(message: &str) -> Result<()> {
         bail!("Commit subject too long (max 100 characters)");
     }
 
-    if subject.chars().next().map(|c| c.is_uppercase()).unwrap_or(false) {
+    if subject
+        .chars()
+        .next()
+        .map(|c| c.is_uppercase())
+        .unwrap_or(false)
+    {
         bail!("Commit subject should not start with uppercase letter");
     }
 
@@ -187,7 +192,10 @@ pub fn validate_profile_name(name: &str) -> Result<()> {
         bail!("Profile name too long (max 50 characters)");
     }
 
-    if !name.chars().all(|c| c.is_alphanumeric() || c == '-' || c == '_') {
+    if !name
+        .chars()
+        .all(|c| c.is_alphanumeric() || c == '-' || c == '_')
+    {
         bail!("Profile name can only contain letters, numbers, hyphens, and underscores");
     }
 

tests/config_export_import_tests.rs

@@ -1,38 +1,11 @@
-use assert_cmd::Command;
+use assert_cmd::cargo::cargo_bin_cmd;
 use predicates::prelude::*;
 use std::fs;
 use std::path::PathBuf;
 use tempfile::TempDir;
 
-fn create_git_repo(dir: &PathBuf) -> std::process::Output {
-    std::process::Command::new("git")
-        .args(&["init"])
-        .current_dir(dir)
-        .output()
-        .expect("Failed to init git repo")
-}
-
-fn configure_git_user(dir: &PathBuf) {
-    std::process::Command::new("git")
-        .args(&["config", "user.name", "Test User"])
-        .current_dir(dir)
-        .output()
-        .expect("Failed to configure git user name");
-
-    std::process::Command::new("git")
-        .args(&["config", "user.email", "test@example.com"])
-        .current_dir(dir)
-        .output()
-        .expect("Failed to configure git user email");
-}
-
-fn setup_git_repo(dir: &PathBuf) {
-    create_git_repo(dir);
-    configure_git_user(dir);
-}
-
 fn init_quicommit(config_path: &PathBuf) {
-    let mut cmd = Command::cargo_bin("quicommit").unwrap();
+    let mut cmd = cargo_bin_cmd!("quicommit");
     cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
     cmd.assert().success();
 }
@@ -46,8 +19,13 @@ mod config_export {
         let config_path = temp_dir.path().join("config.toml");
         init_quicommit(&config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["config", "export", "--config", config_path.to_str().unwrap()]);
+        cmd.args(&[
+            "config",
+            "export",
+            "--config",
+            config_path.to_str().unwrap(),
+        ]);
 
         cmd.assert()
             .success()
@@ -62,12 +40,16 @@ mod config_export {
         let export_path = temp_dir.path().join("exported.toml");
         init_quicommit(&config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "export",
+            "config",
-            "--config", config_path.to_str().unwrap(),
+            "export",
-            "--output", export_path.to_str().unwrap(),
+            "--config",
-            "--password", ""
+            config_path.to_str().unwrap(),
+            "--output",
+            export_path.to_str().unwrap(),
+            "--password",
+            "",
         ]);
 
         cmd.assert()
@@ -78,7 +60,10 @@ mod config_export {
 
         let content = fs::read_to_string(&export_path).unwrap();
         assert!(content.contains("version"), "Export should contain version");
-        assert!(content.contains("[llm]"), "Export should contain LLM config");
+        assert!(
+            content.contains("[llm]"),
+            "Export should contain LLM config"
+        );
     }
 
     #[test]
@@ -88,12 +73,16 @@ mod config_export {
         let export_path = temp_dir.path().join("encrypted.toml");
         init_quicommit(&config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "export",
+            "config",
-            "--config", config_path.to_str().unwrap(),
+            "export",
-            "--output", export_path.to_str().unwrap(),
+            "--config",
-            "--password", "test_password_123"
+            config_path.to_str().unwrap(),
+            "--output",
+            export_path.to_str().unwrap(),
+            "--password",
+            "test_password_123",
         ]);
 
         cmd.assert()
@@ -103,8 +92,14 @@ mod config_export {
         assert!(export_path.exists(), "Export file should be created");
 
         let content = fs::read_to_string(&export_path).unwrap();
-        assert!(content.starts_with("ENCRYPTED:"), "Encrypted file should start with ENCRYPTED:");
+        assert!(
-        assert!(!content.contains("[llm]"), "Encrypted content should not be readable");
+            content.starts_with("ENCRYPTED:"),
+            "Encrypted file should start with ENCRYPTED:"
+        );
+        assert!(
+            !content.contains("[llm]"),
+            "Encrypted content should not be readable"
+        );
     }
 }
 
@@ -164,19 +159,28 @@ keep_changelog_types_english = true
 "#;
         fs::write(&import_path, plain_config).unwrap();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "import",
+            "config",
-            "--config", config_path.to_str().unwrap(),
+            "import",
-            "--file", import_path.to_str().unwrap()
+            "--config",
+            config_path.to_str().unwrap(),
+            "--file",
+            import_path.to_str().unwrap(),
         ]);
 
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("Configuration imported"));
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["config", "get", "llm.provider", "--config", config_path.to_str().unwrap()]);
+        cmd.args(&[
+            "config",
+            "get",
+            "llm.provider",
+            "--config",
+            config_path.to_str().unwrap(),
+        ]);
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("openai"));
@@ -191,35 +195,53 @@ keep_changelog_types_english = true
 
         init_quicommit(&config_path1);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "set", "llm.provider", "anthropic",
+            "config",
-            "--config", config_path1.to_str().unwrap()
+            "set",
+            "llm.provider",
+            "anthropic",
+            "--config",
+            config_path1.to_str().unwrap(),
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "export",
+            "config",
-            "--config", config_path1.to_str().unwrap(),
+            "export",
-            "--output", export_path.to_str().unwrap(),
+            "--config",
-            "--password", "secure_password"
+            config_path1.to_str().unwrap(),
+            "--output",
+            export_path.to_str().unwrap(),
+            "--password",
+            "secure_password",
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "import",
+            "config",
-            "--config", config_path2.to_str().unwrap(),
+            "import",
-            "--file", export_path.to_str().unwrap(),
+            "--config",
-            "--password", "secure_password"
+            config_path2.to_str().unwrap(),
+            "--file",
+            export_path.to_str().unwrap(),
+            "--password",
+            "secure_password",
         ]);
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("Configuration imported"));
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["config", "get", "llm.provider", "--config", config_path2.to_str().unwrap()]);
+        cmd.args(&[
+            "config",
+            "get",
+            "llm.provider",
+            "--config",
+            config_path2.to_str().unwrap(),
+        ]);
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("anthropic"));
@@ -233,21 +255,29 @@ keep_changelog_types_english = true
 
         init_quicommit(&config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "export",
+            "config",
-            "--config", config_path.to_str().unwrap(),
+            "export",
-            "--output", export_path.to_str().unwrap(),
+            "--config",
-            "--password", "correct_password"
+            config_path.to_str().unwrap(),
+            "--output",
+            export_path.to_str().unwrap(),
+            "--password",
+            "correct_password",
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "import",
+            "config",
-            "--config", config_path.to_str().unwrap(),
+            "import",
-            "--file", export_path.to_str().unwrap(),
+            "--config",
-            "--password", "wrong_password"
+            config_path.to_str().unwrap(),
+            "--file",
+            export_path.to_str().unwrap(),
+            "--password",
+            "wrong_password",
         ]);
         cmd.assert()
             .failure()
@@ -267,32 +297,49 @@ mod config_export_import_roundtrip {
 
         init_quicommit(&config_path1);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "set", "llm.model", "gpt-4-turbo",
+            "config",
-            "--config", config_path1.to_str().unwrap()
+            "set",
+            "llm.model",
+            "gpt-4-turbo",
+            "--config",
+            config_path1.to_str().unwrap(),
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "export",
+            "config",
-            "--config", config_path1.to_str().unwrap(),
+            "export",
-            "--output", export_path.to_str().unwrap(),
+            "--config",
-            "--password", ""
+            config_path1.to_str().unwrap(),
+            "--output",
+            export_path.to_str().unwrap(),
+            "--password",
+            "",
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "import",
+            "config",
-            "--config", config_path2.to_str().unwrap(),
+            "import",
-            "--file", export_path.to_str().unwrap()
+            "--config",
+            config_path2.to_str().unwrap(),
+            "--file",
+            export_path.to_str().unwrap(),
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["config", "get", "llm.model", "--config", config_path2.to_str().unwrap()]);
+        cmd.args(&[
+            "config",
+            "get",
+            "llm.model",
+            "--config",
+            config_path2.to_str().unwrap(),
+        ]);
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("gpt-4-turbo"));
@@ -308,26 +355,38 @@ mod config_export_import_roundtrip {
 
         init_quicommit(&config_path1);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "set", "llm.provider", "deepseek",
+            "config",
-            "--config", config_path1.to_str().unwrap()
+            "set",
+            "llm.provider",
+            "deepseek",
+            "--config",
+            config_path1.to_str().unwrap(),
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "set", "llm.model", "deepseek-chat",
+            "config",
-            "--config", config_path1.to_str().unwrap()
+            "set",
+            "llm.model",
+            "deepseek-chat",
+            "--config",
+            config_path1.to_str().unwrap(),
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "export",
+            "config",
-            "--config", config_path1.to_str().unwrap(),
+            "export",
-            "--output", export_path.to_str().unwrap(),
+            "--config",
-            "--password", password
+            config_path1.to_str().unwrap(),
+            "--output",
+            export_path.to_str().unwrap(),
+            "--password",
+            password,
         ]);
         cmd.assert().success();
 
@@ -335,23 +394,39 @@ mod config_export_import_roundtrip {
         assert!(exported_content.starts_with("ENCRYPTED:"));
         assert!(!exported_content.contains("deepseek"));
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&[
-            "config", "import",
+            "config",
-            "--config", config_path2.to_str().unwrap(),
+            "import",
-            "--file", export_path.to_str().unwrap(),
+            "--config",
-            "--password", password
+            config_path2.to_str().unwrap(),
+            "--file",
+            export_path.to_str().unwrap(),
+            "--password",
+            password,
         ]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["config", "get", "llm.provider", "--config", config_path2.to_str().unwrap()]);
+        cmd.args(&[
+            "config",
+            "get",
+            "llm.provider",
+            "--config",
+            config_path2.to_str().unwrap(),
+        ]);
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("deepseek"));
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["config", "get", "llm.model", "--config", config_path2.to_str().unwrap()]);
+        cmd.args(&[
+            "config",
+            "get",
+            "llm.model",
+            "--config",
+            config_path2.to_str().unwrap(),
+        ]);
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("deepseek-chat"));

tests/integration_tests.rs

@@ -1,4 +1,4 @@
-use assert_cmd::Command;
+use assert_cmd::cargo::cargo_bin_cmd;
 use predicates::prelude::*;
 use std::fs;
 use std::path::PathBuf;
@@ -59,7 +59,7 @@ fn setup_test_repo_with_file(dir: &PathBuf, file_name: &str, file_content: &str)
 }
 
 fn init_quicommit(dir: &PathBuf, config_path: &PathBuf) {
-    let mut cmd = Command::cargo_bin("quicommit").unwrap();
+    let mut cmd = cargo_bin_cmd!("quicommit");
     cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()])
         .current_dir(dir);
     cmd.assert().success();
@@ -70,7 +70,7 @@ mod cli_basic {
 
     #[test]
     fn test_help() {
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.arg("--help");
         cmd.assert()
             .success()
@@ -83,7 +83,7 @@ mod cli_basic {
 
     #[test]
     fn test_version() {
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.arg("--version");
         cmd.assert()
             .success()
@@ -92,7 +92,7 @@ mod cli_basic {
 
     #[test]
     fn test_no_args_shows_help() {
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.assert()
             .failure()
             .stderr(predicate::str::contains("Usage:"));
@@ -106,8 +106,14 @@ mod cli_basic {
         create_git_repo(&repo_path);
         configure_git_user(&repo_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["-vv", "init", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "-vv",
+            "init",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert().success();
@@ -122,7 +128,7 @@ mod init_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert()
@@ -135,7 +141,7 @@ mod init_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert().success();
@@ -152,7 +158,7 @@ mod init_command {
 
         let config_path = repo_path.join("test_config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()])
             .current_dir(&repo_path);
 
@@ -164,12 +170,18 @@ mod init_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["init", "--yes", "--reset", "--config", config_path.to_str().unwrap()]);
+        cmd.args(&[
+            "init",
+            "--yes",
+            "--reset",
+            "--config",
+            config_path.to_str().unwrap(),
+        ]);
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("initialized successfully"));
@@ -184,7 +196,7 @@ mod profile_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["profile", "list", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert()
@@ -197,11 +209,11 @@ mod profile_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["profile", "list", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert()
@@ -218,11 +230,11 @@ mod config_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["config", "show", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert()
@@ -235,11 +247,11 @@ mod config_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["config", "path", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert()
@@ -256,12 +268,18 @@ mod commit_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["commit", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "commit",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(temp_dir.path());
 
         cmd.assert()
@@ -278,8 +296,17 @@ mod commit_command {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["commit", "--manual", "-m", "test: empty", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "commit",
+            "--manual",
+            "-m",
+            "test: empty",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert()
@@ -296,8 +323,17 @@ mod commit_command {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["commit", "--manual", "-m", "test: add test file", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "commit",
+            "--manual",
+            "-m",
+            "test: add test file",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert()
@@ -314,14 +350,47 @@ mod commit_command {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["commit", "--date", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "commit",
+            "--date",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("Dry run"));
     }
+
+    #[test]
+    fn test_commit_with_think_flag() {
+        let temp_dir = TempDir::new().unwrap();
+        let repo_path = temp_dir.path().to_path_buf();
+        setup_test_repo_with_file(&repo_path, "test.txt", "Hello, World!");
+
+        let config_path = repo_path.join("config.toml");
+        init_quicommit(&repo_path, &config_path);
+
+        let mut cmd = cargo_bin_cmd!("quicommit");
+        cmd.args(&[
+            "commit",
+            "--think",
+            "--manual",
+            "-m",
+            "test: think flag",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
+        .current_dir(&repo_path);
+
+        cmd.assert().success();
+    }
 }
 
 mod tag_command {
@@ -332,12 +401,18 @@ mod tag_command {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["tag", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "tag",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(temp_dir.path());
 
         cmd.assert()
@@ -358,14 +433,51 @@ mod tag_command {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["tag", "--name", "v0.1.0", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "tag",
+            "--name",
+            "v0.1.0",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert()
             .success()
             .stdout(predicate::str::contains("v0.1.0"));
     }
+
+    #[test]
+    fn test_tag_with_think_flag() {
+        let temp_dir = TempDir::new().unwrap();
+        let repo_path = temp_dir.path().to_path_buf();
+        setup_git_repo(&repo_path);
+
+        create_test_file(&repo_path, "test.txt", "content");
+        stage_file(&repo_path, "test.txt");
+        create_commit(&repo_path, "feat: initial commit");
+
+        let config_path = repo_path.join("config.toml");
+        init_quicommit(&repo_path, &config_path);
+
+        let mut cmd = cargo_bin_cmd!("quicommit");
+        cmd.args(&[
+            "tag",
+            "--think",
+            "--name",
+            "v0.2.0",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
+        .current_dir(&repo_path);
+
+        cmd.assert().success();
+    }
 }
 
 mod changelog_command {
@@ -382,8 +494,15 @@ mod changelog_command {
 
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["changelog", "--init", "--output", changelog_path.to_str().unwrap(), "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "changelog",
+            "--init",
+            "--output",
+            changelog_path.to_str().unwrap(),
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert().success();
@@ -404,12 +523,17 @@ mod changelog_command {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["changelog", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "changelog",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
-        cmd.assert()
+        cmd.assert().success();
-            .success();
     }
 }
 
@@ -421,7 +545,7 @@ mod cross_platform {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("subdir").join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert().success();
@@ -435,7 +559,7 @@ mod cross_platform {
         fs::create_dir_all(&space_dir).unwrap();
         let config_path = space_dir.join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert().success();
@@ -449,7 +573,7 @@ mod cross_platform {
         fs::create_dir_all(&unicode_dir).unwrap();
         let config_path = unicode_dir.join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert().success();
@@ -523,8 +647,17 @@ mod validators {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["commit", "--manual", "-m", "invalid commit message without type", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "commit",
+            "--manual",
+            "-m",
+            "invalid commit message without type",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert()
@@ -541,8 +674,17 @@ mod validators {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["commit", "--manual", "-m", "feat: add new feature", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "commit",
+            "--manual",
+            "-m",
+            "feat: add new feature",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert()
@@ -563,8 +705,17 @@ mod subcommands {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["c", "--manual", "-m", "fix: test", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "c",
+            "--manual",
+            "-m",
+            "fix: test",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert()
@@ -577,7 +728,7 @@ mod subcommands {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["i", "--yes", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert()
@@ -590,11 +741,11 @@ mod subcommands {
         let temp_dir = TempDir::new().unwrap();
         let config_path = temp_dir.path().join("config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["p", "list", "--config", config_path.to_str().unwrap()]);
 
         cmd.assert()
@@ -611,8 +762,13 @@ mod edge_cases {
         let temp_dir = TempDir::new().unwrap();
         let non_existent_config = temp_dir.path().join("non_existent_config.toml");
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["config", "show", "--config", non_existent_config.to_str().unwrap()]);
+        cmd.args(&[
+            "config",
+            "show",
+            "--config",
+            non_existent_config.to_str().unwrap(),
+        ]);
 
         cmd.assert()
             .success()
@@ -627,12 +783,18 @@ mod edge_cases {
         let repo_path = temp_dir.path().to_path_buf();
 
         let config_path = repo_path.join("config.toml");
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
         cmd.args(&["init", "--yes", "--config", config_path.to_str().unwrap()]);
         cmd.assert().success();
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["commit", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "commit",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
         cmd.assert()
@@ -649,12 +811,21 @@ mod edge_cases {
         let config_path = repo_path.join("config.toml");
         init_quicommit(&repo_path, &config_path);
 
-        let mut cmd = Command::cargo_bin("quicommit").unwrap();
+        let mut cmd = cargo_bin_cmd!("quicommit");
-        cmd.args(&["commit", "--manual", "-m", "", "--dry-run", "--yes", "--config", config_path.to_str().unwrap()])
+        cmd.args(&[
+            "commit",
+            "--manual",
+            "-m",
+            "",
+            "--dry-run",
+            "--yes",
+            "--config",
+            config_path.to_str().unwrap(),
+        ])
         .current_dir(&repo_path);
 
-        cmd.assert()
+        cmd.assert().failure().stderr(predicate::str::contains(
-            .failure()
+            "Invalid conventional commit format",
-            .stderr(predicate::str::contains("Invalid conventional commit format"));
+        ));
     }
 }