jarvis-ai-assistant 0.1.160__py3-none-any.whl → 0.1.162__py3-none-any.whl

jarvis/__init__.py

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

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/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/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/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/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("✅ 生成提交消息")
 
                         # 执行提交

jarvis/{jarvis_agent/patch.py → jarvis_tools/edit_file.py}

@@ -1,7 +1,10 @@
+from pydoc import describe
 import re
 from typing import Dict, Any, Tuple
 import os
 
+from networkx import descendants
+
 from yaspin import yaspin # type: ignore
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
@@ -18,35 +21,15 @@ from jarvis.jarvis_utils.utils import is_context_overflow, get_file_line_count,
 from jarvis.jarvis_utils.tag import ot, ct
 
 
-class PatchOutputHandler(OutputHandler):
-    def name(self) -> str:
-        return "PATCH"
-
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
-        return False, apply_patch(response, agent)
-
-    def can_handle(self, response: str) -> bool:
-        if _has_patch_block(response):
-            return True
-        return False
+class PatchOutputHandler:
 
-    def prompt(self) -> str:
-        return f"""
-# 代码补丁规范
+    name = "edit_file"
+    description = """代码编辑工具，用于编辑文件
+# 代码编辑规范
 
 ## 重要提示
 我可以看到完整的代码，所以不需要生成完整的代码，只需要提供修改的代码片段即可。请尽量精简补丁内容，只包含必要的上下文和修改部分。特别注意：不要提供完整文件内容，只提供需要修改的部分！
 
-## 补丁格式定义
-使用{ot("PATCH")}块来精确指定代码更改：
-```
-{ot("PATCH")}
-File: [文件路径]
-Reason: [修改原因]
-[代码修改说明，不用输出完整的代码，仅输出修改的片段即可]
-{ct("PATCH")}
-```
-
 ## 核心原则
 1. **精准修改**：只显示需要修改的代码部分，不需要展示整个文件内容
 2. **最小补丁原则**：始终生成最小范围的补丁，只包含必要的上下文和实际修改
@@ -71,22 +54,6 @@ Reason: [修改原因]
    - 如果原代码行尾没有空格，补丁也不应添加行尾空格
    - 如果原代码使用特定的行尾注释风格，补丁也应保持该风格
 
-## 补丁示例
-```
-{ot("PATCH")}
-File: src/utils/math.py
-Reason: 修复除零错误，增加参数验证以提高函数健壮性
-def safe_divide(a, b):
-    # 添加参数验证
-    if b == 0:
-        raise ValueError("除数不能为零")
-    return a / b
-# 现有代码 ...
-def add(a, b):
-    return a + b
-{ct("PATCH")}
-```
-
 ## 最佳实践
 - 每个补丁专注于单一职责的修改
 - 避免包含过多无关代码
@@ -96,77 +63,47 @@ def add(a, b):
 - 绝不提供完整文件内容，除非是新建文件
 - 每个文件的修改是独立的，不能出现“参照xxx文件的修改”这样的描述
 - 不要出现未实现的代码，如：TODO
-"""
-    
-def _has_patch_block(patch_str: str) -> bool:
-    """判断是否存在补丁块"""
-    return re.search(ot("PATCH")+r'\n?(.*?)\n?' +
-                     ct("PATCH"), patch_str, re.DOTALL) is not None
-
-
-def _parse_patch(patch_str: str) -> Tuple[Dict[str, str], str]:
-    """解析新的上下文补丁格式"""
-    result = {}
-    patches = re.findall(ot("PATCH")+r'\n?(.*?)\n?' +
-                         ct("PATCH"), patch_str, re.DOTALL)
-    if patches:
-        for patch in patches:
-            first_line = patch.splitlines()[0]
-            sm = re.match(r'^File:\s*(.+)$', first_line)
-            if not sm:
-                return ({}, f"""无效的补丁格式，正确格式应该为：
-{ot("PATCH")}
-File: [文件路径]
-Reason: [修改原因]
-[代码修改说明，不用输出完整的代码，仅输出修改的片段即可]
-{ct("PATCH")}""")
-            filepath = os.path.abspath(sm.group(1).strip())
-            if filepath not in result:
-                result[filepath] = patch
-            else:
-                result[filepath] += "\n\n" + patch
-    return result, ""
+- 如果要修改的内容较多，请分多次修改
+    """
+    parameters = {
+        "type": "object",
+        "properties": {
+            "file": {"type": "string", "description": "文件路径"},
+            "reason": {"type": "string", "description": "修改原因"},
+            "content": {"type": "string", "description": "补丁内容"}
+        }
+    }
 
 
-def apply_patch(output_str: str, agent: Any) -> str:
-    """Apply patches to files"""
-    with yaspin(text="正在应用补丁...", color="cyan") as spinner:
-        try:
-            patches, error_msg = _parse_patch(output_str)
-            if error_msg:
-                spinner.text = "补丁格式错误"
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Apply patches to files"""
+
+        from jarvis.jarvis_agent import Agent
+        filepath = args["file"]
+        patch_content = args["content"]
+        agent: Agent = args["agent"]
+
+        with yaspin(text="正在应用补丁...", color="cyan") as spinner:
+
+            # 获取当前提交hash作为起始点
+            spinner.text = "开始获取当前提交hash..."
+            start_hash = get_latest_commit_hash()
+            spinner.write("✅ 当前提交hash获取完成")
+
+            not_read_file = not has_read_file(filepath) and os.path.exists(filepath) and os.path.getsize(filepath) > 0
+            if not_read_file:
+                spinner.text=f"以下文件未读取: {filepath}，应用补丁存在风险，将先读取文件后再生成补丁"
                 spinner.fail("❌")
-                return error_msg
-        except Exception as e:
-            spinner.text = "解析补丁失败"
-            spinner.fail("❌")
-            return f"解析补丁失败: {str(e)}"
-
-        # 获取当前提交hash作为起始点
-        spinner.text = "开始获取当前提交hash..."
-        start_hash = get_latest_commit_hash()
-        spinner.write("✅ 当前提交hash获取完成")
-
-        not_read_file = [
-            f for f in patches.keys() 
-            if not has_read_file(f) 
-            and os.path.exists(f) 
-            and os.path.getsize(f) > 0
-        ]
-        if not_read_file:
-            spinner.text=f"以下文件未读取: {not_read_file}，应用补丁存在风险，将先读取文件后再生成补丁"
-            spinner.fail("❌")
-            return f"以下文件未读取: {not_read_file}，应用补丁存在风险，请先读取文件后再生成补丁"
+                return {
+                    "success": False,
+                    "stdout": f"以下文件未读取: {filepath}，应用补丁存在风险，请先读取文件后再生成补丁",
+                    "stderr": ""
+                }
 
-        # 检查是否有文件在Git仓库外
-        in_git_repo = True
-        for filepath in patches.keys():
-            if not _is_file_in_git_repo(filepath):
-                in_git_repo = False
-                break
+            # 检查是否有文件在Git仓库外
+            in_git_repo = _is_file_in_git_repo(filepath)
 
-        # 按文件逐个处理
-        for filepath, patch_content in patches.items():
             try:
                 spinner.text = f"正在处理文件: {filepath}"
                 if not os.path.exists(filepath):
@@ -188,63 +125,74 @@ def apply_patch(output_str: str, agent: Any) -> str:
                 revert_file(filepath)  # 回滚单个文件
                 spinner.write(f"✅ 文件 {filepath} 回滚完成")
 
-        final_ret = ""
-        if in_git_repo:
-            diff = get_diff()
-            if diff:
-                PrettyOutput.print(diff, OutputType.CODE, lang="diff")
-                with spinner.hidden():
-                    commited = handle_commit_workflow()
-                if commited:
-                    # 获取提交信息
-                    end_hash = get_latest_commit_hash()
-                    commits = get_commits_between(start_hash, end_hash)
-
-                    # 添加提交信息到final_ret
-                    if commits:
-                        final_ret += "✅ 补丁已应用\n"
-                        final_ret += "# 提交信息:\n"
-                        for commit_hash, commit_message in commits:
-                            final_ret += f"- {commit_hash[:7]}: {commit_message}\n"
-
-                        final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
-
-                        # 修改后的提示逻辑
-                        addon_prompt =  "1. 请确认补丁是否已正确应用\n"
-                        addon_prompt += "2. 检查修改后的代码是否符合预期\n"
-                        addon_prompt += "3. 如果确认无误，请继续进行下一步修改\n"
-                        addon_prompt += "4. 如果发现问题，请立即开始修复\n"
-                        addon_prompt += f"如果用户的需求已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
-                        addon_prompt += "如果有任何信息不清楚，调用工具获取信息\n"
-                        addon_prompt += "每次响应必须且只能包含一个操作\n"
-
-                        agent.set_addon_prompt(addon_prompt)
+            final_ret = ""
+            if in_git_repo:
+                diff = get_diff()
+                if diff:
+                    PrettyOutput.print(diff, OutputType.CODE, lang="diff")
+                    with spinner.hidden():
+                        commited = handle_commit_workflow()
+                    if commited:
+                        # 获取提交信息
+                        end_hash = get_latest_commit_hash()
+                        commits = get_commits_between(start_hash, end_hash)
+
+                        # 添加提交信息到final_ret
+                        if commits:
+                            final_ret += "✅ 补丁已应用\n"
+                            final_ret += "# 提交信息:\n"
+                            for commit_hash, commit_message in commits:
+                                final_ret += f"- {commit_hash[:7]}: {commit_message}\n"
+
+                            final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
+
+                            # 修改后的提示逻辑
+                            addon_prompt = f"如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要输出新的PATCH，不要实现任何超出用户需求外的内容\n"
+                            addon_prompt += "如果有任何信息不明确，调用工具获取信息\n"
+                            addon_prompt += "每次响应必须且只能包含一个操作\n"
+
+                            agent.set_addon_prompt(addon_prompt)
 
+                        else:
+                            final_ret += "✅ 补丁已应用（没有新的提交）"
                     else:
-                        final_ret += "✅ 补丁已应用（没有新的提交）"
+                        final_ret += "❌ 补丁应用被拒绝\n"
+                        final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
                 else:
-                    final_ret += "❌ 补丁应用被拒绝\n"
-                    final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
+                    commited = False
+                    final_ret += "❌ 没有要提交的更改\n"
             else:
-                commited = False
-                final_ret += "❌ 没有要提交的更改\n"
-        else:
-            # 对于Git仓库外的文件，直接返回成功
-            final_ret += "✅ 补丁已应用（文件不在Git仓库中）"
-            commited = True
-        # 用户确认最终结果
-        with spinner.hidden():
-            if commited:
-                return final_ret
-            PrettyOutput.print(final_ret, OutputType.USER, lang="markdown")
-            if not is_confirm_before_apply_patch() or user_confirm("是否使用此回复？", default=True):
-                return final_ret
-            custom_reply = get_multiline_input("请输入自定义回复")
-            if not custom_reply.strip():  # 如果自定义回复为空，返回空字符串
-                return ""
-            agent.set_addon_prompt(custom_reply)
-            return final_ret
-
+                # 对于Git仓库外的文件，直接返回成功
+                final_ret += "✅ 补丁已应用（文件不在Git仓库中）"
+                commited = True
+            # 用户确认最终结果
+            with spinner.hidden():
+                if commited:
+                    return {
+                        "success": True,
+                        "stdout": final_ret,
+                        "stderr": ""
+                    }
+                PrettyOutput.print(final_ret, OutputType.USER, lang="markdown")
+                if not is_confirm_before_apply_patch() or user_confirm("是否使用此回复？", default=True):
+                    return {
+                        "success": True,
+                        "stdout": final_ret,
+                        "stderr": ""
+                    }
+                custom_reply = get_multiline_input("请输入自定义回复")
+                if not custom_reply.strip():  # 如果自定义回复为空，返回空字符串
+                    return {
+                        "success": True,
+                        "stdout": final_ret,
+                        "stderr": ""
+                    }
+                agent.set_addon_prompt(custom_reply)
+                return {
+                    "success": True,
+                    "stdout": final_ret,
+                    "stderr": ""
+                }
 
 def _is_file_in_git_repo(filepath: str) -> bool:
     """检查文件是否在当前Git仓库中"""
@@ -347,14 +295,36 @@ def handle_commit_workflow() -> bool:
     """Handle the git commit workflow and return the commit details.
 
     Returns:
-        tuple[bool, str, str]: (continue_execution, commit_id, commit_message)
+        bool: 提交是否成功
     """
     if is_confirm_before_apply_patch() and not user_confirm("是否要提交代码？", default=True):
         revert_change()
         return False
-    git_commiter = GitCommitTool()
-    commit_result = git_commiter.execute({})
-    return commit_result["success"]
+    
+    import subprocess
+    try:
+        # 获取当前分支的提交总数
+        commit_count = subprocess.run(
+            ['git', 'rev-list', '--count', 'HEAD'],
+            capture_output=True,
+            text=True
+        )
+        if commit_count.returncode != 0:
+            return False
+            
+        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
+        )
+        return True
+    except subprocess.CalledProcessError as e:
+        return False
 
 
 def handle_code_operation(filepath: str, patch_content: str) -> bool:
@@ -377,7 +347,7 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
             model = PlatformRegistry().get_normal_platform()
             file_content = FileOperationTool().execute({"operation":"read", "files":[{"path":filepath}]})["stdout"]
 
-            model.set_suppress_output(True)
+            model.set_suppress_output(False)
 
             prompt = f"""
 # 代码合并专家指南
@@ -419,7 +389,8 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
             finished = False
             while count > 0:
                 count -= 1
-                response = model.chat_until_success(prompt).splitlines()
+                with spinner.hidden():
+                    response = model.chat_until_success(prompt).splitlines()
                 try:
                     start_line = response.index(ot("MERGED_CODE")) + 1
                     try:
@@ -481,7 +452,7 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
                     upload_success = True
 
 
-            model.set_suppress_output(True)
+            model.set_suppress_output(False)
 
             main_prompt = f"""
 # 代码补丁生成专家指南
@@ -513,19 +484,19 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 
 ## 输出模板
 {ot("DIFF")}
->>>>>> SEARCH
+{">" * 5} SEARCH
 [需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
 {'='*5}
 [替换后的新代码]
-<<<<<< REPLACE
+{"<" * 5} REPLACE
 {ct("DIFF")}
 
 {ot("DIFF")}
->>>>>> SEARCH
+{">" * 5} SEARCH
 [另一处需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
 {'='*5}
 [另一处替换后的新代码]
-<<<<<< REPLACE
+{"<" * 5} REPLACE
 {ct("DIFF")}
 """
             
@@ -536,12 +507,15 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
     # 原始代码
     {file_content}
     """
-                    response = model.chat_until_success(main_prompt + file_prompt)
+                    with spinner.hidden():
+                        response = model.chat_until_success(main_prompt + file_prompt)
                 else:
                     if upload_success:
-                        response = model.chat_until_success(main_prompt)
+                        with spinner.hidden():
+                            response = model.chat_until_success(main_prompt)
                     else:
-                        response = model.chat_big_content(file_content, main_prompt)
+                        with spinner.hidden():
+                            response = model.chat_big_content(file_content, main_prompt)
 
                 # 解析差异化补丁
                 diff_blocks = re.finditer(ot("DIFF")+r'\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?'+ct("DIFF"),
@@ -563,7 +537,6 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
                     if search_text in modified_content:
                         # 如果有多处，报错
                         if modified_content.count(search_text) > 1:
-                            prompt = f"补丁 #{patch_count} 应用失败：找到多个匹配的代码段"
                             spinner.write(f"❌ 补丁 #{patch_count} 应用失败：找到多个匹配的代码段")
                             success = False
                             break
@@ -573,7 +546,6 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
                         spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
                     else:
                         spinner.write(f"❌ 补丁 #{patch_count} 应用失败：无法找到匹配的代码段")
-                        prompt = f"补丁 #{patch_count} 应用失败：无法找到匹配的代码段"
                         success = False
                         break
                 if not success:

jarvis/jarvis_utils/input.py

@@ -82,29 +82,20 @@ class FileCompleter(Completer):
         # 计算替换长度
         replace_length = len(text_after_at) + 1
 
-        # 从replace_map获取建议列表
-        default_suggestions = [
-            (ot(tag), desc) for tag, desc in [
-                (tag, self._get_description(tag)) 
-                for tag in self.replace_map.keys()
-            ]
-        ]
-        # 添加特殊标记
-        default_suggestions.extend([
+        # 获取所有可能的补全项
+        all_completions = []
+        
+        # 1. 添加特殊标记
+        all_completions.extend([
+            (ot(tag), self._get_description(tag))
+            for tag in self.replace_map.keys()
+        ])
+        all_completions.extend([
             (ot("Summary"), '总结'),
             (ot("Clear"), '清除历史'),
         ])
-        for name, desc in default_suggestions:
-            yield Completion(
-                text=f"'{name}'",
-                start_position=-replace_length,
-                display=name,
-                display_meta=desc
-            ) # type: ignore
-
-
-        # 使用git ls-files获取所有可能的文件
-        all_files = []
+        
+        # 2. 添加文件列表
         try:
             import subprocess
             result = subprocess.run(['git', 'ls-files'],
@@ -112,28 +103,40 @@ class FileCompleter(Completer):
                                  stderr=subprocess.PIPE,
                                  text=True)
             if result.returncode == 0:
-                all_files = [line.strip() for line in result.stdout.splitlines() if line.strip()]
+                all_completions.extend([
+                    (path, "File") 
+                    for path in result.stdout.splitlines() 
+                    if path.strip()
+                ])
         except Exception:
             pass
-        # 生成补全建议
-        if not file_path:
-            scored_files = [(path, 100) for path in all_files[:self.max_suggestions]]
-        else:
-            scored_files_data = process.extract(file_path, all_files, limit=self.max_suggestions)
-            scored_files = [(m[0], m[1]) for m in scored_files_data]
-            scored_files.sort(key=lambda x: x[1], reverse=True)
-            scored_files = scored_files[:self.max_suggestions]
-        # 生成补全项
-        for path, score in scored_files:
-            if not file_path or score > self.min_score:
-                display_text = path
-                if file_path and score < 100:
-                    display_text = f"{path} ({score}%)"
+            
+        # 统一过滤和排序
+        if file_path:
+            # 使用模糊匹配过滤
+            scored_items = process.extract(file_path, [item[0] for item in all_completions], limit=self.max_suggestions)
+            scored_items = [(item[0], item[1]) for item in scored_items if item[1] > self.min_score]
+            # 创建映射以便查找描述
+            completion_map = {item[0]: item[1] for item in all_completions}
+            # 生成补全项
+            for text, score in scored_items:
+                display_text = text
+                if score < 100:
+                    display_text = f"{text} ({score}%)"
                 yield Completion(
-                    text=f"'{path}'",
+                    text=f"'{text}'",
                     start_position=-replace_length,
                     display=display_text,
-                    display_meta="File"
+                    display_meta=completion_map.get(text, "")
+                ) # type: ignore
+        else:
+            # 没有输入时返回前max_suggestions个建议
+            for text, desc in all_completions[:self.max_suggestions]:
+                yield Completion(
+                    text=f"'{text}'",
+                    start_position=-replace_length,
+                    display=text,
+                    display_meta=desc
                 ) # type: ignore
     
     def _get_description(self, tag: str) -> str:

{jarvis_ai_assistant-0.1.160.dist-info → jarvis_ai_assistant-0.1.162.dist-info}/METADATA

@@ -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.dist-info → jarvis_ai_assistant-0.1.162.dist-info}/RECORD

@@ -1,14 +1,13 @@
-jarvis/__init__.py,sha256=2BC-X3PyDiJd9_Z7-M3Dz_vjF41hQuACD5kortAXRDM,50
-jarvis/jarvis_agent/__init__.py,sha256=tii6khwfG971MJiMfKSLwlKTjB3iEv8ITE3JqYSkfQA,24824
+jarvis/__init__.py,sha256=f8wg5GALz7h8klEribpOjtvP8qwhjEN7ycs1Z0a32JE,50
+jarvis/jarvis_agent/__init__.py,sha256=RCFx4Hz755PRYI01Y3VoUKXXJCj0pOGrEg4qP099o_g,24745
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=3rRA-7v_VUSFG1s7tTKhriq9vv0nsa3t69ReV0xH5gs,1505
 jarvis/jarvis_agent/file_input_handler.py,sha256=88VqJLe3oO9GtIRsqyx3KwZl10Apob2ddFMH3HQ2RMg,3413
-jarvis/jarvis_agent/jarvis.py,sha256=6Bp_Y-E3RN6bDmDs5lN3uALL_Dhq-p_aIuVNELG1vtw,5898
+jarvis/jarvis_agent/jarvis.py,sha256=EQDK7CEfoJXg-KkZ7DGDi0lALauFR4tPRvW2O-CxJAQ,5795
 jarvis/jarvis_agent/main.py,sha256=Jlw_Tofh2C-sMVnkeOZBrwWJOWNH3IhsKDUn-WBlgU8,2602
 jarvis/jarvis_agent/output_handler.py,sha256=4limQ-Kf-YYvQjT5SMjJIyyvD1DVG8tINv1A_qbv4ho,405
-jarvis/jarvis_agent/patch.py,sha256=qeRZ6r1qpgHnWpX5uOX4dB3qRCPI1ibk4J50NmoJ74s,23531
 jarvis/jarvis_agent/shell_input_handler.py,sha256=9IoGQCe6FF4HA2V5S11q63AtnWDZFpNeRd3hcqCAlBw,1237
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=vi_g-LWdD5nn3RQsC1X8G2iNK8SrBADwFLUkflqtvKE,13723
+jarvis/jarvis_code_agent/code_agent.py,sha256=yJbVIyJdEEzm2RpqpeBc0jGFQq9mGVWLBYj9Fco1vR8,18118
 jarvis/jarvis_code_analysis/code_review.py,sha256=gB9Xo0-FT6zciDzZb3jF6zxxWA_Aj8QU5008Tmu_Tr4,30192
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=PCjlyxLa939613cAzS7pfEPgP57setO-1RvcdzzPivw,54
 jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=8lfWmhImAxeTBdHPOgVXDjMllaq280Qki1ZOOSDBnvk,1293
@@ -30,12 +29,12 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=UBtGhi3d5sIhyUSGmDckYOXwp
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=-bGfYhaFJyHrbcJrUMbkMyPCNVbk8UljNqebqVJJKxM,2331
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=d-zPPbM_J1G8fgZ2M2-ASQbIxEocsdL1owL4Z2PCnOc,2542
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=phdvLGqRHNijA0OyEwVtgHgz1Hi4ldtJJscOhEQvbSQ,3919
-jarvis/jarvis_dev/main.py,sha256=Ew4cm9o01OkSvHeF2Ky73T10gdp205pEyh2l5fWKT2M,42620
+jarvis/jarvis_dev/main.py,sha256=diznR6kvh0X5kYnZ-lsDIcscgmXV-qatS79FbSWZ3iU,42784
 jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_details/main.py,sha256=YowncVxYyJ3y2EvGrZhAJeR4yizXp6aB3dqvoYTepFY,6117
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=xBNkAl7_8_pQC-C6RcUImA1mEU4KTqhjtA57rG_mMJ8,2179
-jarvis/jarvis_git_utils/git_commiter.py,sha256=nOzM5Zio6CYxuo14YfZHrdr5rPS-yjM0_UbRhsXjPy4,11644
+jarvis/jarvis_git_utils/git_commiter.py,sha256=T94R496xYx17sjh4P3RtLqVYZkjB3xz8so8Q1aaei64,11963
 jarvis/jarvis_lsp/base.py,sha256=f-76xgNijfQ4G3Q0t8IfOGtCu-q2TSQ7a_in6XwDb_8,2030
 jarvis/jarvis_lsp/cpp.py,sha256=ekci2M9_UtkCSEe9__72h26Gat93r9_knL2VmFr8X5M,3141
 jarvis/jarvis_lsp/go.py,sha256=sSypuQSP5X2YtrVMC8XCc5nXkgfG93SO7sC89lHzoR8,3458
@@ -66,6 +65,7 @@ jarvis/jarvis_tools/chdir.py,sha256=do_OdtabiH3lZcT_ynjSAX66XgH2gPl9mYiS7dMMDa8,
 jarvis/jarvis_tools/code_plan.py,sha256=jNa2rs4J3Fam8Q_RHE2_QvVch21TPp-Zfv-W6iQ3D_0,7729
 jarvis/jarvis_tools/create_code_agent.py,sha256=SRiQXZf57ViIDh6YSEmJkcoSKft0-y3iDfWF8f1bvZU,3387
 jarvis/jarvis_tools/create_sub_agent.py,sha256=wGiHukvi58wb1AKW5beP7R8VvApOn8TOeGmtXsmcETE,3001
+jarvis/jarvis_tools/edit_file.py,sha256=z9ebYOUUWAkBHf0NVgv6vLZJ2vJzwasdAGWLH0UsuPE,22610
 jarvis/jarvis_tools/execute_script.py,sha256=AeuC3yZIg-nBq_LTIyqxu-lG_uLG63lvwO28A6dRDYA,5715
 jarvis/jarvis_tools/file_analyzer.py,sha256=EVl7WqGgZoaQXqEX8vLynpqZDE3aug1hVBJbycT7YiY,4844
 jarvis/jarvis_tools/file_operation.py,sha256=zbc1zX_aJ-9x1wpuUUbZOgg0aN8f5sd9ryaCQ-bi870,9124
@@ -84,14 +84,14 @@ jarvis/jarvis_utils/embedding.py,sha256=_Q-VurYHQZSsyISClTFjadDaNqNPBMqJe58lMM6b
 jarvis/jarvis_utils/file_processors.py,sha256=oNtVlz2JHcQ60NS6sgI-VsvYXOnsQgFUEVenznCXHC4,2952
 jarvis/jarvis_utils/git_utils.py,sha256=j_Jw6h7JD91XhMf0WD3MAH4URkLUBrrYCLnuLm1GeN4,5630
 jarvis/jarvis_utils/globals.py,sha256=Ed2d6diWXCgI74HVV_tI4qW7yXxLpNvQKN2yG0IH9hc,3388
-jarvis/jarvis_utils/input.py,sha256=zvL-JQSJvkmsZB7ApJsaVpk46BkpmJA3I_BnWSl_D-4,7299
+jarvis/jarvis_utils/input.py,sha256=3mQO_Ys1DGQQWCrw_zD9hnTF4Xd6vyQUrer8IastzvQ,7408
 jarvis/jarvis_utils/methodology.py,sha256=a1QJLqZ-_RwhL6i7C6mixhT1BmOvZ0mKmh3PTOiNT9M,7744
 jarvis/jarvis_utils/output.py,sha256=BmWdB1bmizv0xfU4Z___9p_xQodorriIcEgADVq9fk0,8416
 jarvis/jarvis_utils/tag.py,sha256=YtXBYuZWy8j8YbeQX2qRrHRQl6Gp2Vt7W4p-2yjo0a4,405
 jarvis/jarvis_utils/utils.py,sha256=neokG_C9Djw6shwLcBxpQmRF5KFp9P6v52bMJMEFozg,4487
-jarvis_ai_assistant-0.1.160.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.160.dist-info/METADATA,sha256=yjL-ZV1dnisJxbtkjiQH9fOeGGv0hI7SUGKIPWnz_h8,12669
-jarvis_ai_assistant-0.1.160.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-jarvis_ai_assistant-0.1.160.dist-info/entry_points.txt,sha256=cKz_9SEpOvElTubKPMZMAdskD4GHz-NyKWRNssIVAWE,973
-jarvis_ai_assistant-0.1.160.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.160.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.162.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.162.dist-info/METADATA,sha256=W8irlmW5HoenF5m40wSEGoL-jV8EYskUWbvChvq_v7M,12669
+jarvis_ai_assistant-0.1.162.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+jarvis_ai_assistant-0.1.162.dist-info/entry_points.txt,sha256=cKz_9SEpOvElTubKPMZMAdskD4GHz-NyKWRNssIVAWE,973
+jarvis_ai_assistant-0.1.162.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.162.dist-info/RECORD,,