jarvis-ai-assistant 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.2"
+__version__ = "0.3.4"

jarvis/jarvis_agent/__init__.py

@@ -3,6 +3,7 @@
 import datetime
 import os
 import platform
+from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
 # 第三方库导入
@@ -14,6 +15,7 @@ from jarvis.jarvis_agent.protocols import OutputHandlerProtocol
 from jarvis.jarvis_agent.session_manager import SessionManager
 from jarvis.jarvis_agent.tool_executor import execute_tool_call
 from jarvis.jarvis_agent.memory_manager import MemoryManager
+from jarvis.jarvis_memory_organizer.memory_organizer import MemoryOrganizer
 from jarvis.jarvis_agent.task_analyzer import TaskAnalyzer
 from jarvis.jarvis_agent.file_methodology_manager import FileMethodologyManager
 from jarvis.jarvis_agent.prompts import (
@@ -28,6 +30,7 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 
 # jarvis_utils 相关
 from jarvis.jarvis_utils.config import (
+    get_data_dir,
     get_max_token_count,
     get_normal_model_name,
     get_normal_platform_name,
@@ -50,6 +53,98 @@ from jarvis.jarvis_utils.input import get_multiline_input, user_confirm
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 
+
+def show_agent_startup_stats(agent_name: str, model_name: str) -> None:
+    """输出启动时的统计信息
+
+    参数:
+        agent_name: Agent的名称
+        model_name: 使用的模型名称
+    """
+    try:
+        from jarvis.jarvis_utils.methodology import _load_all_methodologies
+        from jarvis.jarvis_tools.registry import ToolRegistry
+        from jarvis.jarvis_utils.config import get_data_dir
+        from pathlib import Path
+        from rich.console import Console
+        from rich.panel import Panel
+        from rich.text import Text
+        from rich.align import Align
+        import os
+
+        methodologies = _load_all_methodologies()
+        methodology_count = len(methodologies)
+
+        # 获取工具数量
+        # 创建一个临时的工具注册表类来获取所有工具（不应用过滤）
+        class TempToolRegistry(ToolRegistry):
+            def _apply_tool_config_filter(self) -> None:
+                """重写过滤方法，不执行任何过滤"""
+                pass
+
+        # 获取所有工具的数量
+        tool_registry_all = TempToolRegistry()
+        total_tool_count = len(tool_registry_all.tools)
+
+        # 获取可用工具的数量（应用过滤）
+        tool_registry = ToolRegistry()
+        available_tool_count = len(tool_registry.get_all_tools())
+
+        global_memory_dir = Path(get_data_dir()) / "memory" / "global_long_term"
+        global_memory_count = 0
+        if global_memory_dir.exists():
+            global_memory_count = len(list(global_memory_dir.glob("*.json")))
+
+        # 检查项目记忆
+        project_memory_dir = Path(".jarvis/memory")
+        project_memory_count = 0
+        if project_memory_dir.exists():
+            project_memory_count = len(list(project_memory_dir.glob("*.json")))
+
+        # 获取当前工作目录
+        current_dir = os.getcwd()
+
+        # 构建欢迎信息
+        welcome_message = f"{agent_name} 初始化完成 - 使用 {model_name} 模型"
+
+        stats_parts = [
+            f"📚  本地方法论: [bold cyan]{methodology_count}[/bold cyan]",
+            f"🛠️  工具: [bold green]{available_tool_count}/{total_tool_count}[/bold green] (可用/全部)",
+            f"🧠  全局记忆: [bold yellow]{global_memory_count}[/bold yellow]",
+        ]
+
+        # 如果有项目记忆，添加到统计信息中
+        if project_memory_count > 0:
+            stats_parts.append(
+                f"📝  项目记忆: [bold magenta]{project_memory_count}[/bold magenta]"
+            )
+
+        stats_text = Text.from_markup(" | ".join(stats_parts), justify="center")
+
+        # 创建包含欢迎信息和统计信息的面板内容
+        panel_content = Text()
+        panel_content.append(welcome_message, style="bold white")
+        panel_content.append("\n")
+        panel_content.append(f"📁  工作目录: {current_dir}", style="dim white")
+        panel_content.append("\n\n")
+        panel_content.append(stats_text)
+        panel_content.justify = "center"
+
+        panel = Panel(
+            panel_content,
+            title="✨ Jarvis 资源概览 ✨",
+            title_align="center",
+            border_style="blue",
+            expand=False,
+        )
+
+        console = Console()
+        console.print(Align.center(panel))
+
+    except Exception as e:
+        PrettyOutput.print(f"加载统计信息失败: {e}", OutputType.WARNING)
+
+
 origin_agent_system_prompt = f"""
 <role>
 # 🤖 角色
@@ -175,9 +270,8 @@ class Agent:
         # 设置系统提示词
         self._setup_system_prompt()
 
-        # 打印欢迎信息
-        welcome_message = f"{name} 初始化完成 - 使用 {self.model.name()} 模型"  # type: ignore
-        PrettyOutput.print(welcome_message, OutputType.SYSTEM)
+        # 输出统计信息（包含欢迎信息）
+        show_agent_startup_stats(name, self.model.name())  # type: ignore
 
     def _init_model(self, llm_type: str, model_group: Optional[str]):
         """初始化模型平台"""
@@ -190,7 +284,9 @@ class Agent:
 
         self.model = PlatformRegistry().create_platform(platform_name)
         if self.model is None:
-            PrettyOutput.print(f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING)
+            PrettyOutput.print(
+                f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING
+            )
             self.model = PlatformRegistry().get_normal_platform()
 
         if model_name:
@@ -512,10 +608,8 @@ class Agent:
 
         if self.use_analysis:
             self.task_analyzer.analysis_task(satisfaction_feedback)
-        else:
-            # 如果没有开启分析，也提示用户是否有值得记忆的信息
-            if self.force_save_memory:
-                self.memory_manager.prompt_memory_save()
+
+        self._check_and_organize_memory()
 
         if self.need_summary:
             print("📄 正在生成总结...")
@@ -689,7 +783,9 @@ class Agent:
         返回:
             str: "continue" 或 "complete"
         """
-        user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
+        user_input = self.multiline_inputer(
+            f"{self.name}: 请输入，或输入空行来结束当前任务："
+        )
 
         if user_input:
             self.session.prompt = user_input
@@ -711,6 +807,71 @@ class Agent:
 
         self.first = False
 
+    def _check_and_organize_memory(self):
+        """
+        检查记忆库状态，如果满足条件则提示用户整理。
+        每天只检测一次。
+        """
+        try:
+            # 检查项目记忆
+            self._perform_memory_check("project_long_term", Path(".jarvis"), "project")
+            # 检查全局记忆
+            self._perform_memory_check(
+                "global_long_term",
+                Path(get_data_dir()),
+                "global",
+            )
+        except Exception as e:
+            PrettyOutput.print(f"检查记忆库时发生意外错误: {e}", OutputType.WARNING)
+
+    def _perform_memory_check(self, memory_type: str, base_path: Path, scope_name: str):
+        """执行特定范围的记忆检查和整理"""
+        check_file = base_path / ".last_memory_organizer_check"
+        now = datetime.datetime.now()
+
+        if check_file.exists():
+            try:
+                last_check_time = datetime.datetime.fromisoformat(
+                    check_file.read_text()
+                )
+                if (now - last_check_time).total_seconds() < 24 * 3600:
+                    return  # 24小时内已检查
+            except (ValueError, FileNotFoundError):
+                # 文件内容无效或文件在读取时被删除，继续执行检查
+                pass
+
+        # 立即更新检查时间，防止并发或重复检查
+        base_path.mkdir(parents=True, exist_ok=True)
+        check_file.write_text(now.isoformat())
+
+        organizer = MemoryOrganizer()
+        # NOTE: 使用受保护方法以避免重复实现逻辑
+        memories = organizer._load_memories(memory_type)
+
+        if len(memories) < 200:
+            return
+
+        # NOTE: 使用受保护方法以避免重复实现逻辑
+        overlap_groups = organizer._find_overlapping_memories(memories, min_overlap=3)
+        has_significant_overlap = any(groups for groups in overlap_groups.values())
+
+        if not has_significant_overlap:
+            return
+
+        prompt = (
+            f"检测到您的 '{scope_name}' 记忆库中包含 {len(memories)} 条记忆，"
+            f"并且存在3个以上标签重叠的记忆。\n"
+            f"是否立即整理记忆库以优化性能和相关性？"
+        )
+        if user_confirm(prompt, default=True):
+            PrettyOutput.print(
+                f"正在开始整理 '{scope_name}' ({memory_type}) 记忆库...",
+                OutputType.INFO,
+            )
+            organizer.organize_memories(memory_type, min_overlap=3)
+        else:
+            PrettyOutput.print(f"已取消 '{scope_name}' 记忆库整理。", OutputType.INFO)
+
     def clear_history(self):
         """
         Clears conversation history by delegating to the session manager.

jarvis/jarvis_agent/file_methodology_manager.py

@@ -80,7 +80,12 @@ class FileMethodologyManager:
 
         memory_manager = MemoryManager(self.agent)
         memory_tags_prompt = memory_manager.prepare_memory_tags_prompt()
-        methodology = load_methodology(msg, self.agent.get_tool_registry())
+        methodology = load_methodology(
+            msg,
+            self.agent.get_tool_registry(),
+            platform_name=self.agent.model.platform_name(),
+            model_name=self.agent.model.name(),
+        )
         self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}{memory_tags_prompt}"
 
     def handle_history_with_file_upload(self) -> str:

jarvis/jarvis_agent/share_manager.py

@@ -98,6 +98,27 @@ class ShareManager(ABC):
                 )
                 # 如果有远程分支，执行pull
                 if result.stdout.strip():
+                    # 检查是否有未提交的更改
+                    status_result = subprocess.run(
+                        ["git", "status", "--porcelain"],
+                        cwd=self.repo_path,
+                        capture_output=True,
+                        text=True,
+                        check=True,
+                    )
+                    if status_result.stdout:
+                        if user_confirm(
+                            f"检测到中心{self.get_resource_type()}仓库 '{self.repo_name}' 存在未提交的更改，是否放弃这些更改并更新？"
+                        ):
+                            subprocess.run(
+                                ["git", "checkout", "."], cwd=self.repo_path, check=True
+                            )
+                        else:
+                            PrettyOutput.print(
+                                f"跳过更新 '{self.repo_name}' 以保留未提交的更改。",
+                                OutputType.INFO,
+                            )
+                            return
                     subprocess.run(["git", "pull"], cwd=self.repo_path, check=True)
                 else:
                     PrettyOutput.print(

jarvis/jarvis_agent/tool_executor.py

@@ -41,9 +41,13 @@ def execute_tool_call(response: str, agent: "Agent") -> Tuple[bool, Any]:
     if not agent.execute_tool_confirm or user_confirm(
         f"需要执行{tool_to_execute.name()}确认执行？", True
     ):
-        print(f"🔧 正在执行{tool_to_execute.name()}...")
-        result = tool_to_execute.handle(response, agent)
-        print(f"✅ {tool_to_execute.name()}执行完成")
-        return result
+        try:
+            print(f"🔧 正在执行{tool_to_execute.name()}...")
+            result = tool_to_execute.handle(response, agent)
+            print(f"✅ {tool_to_execute.name()}执行完成")
+            return result
+        except Exception as e:
+            PrettyOutput.print(f"工具执行失败: {str(e)}", OutputType.ERROR)
+            return False, str(e)
 
     return False, ""

jarvis/jarvis_code_agent/code_agent.py

@@ -398,11 +398,6 @@ class CodeAgent:
             if not user_confirm("是否要提交？", True):
                 return
 
-            # 用户确认修改，统计修改次数
-            from jarvis.jarvis_stats.stats import StatsManager
-
-            StatsManager.increment("code_modification_confirmed", group="code_agent")
-
             try:
                 confirm_add_new_files()
 
@@ -431,9 +426,6 @@ class CodeAgent:
                     ["git", "commit", "-m", f"CheckPoint #{commit_count + 1}"],
                     check=True,
                 )
-
-                # 统计提交次数
-                StatsManager.increment("code_commits_accepted", group="code_agent")
             except subprocess.CalledProcessError as e:
                 PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
 
@@ -484,6 +476,10 @@ class CodeAgent:
             )
             git_commiter = GitCommitTool()
             git_commiter.execute({})
+
+            # 在用户接受commit后，根据配置决定是否保存记忆
+            if self.agent.force_save_memory:
+                self.agent.memory_manager.prompt_memory_save()
         elif start_commit:
             os.system(f"git reset --hard {str(start_commit)}")  # 确保转换为字符串
             PrettyOutput.print("已重置到初始提交", OutputType.INFO)
@@ -642,7 +638,8 @@ class CodeAgent:
 def cli(
     llm_type: str = typer.Option(
         "normal",
-        "-t", "--llm_type",
+        "-t",
+        "--llm_type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
     model_group: Optional[str] = typer.Option(
@@ -695,9 +692,7 @@ def cli(
             sys.exit(0)
 
     curr_dir = os.getcwd()
-    git_dir = find_git_root_and_cd(curr_dir)
-    PrettyOutput.print(f"当前目录: {git_dir}", OutputType.INFO)
-
+    find_git_root_and_cd(curr_dir)
     try:
         agent = CodeAgent(
             llm_type=llm_type,

jarvis/jarvis_code_analysis/code_review.py

@@ -300,7 +300,11 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
+                        diff_cmd,
+                        shell=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
                     )
                     if not diff_output:
                         return {
@@ -339,7 +343,11 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
+                        diff_cmd,
+                        shell=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
                     )
                     if not diff_output:
                         return {
@@ -381,7 +389,11 @@ class CodeReviewTool:
 
                     # Execute git command and get diff output
                     diff_output = subprocess.check_output(
-                        diff_cmd, shell=True, text=True, encoding="utf-8", errors="replace"
+                        diff_cmd,
+                        shell=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
                     )
                     if not diff_output:
                         return {
@@ -581,16 +593,48 @@ class CodeReviewTool:
                 tool_registry = ToolRegistry()
                 tool_registry.dont_use_tools(["code_review"])
 
-                # Use the provided agent's model_group or get it from globals
+                # Get llm_type and model_group from args
+                llm_type = args.get("llm_type", "normal")
+                model_group = args.get("model_group")
+
+                # Get platform and model based on llm_type and model_group
+                from jarvis.jarvis_utils.config import (
+                    get_normal_platform_name,
+                    get_normal_model_name,
+                    get_thinking_platform_name,
+                    get_thinking_model_name,
+                )
+
+                if llm_type == "thinking":
+                    platform_name = get_thinking_platform_name(model_group)
+                    model_name = get_thinking_model_name(model_group)
+                else:
+                    platform_name = get_normal_platform_name(model_group)
+                    model_name = get_normal_model_name(model_group)
+
+                # If no explicit parameters, try to get from existing agent
                 calling_agent = agent or get_agent(current_agent_name)
-                model_group = None
-                if calling_agent and hasattr(calling_agent, "model") and calling_agent.model:
-                    model_group = calling_agent.model.model_group
+                if (
+                    not platform_name
+                    and calling_agent
+                    and hasattr(calling_agent, "model")
+                    and calling_agent.model
+                ):
+                    platform_name = calling_agent.model.platform_name()
+                    model_name = calling_agent.model.name()
+
+                # Create a new platform instance
+                review_model = None
+                if platform_name:
+                    review_model = PlatformRegistry().create_platform(platform_name)
+                    if review_model and model_name:
+                        review_model.set_model_name(model_name)
+                        if model_group:
+                            review_model.model_group = model_group
 
                 agent = Agent(
                     system_prompt=system_prompt,
                     name="Code Review Agent",
-                    model_group=model_group,
                     summary_prompt=f"""<code_review_report>
 <overview>
 # 整体评估
@@ -660,6 +704,10 @@ class CodeReviewTool:
                     auto_complete=False,
                 )
 
+                # Replace the agent's model with our custom platform instance
+                if review_model:
+                    agent.model = review_model
+
                 # Determine if we need to split the diff due to size
                 max_diff_size = 100 * 1024 * 1024  # Limit to 100MB
 
@@ -693,7 +741,9 @@ class CodeReviewTool:
 
                 try:
                     # Check if content is too large
-                    is_large_content = is_context_overflow(diff_output, model_group)
+                    is_large_content = is_context_overflow(
+                        diff_output, review_model.model_group if review_model else None
+                    )
 
                     # Upload the file to the agent's model
                     if is_large_content:
@@ -773,10 +823,25 @@ def extract_code_report(result: str) -> str:
 def review_commit(
     commit: str = typer.Argument(..., help="要审查的提交SHA"),
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     """审查指定的提交"""
     tool = CodeReviewTool()
-    tool_args = {"review_type": "commit", "commit_sha": commit, "root_dir": root_dir}
+    tool_args = {
+        "review_type": "commit",
+        "commit_sha": commit,
+        "root_dir": root_dir,
+        "llm_type": llm_type,
+        "model_group": model_group,
+    }
     result = tool.execute(tool_args)
     if result["success"]:
         PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
@@ -789,10 +854,24 @@ def review_commit(
 @app.command("current")
 def review_current(
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     """审查当前的变更"""
     tool = CodeReviewTool()
-    tool_args = {"review_type": "current", "root_dir": root_dir}
+    tool_args = {
+        "review_type": "current",
+        "root_dir": root_dir,
+        "llm_type": llm_type,
+        "model_group": model_group,
+    }
     result = tool.execute(tool_args)
     if result["success"]:
         PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
@@ -807,6 +886,15 @@ def review_range(
     start_commit: str = typer.Argument(..., help="起始提交SHA"),
     end_commit: str = typer.Argument(..., help="结束提交SHA"),
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     """审查提交范围"""
     tool = CodeReviewTool()
@@ -815,6 +903,8 @@ def review_range(
         "start_commit": start_commit,
         "end_commit": end_commit,
         "root_dir": root_dir,
+        "llm_type": llm_type,
+        "model_group": model_group,
     }
     result = tool.execute(tool_args)
     if result["success"]:
@@ -829,10 +919,25 @@ def review_range(
 def review_file(
     file: str = typer.Argument(..., help="要审查的文件路径"),
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     """审查指定的文件"""
     tool = CodeReviewTool()
-    tool_args = {"review_type": "file", "file_path": file, "root_dir": root_dir}
+    tool_args = {
+        "review_type": "file",
+        "file_path": file,
+        "root_dir": root_dir,
+        "llm_type": llm_type,
+        "model_group": model_group,
+    }
     result = tool.execute(tool_args)
     if result["success"]:
         PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)

jarvis/jarvis_git_utils/git_commiter.py

@@ -164,14 +164,59 @@ commit信息
 {ct("COMMIT_MESSAGE")}
                 """
 
-                # 获取模型并尝试上传文件
+                # Get llm_type and model_group from args
+                llm_type = args.get("llm_type", "normal")
+                model_group = args.get("model_group")
+
+                # Get platform and model based on llm_type and model_group
+                from jarvis.jarvis_utils.config import (
+                    get_normal_platform_name,
+                    get_normal_model_name,
+                    get_thinking_platform_name,
+                    get_thinking_model_name,
+                )
+
+                if llm_type == "thinking":
+                    platform_name = get_thinking_platform_name(model_group)
+                    model_name = get_thinking_model_name(model_group)
+                else:
+                    platform_name = get_normal_platform_name(model_group)
+                    model_name = get_normal_model_name(model_group)
+
+                # If no explicit parameters, try to get from existing agent
                 agent = get_agent(current_agent_name)
-                if agent:
-                    platform = agent.model
-                    model_group = agent.model.model_group
+                if (
+                    not platform_name
+                    and agent
+                    and hasattr(agent, "model")
+                    and agent.model
+                ):
+                    platform_name = agent.model.platform_name()
+                    model_name = agent.model.name()
+                    if not model_group:
+                        model_group = agent.model.model_group
+
+                # Create a new platform instance
+                if platform_name:
+                    platform = PlatformRegistry().create_platform(platform_name)
+                    if platform and model_name:
+                        platform.set_model_name(model_name)
+                        if model_group:
+                            platform.model_group = model_group
                 else:
-                    platform = PlatformRegistry().get_normal_platform()
-                    model_group = None
+                    if llm_type == "thinking":
+                        platform = PlatformRegistry().get_thinking_platform()
+                    else:
+                        platform = PlatformRegistry().get_normal_platform()
+
+                # Ensure platform is not None
+                if not platform:
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": "错误：无法创建平台实例",
+                    }
+
                 upload_success = False
 
                 # Check if content is too large
@@ -330,9 +375,7 @@ commit信息
 
 @app.command()
 def cli(
-    root_dir: str = typer.Option(
-        ".", "--root-dir", help="Git仓库的根目录路径"
-    ),
+    root_dir: str = typer.Option(".", "--root-dir", help="Git仓库的根目录路径"),
     prefix: str = typer.Option(
         "",
         "--prefix",
@@ -343,6 +386,15 @@ def cli(
         "--suffix",
         help="提交信息后缀（用换行分隔）",
     ),
+    llm_type: str = typer.Option(
+        "normal",
+        "-t",
+        "--llm_type",
+        help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "-g", "--llm_group", help="使用的模型组，覆盖配置文件中的设置"
+    ),
 ):
     init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")
     tool = GitCommitTool()
@@ -351,6 +403,8 @@ def cli(
             "root_dir": root_dir,
             "prefix": prefix,
             "suffix": suffix,
+            "llm_type": llm_type,
+            "model_group": model_group,
         }
     )