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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.160
+Version: 0.1.161
 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.161}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.160"
+version = "0.1.161"
 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.161}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.160",
+    version="0.1.161",
     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.161}/src/jarvis/__init__.py

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

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

@@ -94,7 +94,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

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

@@ -210,12 +210,8 @@ def apply_patch(output_str: str, agent: Any) -> str:
                         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 = f"如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
+                        addon_prompt += "如果有任何信息不明确，调用工具获取信息\n"
                         addon_prompt += "每次响应必须且只能包含一个操作\n"
 
                         agent.set_addon_prompt(addon_prompt)
@@ -347,14 +343,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 +395,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 +437,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 +500,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"""
 # 代码补丁生成专家指南
@@ -536,12 +555,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 +585,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 +594,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_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.161}/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
@@ -243,6 +243,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 +338,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 +399,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 +424,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.161}/src/jarvis/jarvis_git_utils/git_commiter.py

@@ -164,6 +164,7 @@ class GitCommitTool:
         
         请详细分析已上传的代码差异文件，生成符合上述格式的提交信息。
         '''
+                            commit_message = platform.chat_until_success(prompt)
                         else:
                             # 如果上传失败但内容较大，使用chat_big_content
                             if is_large_content and hasattr(platform, 'chat_big_content'):
@@ -180,11 +181,13 @@ class GitCommitTool:
                         # 尝试生成提交信息
                         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 +196,7 @@ class GitCommitTool:
         [可选] 详细描述变更内容和原因
         {ct("COMMIT_MESSAGE")}
                             """
+                            commit_message = platform.chat_until_success(prompt)
                         spinner.write("✅ 生成提交消息")
 
                         # 执行提交

{jarvis_ai_assistant-0.1.160 → jarvis_ai_assistant-0.1.161}/src/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 → jarvis_ai_assistant-0.1.161/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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