jarvis-ai-assistant 0.1.206__tar.gz → 0.1.208__tar.gz

{jarvis_ai_assistant-0.1.206/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.208}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.206
+Version: 0.1.208
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -43,7 +43,6 @@ License-File: LICENSE
 Requires-Dist: requests==2.32.3
 Requires-Dist: colorama==0.4.6
 Requires-Dist: prompt_toolkit==3.0.50
-Requires-Dist: yaspin==2.4.0
 Requires-Dist: pygments==2.19.1
 Requires-Dist: fuzzywuzzy==0.18.0
 Requires-Dist: fastapi==0.115.12
@@ -109,7 +108,6 @@ pip3 install jarvis-ai-assistant
 | `jarvis-platform-manager` | - | 使用平台管理功能 |
 | `jarvis-code-review` | - | 使用代码审查功能 |
 | `jarvis-git-commit` | `jgc` | 使用自动化git commit功能 |
-| `jarvis-dev` | - | 使用dev功能（开发中） |
 | `jarvis-git-squash` | - | 使用git squash功能 |
 | `jarvis-multi-agent` | - | 使用多代理功能 |
 | `jarvis-agent` | - | 使用agent功能 |
@@ -529,7 +527,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 推理任务使用的平台 |
 | `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 推理任务使用的模型 |
 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
-| `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
+| `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | false | 应用补丁前是否需要确认 |
 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
 | `JARVIS_AUTO_UPDATE` | true | 是否自动更新Jarvis |
 | `JARVIS_MAX_BIG_CONTENT_SIZE` | 160000 | 最大大内容大小 |
@@ -547,15 +545,10 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | 工具名称 | 描述 |
 |----------|------|
 | ask_user | 交互式用户输入收集 |
-| chdir | 更改当前工作目录 |
 | rewrite_file | 文件重写工具 |
 | edit_file | 代码编辑工具 |
-| code_plan | 理解需求并制定代码修改计划 |
-| create_code_agent | 代码开发工具 |
-| create_sub_agent | 创建子代理处理特定任务 |
 | execute_script | 执行脚本并返回结果 |
 | file_analyzer | 分析文件内容并提取关键信息 |
-| file_operation | 文件批量操作工具 |
 | methodology | 方法论管理工具 |
 | read_code | 代码阅读与分析工具 |
 | read_webpage | 读取网页内容并分析 |
@@ -569,14 +562,12 @@ OPENAI_API_BASE: https://api.openai.com/v1
 |------|------|
 | `'Summary'` | 总结当前会话并清空历史记录 |
 | `'Clear'` | 清空当前会话 |
-| `'CodeBase'` | 查询代码库 |
-| `'Web'` | 网页搜索 |
-| `'Methodology'` | 查找相关方法论 |
-| `'Plan'` | 生成代码修改计划 |
-| `'FindRelatedFiles'` | 查找相关文件 |
-| `'FindMethodology'` | 查找方法论 |
-| `'Dev'` | 调用create_code_agent开发需求 |
+| `'ToolUsage'` | 显示可用工具列表及使用方法 |
+| `'ReloadConfig'` | 重新加载配置文件 |
+| `'Web'` | 网页搜索，支持多种提问格式 |
+| `'FindRelatedFiles'` | 查找与功能相关的文件 |
 | `'Fix'` | 修复问题 |
+| `'Check'` | 执行静态代码检查，包括错误和风格问题 |
 
 ### 3. 自定义替换配置
 在`~/.jarvis/config.yaml`中添加：

{jarvis_ai_assistant-0.1.206 → jarvis_ai_assistant-0.1.208}/README.md

@@ -39,7 +39,6 @@ pip3 install jarvis-ai-assistant
 | `jarvis-platform-manager` | - | 使用平台管理功能 |
 | `jarvis-code-review` | - | 使用代码审查功能 |
 | `jarvis-git-commit` | `jgc` | 使用自动化git commit功能 |
-| `jarvis-dev` | - | 使用dev功能（开发中） |
 | `jarvis-git-squash` | - | 使用git squash功能 |
 | `jarvis-multi-agent` | - | 使用多代理功能 |
 | `jarvis-agent` | - | 使用agent功能 |
@@ -459,7 +458,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 推理任务使用的平台 |
 | `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 推理任务使用的模型 |
 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
-| `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
+| `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | false | 应用补丁前是否需要确认 |
 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
 | `JARVIS_AUTO_UPDATE` | true | 是否自动更新Jarvis |
 | `JARVIS_MAX_BIG_CONTENT_SIZE` | 160000 | 最大大内容大小 |
@@ -477,15 +476,10 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | 工具名称 | 描述 |
 |----------|------|
 | ask_user | 交互式用户输入收集 |
-| chdir | 更改当前工作目录 |
 | rewrite_file | 文件重写工具 |
 | edit_file | 代码编辑工具 |
-| code_plan | 理解需求并制定代码修改计划 |
-| create_code_agent | 代码开发工具 |
-| create_sub_agent | 创建子代理处理特定任务 |
 | execute_script | 执行脚本并返回结果 |
 | file_analyzer | 分析文件内容并提取关键信息 |
-| file_operation | 文件批量操作工具 |
 | methodology | 方法论管理工具 |
 | read_code | 代码阅读与分析工具 |
 | read_webpage | 读取网页内容并分析 |
@@ -499,14 +493,12 @@ OPENAI_API_BASE: https://api.openai.com/v1
 |------|------|
 | `'Summary'` | 总结当前会话并清空历史记录 |
 | `'Clear'` | 清空当前会话 |
-| `'CodeBase'` | 查询代码库 |
-| `'Web'` | 网页搜索 |
-| `'Methodology'` | 查找相关方法论 |
-| `'Plan'` | 生成代码修改计划 |
-| `'FindRelatedFiles'` | 查找相关文件 |
-| `'FindMethodology'` | 查找方法论 |
-| `'Dev'` | 调用create_code_agent开发需求 |
+| `'ToolUsage'` | 显示可用工具列表及使用方法 |
+| `'ReloadConfig'` | 重新加载配置文件 |
+| `'Web'` | 网页搜索，支持多种提问格式 |
+| `'FindRelatedFiles'` | 查找与功能相关的文件 |
 | `'Fix'` | 修复问题 |
+| `'Check'` | 执行静态代码检查，包括错误和风格问题 |
 
 ### 3. 自定义替换配置
 在`~/.jarvis/config.yaml`中添加：

{jarvis_ai_assistant-0.1.206 → jarvis_ai_assistant-0.1.208}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.206"
+version = "0.1.208"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -29,7 +29,6 @@ dependencies = [
     "requests==2.32.3",
     "colorama==0.4.6",
     "prompt_toolkit==3.0.50",
-    "yaspin==2.4.0",
     "pygments==2.19.1",
     "fuzzywuzzy==0.18.0",
     "fastapi==0.115.12",
@@ -61,7 +60,6 @@ jarvis-platform-manager = "jarvis.jarvis_platform_manager.main: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"
 jarvis-agent = "jarvis.jarvis_agent.main:main"

{jarvis_ai_assistant-0.1.206 → jarvis_ai_assistant-0.1.208}/setup.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-from setuptools import setup, find_packages
+from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.206",
+    version="0.1.208",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -14,16 +14,12 @@ setup(
     package_dir={"": "src"},
     include_package_data=True,
     package_data={
-        "jarvis": [
-            "jarvis_data/huggingface.tar.gz",
-            "jarvis_data/config_schema.json"
-        ],
+        "jarvis": ["jarvis_data/huggingface.tar.gz", "jarvis_data/config_schema.json"],
     },
     install_requires=[
         "requests==2.32.3",
         "colorama==0.4.6",
         "prompt_toolkit==3.0.50",
-        "yaspin==2.4.0",
         "pygments==2.19.1",
         "fuzzywuzzy==0.18.0",
         "fastapi==0.115.12",
@@ -37,9 +33,7 @@ setup(
         "tabulate==0.9.0",
         "pyte==0.8.2",
     ],
-    extras_require={
-        "dev": ["pytest", "black", "isort", "mypy", "build", "twine"]
-    },
+    extras_require={"dev": ["pytest", "black", "isort", "mypy", "build", "twine"]},
     entry_points={
         "console_scripts": [
             "jarvis=jarvis.jarvis_agent.jarvis:main",
@@ -49,9 +43,8 @@ setup(
             "jss=jarvis.jarvis_smart_shell.main:main",
             "jarvis-platform-manager=jarvis.jarvis_platform_manager.main:main",
             "jarvis-code-review=jarvis.jarvis_code_analysis.code_review:main",
-            "jarvis-git-commit=jarvis.jarvis_git_utils.git_commiter: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",
             "jarvis-agent=jarvis.jarvis_agent.main:main",

{jarvis_ai_assistant-0.1.206 → jarvis_ai_assistant-0.1.208}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.206 → jarvis_ai_assistant-0.1.208}/src/jarvis/jarvis_agent/__init__.py

@@ -7,27 +7,35 @@ import platform
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
 # 第三方库导入
-from yaspin import yaspin  # type: ignore
 
 # 本地库导入
 # jarvis_agent 相关
 # jarvis_platform 相关
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
+
 # jarvis_utils 相关
-from jarvis.jarvis_utils.config import (get_data_dir, get_max_token_count,
-                                        get_max_tool_call_count,
-                                        is_auto_complete,
-                                        is_execute_tool_confirm,
-                                        is_use_analysis, get_history_count, is_use_methodology)
+from jarvis.jarvis_utils.config import (
+    get_data_dir,
+    get_max_token_count,
+    get_max_tool_call_count,
+    is_auto_complete,
+    is_execute_tool_confirm,
+    is_use_analysis,
+    get_history_count,
+    is_use_methodology,
+)
 from jarvis.jarvis_utils.embedding import get_context_token_count
-from jarvis.jarvis_utils.globals import (delete_agent, get_interrupt,
-                                         make_agent_name, set_agent,
-                                         set_interrupt)
+from jarvis.jarvis_utils.globals import (
+    delete_agent,
+    get_interrupt,
+    make_agent_name,
+    set_agent,
+    set_interrupt,
+)
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.jarvis_history import JarvisHistory
-from jarvis.jarvis_utils.methodology import (load_methodology,
-                                             upload_methodology)
+from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import user_confirm
@@ -240,11 +248,12 @@ class Agent:
         self.after_tool_call_cb: Optional[Callable[[Agent], None]] = None
 
         self.history = JarvisHistory()
-        self.history_dir = str(Path(get_data_dir())/"history")
+        self.history_dir = str(Path(get_data_dir()) / "history")
         self.history.start_record(self.history_dir)
 
-        self.history_count = history_count if history_count is not None else get_history_count()
-
+        self.history_count = (
+            history_count if history_count is not None else get_history_count()
+        )
 
         self.execute_tool_confirm = (
             execute_tool_confirm
@@ -422,8 +431,8 @@ class Agent:
         注意:
             仅生成摘要，不修改对话状态
         """
-        with yaspin(text="正在总结对话历史...", color="cyan") as spinner:
-            summary_prompt = """
+        print("📄 正在总结对话历史...")
+        summary_prompt = """
 <summary_request>
 <objective>
 请对当前对话历史进行简明扼要的总结，提取关键信息和重要决策点。这个总结将作为上下文继续任务，因此需要保留对后续对话至关重要的内容。
@@ -447,14 +456,11 @@ class Agent:
 """
 
         try:
-            with spinner.hidden():
-                summary = self.model.chat_until_success(self.prompt + "\n" + summary_prompt)  # type: ignore
-            spinner.text = "总结对话历史完成"
-            spinner.ok("✅")
+            summary = self.model.chat_until_success(self.prompt + "\n" + summary_prompt)  # type: ignore
+            print("✅ 总结对话历史完成")
             return summary
         except Exception as e:
-            spinner.text = "总结对话历史失败"
-            spinner.fail("❌")
+            print("❌ 总结对话历史失败")
             return ""
 
     def _summarize_and_clear_history(self) -> str:
@@ -482,6 +488,7 @@ class Agent:
                 summary = self.generate_summary()
             else:
                 import tempfile
+
                 tmp_file = tempfile.NamedTemporaryFile(delete=False)
                 tmp_file_name = tmp_file.name
                 self.history.save_history(tmp_file_name)
@@ -553,15 +560,11 @@ class Agent:
         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
+            print(f"🔧 正在执行{tool_list[0].name()}...")
+            result = tool_list[0].handle(response, self)
+            print(f"✅ {tool_list[0].name()}执行完成")
+            self.tool_call_count += 1
+            return result
         return False, ""
 
     def reset_tool_call_count(self):
@@ -581,21 +584,19 @@ class Agent:
         if self.use_analysis:
             self._analysis_task()
         if self.need_summary:
-            with yaspin(text="正在生成总结...", color="cyan") as spinner:
-                self.prompt = self.summary_prompt
-                with spinner.hidden():
-                    ret = self.model.chat_until_success(self.prompt)  # type: ignore
-                    spinner.text = "总结生成完成"
-                    spinner.ok("✅")
-                    return ret
+            print("📄 正在生成总结...")
+            self.prompt = self.summary_prompt
+            ret = self.model.chat_until_success(self.prompt)  # type: ignore
+            print("✅ 总结生成完成")
+            return ret
 
         return "任务完成"
 
     def _analysis_task(self):
-        with yaspin(text="正在分析任务...", color="cyan") as spinner:
-            try:
-                # 让模型判断是否需要生成方法论
-                analysis_prompt = f"""<task_analysis>
+        print("🔍 正在分析任务...")
+        try:
+            # 让模型判断是否需要生成方法论
+            analysis_prompt = f"""<task_analysis>
 <request>
 当前任务已结束，请分析该任务的解决方案：
 1. 首先检查现有工具或方法论是否已经可以完成该任务，如果可以，直接说明即可，无需生成新内容
@@ -741,17 +742,12 @@ arguments:
 </output_requirements>
 </task_analysis>"""
 
-                self.prompt = analysis_prompt
-                with spinner.hidden():
-                    response = self.model.chat_until_success(self.prompt)  # type: ignore
-
-                with spinner.hidden():
-                    self._call_tools(response)
-                spinner.text = "分析完成"
-                spinner.ok("✅")
-            except Exception as e:
-                spinner.text = "分析失败"
-                spinner.fail("❌")
+            self.prompt = analysis_prompt
+            response = self.model.chat_until_success(self.prompt)  # type: ignore
+            self._call_tools(response)
+            print("✅ 分析完成")
+        except Exception as e:
+            print("❌ 分析失败")
 
     def make_default_addon_prompt(self, need_complete: bool) -> str:
         """生成附加提示。
@@ -822,8 +818,13 @@ arguments:
                         )
                         if user_input:
                             # 如果有工具调用且用户确认继续，则将干预信息和工具执行结果拼接为prompt
-                            if any(handler.can_handle(current_response) for handler in self.output_handler):
-                                if user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
+                            if any(
+                                handler.can_handle(current_response)
+                                for handler in self.output_handler
+                            ):
+                                if user_confirm(
+                                    "检测到有工具调用，是否继续处理工具调用？", True
+                                ):
                                     self.prompt = f"{user_input}\n\n{current_response}"
                                     continue
                             self.prompt += f"{user_input}"
@@ -871,18 +872,25 @@ arguments:
         history_md = ""
         if self.history_count > 0 and self.model and self.model.support_upload_files():
             import tempfile
+
             timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
-            history_md = str(Path(tempfile.gettempdir())/f"{self.name}_history_{timestamp}.md")
-            self.history.export_history_to_markdown(self.history_dir, history_md, max_files=self.history_count)
+            history_md = str(
+                Path(tempfile.gettempdir()) / f"{self.name}_history_{timestamp}.md"
+            )
+            self.history.export_history_to_markdown(
+                self.history_dir, history_md, max_files=self.history_count
+            )
             self.files.append(history_md)
 
-                        # 如果有上传文件，先上传文件
+            # 如果有上传文件，先上传文件
         if self.model and self.model.support_upload_files():
             if self.use_methodology:
                 if not upload_methodology(self.model, other_files=self.files):
                     if self.files:
-                        PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
-                                    # 上传失败则回退到本地加载
+                        PrettyOutput.print(
+                            "文件上传失败，将忽略文件列表", OutputType.WARNING
+                        )
+                        # 上传失败则回退到本地加载
                     msg = self.prompt
                     for handler in self.input_handler:
                         msg, _ = handler(msg, self)
@@ -894,7 +902,9 @@ arguments:
                         self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
             elif self.files:
                 if not self.model.upload_files(self.files):
-                    PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
+                    PrettyOutput.print(
+                        "文件上传失败，将忽略文件列表", OutputType.WARNING
+                    )
                 else:
                     self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
         else:

{jarvis_ai_assistant-0.1.206 → jarvis_ai_assistant-0.1.208}/src/jarvis/jarvis_agent/edit_file_handler.py

@@ -2,9 +2,6 @@ import os
 import re
 from typing import Any, Dict, List, Tuple
 
-from yaspin import yaspin  # type: ignore
-from yaspin.core import Yaspin  # type: ignore
-
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.git_utils import revert_file
@@ -71,19 +68,19 @@ class EditFileHandler(OutputHandler):
                 {"SEARCH": diff["SEARCH"], "REPLACE": diff["REPLACE"]} for diff in diffs
             ]
 
-            with yaspin(text=f"正在处理文件 {file_path}...", color="cyan") as spinner:
-                # 首先尝试fast_edit模式
-                success, result = self._fast_edit(file_path, file_patches, spinner)
-                if not success:
-                    # 如果fast_edit失败，尝试slow_edit模式
-                    success, result = EditFileHandler._slow_edit(
-                        file_path, file_patches, spinner, agent
-                    )
+            print(f"📝 正在处理文件 {file_path}...")
+            # 首先尝试fast_edit模式
+            success, result = self._fast_edit(file_path, file_patches)
+            if not success:
+                # 如果fast_edit失败，尝试slow_edit模式
+                success, result = EditFileHandler._slow_edit(
+                    file_path, file_patches, agent
+                )
 
-                if success:
-                    results.append(f"✅ 文件 {file_path} 修改成功")
-                else:
-                    results.append(f"❌ 文件 {file_path} 修改失败: {result}")
+            if success:
+                results.append(f"✅ 文件 {file_path} 修改成功")
+            else:
+                results.append(f"❌ 文件 {file_path} 修改失败: {result}")
 
         summary = "\n".join(results)
         return False, summary
@@ -153,10 +150,11 @@ class EditFileHandler(OutputHandler):
             file_path = match.group(1) or match.group(2) or match.group(3)
             diffs = []
             for diff_match in self.diff_pattern.finditer(match.group(0)):
+                # 完全保留原始格式（包括所有空白和换行）
                 diffs.append(
                     {
-                        "SEARCH": diff_match.group(1).strip(),
-                        "REPLACE": diff_match.group(2).strip(),
+                        "SEARCH": diff_match.group(1),  # 原始SEARCH内容
+                        "REPLACE": diff_match.group(2),  # 原始REPLACE内容
                     }
                 )
             if diffs:
@@ -167,9 +165,7 @@ class EditFileHandler(OutputHandler):
         return patches
 
     @staticmethod
-    def _fast_edit(
-        file_path: str, patches: List[Dict[str, str]], spinner: Yaspin
-    ) -> Tuple[bool, str]:
+    def _fast_edit(file_path: str, patches: List[Dict[str, str]]) -> Tuple[bool, str]:
         """快速应用补丁到文件
 
         该方法直接尝试将补丁应用到目标文件，适用于简单、明确的修改场景。
@@ -182,7 +178,6 @@ class EditFileHandler(OutputHandler):
         Args:
             file_path: 要修改的文件路径，支持绝对路径和相对路径
             patches: 补丁列表，每个补丁包含search(搜索文本)和replace(替换文本)
-            spinner: 进度显示对象，用于显示处理状态和结果
 
         Returns:
             Tuple[bool, str]:
@@ -207,17 +202,22 @@ class EditFileHandler(OutputHandler):
                 replace_text = patch["REPLACE"]
                 patch_count += 1
 
-                if search_text in modified_content:
-                    if modified_content.count(search_text) > 1:
+                # 精确匹配搜索文本（保留原始换行和空格）
+                exact_search = search_text
+
+                if exact_search in modified_content:
+                    if modified_content.count(exact_search) > 1:
                         PrettyOutput.print(
-                            f"搜索文本在文件中存在多处匹配：\n{search_text}",
+                            f"搜索文本在文件中存在多处匹配：\n{exact_search}",
                             output_type=OutputType.WARNING,
                         )
-                        return False, f"搜索文本在文件中存在多处匹配：\n{search_text}"
+                        return False, f"搜索文本在文件中存在多处匹配：\n{exact_search}"
+
+                    # 直接执行替换（保留所有原始格式）
                     modified_content = modified_content.replace(
-                        search_text, replace_text
+                        exact_search, replace_text
                     )
-                    spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
+                    print(f"✅ 补丁 #{patch_count} 应用成功")
                 else:
                     # 尝试增加缩进重试
                     found = False
@@ -243,7 +243,7 @@ class EditFileHandler(OutputHandler):
                             modified_content = modified_content.replace(
                                 indented_search, indented_replace
                             )
-                            spinner.write(
+                            print(
                                 f"✅ 补丁 #{patch_count} 应用成功 (自动增加 {space_count} 个空格缩进)"
                             )
                             found = True
@@ -260,19 +260,17 @@ class EditFileHandler(OutputHandler):
             with open(file_path, "w", encoding="utf-8") as f:
                 f.write(modified_content)
 
-            spinner.text = f"文件 {file_path} 修改完成，应用了 {patch_count} 个补丁"
-            spinner.ok("✅")
+            print(f"✅ 文件 {file_path} 修改完成，应用了 {patch_count} 个补丁")
             return True, modified_content
 
         except Exception as e:
-            spinner.text = f"文件修改失败: {str(e)}"
-            spinner.fail("❌")
+            print(f"❌ 文件修改失败: {str(e)}")
             revert_file(file_path)
             return False, f"文件修改失败: {str(e)}"
 
     @staticmethod
     def _slow_edit(
-        file_path: str, patches: List[Dict[str, str]], spinner: Yaspin, agent: Any
+        file_path: str, patches: List[Dict[str, str]], agent: Any
     ) -> Tuple[bool, str]:
         """使用AI模型生成补丁并应用到文件
 
@@ -287,7 +285,6 @@ class EditFileHandler(OutputHandler):
         Args:
             file_path: 要修改的文件路径，支持绝对路径和相对路径
             patches: 补丁列表，每个补丁包含search(搜索文本)和replace(替换文本)
-            spinner: 进度显示对象，用于显示处理状态和结果
             agent: 执行处理的agent实例，用于访问AI模型平台
 
         Returns:
@@ -308,13 +305,12 @@ class EditFileHandler(OutputHandler):
             upload_success = False
 
             # 如果是大文件，尝试上传到模型平台
-            with spinner.hidden():
-                if (
-                    is_large_context
-                    and model.support_upload_files()
-                    and model.upload_files([file_path])
-                ):
-                    upload_success = True
+            if (
+                is_large_context
+                and model.support_upload_files()
+                and model.upload_files([file_path])
+            ):
+                upload_success = True
 
             model.set_suppress_output(True)
 
@@ -387,8 +383,9 @@ class EditFileHandler(OutputHandler):
                 # 检查是否被中断
                 if get_interrupt():
                     set_interrupt(False)
-                    with spinner.hidden():
-                        user_input = agent.multiline_inputer("补丁应用被中断，请输入补充信息:")
+                    user_input = agent.multiline_inputer(
+                        "补丁应用被中断，请输入补充信息:"
+                    )
                     if not user_input.strip():
                         return False, "用户中断了补丁应用"
                     return False, f"用户中断了补丁应用并提供了补充信息: {user_input}"
@@ -422,7 +419,7 @@ class EditFileHandler(OutputHandler):
                 if generated_patches:
                     # 尝试应用生成的补丁
                     success, result = EditFileHandler._fast_edit(
-                        file_path, generated_patches, spinner
+                        file_path, generated_patches
                     )
                     if success:
                         return True, result
@@ -430,7 +427,6 @@ class EditFileHandler(OutputHandler):
             return False, "AI模型无法生成有效的补丁"
 
         except Exception as e:
-            spinner.text = f"文件修改失败: {str(e)}"
-            spinner.fail("❌")
+            print(f"❌ 文件修改失败: {str(e)}")
             revert_file(file_path)
             return False, f"文件修改失败: {str(e)}"