jarvis-ai-assistant 0.1.138__tar.gz → 0.1.141__tar.gz

{jarvis_ai_assistant-0.1.138/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.141}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.138
+Version: 0.1.141
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -45,7 +45,6 @@ Requires-Dist: pyyaml>=5.1
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: prompt_toolkit>=3.0.0
 Requires-Dist: openai>=1.20.0
-Requires-Dist: playwright>=1.41.1
 Requires-Dist: numpy>=1.19.5
 Requires-Dist: faiss-cpu>=1.8.0
 Requires-Dist: sentence-transformers>=2.2.2
@@ -55,7 +54,7 @@ Requires-Dist: python-docx>=0.8.11
 Requires-Dist: tiktoken>=0.3.0
 Requires-Dist: tqdm>=4.65.0
 Requires-Dist: docx>=0.2.4
-Requires-Dist: yaspin>=2.5.0
+Requires-Dist: yaspin>=2.4.0
 Requires-Dist: rich>=13.3.1
 Requires-Dist: pygments>=2.15.0
 Requires-Dist: fuzzywuzzy>=0.18.0
@@ -66,6 +65,7 @@ Requires-Dist: fastapi>=0.115.4
 Requires-Dist: uvicorn>=0.33.0
 Requires-Dist: python-pptx>=1.0.0
 Requires-Dist: pandas>=2.0.0
+Requires-Dist: html2text>=2024.2.26
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -165,7 +165,7 @@ jarvis-ask-codebase --help
 |----------|------|
 | read_code | 支持行号和范围的代码文件读取 |
 | execute_shell | 执行系统命令并捕获输出 |
-| execute_shell_script | 执行shell脚本文件 |
+| execute_script | 执行脚本并返回结果，支持Shell命令、Shell脚本和Python脚本 |
 | ask_codebase | 智能代码库查询和分析，用于定位功能所在文件和理解单点实现，适合查询特定功能位置和实现原理 |
 | ask_user | 交互式用户输入收集 |
 | file_operation | 基础文件操作（读取/写入/存在性检查） |

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/README.md

@@ -91,7 +91,7 @@ jarvis-ask-codebase --help
 |----------|------|
 | read_code | 支持行号和范围的代码文件读取 |
 | execute_shell | 执行系统命令并捕获输出 |
-| execute_shell_script | 执行shell脚本文件 |
+| execute_script | 执行脚本并返回结果，支持Shell命令、Shell脚本和Python脚本 |
 | ask_codebase | 智能代码库查询和分析，用于定位功能所在文件和理解单点实现，适合查询特定功能位置和实现原理 |
 | ask_user | 交互式用户输入收集 |
 | file_operation | 基础文件操作（读取/写入/存在性检查） |

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.138"
+version = "0.1.141"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -27,7 +27,6 @@ dependencies = [
     "colorama>=0.4.6",
     "prompt_toolkit>=3.0.0",
     "openai>=1.20.0",
-    "playwright>=1.41.1",
     "numpy>=1.19.5",
     "faiss-cpu>=1.8.0",
     "sentence-transformers>=2.2.2",
@@ -37,7 +36,7 @@ dependencies = [
     "tiktoken>=0.3.0",
     "tqdm>=4.65.0",
     "docx>=0.2.4",
-    "yaspin>=2.5.0",
+    "yaspin>=2.4.0",
     "rich>=13.3.1",
     "pygments>=2.15.0",
     "fuzzywuzzy>=0.18.0",
@@ -48,6 +47,7 @@ dependencies = [
     "uvicorn>=0.33.0",
     "python-pptx>=1.0.0",
     "pandas>=2.0.0",
+    "html2text>=2024.2.26",
 ]
 requires-python = ">=3.8"
 
@@ -61,13 +61,12 @@ Homepage = "https://github.com/skyfireitdiy/Jarvis"
 jarvis = "jarvis.jarvis_agent.jarvis:main"
 jarvis-code-agent = "jarvis.jarvis_code_agent.code_agent:main"
 jca = "jarvis.jarvis_code_agent.code_agent:main"
-jarvis-rag = "jarvis.jarvis_rag.main:main"
 jarvis-smart-shell = "jarvis.jarvis_smart_shell.main:main"
 jss = "jarvis.jarvis_smart_shell.main:main"
 jarvis-platform-manager = "jarvis.jarvis_platform_manager.main:main"
-jarvis-git-commit = "jarvis.jarvis_tools.git_commiter:main"
-jarvis-code-review = "jarvis.jarvis_tools.code_review:main"
-jgc = "jarvis.jarvis_tools.git_commiter:main"
+jarvis-git-commit = "jarvis.jarvis_git_utils.git_commiter:main"
+jarvis-code-review = "jarvis.jarvis_code_analysis.code_review:main"
+jgc = "jarvis.jarvis_git_utils.git_commiter:main"
 jarvis-dev = "jarvis.jarvis_dev.main:main"
 jarvis-git-squash = "jarvis.jarvis_git_squash.main:main"
 jarvis-multi-agent = "jarvis.jarvis_multi_agent.main:main"
@@ -76,3 +75,4 @@ jarvis-tool = "jarvis.jarvis_tools.registry:main"
 jarvis-ask-codebase = "jarvis.jarvis_tools.ask_codebase:main"
 jarvis-git-details = "jarvis.jarvis_git_details.main:main"
 jarvis-methodology = "jarvis.jarvis_methodology.main:main"
+jarvis-init = "jarvis.jarvis_init.main:main"

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/setup.py

@@ -1,18 +1,8 @@
 from setuptools import setup, find_packages
-from setuptools.command.install import install
-import subprocess
-
-# 自定义安装命令
-class CustomInstallCommand(install):
-    def run(self):
-        # 先运行默认的安装逻辑
-        install.run(self)
-        # 安装完成后执行 playwright install
-        subprocess.check_call(["playwright", "install"])
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.138",
+    version="0.1.141",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -28,7 +18,6 @@ setup(
         "colorama>=0.4.6",
         "prompt_toolkit>=3.0.0",
         "openai>=1.20.0",
-        "playwright>=1.41.1",
         "numpy>=1.19.5",
         "faiss-cpu>=1.8.0",
         "sentence-transformers>=2.2.2",
@@ -38,7 +27,7 @@ setup(
         "tiktoken>=0.3.0",
         "tqdm>=4.65.0",
         "docx>=0.2.4",
-        "yaspin>=2.5.0",
+        "yaspin>=2.4.0",
         "rich>=13.3.1",
         "pygments>=2.15.0",
         "fuzzywuzzy>=0.18.0",
@@ -49,19 +38,19 @@ setup(
         "uvicorn>=0.33.0",
         "python-pptx>=1.0.0",
         "pandas>=2.0.0",
+        "html2text>=2024.2.26",
     ],
     entry_points={
         "console_scripts": [
             "jarvis=jarvis.jarvis_agent.jarvis:main",
             "jarvis-code-agent=jarvis.jarvis_code_agent.code_agent:main",
             "jca=jarvis.jarvis_code_agent.code_agent:main",
-            "jarvis-rag=jarvis.jarvis_rag.main:main",
             "jarvis-smart-shell=jarvis.jarvis_smart_shell.main:main",
             "jss=jarvis.jarvis_smart_shell.main:main",
             "jarvis-platform-manager=jarvis.jarvis_platform_manager.main:main",
-            "jarvis-git-commit=jarvis.jarvis_tools.git_commiter:main",
-            "jarvis-code-review=jarvis.jarvis_tools.code_review:main",
-            "jgc=jarvis.jarvis_tools.git_commiter:main",
+            "jarvis-code-review=jarvis.jarvis_code_analysis.code_review:main",
+            "jarvis-git-commit=jarvis.jarvis_git_utils.git_commiter:main", 
+            "jgc=jarvis.jarvis_git_utils.git_commiter:main",
             "jarvis-dev=jarvis.jarvis_dev.main:main",
             "jarvis-git-squash=jarvis.jarvis_git_squash.main:main",
             "jarvis-multi-agent=jarvis.jarvis_multi_agent.main:main",
@@ -70,6 +59,7 @@ setup(
             "jarvis-ask-codebase=jarvis.jarvis_tools.ask_codebase:main",
             "jarvis-git-details=jarvis.jarvis_git_details.main:main",
             "jarvis-methodology=jarvis.jarvis_methodology.main:main",
+            "jarvis-init=jarvis.jarvis_init.main:main",
         ],
     },
     python_requires=">=3.8",
@@ -84,7 +74,4 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
     ],
-    cmdclass={
-        'install': CustomInstallCommand,  # 注册自定义安装命令
-    },
 )

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.138"
+__version__ = "0.1.141"

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/src/jarvis/jarvis_agent/__init__.py

@@ -9,7 +9,7 @@ from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_utils.embedding import get_context_token_count
-from jarvis.jarvis_utils.config import is_auto_complete, is_execute_tool_confirm
+from jarvis.jarvis_utils.config import get_max_tool_call_count, is_auto_complete, is_execute_tool_confirm
 from jarvis.jarvis_utils.methodology import load_methodology
 from jarvis.jarvis_utils.globals import make_agent_name, set_agent, delete_agent
 from jarvis.jarvis_utils.input import get_multiline_input
@@ -153,7 +153,6 @@ class Agent:
                  auto_complete: Optional[bool] = None,
                  output_handler: List[OutputHandler] = [],
                  input_handler: Optional[List[Callable[[str, Any], Tuple[str, bool]]]] = None,
-                 max_context_length: Optional[int] = None,
                  execute_tool_confirm: Optional[bool] = None,
                  need_summary: bool = True,
                  multiline_inputer: Optional[Callable[[str], str]] = None):
@@ -205,6 +204,9 @@ class Agent:
         # Load configuration from environment variables
         self.addon_prompt = ""
 
+        self.tool_call_count = 0
+        self.max_tool_call_count = get_max_tool_call_count()
+
 
         self.execute_tool_confirm = execute_tool_confirm if execute_tool_confirm is not None else is_execute_tool_confirm()
 
@@ -219,7 +221,7 @@ class Agent:
 请使用简洁的要点描述，突出重要信息。
 """
 
-        self.max_token_count = max_context_length if max_context_length is not None else get_max_token_count()
+        self.max_token_count =  get_max_token_count()
         self.auto_complete = auto_complete if auto_complete is not None else is_auto_complete()
         welcome_message = f"{name} 初始化完成 - 使用 {self.model.name()} 模型"
 
@@ -299,6 +301,8 @@ class Agent:
 - 必须包含参数和说明
 - 操作结束需等待结果
 - 如果判断任务已经完成，不必输出操作
+- 如果信息不明确，请请求用户补充
+- 如果执行过程中连续失败5次，请使用ask_user询问用户操作
 
 **可用操作列表：**
 {action_handlers}
@@ -368,16 +372,48 @@ class Agent:
 
         with yaspin(text="正在总结对话历史...", color="cyan") as spinner:
 
-            prompt = """请总结之前对话中的关键信息，包括：
-    1. 整体任务目标
-    2. 背景信息
-    3. 已获取并确认的关键信息
-    4. 已尝试的解决方案
-    5. 当前进展
-    6. 待解决的问题
+            prompt = """请详细总结之前对话中的关键信息，生成一个全面而精确的对话摘要，包括以下方面：
+
+1. 任务目标与需求:
+   - 用户最初提出的核心问题或任务
+   - 任务的预期结果和成功标准
+   - 用户明确强调的任何特殊要求或限制条件
+
+2. 背景与上下文信息:
+   - 问题的业务或技术背景
+   - 相关系统、平台或环境的信息
+   - 已知的约束条件或依赖关系
+
+3. 已获取的关键信息:
+   - 用户确认的重要事实
+   - 收集到的相关数据或状态
+   - 已验证的系统参数或配置
+
+4. 问题分析与诊断:
+   - 已识别的根本原因(针对问题诊断任务)
+   - 关键的技术细节或错误信息
+   - 排除的可能性和已验证的假设
+
+5. 解决方案进展:
+   - 已尝试的方法及其结果
+   - 成功实施的步骤
+   - 失败的尝试及原因
+   - 用户对解决方案的反馈
 
-    请用简洁的要点形式描述，突出重要信息。不要包含对话细节。
-    """
+6. 当前状态:
+   - 任务完成的程度
+   - 当前遇到的障碍或挑战
+   - 下一步需要解决的问题
+
+7. 决策记录:
+   - 做出的关键决策及其理由
+   - 用户表达的偏好
+   - 关键的选择点及选择依据
+
+请以结构化方式组织信息，使用明确的段落和要点，确保新的对话能无缝继续。摘要应该足够详细，以便于在没有完整历史记录的情况下理解任务全貌和当前进展。
+
+注意：保留专业术语和技术细节，但不要包含无关的对话内容或冗长的代码片段。
+"""
 
             try:
                 with spinner.hidden():
@@ -395,7 +431,7 @@ class Agent:
 
 {summary}
 
-请基于以上信息继续完成任务。
+请基于以上信息继续完成任务。请注意，这是之前对话的摘要，上下文长度已超过限制而被重置。请直接继续任务，无需重复已完成的步骤。如有需要，可以询问用户以获取更多信息。
 """
             except Exception as e:
                 spinner.text = "总结对话历史失败"
@@ -427,14 +463,23 @@ class Agent:
             return False, f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}"
         if len(tool_list) == 0:
             return False, ""
+        if self.tool_call_count >= self.max_tool_call_count:
+            if user_confirm(f"工具调用次数超过限制，是否继续执行？", True):
+                self.reset_tool_call_count()
+            else:
+                return False, ""
         if not self.execute_tool_confirm or user_confirm(f"需要执行{tool_list[0].name()}确认执行？", True):
             with yaspin(text=f"正在执行{tool_list[0].name()}...", color="cyan") as spinner:
                 with spinner.hidden():
                     result = tool_list[0].handle(response, self)
                 spinner.text = f"{tool_list[0].name()}执行完成"
                 spinner.ok("✅")
+                self.tool_call_count += 1
                 return result
         return False, ""
+    
+    def reset_tool_call_count(self):
+        self.tool_call_count = 0
 
 
     def _complete_task(self) -> str:
@@ -489,6 +534,7 @@ class Agent:
 
 方法论格式：
 {ot("TOOL_CALL")}
+want: 添加/更新xxxx的方法论
 name: methodology
 arguments:
   operation: add/update
@@ -541,7 +587,7 @@ arguments:
             self.prompt = f"{user_input}"
 
             if self.first:
-                self.prompt = f"{user_input}\n\n{load_methodology(user_input)}"
+                self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(user_input)}"
                 self.first = False
 
             while True:
@@ -562,6 +608,8 @@ arguments:
 
                     if self.auto_complete and ot("!!!COMPLETE!!!") in current_response:
                         return self._complete_task()
+                    
+                    self.reset_tool_call_count()
 
                     # 获取用户输入
                     user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/src/jarvis/jarvis_agent/builtin_input_handler.py

@@ -40,24 +40,14 @@ def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
 """
         elif tag == "Web":
             user_input = user_input.replace(f"'<{tag}>'", "")
-            user_input += """
+            agent.set_addon_prompt("""
 请使用search_web工具进行网页搜索，可以使用的提问格式包括：
 1. xxx技术的最新发展是什么？
 2. xxx框架的官方文档在哪里？
 3. xxx库的GitHub仓库地址是什么？
 4. xxx问题的解决方案有哪些？
 5. xxx概念的详细解释是什么？
-"""
-        elif tag == "RAG":
-            user_input = user_input.replace(f"'<{tag}>'", "")
-            user_input += """
-请使用rag工具进行知识库检索，可以使用的提问格式包括：
-1. 关于xxx的知识点有哪些？
-2. xxx的最佳实践是什么？
-3. xxx的实现方案有哪些？
-4. xxx的相关案例有哪些？
-5. xxx的技术细节是什么？
-"""
+""")
         elif tag == "Summary":
             user_input = user_input.replace(f"'<{tag}>'", "")
             agent._summarize_and_clear_history()
@@ -70,14 +60,14 @@ def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                 return "", True
         elif tag == "Methodology":
             user_input = user_input.replace(f"'<{tag}>'", "")
-            user_input += """
+            agent.set_addon_prompt("""
 请使用find_methodology工具查找相关方法论，可以使用的提问格式包括：
 1. 关于xxx的方法论有哪些？
 2. 如何解决xxx问题？
 3. xxx的最佳实践是什么？
 4. 处理xxx的标准流程是什么？
 5. 实现xxx的参考方案有哪些？
-"""
+""")
         # 移除对未知标记的警告输出
 
     return user_input, False

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/src/jarvis/jarvis_agent/main.py

@@ -61,7 +61,7 @@ def main():
                 user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
                 if not user_input:
                     break
-                agent.set_addon_prompt("如果有必要，请先指定出行动计划，然后根据计划一步步执行")
+                agent.set_addon_prompt("如果有必要，请先指定出行动计划，然后根据计划一步步执行，如果任务过于复杂，可以拆分子Agent进行执行，拆的子Agent需要掌握所有必要的任务信息，否则无法执行")
                 agent.run(user_input)
             except Exception as e:
                 PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/src/jarvis/jarvis_agent/patch.py

@@ -7,7 +7,7 @@ from yaspin import yaspin
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_tools.git_commiter import GitCommitTool
+from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.file_operation import FileOperationTool
 from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
 from jarvis.jarvis_utils.git_utils import get_commits_between, get_latest_commit_hash
@@ -25,7 +25,7 @@ class PatchOutputHandler(OutputHandler):
         return False, apply_patch(response, agent)
 
     def can_handle(self, response: str) -> bool:
-        if _parse_patch(response):
+        if _has_patch_block(response):
             return True
         return False
 
@@ -42,7 +42,7 @@ class PatchOutputHandler(OutputHandler):
 {ot("PATCH")}
 File: [文件路径]
 Reason: [修改原因]
-[上下文代码片段]
+[代码修改说明，不用输出完整的代码，仅输出修改的片段即可]
 {ct("PATCH")}
 ```
 
@@ -96,9 +96,14 @@ 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) -> Dict[str, str]:
+def _parse_patch(patch_str: str) -> Tuple[Dict[str, str], str]:
     """解析新的上下文补丁格式"""
     result = {}
     patches = re.findall(ot("PATCH")+r'\n?(.*?)\n?' +
@@ -108,24 +113,33 @@ def _parse_patch(patch_str: str) -> Dict[str, str]:
             first_line = patch.splitlines()[0]
             sm = re.match(r'^File:\s*(.+)$', first_line)
             if not sm:
-                PrettyOutput.print("无效的补丁格式", OutputType.WARNING)
-                continue
-            filepath = sm.group(1).strip()
+                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
+    return result, ""
 
 
 def apply_patch(output_str: str, agent: Any) -> str:
     """Apply patches to files"""
     with yaspin(text="正在应用补丁...", color="cyan") as spinner:
         try:
-            patches = _parse_patch(output_str)
+            patches, error_msg = _parse_patch(output_str)
+            if error_msg:
+                spinner.text = "补丁格式错误"
+                spinner.fail("❌")
+                return error_msg
         except Exception as e:
-            PrettyOutput.print(f"解析补丁失败: {str(e)}", OutputType.ERROR)
-            return ""
+            spinner.text = "解析补丁失败"
+            spinner.fail("❌")
+            return f"解析补丁失败: {str(e)}"
 
         # 获取当前提交hash作为起始点
         spinner.text = "开始获取当前提交hash..."
@@ -134,7 +148,8 @@ def apply_patch(output_str: str, agent: Any) -> str:
 
         not_read_file = [f for f in patches.keys() if not has_read_file(f)]
         if not_read_file:
-            yaspin.write(f"❌ 以下文件未读取: {not_read_file}，应用补丁存在风险，将先读取文件后再生成补丁", color="red")
+            spinner.text=f"以下文件未读取: {not_read_file}，应用补丁存在风险，将先读取文件后再生成补丁"
+            spinner.fail("❌")
             return f"以下文件未读取: {not_read_file}，应用补丁存在风险，请先读取文件后再生成补丁"
 
         # 按文件逐个处理
@@ -182,9 +197,9 @@ def apply_patch(output_str: str, agent: Any) -> str:
 
                     # 增加代码变更分析和错误提示
 
-                    addon_prompt = "1. 请调用静态检查工具（如有）检查以上变更是否引入了潜在错误\n"
-                    addon_prompt += "2. 如果发现代码错误，请立即提出修复方案\n"
-                    addon_prompt += "3. 如果错误并非是本次修改引入，要询问用户是否需要立即修复\n"
+                    addon_prompt =  "1. 请调用静态检查工具（如有）检查以上变更是否引入了潜在错误\n"
+                    addon_prompt += "2. 如果发现致命的代码错误，请立即开始修复\n"
+                    addon_prompt += "3. 如果发现性能、风格等问题，要询问用户是否需要立即修复\n"
                     addon_prompt += "\n\n"
                     addon_prompt += "如果没有问题，请继续进行下一步修改\n"
                     addon_prompt += f"如果用户的需求已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
@@ -292,12 +307,11 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
     """处理基于上下文的代码片段"""
     with yaspin(text=f"正在修改文件 {filepath}...", color="cyan") as spinner:
         try:
+            model = PlatformRegistry().get_normal_platform()
             with spinner.hidden():
-                old_file_content = FileOperationTool().execute(
-                    {"operation": "read", "files": [{"path": filepath}]})
-                if not old_file_content["success"]:
-                    spinner.write("❌ 文件读取失败")
-                    return False
+                model.upload_files([filepath])
+
+            model.set_suppress_output(False)
 
             prompt = f"""
 # 代码合并专家指南
@@ -305,12 +319,6 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
 ## 任务描述
 你是一位精确的代码审查与合并专家，需要将补丁内容与原始代码智能合并。
 
-## 输入资料
-### 原始代码
-```
-{old_file_content["stdout"]}
-```
-
 ### 补丁内容
 ```
 {patch_content}
@@ -334,8 +342,7 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
 [合并后的完整代码，包括所有空行和缩进]
 {ct("MERGED_CODE")}
 """
-            model = PlatformRegistry().get_normal_platform()
-            model.set_suppress_output(False)
+            
             count = 30
             start_line = -1
             end_line = -1
@@ -397,12 +404,8 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
     with yaspin(text=f"正在处理文件 {filepath}...", color="cyan") as spinner:
         try:
             # 读取原始文件内容
-            old_file_content = FileOperationTool().execute(
-                {"operation": "read", "files": [{"path": filepath}]})
-            if not old_file_content["success"]:
-                spinner.text = "文件读取失败"
-                spinner.fail("❌")
-                return False
+            with spinner.hidden():  
+                model.upload_files([filepath])
 
             model.set_suppress_output(False)
 
@@ -412,12 +415,6 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 ## 任务描述
 你是一位精确的代码补丁生成专家，需要根据补丁描述生成精确的代码差异。
 
-## 输入资料
-### 原始代码
-```
-{old_file_content["stdout"]}
-```
-
 ### 补丁内容
 ```
 {patch_content}

{jarvis_ai_assistant-0.1.138 → jarvis_ai_assistant-0.1.141}/src/jarvis/jarvis_agent/shell_input_handler.py

@@ -1,5 +1,3 @@
-
-
 from typing import Any, Tuple
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -17,8 +15,9 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
         if user_confirm(f"是否要执行以上shell脚本？", default=True):
             from jarvis.jarvis_tools.registry import ToolRegistry
             output = ToolRegistry().handle_tool_calls({
-                "name": "execute_shell_script",
+                "name": "execute_script",
                 "arguments": {
+                    "interpreter": "bash",
                     "script_content": script
                 }
             }, agent)