jarvis-ai-assistant 0.1.160__tar.gz → 0.1.162__tar.gz

{jarvis_ai_assistant-0.1.160/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.162}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.160
+Version: 0.1.162
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.162}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.160"
+version = "0.1.162"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.162}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.160",
+    version="0.1.162",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.162}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.160"
+__version__ = "0.1.162"

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_agent/__init__.py

@@ -5,7 +5,6 @@ from typing import Any, Callable, List, Optional, Tuple, Union
 from yaspin import yaspin # type: ignore
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
-from jarvis.jarvis_agent.patch import PatchOutputHandler
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
@@ -180,7 +179,7 @@ class Agent:
         self.model.set_suppress_output(False)
 
         from jarvis.jarvis_tools.registry import ToolRegistry
-        self.output_handler = output_handler if output_handler else [ToolRegistry(), PatchOutputHandler()]
+        self.output_handler = output_handler if output_handler else [ToolRegistry()]
         self.multiline_inputer = multiline_inputer if multiline_inputer else get_multiline_input
 
         self.prompt = ""

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_agent/jarvis.py

@@ -15,7 +15,6 @@ from jarvis.jarvis_agent import (
      Agent,
      origin_agent_system_prompt
 )
-from jarvis.jarvis_agent.patch import PatchOutputHandler
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_agent.file_input_handler import file_input_handler
@@ -94,7 +93,7 @@ def _select_task(tasks: Dict[str, str]) -> str:
                 # 询问是否需要补充信息
                 need_additional = user_confirm("需要为此任务添加补充信息吗？", default=False)
                 if need_additional:
-                    additional_input = get_multiline_input("请输入补充信息（输入空行结束）：")
+                    additional_input = get_multiline_input("请输入补充信息：")
                     if additional_input:
                         selected_task = f"{selected_task}\n\n补充信息:\n{additional_input}"
                 return selected_task
@@ -123,7 +122,7 @@ def main() -> None:
             platform=args.platform,
             model_name=args.model,
             input_handler=[file_input_handler, shell_input_handler, builtin_input_handler],
-            output_handler=[ToolRegistry(), PatchOutputHandler()],
+            output_handler=[ToolRegistry()],
             need_summary=False
         )
 

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -7,7 +7,7 @@ import os
 import sys
 import subprocess
 import argparse
-from typing import Optional, List, Tuple
+from typing import Any, Dict, Optional, List, Tuple
 
 # 忽略yaspin的类型检查
 from yaspin import yaspin  # type: ignore
@@ -16,7 +16,6 @@ from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
 from jarvis.jarvis_agent.file_input_handler import file_input_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
-from jarvis.jarvis_agent.patch import PatchOutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.registry import ToolRegistry
@@ -51,9 +50,8 @@ class CodeAgent:
             "read_code",
             "methodology",
             "chdir",
-            "create_code_agent",
             "find_methodology",
-            "virtual_tty",
+            "edit_file",
         ])
         code_system_prompt = """
 <code_engineer_guide>
@@ -204,7 +202,13 @@ class CodeAgent:
 - loc比wc -l提供更多代码统计信息，应优先使用
 - 针对不同编程语言选择对应的代码质量检查工具
 - 不要留下未实现的代码
-- 对于非常复杂的需求，可以使用create_code_agent工具，但是要提供完整的上下文信息
+
+### 代码编辑规范
+- 使用edit_file工具进行代码修改时，必须遵循最小补丁原则
+- 只提供需要修改的代码部分，不要提供完整文件内容
+- 保持原始代码的缩进、空行和格式风格
+- 每个修改必须包含清晰的修改理由
+- 新建文件时可以提供完整内容，修改现有文件时只提供差异部分
 </notes>
 </code_engineer_guide>
 """
@@ -220,7 +224,7 @@ class CodeAgent:
             system_prompt=code_system_prompt,
             name="CodeAgent",
             auto_complete=False,
-            output_handler=[tool_registry, PatchOutputHandler()],
+            output_handler=[tool_registry],
             platform=platform_instance,
             input_handler=[
                 shell_input_handler,
@@ -243,6 +247,83 @@ class CodeAgent:
         """
         return self.root_dir
 
+    def get_loc_stats(self) -> str:
+        """使用loc命令获取当前目录的代码统计信息
+        
+        返回:
+            str: loc命令输出的原始字符串，失败时返回空字符串
+        """
+        try:
+            result = subprocess.run(
+                ['loc'],
+                cwd=self.root_dir,
+                capture_output=True,
+                text=True
+            )
+            return result.stdout if result.returncode == 0 else ""
+        except FileNotFoundError:
+            return ""
+
+    def get_recent_commits_with_files(self) -> List[Dict[str, Any]]:
+        """获取最近5次提交的commit信息和文件清单
+        
+        返回:
+            List[Dict[str, Any]]: 包含commit信息和文件清单的字典列表，格式为:
+                [
+                    {
+                        'hash': 提交hash,
+                        'message': 提交信息,
+                        'author': 作者,
+                        'date': 提交日期,
+                        'files': [修改的文件列表] (最多50个文件)
+                    },
+                    ...
+                ]
+                失败时返回空列表
+        """
+        try:
+            # 获取最近5次提交的基本信息
+            result = subprocess.run(
+                ['git', 'log', '-5', '--pretty=format:%H%n%s%n%an%n%ad'],
+                cwd=self.root_dir,
+                capture_output=True,
+                text=True
+            )
+            if result.returncode != 0:
+                return []
+
+            # 解析提交信息
+            commits = []
+            lines = result.stdout.splitlines()
+            for i in range(0, len(lines), 4):
+                if i + 3 >= len(lines):
+                    break
+                commit = {
+                    'hash': lines[i],
+                    'message': lines[i+1],
+                    'author': lines[i+2],
+                    'date': lines[i+3],
+                    'files': []
+                }
+                commits.append(commit)
+
+            # 获取每个提交的文件修改清单
+            for commit in commits:
+                files_result = subprocess.run(
+                    ['git', 'show', '--name-only', '--pretty=format:', commit['hash']],
+                    cwd=self.root_dir,
+                    capture_output=True,
+                    text=True
+                )
+                if files_result.returncode == 0:
+                    files = list(set(filter(None, files_result.stdout.splitlines())))
+                    commit['files'] = files[:50]  # 限制最多50个文件
+
+            return commits
+
+        except subprocess.CalledProcessError:
+            return []
+
     def _init_env(self) -> None:
         """初始化环境"""
         with yaspin(text="正在初始化环境...", color="cyan") as spinner:
@@ -261,8 +342,29 @@ class CodeAgent:
         if has_uncommitted_changes():
             PrettyOutput.print("检测到未提交的修改，是否要提交？", OutputType.WARNING)
             if user_confirm("是否要提交？", True):
-                git_commiter = GitCommitTool()
-                git_commiter.execute({})
+                import subprocess
+                try:
+                    # 获取当前分支的提交总数
+                    commit_count = subprocess.run(
+                        ['git', 'rev-list', '--count', 'HEAD'],
+                        capture_output=True,
+                        text=True
+                    )
+                    if commit_count.returncode != 0:
+                        return
+                        
+                    commit_count = int(commit_count.stdout.strip())
+                    
+                    # 暂存所有修改
+                    subprocess.run(['git', 'add', '.'], check=True)
+                    
+                    # 提交变更
+                    subprocess.run(
+                        ['git', 'commit', '-m', f'CheckPoint #{commit_count + 1}'], 
+                        check=True
+                    )
+                except subprocess.CalledProcessError as e:
+                    PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
 
     def _show_commit_history(
         self,
@@ -301,17 +403,14 @@ class CodeAgent:
     ) -> None:
         """处理提交确认和可能的重置"""
         if commits and user_confirm("是否接受以上提交记录？", True):
-            if len(commits) > 1 and user_confirm(
-                "是否要合并为一个更清晰的提交记录？", True
-            ):
-                subprocess.run(
-                    ["git", "reset", "--mixed", str(start_commit)],
-                    stdout=subprocess.DEVNULL,
-                    stderr=subprocess.DEVNULL,
-                    check=True
-                )
-                git_commiter = GitCommitTool()
-                git_commiter.execute({})
+            subprocess.run(
+                ["git", "reset", "--mixed", str(start_commit)],
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                check=True
+            )
+            git_commiter = GitCommitTool()
+            git_commiter.execute({})
         elif start_commit:
             os.system(f"git reset --hard {str(start_commit)}")  # 确保转换为字符串
             PrettyOutput.print("已重置到初始提交", OutputType.INFO)
@@ -329,8 +428,24 @@ class CodeAgent:
             self._init_env()
             start_commit = get_latest_commit_hash()
 
+            # 获取项目统计信息并附加到用户输入
+            loc_stats = self.get_loc_stats()
+            commits_info = self.get_recent_commits_with_files()
+            
+            project_info = []
+            if loc_stats:
+                project_info.append(f"代码统计:\n{loc_stats}")
+            if commits_info:
+                commits_str = "\n".join(
+                    f"提交 {i+1}: {commit['hash'][:7]} - {commit['message']} ({len(commit['files'])}个文件)"
+                    for i, commit in enumerate(commits_info)
+                )
+                project_info.append(f"最近提交:\n{commits_str}")
+            
+            enhanced_input = f"{user_input}\n\n项目概况:\n" + "\n\n".join(project_info) if project_info else user_input
+
             try:
-                self.agent.run(user_input)
+                self.agent.run(enhanced_input)
             except RuntimeError as e:
                 PrettyOutput.print(f"执行失败: {str(e)}", OutputType.WARNING)
                 return str(e)

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_dev/main.py

@@ -3,7 +3,8 @@ from jarvis.jarvis_multi_agent import MultiAgent
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import ct, ot, init_env
+from jarvis.jarvis_utils.tag import ct, ot
+from jarvis.jarvis_utils.utils import init_env
 
 # 定义每个角色的系统提示
 PM_PROMPT = f"""
@@ -994,7 +995,8 @@ def create_dev_team() -> MultiAgent:
         "search_web",
         "execute_script",
         "methodology",
-        "ask_codebase"
+        "ask_codebase",
+        "edit_file",
     ])
 
     BA_output_handler = ToolRegistry()
@@ -1005,7 +1007,8 @@ def create_dev_team() -> MultiAgent:
         "execute_script",
         "read_webpage",
         "methodology",
-        "ask_codebase"
+        "ask_codebase",
+        "edit_file",
     ])
 
     SA_output_handler = ToolRegistry()
@@ -1015,7 +1018,8 @@ def create_dev_team() -> MultiAgent:
         "ask_codebase",
         "execute_script",
         "read_code",
-        "methodology"
+        "methodology",
+        "edit_file",
     ])
 
     TL_output_handler = ToolRegistry()
@@ -1025,6 +1029,7 @@ def create_dev_team() -> MultiAgent:
         "lsp_get_diagnostics",
         "execute_script",
         "methodology",
+        "edit_file",
     ])
 
     DEV_output_handler = ToolRegistry()
@@ -1036,6 +1041,7 @@ def create_dev_team() -> MultiAgent:
         "read_code",
         "create_sub_agent",
         "methodology",
+        "edit_file",
     ])
 
     QA_output_handler = ToolRegistry()
@@ -1048,6 +1054,7 @@ def create_dev_team() -> MultiAgent:
         "execute_script",
         "read_code",
         "methodology",
+        "edit_file",
     ])
 
     # Update PM prompt with tool usage guidance

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.162}/src/jarvis/jarvis_git_utils/git_commiter.py

@@ -153,9 +153,10 @@ class GitCommitTool:
                             except Exception as e:
                                 spinner.write(f"⚠️ 上传文件时出错: {str(e)}")
                                 upload_success = False
-                        
                         # 根据上传状态准备完整的提示
                         if upload_success:
+                            # 尝试生成提交信息
+                            spinner.text = "正在生成提交消息..."
                             # 使用上传的文件
                             prompt = base_prompt + f'''
         # 变更概述
@@ -164,6 +165,7 @@ class GitCommitTool:
         
         请详细分析已上传的代码差异文件，生成符合上述格式的提交信息。
         '''
+                            commit_message = platform.chat_until_success(prompt)
                         else:
                             # 如果上传失败但内容较大，使用chat_big_content
                             if is_large_content and hasattr(platform, 'chat_big_content'):
@@ -177,14 +179,14 @@ class GitCommitTool:
         '''
                                 commit_message = platform.chat_until_success(prompt)
                         
-                        # 尝试生成提交信息
-                        spinner.text = "正在生成提交消息..."
                         while True:
-                            if not upload_success and not is_large_content:
+                            # 只在特定情况下重新获取commit_message
+                            if not upload_success and not is_large_content and not commit_message:
                                 commit_message = platform.chat_until_success(prompt)
-                            commit_message = self._extract_commit_message(commit_message)
+                            extracted_message = self._extract_commit_message(commit_message)
                             # 如果成功提取，就跳出循环
-                            if commit_message:
+                            if extracted_message:
+                                commit_message = extracted_message
                                 break
                             prompt = f"""格式错误，请按照以下格式重新生成提交信息：
                             {ot("COMMIT_MESSAGE")}
@@ -193,6 +195,7 @@ class GitCommitTool:
         [可选] 详细描述变更内容和原因
         {ct("COMMIT_MESSAGE")}
                             """
+                            commit_message = platform.chat_until_success(prompt)
                         spinner.write("✅ 生成提交消息")
 
                         # 执行提交