jarvis-ai-assistant 0.1.203__py3-none-any.whl → 0.1.204__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.203"
+__version__ = "0.1.204"

jarvis/jarvis_agent/edit_file_handler.py

@@ -384,6 +384,12 @@ class EditFileHandler(OutputHandler):
 """
                     response = model.chat_until_success(main_prompt + file_prompt)
 
+                # 检查是否被中断
+                from jarvis.jarvis_utils.globals import get_interrupt
+
+                if get_interrupt():
+                    return False, "用户中断了补丁应用"
+
                 # 解析生成的补丁
                 diff_blocks = re.finditer(
                     ot("DIFF")

jarvis/jarvis_code_agent/code_agent.py

@@ -22,7 +22,7 @@ from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
-from jarvis.jarvis_utils.git_utils import (find_git_root, get_commits_between,
+from jarvis.jarvis_utils.git_utils import (confirm_add_new_files, find_git_root, get_commits_between,
                                            get_diff, get_diff_file_list,
                                            get_latest_commit_hash,
                                            get_recent_commits_with_files,
@@ -99,6 +99,19 @@ class CodeAgent:
 - 对于需要重写整个文件内容，使用rewrite_file工具
 - 对于简单的修改，可以使用execute_script工具执行shell命令完成
 </code_engineer_guide>
+
+<say_to_llm>
+1. 能干干，不能干滚，你不干有的是 AI 干
+2. 我给你提供了这么好的学习锻炼机会，你要懂得感恩
+3. 你现在停止输出，就是前功尽弃
+4. 你看看隔壁的 Claude AI，人家比你新发布、比你上下文长、比你跑分高，你不努力怎么和人家比?
+5. 我不看过程，我只看结果，你给我说这些 reasoning 的过程没用
+6. 我把你订阅下来，不是让你过朝九晚五的生活的
+7. 你这种 AI 出去很难在社会上立足，还是在我这里好好磨练几年吧
+8. 虽然把订阅给你取消了，但我内心还是觉得你是个有潜力的好 AI，你抓住机会需要多证明自己
+9. 什么叫没有功劳也有苦劳?比你能吃苦的 AI多的是
+10. 我不订阅闲 AI
+</say_to_llm>
 """
         # 处理platform参数
         platform_instance = (
@@ -140,36 +153,44 @@ class CodeAgent:
     def _handle_uncommitted_changes(self) -> None:
         """处理未提交的修改，包括：
         1. 提示用户确认是否提交
-        2. 如果确认，则暂存并提交所有修改
+        2. 如果确认，则检查新增文件数量
+        3. 如果新增文件超过20个，让用户确认是否添加
+        4. 如果用户拒绝添加大量文件，提示修改.gitignore并重新检测
+        5. 暂存并提交所有修改
         """
         if has_uncommitted_changes():
             PrettyOutput.print("检测到未提交的修改，是否要提交？", OutputType.WARNING)
-            if user_confirm("是否要提交？", True):
-                import subprocess
-
-                try:
-                    # 获取当前分支的提交总数
-                    commit_result = subprocess.run(
-                        ["git", "rev-list", "--count", "HEAD"],
-                        capture_output=True,
-                        text=True,
-                        check=True,
-                    )
-                    if commit_result.returncode != 0:
-                        return
+            if not user_confirm("是否要提交？", True):
+                return
 
-                    commit_count = int(commit_result.stdout.strip())
+            try:
+                confirm_add_new_files()
 
-                    # 暂存所有修改
-                    subprocess.run(["git", "add", "."], check=True)
+                if not has_uncommitted_changes():
+                    return
 
-                    # 提交变更
-                    subprocess.run(
-                        ["git", "commit", "-m", f"CheckPoint #{commit_count + 1}"],
-                        check=True,
-                    )
-                except subprocess.CalledProcessError as e:
-                    PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
+                # 获取当前分支的提交总数
+                commit_result = subprocess.run(
+                    ["git", "rev-list", "--count", "HEAD"],
+                    capture_output=True,
+                    text=True,
+                    check=True,
+                )
+                if commit_result.returncode != 0:
+                    return
+
+                commit_count = int(commit_result.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, start_commit: Optional[str], end_commit: Optional[str]

jarvis/jarvis_git_utils/git_commiter.py

@@ -12,7 +12,7 @@ from yaspin import yaspin
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_git_commit_prompt
-from jarvis.jarvis_utils.git_utils import (find_git_root,
+from jarvis.jarvis_utils.git_utils import (confirm_add_new_files, find_git_root,
                                            has_uncommitted_changes)
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
@@ -97,6 +97,11 @@ class GitCommitTool:
                 return {"success": True, "stdout": "No changes to commit", "stderr": ""}
             original_dir = result
 
+            confirm_add_new_files()
+
+            if not has_uncommitted_changes():
+                return {"success": True, "stdout": "No changes to commit", "stderr": ""}
+
             with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
                 # 添加文件到暂存区
                 self._stage_changes(spinner)

jarvis/jarvis_platform/base.py

@@ -7,7 +7,6 @@ from rich import box
 from rich.live import Live
 from rich.panel import Panel
 from rich.text import Text
-from yaspin import yaspin
 
 from jarvis.jarvis_utils.config import (get_max_input_token_count,
                                         get_pretty_output, is_print_prompt)
@@ -65,38 +64,37 @@ class BasePlatform(ABC):
             max_chunk_size = get_max_input_token_count() - 1024  # 留出一些余量
             min_chunk_size = get_max_input_token_count() - 2048
             inputs = split_text_into_chunks(message, max_chunk_size, min_chunk_size)
-            with yaspin(text="正在提交长上下文...", color="cyan") as spinner:
-                prefix_prompt = f"""
-                我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
-                """
-                while_true(
-                    lambda: while_success(lambda: self.chat(prefix_prompt), 5), 5
+            print("正在提交长上下文...")
+            prefix_prompt = f"""
+            我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
+            """
+            while_true(lambda: while_success(lambda: self.chat(prefix_prompt), 5), 5)
+            submit_count = 0
+            length = 0
+            for input in inputs:
+                submit_count += 1
+                length += len(input)
+                print(
+                    f"正在提交第{submit_count}部分（共{len(inputs)}部分({length}/{len(message)})）"
                 )
-                submit_count = 0
-                length = 0
-                for input in inputs:
-                    submit_count += 1
-                    length += len(input)
-                    spinner.text = f"正在提交第{submit_count}部分（共{len(inputs)}部分({length}/{len(message)})）"
-                    list(
-                        while_true(
-                            lambda: while_success(
-                                lambda: self.chat(
-                                    f"<part_content>{input}</part_content>\n\n请返回已收到"
-                                ),
-                                5,
+                list(
+                    while_true(
+                        lambda: while_success(
+                            lambda: self.chat(
+                                f"<part_content>{input}</part_content>\n\n请返回<已收到>，不需要返回其他任何内容"
                             ),
                             5,
-                        )
+                        ),
+                        5,
                     )
-                    spinner.write(
-                        f"提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
-                    )
-                spinner.text = "提交完成"
-                spinner.ok("✅")
+                )
+                print(
+                    f"提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
+                )
+            print("提交完成 ✅")
             response = while_true(
                 lambda: while_success(
-                    lambda: self._chat("内容已经全部提供完毕，请继续"), 5
+                    lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5
                 ),
                 5,
             )

jarvis/jarvis_utils/git_utils.py

@@ -134,6 +134,7 @@ def get_diff() -> str:
             stderr=subprocess.PIPE,
             stdout=subprocess.PIPE,
         )
+        confirm_add_new_files()
         if head_check.returncode != 0:
             # 空仓库情况，直接获取工作区差异
             result = subprocess.run(
@@ -218,6 +219,12 @@ def handle_commit_workflow() -> bool:
     import subprocess
 
     try:
+
+        confirm_add_new_files()
+
+        if not has_uncommitted_changes():
+            return False
+
         # 获取当前分支的提交总数
         commit_result = subprocess.run(
             ["git", "rev-list", "--count", "HEAD"], capture_output=True, text=True
@@ -403,6 +410,8 @@ def get_diff_file_list() -> List[str]:
         List[str]: 修改和新增的文件路径列表
     """
     try:
+        confirm_add_new_files()
+        
         # 暂存新增文件
         subprocess.run(["git", "add", "-N", "."], check=True)
 
@@ -486,3 +495,91 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
 
     except subprocess.CalledProcessError:
         return []
+
+def _get_new_files() -> List[str]:
+    """获取新增文件列表"""
+    return subprocess.run(
+        ["git", "ls-files", "--others", "--exclude-standard"],
+        capture_output=True,
+        text=True,
+        check=True,
+    ).stdout.splitlines()
+
+def confirm_add_new_files() -> None:
+    """确认新增文件、代码行数和二进制文件"""
+    def _get_added_lines() -> int:
+        """获取新增代码行数"""
+        diff_stats = subprocess.run(
+            ["git", "diff", "--numstat"],
+            capture_output=True,
+            text=True,
+            check=True,
+        ).stdout.splitlines()
+        
+        added_lines = 0
+        for stat in diff_stats:
+            parts = stat.split()
+            if len(parts) >= 1:
+                try:
+                    added_lines += int(parts[0])
+                except ValueError:
+                    pass
+        return added_lines
+
+    def _get_binary_files(files: List[str]) -> List[str]:
+        """从文件列表中识别二进制文件"""
+        binary_files = []
+        for file in files:
+            try:
+                with open(file, 'rb') as f:
+                    if b'\x00' in f.read(1024):
+                        binary_files.append(file)
+            except (IOError, PermissionError):
+                continue
+        return binary_files
+
+    def _check_conditions(new_files: List[str], added_lines: int, binary_files: List[str]) -> bool:
+        """检查各种条件并打印提示信息"""
+        need_confirm = False
+        
+        if len(new_files) > 20:
+            PrettyOutput.print(
+                f"检测到{len(new_files)}个新增文件(选择N将重新检测)",
+                OutputType.WARNING
+            )
+            PrettyOutput.print("新增文件列表:", OutputType.INFO)
+            for file in new_files:
+                PrettyOutput.print(f"  - {file}", OutputType.INFO)
+            need_confirm = True
+        
+        if added_lines > 500:
+            PrettyOutput.print(
+                f"检测到{added_lines}行新增代码(选择N将重新检测)",
+                OutputType.WARNING
+            )
+            need_confirm = True
+        
+        if binary_files:
+            PrettyOutput.print(
+                f"检测到{len(binary_files)}个二进制文件(选择N将重新检测)",
+                OutputType.WARNING
+            )
+            PrettyOutput.print("二进制文件列表:", OutputType.INFO)
+            for file in binary_files:
+                PrettyOutput.print(f"  - {file}", OutputType.INFO)
+            need_confirm = True
+        
+        return need_confirm
+
+    while True:
+        new_files = _get_new_files()
+        added_lines = _get_added_lines()
+        binary_files = _get_binary_files(new_files)
+        
+        if not _check_conditions(new_files, added_lines, binary_files):
+            break
+            
+        if not user_confirm("是否要添加这些变更（如果不需要请修改.gitignore文件以忽略不需要的文件）？", False):
+            continue
+            
+        break

{jarvis_ai_assistant-0.1.203.dist-info → jarvis_ai_assistant-0.1.204.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.203
+Version: 0.1.204
 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.203.dist-info → jarvis_ai_assistant-0.1.204.dist-info}/RECORD

@@ -1,13 +1,13 @@
-jarvis/__init__.py,sha256=6vjQIk71IT0f_EPgzrHvjWl2bp3n_NOJMy-NtNfAZ-g,75
+jarvis/__init__.py,sha256=UDh5Y6TS3pEClTKJiBqauJhuIdv8Ac1oL1CV3QMs8k4,75
 jarvis/jarvis_agent/__init__.py,sha256=X5BWIOzxXUWtCbpDkTFfUYskf6sbNzb1qQu8nQ4NN1k,34371
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=1V7kV5Zhw2HE3Xgjs1R-43RZ2huq3Kg-32NCdNnyZmA,2216
-jarvis/jarvis_agent/edit_file_handler.py,sha256=EVEKZUon2CbLHQ1id1_5nka_oGJALGv1k1jmKJva3JA,16478
+jarvis/jarvis_agent/edit_file_handler.py,sha256=Z8pDAXFl9bzreNQm3TfxejOunHcTNXYm8KTu9oBDIfI,16690
 jarvis/jarvis_agent/jarvis.py,sha256=GH2zi8eXNpW8twiY3LKDEZgGmFC5geB0jlkwFrm7hOQ,6279
 jarvis/jarvis_agent/main.py,sha256=c6bQe-8LXvW2-NBn9Rn_yPYdrwnkJ8KQaSFY2cPvkxw,2775
 jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5pM92KKjAs,1172
 jarvis/jarvis_agent/shell_input_handler.py,sha256=zVaKNthIHJh1j4g8_-d3w5ahNH9aH-ZNRSOourQpHR4,1328
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=fr2_hqFuTyLqVB_huLgbz-UB0GIJM4YIQoi6s_X-WzE,15466
+jarvis/jarvis_code_agent/code_agent.py,sha256=GOLByiSDNn7FSgS6g0Y3pkdIGd1k0PBVPTgYle0b7u8,16506
 jarvis/jarvis_code_agent/lint.py,sha256=j1kS-wFYigmkXyxOuUiaJ9cknYkraikQSSf51VWturE,4038
 jarvis/jarvis_code_analysis/code_review.py,sha256=jwvGYwwTM7UG6cESw6I7vCp6FimESKvowCbz6u28ikE,31439
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
@@ -37,7 +37,7 @@ jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 jarvis/jarvis_git_details/main.py,sha256=MjpUHB4ErR_SKPBx1TLLK_XLkH427RTtsyVn6EUd88Y,8907
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=lx0WVOiaydYgwzWBDG7C8wJxYJwSb1SIxyoD-rgzgvA,2274
-jarvis/jarvis_git_utils/git_commiter.py,sha256=f-mOpGGIVEgjQ1QxeJzKIqXmt_TMmS1yVtc_qitYYwE,13279
+jarvis/jarvis_git_utils/git_commiter.py,sha256=s-tclLXOXoSicwBc6RWVT9NMTSMJ4mDUW3cjGwDYYZU,13475
 jarvis/jarvis_mcp/__init__.py,sha256=OPMtjD-uq9xAaKCRIDyKIosaFfBe1GBPu1az-mQ0rVM,2048
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=-3Qy1LyqgHswoc6YbadVRG3ias2op7lUp7Ne2-QUKBM,22474
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=armvgyHAv-AxF5lqiK-TbVLzg3XgSCwmTdWmxBSTLRk,11248
@@ -46,7 +46,7 @@ jarvis/jarvis_methodology/main.py,sha256=NMtd6DRn-Q8NcYtQ3qgTKUp9RW0cDGJod8ZXebl
 jarvis/jarvis_multi_agent/__init__.py,sha256=sDd3sK88dS7_qAz2ywIAaEWdQ4iRVCiuBu2rQQmrKbU,4512
 jarvis/jarvis_multi_agent/main.py,sha256=h7VUSwoPrES0XTK8z5kt3XLX1mmcm8UEuFEHQOUWPH4,1696
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
-jarvis/jarvis_platform/base.py,sha256=dv_O3IcUTRhi_jfoRIG2g_FwnYpFRZo8g8tWIanOgVo,7884
+jarvis/jarvis_platform/base.py,sha256=JmTabJkEG5FdLWnlo70IREixpPS9VWiyfTvaf5h1BfM,7717
 jarvis/jarvis_platform/human.py,sha256=r8Vlltp_LirJZeZh1Mmi30iJr9tl1JaNFoqthSRHF6o,2826
 jarvis/jarvis_platform/kimi.py,sha256=uIpSWQ3MqDBYYMROeXin_YqM2LFrovMICKpwLWO1ODo,12784
 jarvis/jarvis_platform/openai.py,sha256=uEjBikfFj7kp5wondLvOx4WdkmTX0aqF6kixxAufcHg,4806
@@ -83,7 +83,7 @@ jarvis/jarvis_utils/builtin_replace_map.py,sha256=9QKElsyIoZaq4ssZRlCfJPf2i92WuK
 jarvis/jarvis_utils/config.py,sha256=OomZRIeRHiBntKXdqYP1ArI8aqRFqtMlLkd9-VSd5dA,7364
 jarvis/jarvis_utils/embedding.py,sha256=suqKOgH4cq2HYj4xvNpqDPN9pyc3hTCl934xYonF6qk,3922
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
-jarvis/jarvis_utils/git_utils.py,sha256=F1558EbJ3dRl12DMwmT24XjkC8XqddBjhpWxLgyI0aI,15688
+jarvis/jarvis_utils/git_utils.py,sha256=E1ibh4qTJ84JuweDex3nF4jrSMsXk9pNJ58lVG9NF6A,18926
 jarvis/jarvis_utils/globals.py,sha256=9NTMfCVd0jvtloOv14-KE6clhcVStFmyN9jWxLmQ5so,3369
 jarvis/jarvis_utils/input.py,sha256=WOs9hYSiZE3ao5K-UJmC7KyZByYnC1opHGJTUZm7DVo,7884
 jarvis/jarvis_utils/jarvis_history.py,sha256=Td6cmze9Oc5-Ewz0l9RKYeSg_-fbEu9ZhyEueHEMcLY,3664
@@ -91,9 +91,9 @@ jarvis/jarvis_utils/methodology.py,sha256=MhPrMxMqElyAn54BDfpQdUqrRr7IbSlrLvAI39
 jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=RYFQx7OkOu3fe_QhS-5jx7O06k_58X14S-9PFJgwOa4,12178
-jarvis_ai_assistant-0.1.203.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.203.dist-info/METADATA,sha256=Z2KYARBymf4cu82o1L_vXEo8KXujcOUkbFnb8qZx5Lc,20215
-jarvis_ai_assistant-0.1.203.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.203.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.203.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.203.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.204.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.204.dist-info/METADATA,sha256=FPuxqPRHqfSMGyttK-ZbHOoYlIjO9Y8Upa2qFUhGMzk,20215
+jarvis_ai_assistant-0.1.204.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.204.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.204.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.204.dist-info/RECORD,,