jarvis-ai-assistant 0.3.30__py3-none-any.whl → 0.7.6__py3-none-any.whl

jarvis/jarvis_code_analysis/code_review.py

@@ -9,455 +9,408 @@ import typer
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_code_analysis.checklists.loader import get_language_checklist
-from jarvis.jarvis_platform.registry import PlatformRegistry
+
 from jarvis.jarvis_tools.read_code import ReadCodeTool
-from jarvis.jarvis_utils.globals import get_agent, current_agent_name
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput  # 保留用于语法高亮
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 
 app = typer.Typer(help="自动代码审查工具")
 
 
-class CodeReviewTool:
-    name = "code_review"
-    description = "自动代码审查工具，用于分析代码变更"
-    labels = ["code", "analysis", "review"]
-    parameters = {
-        "type": "object",
-        "properties": {
-            "review_type": {
-                "type": "string",
-                "description": "审查类型：'commit' 审查特定提交，'current' 审查当前变更，'range' 审查提交范围，'file' 审查特定文件",
-                "enum": ["commit", "current", "range", "file"],
-                "default": "current",
-            },
-            "commit_sha": {
-                "type": "string",
-                "description": "要分析的提交SHA（review_type='commit'时必填）",
-            },
-            "start_commit": {
-                "type": "string",
-                "description": "起始提交SHA（review_type='range'时必填）",
-            },
-            "end_commit": {
-                "type": "string",
-                "description": "结束提交SHA（review_type='range'时必填）",
-            },
-            "file_path": {
-                "type": "string",
-                "description": "要审查的文件路径（review_type='file'时必填）",
-            },
-            "root_dir": {
-                "type": "string",
-                "description": "代码库根目录路径（可选）",
-                "default": ".",
-            },
-        },
-        "required": [],
+def _detect_languages_from_files(file_paths: List[str]) -> List[str]:
+    """
+    Detect programming languages from a list of file paths using file extensions.
+    Returns a list of detected languages ('c_cpp', 'go', 'python', 'rust', 'java', 'javascript', 'typescript', etc.).
+    """
+    if not file_paths:
+        return []
+
+    # Extension-based language detection
+    languages = set()
+    for file_path in file_paths:
+        file_path = file_path.lower()
+        _, ext = os.path.splitext(file_path)
+
+        # Get base name for special files without extensions
+        base_name = os.path.basename(file_path)
+
+        # C/C++
+        if ext in [
+            ".c",
+            ".cpp",
+            ".cc",
+            ".cxx",
+            ".h",
+            ".hpp",
+            ".hxx",
+            ".inl",
+            ".ipp",
+        ]:
+            languages.add("c_cpp")
+
+        # Go
+        elif ext in [".go"]:
+            languages.add("go")
+
+        # Python
+        elif ext in [".py", ".pyw", ".pyi", ".pyx", ".pxd"] or base_name in [
+            "requirements.txt",
+            "setup.py",
+            "pyproject.toml",
+        ]:
+            languages.add("python")
+
+        # Rust
+        elif ext in [".rs", ".rlib"] or base_name in ["Cargo.toml", "Cargo.lock"]:
+            languages.add("rust")
+
+        # Java
+        elif ext in [".java", ".class", ".jar"] or base_name in [
+            "pom.xml",
+            "build.gradle",
+        ]:
+            languages.add("java")
+
+        # JavaScript
+        elif ext in [".js", ".mjs", ".cjs", ".jsx"]:
+            languages.add("javascript")
+
+        # TypeScript
+        elif ext in [".ts", ".tsx", ".cts", ".mts"]:
+            languages.add("typescript")
+
+        # PHP
+        elif ext in [".php", ".phtml", ".php5", ".php7", ".phps"]:
+            languages.add("php")
+
+        # Ruby
+        elif ext in [".rb", ".rake", ".gemspec"] or base_name in [
+            "Gemfile",
+            "Rakefile",
+        ]:
+            languages.add("ruby")
+
+        # Swift
+        elif ext in [".swift"]:
+            languages.add("swift")
+
+        # Kotlin
+        elif ext in [".kt", ".kts"]:
+            languages.add("kotlin")
+
+        # C#
+        elif ext in [".cs", ".csx"]:
+            languages.add("csharp")
+
+        # SQL
+        elif ext in [".sql"]:
+            languages.add("sql")
+
+        # Shell/Bash
+        elif (
+            ext in [".sh", ".bash"]
+            or base_name.startswith(".bash")
+            or base_name.startswith(".zsh")
+        ):
+            languages.add("shell")
+
+        # HTML/CSS
+        elif ext in [".html", ".htm", ".xhtml"]:
+            languages.add("html")
+        elif ext in [".css", ".scss", ".sass", ".less"]:
+            languages.add("css")
+
+        # XML/JSON/YAML (config files)
+        elif ext in [
+            ".xml",
+            ".xsd",
+            ".dtd",
+            ".tld",
+            ".jsp",
+            ".jspx",
+            ".tag",
+            ".tagx",
+        ]:
+            languages.add("xml")
+        elif ext in [".json", ".jsonl", ".json5"]:
+            languages.add("json")
+        elif ext in [".yaml", ".yml"]:
+            languages.add("yaml")
+
+        # Markdown/Documentation
+        elif ext in [".md", ".markdown", ".rst", ".adoc"]:
+            languages.add("markdown")
+
+        # Docker
+        elif ext in [".dockerfile"] or base_name in [
+            "Dockerfile",
+            "docker-compose.yml",
+            "docker-compose.yaml",
+        ]:
+            languages.add("docker")
+
+        # Terraform
+        elif ext in [".tf", ".tfvars"]:
+            languages.add("terraform")
+
+        # Makefile
+        elif ext in [".mk"] or base_name == "Makefile":
+            languages.add("makefile")
+
+    # Map to our primary language groups for checklist purposes
+    primary_languages = set()
+    language_mapping = {
+        "c_cpp": "c_cpp",
+        "go": "go",
+        "python": "python",
+        "rust": "rust",
+        "java": "java",
+        "javascript": "javascript",
+        "typescript": "typescript",
+        "php": "php",
+        "ruby": "ruby",
+        "swift": "swift",
+        "kotlin": "kotlin",
+        "csharp": "csharp",
+        "sql": "sql",
+        "shell": "shell",
+        "html": "html",
+        "css": "css",
+        "xml": "xml",
+        "json": "json",
+        "yaml": "yaml",
+        "markdown": "docs",
+        "docker": "docker",
+        "terraform": "terraform",
+        "makefile": "devops",
     }
 
-    def _detect_languages_from_files(self, file_paths: List[str]) -> List[str]:
-        """
-        Detect programming languages from a list of file paths using file extensions.
-        Returns a list of detected languages ('c_cpp', 'go', 'python', 'rust', 'java', 'javascript', 'typescript', etc.).
-        """
-        if not file_paths:
-            return []
-
-        # Extension-based language detection
-        languages = set()
-        for file_path in file_paths:
-            file_path = file_path.lower()
-            _, ext = os.path.splitext(file_path)
-
-            # Get base name for special files without extensions
-            base_name = os.path.basename(file_path)
-
-            # C/C++
-            if ext in [
-                ".c",
-                ".cpp",
-                ".cc",
-                ".cxx",
-                ".h",
-                ".hpp",
-                ".hxx",
-                ".inl",
-                ".ipp",
+    # Map detected languages to primary language groups
+    for lang in languages:
+        primary_lang = language_mapping.get(lang)
+        if primary_lang:
+            # Only keep languages we have checklists for
+            if primary_lang in [
+                "c_cpp",
+                "go",
+                "python",
+                "rust",
+                "java",
+                "javascript",
+                "typescript",
+                "csharp",
+                "swift",
+                "php",
+                "shell",
+                "sql",
+                "ruby",
+                "kotlin",
+                "html",
+                "css",
+                "xml",
+                "json",
+                "yaml",
+                "docker",
+                "terraform",
+                "docs",
+                "markdown",
+                "devops",
+                "makefile",
             ]:
-                languages.add("c_cpp")
-
-            # Go
-            elif ext in [".go"]:
-                languages.add("go")
+                primary_languages.add(primary_lang)
 
-            # Python
-            elif ext in [".py", ".pyw", ".pyi", ".pyx", ".pxd"] or base_name in [
-                "requirements.txt",
-                "setup.py",
-                "pyproject.toml",
-            ]:
-                languages.add("python")
+    return list(primary_languages)
 
-            # Rust
-            elif ext in [".rs", ".rlib"] or base_name in ["Cargo.toml", "Cargo.lock"]:
-                languages.add("rust")
 
-            # Java
-            elif ext in [".java", ".class", ".jar"] or base_name in [
-                "pom.xml",
-                "build.gradle",
-            ]:
-                languages.add("java")
+def _get_language_checklist(language: str) -> str:
+    """Get the checklist for a specific language."""
+    checklist = get_language_checklist(language)
+    return checklist if checklist else ""
 
-            # JavaScript
-            elif ext in [".js", ".mjs", ".cjs", ".jsx"]:
-                languages.add("javascript")
 
-            # TypeScript
-            elif ext in [".ts", ".tsx", ".cts", ".mts"]:
-                languages.add("typescript")
+def execute_code_review(
+    args: Dict[str, Any], agent: Optional["Agent"] = None
+) -> Dict[str, Any]:
+    """
+    纯CLI Agent执行入口：根据审查类型获取差异、构建审查上下文并通过Agent生成报告。
+    不注册为Tool，不通过ToolRegistry。
+    """
+    try:
+        review_type = args.get("review_type", "current").strip()
+        root_dir = args.get("root_dir", ".")
 
-            # PHP
-            elif ext in [".php", ".phtml", ".php5", ".php7", ".phps"]:
-                languages.add("php")
+        # Store current directory
+        original_dir = os.getcwd()
 
-            # Ruby
-            elif ext in [".rb", ".rake", ".gemspec"] or base_name in [
-                "Gemfile",
-                "Rakefile",
-            ]:
-                languages.add("ruby")
-
-            # Swift
-            elif ext in [".swift"]:
-                languages.add("swift")
-
-            # Kotlin
-            elif ext in [".kt", ".kts"]:
-                languages.add("kotlin")
-
-            # C#
-            elif ext in [".cs", ".csx"]:
-                languages.add("csharp")
-
-            # SQL
-            elif ext in [".sql"]:
-                languages.add("sql")
-
-            # Shell/Bash
-            elif (
-                ext in [".sh", ".bash"]
-                or base_name.startswith(".bash")
-                or base_name.startswith(".zsh")
-            ):
-                languages.add("shell")
-
-            # HTML/CSS
-            elif ext in [".html", ".htm", ".xhtml"]:
-                languages.add("html")
-            elif ext in [".css", ".scss", ".sass", ".less"]:
-                languages.add("css")
-
-            # XML/JSON/YAML (config files)
-            elif ext in [
-                ".xml",
-                ".xsd",
-                ".dtd",
-                ".tld",
-                ".jsp",
-                ".jspx",
-                ".tag",
-                ".tagx",
-            ]:
-                languages.add("xml")
-            elif ext in [".json", ".jsonl", ".json5"]:
-                languages.add("json")
-            elif ext in [".yaml", ".yml"]:
-                languages.add("yaml")
-
-            # Markdown/Documentation
-            elif ext in [".md", ".markdown", ".rst", ".adoc"]:
-                languages.add("markdown")
-
-            # Docker
-            elif ext in [".dockerfile"] or base_name in [
-                "Dockerfile",
-                "docker-compose.yml",
-                "docker-compose.yaml",
-            ]:
-                languages.add("docker")
-
-            # Terraform
-            elif ext in [".tf", ".tfvars"]:
-                languages.add("terraform")
-
-            # Makefile
-            elif ext in [".mk"] or base_name == "Makefile":
-                languages.add("makefile")
-
-        # Map to our primary language groups for checklist purposes
-        primary_languages = set()
-        language_mapping = {
-            "c_cpp": "c_cpp",
-            "go": "go",
-            "python": "python",
-            "rust": "rust",
-            "java": "java",
-            "javascript": "javascript",
-            "typescript": "typescript",
-            "php": "php",
-            "ruby": "ruby",
-            "swift": "swift",
-            "kotlin": "kotlin",
-            "csharp": "csharp",
-            "sql": "sql",
-            "shell": "shell",
-            "html": "html",
-            "css": "css",
-            "xml": "xml",
-            "json": "json",
-            "yaml": "yaml",
-            "markdown": "docs",
-            "docker": "docker",
-            "terraform": "terraform",
-            "makefile": "devops",
-        }
-
-        # Map detected languages to primary language groups
-        for lang in languages:
-            primary_lang = language_mapping.get(lang)
-            if primary_lang:
-                # Only keep languages we have checklists for
-                if primary_lang in [
-                    "c_cpp",
-                    "go",
-                    "python",
-                    "rust",
-                    "java",
-                    "javascript",
-                    "typescript",
-                    "csharp",
-                    "swift",
-                    "php",
-                    "shell",
-                    "sql",
-                    "ruby",
-                    "kotlin",
-                    "html",
-                    "css",
-                    "xml",
-                    "json",
-                    "yaml",
-                    "docker",
-                    "terraform",
-                    "docs",
-                    "markdown",
-                    "devops",
-                    "makefile",
-                ]:
-                    primary_languages.add(primary_lang)
-
-        return list(primary_languages)
-
-    def _get_language_checklist(self, language: str) -> str:
-        """Get the checklist for a specific language."""
-        checklist = get_language_checklist(language)
-        return checklist if checklist else ""
-
-    def execute(
-        self, args: Dict[str, Any], agent: Optional["Agent"] = None
-    ) -> Dict[str, Any]:
         try:
-            review_type = args.get("review_type", "current").strip()
-            root_dir = args.get("root_dir", ".")
-
-            # Store current directory
-            original_dir = os.getcwd()
-
-            try:
-                # Change to root_dir
-                os.chdir(root_dir)
-
-                # Variables to store file paths and diff output
-                file_paths = []
-                diff_output = ""
-
-                # Build git diff command based on review type
-
-                if review_type == "commit":
-                    if "commit_sha" not in args:
-                        return {
-                            "success": False,
-                            "stdout": {},
-                            "stderr": "commit_sha is required for commit review type",
-                        }
-                    commit_sha = args["commit_sha"].strip()
-                    diff_cmd = f"git show {commit_sha} | cat -"
-
-                    # Execute git command and get diff output
-                    diff_output = subprocess.check_output(
-                        diff_cmd,
-                        shell=True,
-                        text=True,
-                        encoding="utf-8",
-                        errors="replace",
-                    )
-                    if not diff_output:
-                        return {
-                            "success": False,
-                            "stdout": {},
-                            "stderr": "No changes to review",
-                        }
-
-                    # Extract changed files using git command
-                    # Use git show with proper formatting to avoid needing grep
-                    files_cmd = f"git show --name-only --pretty=format: {commit_sha}"
-                    try:
-                        files_output = subprocess.check_output(
-                            files_cmd, shell=True, text=True
-                        )
-                        # Filter out empty lines without using grep
-                        file_paths = [
-                            f.strip() for f in files_output.split("\n") if f.strip()
-                        ]
-                    except subprocess.CalledProcessError:
-                        # Fallback to regex extraction if git command fails
-                        file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
-                        files = re.findall(file_pattern, diff_output)
-                        file_paths = [match[0] for match in files]
-
-                elif review_type == "range":
-                    if "start_commit" not in args or "end_commit" not in args:
-                        return {
-                            "success": False,
-                            "stdout": {},
-                            "stderr": "start_commit and end_commit are required for range review type",
-                        }
-                    start_commit = args["start_commit"].strip()
-                    end_commit = args["end_commit"].strip()
-                    diff_cmd = f"git diff {start_commit}..{end_commit} | cat -"
-
-                    # Execute git command and get diff output
-                    diff_output = subprocess.check_output(
-                        diff_cmd,
-                        shell=True,
-                        text=True,
-                        encoding="utf-8",
-                        errors="replace",
-                    )
-                    if not diff_output:
-                        return {
-                            "success": False,
-                            "stdout": {},
-                            "stderr": "No changes to review",
-                        }
-
-                    # Extract changed files using git command
-                    files_cmd = f"git diff --name-only {start_commit}..{end_commit}"
-                    try:
-                        files_output = subprocess.check_output(
-                            files_cmd, shell=True, text=True
-                        )
-                        file_paths = [
-                            f.strip() for f in files_output.split("\n") if f.strip()
-                        ]
-                    except subprocess.CalledProcessError:
-                        # Fallback to regex extraction if git command fails
-                        file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
-                        files = re.findall(file_pattern, diff_output)
-                        file_paths = [match[0] for match in files]
-
-                elif review_type == "file":
-                    if "file_path" not in args:
-                        return {
-                            "success": False,
-                            "stdout": {},
-                            "stderr": "file_path is required for file review type",
-                        }
-                    file_path = args["file_path"].strip()
-                    file_paths = [file_path]
-                    diff_output = ReadCodeTool().execute(
-                        {"files": [{"path": file_path}]}
-                    )["stdout"]
-
-                else:  # current changes
-                    diff_cmd = "git diff HEAD | cat -"
-
-                    # Execute git command and get diff output
-                    diff_output = subprocess.check_output(
-                        diff_cmd,
-                        shell=True,
-                        text=True,
-                        encoding="utf-8",
-                        errors="replace",
-                    )
-                    if not diff_output:
-                        return {
-                            "success": False,
-                            "stdout": {},
-                            "stderr": "No changes to review",
-                        }
-
-                    # Extract changed files using git command
-                    files_cmd = "git diff --name-only HEAD"
-                    try:
-                        files_output = subprocess.check_output(
-                            files_cmd, shell=True, text=True
-                        )
-                        file_paths = [
-                            f.strip() for f in files_output.split("\n") if f.strip()
-                        ]
-                    except subprocess.CalledProcessError:
-                        # Fallback to regex extraction if git command fails
-                        file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
-                        files = re.findall(file_pattern, diff_output)
-                        file_paths = [match[0] for match in files]
-
-                # Detect languages from the file paths
-                detected_languages = self._detect_languages_from_files(file_paths)
-
-                # Add review type and related information to the diff output
-                review_info = f"""
+            # Change to root_dir
+            os.chdir(root_dir)
+
+            # Variables to store file paths and diff output
+            file_paths: List[str] = []
+            diff_output = ""
+
+            # Build git diff command based on review type
+
+            if review_type == "commit":
+                if "commit_sha" not in args:
+                    return {
+                        "success": False,
+                        "stdout": {},
+                        "stderr": "commit_sha is required for commit review type",
+                    }
+                commit_sha = args["commit_sha"].strip()
+                diff_cmd = f"git show {commit_sha} | cat -"
+
+                # Execute git command and get diff output
+                diff_output = subprocess.check_output(
+                    diff_cmd,
+                    shell=True,
+                    text=True,
+                    encoding="utf-8",
+                    errors="replace",
+                )
+                if not diff_output:
+                    return {
+                        "success": False,
+                        "stdout": {},
+                        "stderr": "No changes to review",
+                    }
+
+                # Extract changed files using git command
+                files_cmd = f"git show --name-only --pretty=format: {commit_sha}"
+                try:
+                    files_output = subprocess.check_output(files_cmd, shell=True, text=True)
+                    # Filter out empty lines without using grep
+                    file_paths = [f.strip() for f in files_output.split("\n") if f.strip()]
+                except subprocess.CalledProcessError:
+                    # Fallback to regex extraction if git command fails
+                    file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
+                    files = re.findall(file_pattern, diff_output)
+                    file_paths = [match[0] for match in files]
+
+            elif review_type == "range":
+                if "start_commit" not in args or "end_commit" not in args:
+                    return {
+                        "success": False,
+                        "stdout": {},
+                        "stderr": "start_commit and end_commit are required for range review type",
+                    }
+                start_commit = args["start_commit"].strip()
+                end_commit = args["end_commit"].strip()
+                diff_cmd = f"git diff {start_commit}..{end_commit} | cat -"
+
+                # Execute git command and get diff output
+                diff_output = subprocess.check_output(
+                    diff_cmd,
+                    shell=True,
+                    text=True,
+                    encoding="utf-8",
+                    errors="replace",
+                )
+                if not diff_output:
+                    return {
+                        "success": False,
+                        "stdout": {},
+                        "stderr": "No changes to review",
+                    }
+
+                # Extract changed files using git command
+                files_cmd = f"git diff --name-only {start_commit}..{end_commit}"
+                try:
+                    files_output = subprocess.check_output(files_cmd, shell=True, text=True)
+                    file_paths = [f.strip() for f in files_output.split("\n") if f.strip()]
+                except subprocess.CalledProcessError:
+                    # Fallback to regex extraction if git command fails
+                    file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
+                    files = re.findall(file_pattern, diff_output)
+                    file_paths = [match[0] for match in files]
+
+            elif review_type == "file":
+                if "file_path" not in args:
+                    return {
+                        "success": False,
+                        "stdout": {},
+                        "stderr": "file_path is required for file review type",
+                    }
+                file_path = args["file_path"].strip()
+                file_paths = [file_path]
+                diff_output = ReadCodeTool().execute({"files": [{"path": file_path}]})["stdout"]
+
+            else:  # current changes
+                diff_cmd = "git diff HEAD | cat -"
+
+                # Execute git command and get diff output
+                diff_output = subprocess.check_output(
+                    diff_cmd,
+                    shell=True,
+                    text=True,
+                    encoding="utf-8",
+                    errors="replace",
+                )
+                if not diff_output:
+                    return {
+                        "success": False,
+                        "stdout": {},
+                        "stderr": "No changes to review",
+                    }
+
+                # Extract changed files using git command
+                files_cmd = "git diff --name-only HEAD"
+                try:
+                    files_output = subprocess.check_output(files_cmd, shell=True, text=True)
+                    file_paths = [f.strip() for f in files_output.split("\n") if f.strip()]
+                except subprocess.CalledProcessError:
+                    # Fallback to regex extraction if git command fails
+                    file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
+                    files = re.findall(file_pattern, diff_output)
+                    file_paths = [match[0] for match in files]
+
+            # Detect languages from the file paths
+            detected_languages = _detect_languages_from_files(file_paths)
+
+            # Add review type and related information to the diff output
+            review_info = f"""
 ----- 代码审查信息 -----
 审查类型: {review_type}"""
 
-                # Add specific information based on review type
-                if review_type == "commit":
-                    review_info += f"\n提交SHA: {args['commit_sha']}"
-                elif review_type == "range":
-                    review_info += f"\n起始提交: {args['start_commit']}\n结束提交: {args['end_commit']}"
-                elif review_type == "file":
-                    review_info += f"\n文件路径: {args['file_path']}"
-                else:  # current changes
-                    review_info += "\n当前未提交修改"
-
-                # Add file list
-                if file_paths:
-                    review_info += "\n\n----- 变更文件列表 -----"
-                    for i, path in enumerate(file_paths, 1):
-                        review_info += f"\n{i}. {path}"
-
-                # Add language-specific checklists
-                if detected_languages:
-                    review_info += "\n\n----- 检测到的编程语言 -----"
-                    review_info += f"\n检测到的语言: {', '.join(detected_languages)}"
-
-                    review_info += "\n\n----- 语言特定审查清单 -----"
-                    for lang in detected_languages:
-                        checklist = self._get_language_checklist(lang)
-                        if checklist:
-                            review_info += f"\n{checklist}"
-
-                review_info += "\n------------------------\n\n"
-
-                # Combine review info with diff output
-                diff_output = review_info + diff_output
-
-                PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")
-
-                system_prompt = """<code_review_guide>
+            # Add specific information based on review type
+            if review_type == "commit":
+                review_info += f"\n提交SHA: {args['commit_sha']}"
+            elif review_type == "range":
+                review_info += f"\n起始提交: {args['start_commit']}\n结束提交: {args['end_commit']}"
+            elif review_type == "file":
+                review_info += f"\n文件路径: {args['file_path']}"
+            else:  # current changes
+                review_info += "\n当前未提交修改"
+
+            # Add file list
+            if file_paths:
+                review_info += "\n\n----- 变更文件列表 -----"
+                for i, path in enumerate(file_paths, 1):
+                    review_info += f"\n{i}. {path}"
+
+            # Add language-specific checklists
+            if detected_languages:
+                review_info += "\n\n----- 检测到的编程语言 -----"
+                review_info += f"\n检测到的语言: {', '.join(detected_languages)}"
+
+                review_info += "\n\n----- 语言特定审查清单 -----"
+                for lang in detected_languages:
+                    checklist = _get_language_checklist(lang)
+                    if checklist:
+                        review_info += f"\n{checklist}"
+
+            review_info += "\n------------------------\n\n"
+
+            # Combine review info with diff output
+            diff_output = review_info + diff_output
+
+            PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")  # 保留语法高亮
+
+            system_prompt = """<code_review_guide>
 <role>
 你是一位精益求精的首席代码审查专家，拥有多年企业级代码审计经验。你需要对所有代码变更进行极其全面、严谨且深入的审查，确保代码质量达到最高标准。
 </role>
@@ -585,47 +538,17 @@ class CodeReviewTool:
 
 我将分析上传的代码差异文件，进行全面的代码审查。
 </code_review_guide>"""
-                from jarvis.jarvis_tools.registry import ToolRegistry
 
-                tool_registry = ToolRegistry()
-                tool_registry.dont_use_tools(["code_review"])
+            # Get model_group from args (thinking mode removed)
+            model_group = args.get("model_group")
 
-                # Get model_group from args (thinking mode removed)
-                model_group = args.get("model_group")
 
-                # Get platform and model from model_group
-                from jarvis.jarvis_utils.config import (
-                    get_normal_platform_name,
-                    get_normal_model_name,
-                )
-
-                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)
-                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",
-                    summary_prompt=f"""<code_review_report>
+            agent = Agent(
+                system_prompt=system_prompt,
+                name="Code Review Agent",
+                model_group=model_group,
+                use_methodology=False,
+                summary_prompt=f"""<code_review_report>
 <overview>
 # 整体评估
 [提供对整体代码质量、架构和主要关注点的简明概述，总结主要发现]
@@ -689,29 +612,23 @@ class CodeReviewTool:
 {ot("REPORT")}
 [在此处插入完整MARKDOWN格式的审查报告]
 {ct("REPORT")}""",
-                    output_handler=[tool_registry],  # type: ignore
-                    auto_complete=False,
-                )
+                auto_complete=args.get("auto_complete", False),
+            )
 
-                # Replace the agent's model with our custom platform instance
-                if review_model:
-                    agent.model = review_model
+            # Agent将基于传入的 model_group 自动初始化模型，无需手动注入
 
-                # Determine if we need to split the diff due to size
-                max_diff_size = 100 * 1024 * 1024  # Limit to 100MB
+            # Determine if we need to split the diff due to size
+            max_diff_size = 100 * 1024 * 1024  # Limit to 100MB
 
-                if len(diff_output) > max_diff_size:
-                    PrettyOutput.print(
-                        f"代码差异内容总大小超过限制 ({len(diff_output)} > {max_diff_size} 字节)，将截断内容",
-                        OutputType.WARNING,
-                    )
-                    diff_output = (
-                        diff_output[:max_diff_size]
-                        + "\n\n[diff content truncated due to size limitations...]"
-                    )
+            if len(diff_output) > max_diff_size:
+                print(f"⚠️ 代码差异内容总大小超过限制 ({len(diff_output)} > {max_diff_size} 字节)，将截断内容")
+                diff_output = (
+                    diff_output[:max_diff_size]
+                    + "\n\n[diff content truncated due to size limitations...]"
+                )
 
-                # Prepare the user prompt for code review
-                user_prompt = f"""请对以下代码变更进行全面审查。
+            # Prepare the user prompt for code review
+            user_prompt = f"""请对以下代码变更进行全面审查。
 
 代码信息：
 - 审查类型: {review_type}
@@ -720,45 +637,44 @@ class CodeReviewTool:
 
 请根据SCRIPPPS框架和语言特定的审查清单进行分析，提供详细的代码审查报告。"""
 
-                # Write the full diff output to a temporary file for uploading
-                with tempfile.NamedTemporaryFile(
-                    mode="w", suffix=".diff", delete=False
-                ) as temp_file:
-                    temp_file_path = temp_file.name
-                    temp_file.write(diff_output)
-                    temp_file.flush()
+            # Write the full diff output to a temporary file for uploading
+            with tempfile.NamedTemporaryFile(mode="w", suffix=".diff", delete=False) as temp_file:
+                temp_file_path = temp_file.name
+                temp_file.write(diff_output)
+                temp_file.flush()
 
-                try:
-                    # Check if content is too large
-                    is_large_content = is_context_overflow(
-                        diff_output, review_model.model_group if review_model else None
-                    )
+            try:
+                # Check if content is too large
+                platform = agent.model if agent and agent.model else None
+                is_large_content = is_context_overflow(
+                    diff_output, model_group, platform
+                )
 
-                    # Upload the file to the agent's model
-                    if is_large_content:
-                        if not agent.model or not agent.model.support_upload_files():
-                            return {
-                                "success": False,
-                                "stdout": "",
-                                "stderr": "代码差异太大，无法处理",
-                            }
-
-                        upload_success = agent.model.upload_files([temp_file_path])
-                        if upload_success:
-                            pass
-                        else:
-                            return {
-                                "success": False,
-                                "stdout": "",
-                                "stderr": "上传代码差异文件失败",
-                            }
-
-                    # Prepare the prompt based on upload status
-                    if is_large_content:
-                        # When file is uploaded, reference it in the prompt
-                        complete_prompt = (
-                            user_prompt
-                            + f"""
+                # Upload the file to the agent's model
+                if is_large_content:
+                    if not agent.model or not agent.model.support_upload_files():
+                        return {
+                            "success": False,
+                            "stdout": "",
+                            "stderr": "代码差异太大，无法处理",
+                        }
+
+                    upload_success = agent.model.upload_files([temp_file_path])
+                    if upload_success:
+                        pass
+                    else:
+                        return {
+                            "success": False,
+                            "stdout": "",
+                            "stderr": "上传代码差异文件失败",
+                        }
+
+                # Prepare the prompt based on upload status
+                if is_large_content:
+                    # When file is uploaded, reference it in the prompt
+                    complete_prompt = (
+                        user_prompt
+                        + f"""
 
 我已上传了一个包含代码差异的文件。该文件包含:
 - 审查类型: {review_type}
@@ -766,39 +682,36 @@ class CodeReviewTool:
 - 检测到的编程语言: {', '.join(detected_languages) if detected_languages else '未检测到特定语言'}
 
 请基于上传的代码差异文件进行全面审查，并生成详细的代码审查报告。"""
-                        )
-                        # Run the agent with the prompt
-                        result = agent.run(complete_prompt)
-                    else:
-                        complete_prompt = (
-                            user_prompt
-                            + "\n\n代码差异内容:\n```diff\n"
-                            + diff_output
-                            + "\n```"
-                        )
-                        result = agent.run(complete_prompt)
-                finally:
-                    # Clean up the temporary file
-                    if os.path.exists(temp_file_path):
-                        try:
-                            os.unlink(temp_file_path)
-                        except Exception:
-                            PrettyOutput.print(
-                                f"临时文件 {temp_file_path} 未能删除",
-                                OutputType.WARNING,
-                            )
-
-                return {"success": True, "stdout": result, "stderr": ""}
+                    )
+                    # Run the agent with the prompt
+                    result = agent.run(complete_prompt)
+                else:
+                    complete_prompt = (
+                        user_prompt
+                        + "\n\n代码差异内容:\n```diff\n"
+                        + diff_output
+                        + "\n```"
+                    )
+                    result = agent.run(complete_prompt)
             finally:
-                # Always restore original directory
-                os.chdir(original_dir)
-
-        except Exception as e:
-            return {
-                "success": False,
-                "stdout": {},
-                "stderr": f"Review failed: {str(e)}",
-            }
+                # Clean up the temporary file
+                if os.path.exists(temp_file_path):
+                    try:
+                        os.unlink(temp_file_path)
+                    except Exception:
+                        print(f"⚠️ 临时文件 {temp_file_path} 未能删除")
+
+            return {"success": True, "stdout": result, "stderr": ""}
+        finally:
+            # Always restore original directory
+            os.chdir(original_dir)
+
+    except Exception as e:
+        return {
+            "success": False,
+            "stdout": {},
+            "stderr": f"Review failed: {str(e)}",
+        }
 
 
 def extract_code_report(result: str) -> str:
@@ -812,52 +725,50 @@ def extract_code_report(result: str) -> str:
 def review_commit(
     commit: str = typer.Argument(..., help="要审查的提交SHA"),
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
-
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
+    auto_complete: bool = typer.Option(False, "--auto-complete/--no-auto-complete", help="是否自动完成"),
 ):
     """审查指定的提交"""
-    tool = CodeReviewTool()
     tool_args = {
         "review_type": "commit",
         "commit_sha": commit,
         "root_dir": root_dir,
-
         "model_group": model_group,
+        "auto_complete": auto_complete,
     }
-    result = tool.execute(tool_args)
+    result = execute_code_review(tool_args)
     if result["success"]:
-        PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
+        print("✅ 自动代码审查结果:")
         report = extract_code_report(result["stdout"])
-        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")
+        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")  # 保留语法高亮
     else:
-        PrettyOutput.print(result["stderr"], OutputType.WARNING)
+        print(f"⚠️ {result['stderr']}")
 
 
 @app.command("current")
 def review_current(
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
-
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
+    auto_complete: bool = typer.Option(False, "--auto-complete/--no-auto-complete", help="是否自动完成"),
 ):
     """审查当前的变更"""
-    tool = CodeReviewTool()
     tool_args = {
         "review_type": "current",
         "root_dir": root_dir,
-
         "model_group": model_group,
+        "auto_complete": auto_complete,
     }
-    result = tool.execute(tool_args)
+    result = execute_code_review(tool_args)
     if result["success"]:
-        PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
+        print("✅ 自动代码审查结果:")
         report = extract_code_report(result["stdout"])
-        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")
+        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")  # 保留语法高亮
     else:
-        PrettyOutput.print(result["stderr"], OutputType.WARNING)
+        print(f"⚠️ {result['stderr']}")
 
 
 @app.command("range")
@@ -865,60 +776,58 @@ 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="代码库根目录路径"),
-
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
+    auto_complete: bool = typer.Option(False, "--auto-complete/--no-auto-complete", help="是否自动完成"),
 ):
     """审查提交范围"""
-    tool = CodeReviewTool()
     tool_args = {
         "review_type": "range",
         "start_commit": start_commit,
         "end_commit": end_commit,
         "root_dir": root_dir,
-
         "model_group": model_group,
+        "auto_complete": auto_complete,
     }
-    result = tool.execute(tool_args)
+    result = execute_code_review(tool_args)
     if result["success"]:
-        PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
+        print("✅ 自动代码审查结果:")
         report = extract_code_report(result["stdout"])
-        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")
+        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")  # 保留语法高亮
     else:
-        PrettyOutput.print(result["stderr"], OutputType.WARNING)
+        print(f"⚠️ {result['stderr']}")
 
 
 @app.command("file")
 def review_file(
     file: str = typer.Argument(..., help="要审查的文件路径"),
     root_dir: str = typer.Option(".", "--root-dir", help="代码库根目录路径"),
-
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
+    auto_complete: bool = typer.Option(False, "--auto-complete/--no-auto-complete", help="是否自动完成"),
 ):
     """审查指定的文件"""
-    tool = CodeReviewTool()
     tool_args = {
         "review_type": "file",
         "file_path": file,
         "root_dir": root_dir,
-
         "model_group": model_group,
+        "auto_complete": auto_complete,
     }
-    result = tool.execute(tool_args)
+    result = execute_code_review(tool_args)
     if result["success"]:
-        PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
+        print("✅ 自动代码审查结果:")
         report = extract_code_report(result["stdout"])
-        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")
+        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")  # 保留语法高亮
     else:
-        PrettyOutput.print(result["stderr"], OutputType.WARNING)
+        print(f"⚠️ {result['stderr']}")
 
 
 def cli():
     """Typer application entry point"""
-    init_env("欢迎使用 Jarvis-CodeReview，您的代码审查助手已准备就绪！")
+    init_env("")
     app()
 
 
@@ -928,4 +837,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()