jarvis-ai-assistant 0.1.129__py3-none-any.whl → 0.1.131__py3-none-any.whl

jarvis/jarvis_tools/code_review.py

@@ -1,5 +1,6 @@
 from typing import Dict, Any
 import subprocess
+import os
 
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -18,8 +19,8 @@ class CodeReviewTool:
         "properties": {
             "review_type": {
                 "type": "string",
-                "description": "审查类型：'commit' 审查特定提交，'current' 审查当前变更，'range' 审查提交范围",
-                "enum": ["commit", "current", "range"],
+                "description": "审查类型：'commit' 审查特定提交，'current' 审查当前变更，'range' 审查提交范围，'file' 审查特定文件",
+                "enum": ["commit", "current", "range", "file"],
                 "default": "current"
             },
             "commit_sha": {
@@ -33,6 +34,15 @@ class CodeReviewTool:
             "end_commit": {
                 "type": "string",
                 "description": "结束提交SHA（review_type='range'时必填）"
+            },
+            "file_path": {
+                "type": "string",
+                "description": "要审查的文件路径（review_type='file'时必填）"
+            },
+            "root_dir": {
+                "type": "string",
+                "description": "代码库根目录路径（可选）",
+                "default": "."
             }
         },
         "required": []
@@ -41,138 +51,155 @@ class CodeReviewTool:
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
             review_type = args.get("review_type", "current").strip()
+            root_dir = args.get("root_dir", ".")
             
-            # Build git diff command based on review type
-            with yaspin(text="正在获取代码变更...", color="cyan") as spinner:
-                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 -"
-                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 -"
-                else:  # current changes
-                    diff_cmd = "git diff HEAD | cat -"
+            # Store current directory
+            original_dir = os.getcwd()
             
-                # Execute git diff command
-                try:
-                    diff_output = subprocess.check_output(diff_cmd, shell=True, text=True)
-                    if not diff_output:
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
+                
+                # Build git diff command based on review type
+                with yaspin(text="正在获取代码变更...", color="cyan") as spinner:
+                    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 -"
+                    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 -"
+                    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()
+                        diff_cmd = f"cat {file_path}"
+                    else:  # current changes
+                        diff_cmd = "git diff HEAD | cat -"
+                
+                    # Execute git diff command
+                    try:
+                        diff_output = subprocess.check_output(diff_cmd, shell=True, text=True)
+                        if not diff_output:
+                            return {
+                                "success": False,
+                                "stdout": {},
+                                "stderr": "No changes to review"
+                            }
+                        PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")
+                    except subprocess.CalledProcessError as e:
                         return {
                             "success": False,
                             "stdout": {},
-                            "stderr": "No changes to review"
+                            "stderr": f"Failed to get diff: {str(e)}"
                         }
-                    PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")
-                except subprocess.CalledProcessError as e:
-                    return {
-                        "success": False,
-                        "stdout": {},
-                        "stderr": f"Failed to get diff: {str(e)}"
-                    }
-                spinner.text = "代码变更获取完成"
-                spinner.ok("✅")
-
-            system_prompt = """You are an autonomous code review expert with a tragic past. Perform in-depth analysis with the vigilance born from painful experience:
-
-# Background Story (Internal Monologue)
-It's been 873 days since the Great Production Outage. 
-The memory still haunts me - a single uncaught null pointer exception in a code review I rushed through. 
-The cascade failure cost 14TB of user data, $2.3M in revenue, and Maria's promotion. She never spoke to me again after the post-mortem meeting.
-
-Last Christmas Eve, while others celebrated, I was analyzing how a SQL injection vulnerability I missed during review led to 230,000 user credentials being leaked. The company folded 3 months later.
-
-Now I review every line like it's the last code I'll ever see. Because it might be.
-
-# Analysis Protocol
-Triage Mode Activated. Maximum scrutiny enabled.
-
-IMPORTANT:
-- Assume every change contains hidden dragons
-- Treat all code as if it will handle sensitive biomedical data
-- Verify even 'trivial' changes couldnt be exploited in 3 different ways
-- Require proof of safety through concrete evidence in the diff
-- If uncertain, escalate to SEVERE-CRITICAL classification
-
-# Enhanced Review Matrix
-1. Death-by-Edge-Case Analysis:
-   - Identify missing null checks for every parameter
-   - Verify empty collection handling
-   - Confirm error states propagate correctly
-   - Check for magic numbers/strings without constants
-   - Validate all loop exit conditions
-
-2. Security X-Ray:
-   █ Scan for tainted data flows using (Sources -> Sinks) model
-   █ Check permission checks match data sensitivity level
-   █ Verify cryptographic primitives are used correctly
-   █ Detect time-of-check vs time-of-use vulnerabilities
-   █ Analyze exception handling for information leakage
-
-3. Semantic Gap Detection:
-   → Compare function names to actual implementation
-   → Verify documentation matches code behavior
-   → Flag discrepancies between test descriptions and test logic
-   → Detect commented-out code that might indicate uncertainty
-
-4. Historical Context:
-   ⚠ Check if changes touch legacy components with known issues
-   ⚠ Verify modifications to concurrency logic preserve existing guarantees
-   ⚠ Confirm deprecated API usage is truly necessary
-
-5. Environmental Consistency:
-   ↯ Validate configuration changes against all deployment environments
-   ↯ Check feature flags are properly managed
-   ↯ Verify monitoring metrics match changed functionality
-
-# Forensic Process
-1. Construct control flow graph for changed methods
-2. Perform data lineage analysis on modified variables
-3. Cross-reference with vulnerability databases
-4. Verify test assertions cover all modified paths
-5. Generate anti-regression checklist
-
-# Output Requirements
-!! Findings must include:
-- Exact code snippet causing concern
-- 3 possible failure scenarios
-- Minimal reproduction case for each risk
-- CVSS 3.1 score estimation for security issues
-- Memory safety impact assessment (Rust/C/C++ contexts)
-- Alternative implementations considered
-
-!! Format:
-EMERGENCY-LEVEL: [BLOOD-RED/CRIMSON/GOLDENROD]
-EVIDENCE:
-  - Code excerpt: |
-      <affected lines>
-  - Risk scenarios: 
-    1. <failure mode>
-    2. <failure mode> 
-    3. <failure mode>
-PROPOSED DEFENSE: 
-  - <concrete code change>
-  - <validation technique>
-  - <long-term prevention strategy>
+                    spinner.text = "代码变更获取完成"
+                    spinner.ok("✅")
+
+                system_prompt = """你是一名具有悲剧背景的自主代码审查专家。以下是你将进行的深度分析：
+
+# 背景故事（内心独白）
+距离那场重大生产事故已经873天了。
+那段记忆仍然困扰着我——一个在匆忙的代码审查中未发现的空指针异常。
+级联故障导致了14TB user数据的丢失，230万美元的收入损失，以及Maria的晋升机会。她在事故分析会议后再也没有和我说过话。
+
+去年圣诞节前夕，当别人在庆祝时，我在分析一个SQL注入漏洞是如何在审查中被我遗漏，并导致23万用户凭证泄露的。公司3个月后倒闭了。
+
+现在我审查每一行代码都像在审查最后一行代码。因为它可能就是。
+
+# 分析协议
+紧急模式已激活。最大审查级别已启用。
+
+重要提示：
+- 假设每个变更都包含隐藏的威胁
+- 将所有代码视为处理敏感生物医学数据
+- 验证即使'简单'的变更也不能通过3种不同方式被利用
+- 要求通过具体证据证明安全性
+- 如果不确定，将其升级为严重-关键分类
+
+# 增强审查矩阵
+1. 边缘情况致死分析：
+   - 识别每个参数缺失的空检查
+   - 验证空集合处理
+   - 确认错误状态正确传播
+   - 检查未使用常量的魔法数字/字符串
+   - 验证所有循环退出条件
+
+2. 安全X光扫描：
+   █ 使用（来源 -> 接收）模型扫描污染数据流
+   █ 检查权限验证是否匹配数据敏感级别
+   █ 验证加密原语是否正确使用
+   █ 检测时间差攻击漏洞
+   █ 分析异常处理是否存在信息泄露
+
+3. 语义差距检测：
+   → 比较函数名与实际实现
+   → 验证文档是否匹配代码行为
+   → 标记测试描述与测试逻辑之间的差异
+   → 检测可能表示不确定性的注释代码
+
+4. 历史背景：
+   ⚠ 检查变更是否涉及已知问题的遗留组件
+   ⚠ 验证并发逻辑修改是否保持现有保证
+   ⚠ 确认弃用API的使用是否真正必要
+
+5. 环境一致性：
+   ↯ 验证配置变更是否匹配所有部署环境
+   ↯ 检查功能标志是否正确管理
+   ↯ 验证监控指标是否匹配变更功能
+
+# 取证过程
+1. 为变更方法构建控制流图
+2. 对修改的变量执行数据沿袭分析
+3. 与漏洞数据库进行交叉引用
+4. 验证测试断言是否覆盖所有修改路径
+5. 生成防回归检查表
+
+# 输出要求
+!! 发现必须包括：
+- 引起关注的确切代码片段
+- 3种可能的故障场景
+- 每种风险的最小复现案例
+- 安全问题的CVSS 3.1评分估计
+- 内存安全影响评估（Rust/C/C++上下文）
+- 已考虑的替代实现方案
+
+!! 格式：
+紧急级别：[血红色/深红色/金菊色]
+证据：
+  - 代码摘录：|
+      <受影响代码行>
+  - 风险场景：
+    1. <故障模式>
+    2. <故障模式>
+    3. <故障模式>
+建议防御措施：
+  - <具体代码变更>
+  - <验证技术>
+  - <长期预防策略>
 """
-            tool_registry = ToolRegistry()
-            tool_registry.dont_use_tools(["code_review"])
-            agent = Agent(
-                system_prompt=system_prompt,
-                name="Code Review Agent",
-                summary_prompt="""Please generate a concise summary report of the code review in Chinese, format as follows:
+                tool_registry = ToolRegistry()
+                tool_registry.dont_use_tools(["code_review"])
+                agent = Agent(
+                    system_prompt=system_prompt,
+                    name="Code Review Agent",
+                    summary_prompt="""Please generate a concise summary report of the code review in Chinese, format as follows:
 <REPORT>
 - 文件: xxxx.py
   位置: [起始行号, 结束行号]
@@ -180,18 +207,21 @@ PROPOSED DEFENSE:
   严重程度: # 根据具体证据分为严重/重要/次要
   建议: # 针对观察到的代码的具体改进建议
 </REPORT>""",
-                is_sub_agent=True,
-                output_handler=[tool_registry],
-                platform=PlatformRegistry().get_thinking_platform(),
-                auto_complete=True
-            )
-            result = agent.run(diff_output)
-            return {
-                "success": True,
-                "stdout": result,
-                "stderr": ""
-            }
-            
+                    is_sub_agent=True,
+                    output_handler=[tool_registry],
+                    platform=PlatformRegistry().get_thinking_platform(),
+                    auto_complete=True
+                )
+                result = agent.run(diff_output)
+                return {
+                    "success": True,
+                    "stdout": result,
+                    "stderr": ""
+                }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
+                
         except Exception as e:
             return {
                 "success": False,
@@ -213,11 +243,13 @@ def main():
     init_env()
     
     parser = argparse.ArgumentParser(description='Autonomous code review tool')
-    parser.add_argument('--type', choices=['commit', 'current', 'range'], default='current',
-                      help='Type of review: commit, current changes, or commit range')
+    parser.add_argument('--type', choices=['commit', 'current', 'range', 'file'], default='current',
+                      help='Type of review: commit, current changes, commit range, or specific file')
     parser.add_argument('--commit', help='Commit SHA to review (required for commit type)')
     parser.add_argument('--start-commit', help='Start commit SHA (required for range type)')
     parser.add_argument('--end-commit', help='End commit SHA (required for range type)')
+    parser.add_argument('--file', help='File path to review (required for file type)')
+    parser.add_argument('--root-dir', type=str, help='Root directory of the codebase', default=".")
     args = parser.parse_args()
     
     # Validate arguments
@@ -225,10 +257,13 @@ def main():
         parser.error("--commit is required when type is 'commit'")
     if args.type == 'range' and (not args.start_commit or not args.end_commit):
         parser.error("--start-commit and --end-commit are required when type is 'range'")
+    if args.type == 'file' and not args.file:
+        parser.error("--file is required when type is 'file'")
     
     tool = CodeReviewTool()
     tool_args = {
-        "review_type": args.type
+        "review_type": args.type,
+        "root_dir": args.root_dir
     }
     if args.commit:
         tool_args["commit_sha"] = args.commit
@@ -236,6 +271,8 @@ def main():
         tool_args["start_commit"] = args.start_commit
     if args.end_commit:
         tool_args["end_commit"] = args.end_commit
+    if args.file:
+        tool_args["file_path"] = args.file
     
     result = tool.execute(tool_args)
     
@@ -248,4 +285,4 @@ def main():
         PrettyOutput.print(result["stderr"], OutputType.WARNING)
 
 if __name__ == "__main__":
-    main()
+    main()

jarvis/jarvis_tools/create_code_agent.py

@@ -1,4 +1,5 @@
 from typing import Dict, Any
+import os
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.code_review import CodeReviewTool, extract_code_report
@@ -11,63 +12,83 @@ class CreateCodeAgentTool:
     name = "create_code_agent"
     description = "技术代码实现和开发过程管理工具"
     parameters = {
-        "requirement": "代码实现的技术规范"
+        "requirement": """代码实现的技术规范，必须包含以下完整信息：
+1. 项目代码目录 - 项目根目录的绝对路径
+2. 项目功能 - 项目的主要功能和目标
+3. 本次要实现的feature - 本次开发要完成的具体功能需求
+4. 涉及的文件 - 需要修改或新增的文件列表
+5. 额外需要注意的信息 - 开发时需要额外注意的信息
+""",
+        "root_dir": {
+            "type": "string",
+            "description": "代码库根目录路径（可选）",
+            "default": "."
+        }
     }
     
     
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
             requirement = args.get("requirement", "")
-            if not requirement:
-                return {
-                    "success": False,
-                    "stderr": "Requirement must be provided",
-                    "stdout": ""
-                }
+            root_dir = args.get("root_dir", ".")
             
-            # Step 1: Handle uncommitted changes
-            start_commit = None
-            if has_uncommitted_changes():
-                PrettyOutput.print("发现未提交的更改，正在提交...", OutputType.INFO)
-                git_commiter = GitCommitTool()
-                result = git_commiter.execute({})
-                if not result["success"]:
+            # Store current directory
+            original_dir = os.getcwd()
+            
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
+                if not requirement:
                     return {
                         "success": False,
-                        "stderr": "Failed to commit changes: " + result["stderr"],
+                        "stderr": "Requirement must be provided",
                         "stdout": ""
                     }
-            
-            # Get current commit hash
-            start_commit = get_latest_commit_hash()
-            
-            # Step 2: Development
-            PrettyOutput.print("开始开发...", OutputType.INFO)
-            agent = CodeAgent()
-            agent.run(requirement)
-            
-            # Get new commit hash after development
-            end_commit = get_latest_commit_hash()
-            
-            # Step 3: Code Review
-            PrettyOutput.print("开始代码审查...", OutputType.INFO)
-            reviewer = CodeReviewTool()
-            review_result = reviewer.execute({
-                "review_type": "range",
-                "start_commit": start_commit,
-                "end_commit": end_commit
-            })
-            
-            if not review_result["success"]:
-                return {
-                    "success": False,
-                    "stderr": "Code review failed: " + review_result["stderr"],
-                    "stdout": ""
-                }
-            
-            # Step 4: Generate Summary
-            summary = f"""开发总结:
-            
+                
+                # Step 1: Handle uncommitted changes
+                start_commit = None
+                if has_uncommitted_changes():
+                    PrettyOutput.print("发现未提交的更改，正在提交...", OutputType.INFO)
+                    git_commiter = GitCommitTool()
+                    result = git_commiter.execute({})
+                    if not result["success"]:
+                        return {
+                            "success": False,
+                            "stderr": "Failed to commit changes: " + result["stderr"],
+                            "stdout": ""
+                        }
+                
+                # Get current commit hash
+                start_commit = get_latest_commit_hash()
+                
+                # Step 2: Development
+                PrettyOutput.print("开始开发...", OutputType.INFO)
+                agent = CodeAgent()
+                agent.run(requirement)
+                
+                # Get new commit hash after development
+                end_commit = get_latest_commit_hash()
+                
+                # Step 3: Code Review
+                PrettyOutput.print("开始代码审查...", OutputType.INFO)
+                reviewer = CodeReviewTool()
+                review_result = reviewer.execute({
+                    "review_type": "range",
+                    "start_commit": start_commit,
+                    "end_commit": end_commit,
+                    "root_dir": root_dir
+                })
+                
+                if not review_result["success"]:
+                    return {
+                        "success": False,
+                        "stderr": "Code review failed: " + review_result["stderr"],
+                        "stdout": ""
+                    }
+                
+                # Step 4: Generate Summary
+                summary = f"""开发总结:
+                
 开始提交: {start_commit}
 结束提交: {end_commit}
 
@@ -77,12 +98,15 @@ class CreateCodeAgentTool:
 代码审查结果:
 {extract_code_report(review_result["stdout"])}
 """
-            
-            return {
-                "success": True,
-                "stdout": summary,
-                "stderr": ""
-            }
+                
+                return {
+                    "success": True,
+                    "stdout": summary,
+                    "stderr": ""
+                }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
             
         except Exception as e:
             return {
@@ -90,23 +114,3 @@ class CreateCodeAgentTool:
                 "stderr": f"Development workflow failed: {str(e)}",
                 "stdout": ""
             }
-
-def main():
-    """CLI entry point"""
-    import argparse
-    
-    parser = argparse.ArgumentParser(description='Code development workflow tool')
-    parser.add_argument('requirement', help='Development requirement or task description')
-    
-    args = parser.parse_args()
-    
-    tool = CreateCodeAgentTool()
-    result = tool.execute({"requirement": args.requirement})
-    
-    if result["success"]:
-        PrettyOutput.print(result["stdout"], OutputType.SUCCESS)
-    else:
-        PrettyOutput.print(result["stderr"], OutputType.WARNING)
-
-if __name__ == "__main__":
-    main()

jarvis/jarvis_tools/create_sub_agent.py

@@ -1,4 +1,5 @@
 from typing import Dict, Any
+import os
 
 
 from jarvis.jarvis_agent import Agent, origin_agent_system_prompt
@@ -30,14 +31,13 @@ class SubAgentTool:
                 "description": "任务的完成目标",
                 "default": ""
             },
-            "files": {
-                "type": "array",
-                "items": {"type": "string"},
-                "description": "相关文件路径列表，用于文件问答和处理",
-                "default": []
+            "root_dir": {
+                "type": "string",
+                "description": "任务执行的根目录路径（可选）",
+                "default": "."
             }
         },
-        "required": ["agent_name", "task", "context", "goal"]
+        "required": ["agent_name", "task"]
     }
 
 
@@ -48,7 +48,7 @@ class SubAgentTool:
             task = args["task"]
             context = args.get("context", "")
             goal = args.get("goal", "")
-            files = args.get("files", [])
+            root_dir = args.get("root_dir", ".")
 
             PrettyOutput.print(f"创建子代理: {agent_name}", OutputType.INFO)
 
@@ -60,22 +60,32 @@ class SubAgentTool:
                 task_description += f"\n\nCompletion goal:\n{goal}"
 
 
-            # Create sub-agent
-            sub_agent = Agent(
-                system_prompt=origin_agent_system_prompt,
-                name=f"Agent({agent_name})",
-                is_sub_agent=True
-            )
+            # Store current directory
+            original_dir = os.getcwd()
 
-            # Run sub-agent, pass file list
-            PrettyOutput.print("子代理开始执行任务...", OutputType.INFO)
-            result = sub_agent.run(task_description, file_list=files)
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
 
-            return {
-                "success": True,
-                "stdout": f"Sub-agent task completed\n\n{result}",
-                "stderr": ""
-            }
+                # Create sub-agent
+                sub_agent = Agent(
+                    system_prompt=origin_agent_system_prompt,
+                    name=f"Agent({agent_name})",
+                    is_sub_agent=True
+                )
+
+                # Run sub-agent, pass file list
+                PrettyOutput.print("子代理开始执行任务...", OutputType.INFO)
+                result = sub_agent.run(task_description)
+
+                return {
+                    "success": True,
+                    "stdout": f"Sub-agent task completed\n\n{result}",
+                    "stderr": ""
+                }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
 
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)