jarvis-ai-assistant 0.1.126__tar.gz → 0.1.128__tar.gz

{jarvis_ai_assistant-0.1.126/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.128}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.126
+Version: 0.1.128
 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.126 → jarvis_ai_assistant-0.1.128}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.126"
+version = "0.1.128"
 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.126 → jarvis_ai_assistant-0.1.128}/setup.py

@@ -1,8 +1,18 @@
 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.126",
+    version="0.1.128",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -67,4 +77,7 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
     ],
+    cmdclass={
+        'install': CustomInstallCommand,  # 注册自定义安装命令
+    },
 )

{jarvis_ai_assistant-0.1.126 → jarvis_ai_assistant-0.1.128}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.126" 
+__version__ = "0.1.128" 

{jarvis_ai_assistant-0.1.126 → jarvis_ai_assistant-0.1.128}/src/jarvis/jarvis_agent/__init__.py

@@ -3,6 +3,7 @@ from typing import Any, Callable, List, Optional, Tuple, Union
 
 from prompt_toolkit import prompt
 import yaml
+from yaspin import yaspin
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.base import BasePlatform
@@ -66,9 +67,9 @@ class Agent:
         if model_name is not None:
             self.model.set_model_name(model_name)
 
+        self.model.set_suppress_output(False)
 
         self.output_handler = output_handler
-
         
         self.record_methodology = record_methodology if record_methodology is not None else is_record_methodology()
         self.use_methodology = use_methodology if use_methodology is not None else is_use_methodology()
@@ -165,6 +166,7 @@ class Agent:
             message, need_return = handler(message, self)
             if need_return:
                 return message
+        PrettyOutput.section("模型输出", OutputType.SYSTEM)
         return self.model.chat_until_success(message)   # type: ignore
 
 
@@ -184,35 +186,38 @@ class Agent:
         """
         # Create a new model instance to summarize, avoid affecting the main conversation
 
-        PrettyOutput.print("总结对话历史，准备生成摘要，开始新对话...", OutputType.PROGRESS)
-        
-        prompt = """请总结之前对话中的关键信息，包括：
-1. 当前任务目标
-2. 已确认的关键信息
-3. 已尝试的解决方案
-4. 当前进展
-5. 待解决的问题
-
-请用简洁的要点形式描述，突出重要信息。不要包含对话细节。
-"""
-        
-        try:
-            summary = self._call_model(self.prompt + "\n" + prompt)
+        with yaspin(text="正在总结对话历史...", color="cyan") as spinner:
             
-            # 清空当前对话历史，但保留系统消息
-            self.conversation_length = 0  # Reset conversation length
+            prompt = """请总结之前对话中的关键信息，包括：
+    1. 当前任务目标
+    2. 已确认的关键信息
+    3. 已尝试的解决方案
+    4. 当前进展
+    5. 待解决的问题
+
+    请用简洁的要点形式描述，突出重要信息。不要包含对话细节。
+    """
             
-            # 添加总结作为新的上下文
-            self.prompt = f"""以下是之前对话的关键信息总结：
+            try:
+                with spinner.hidden():
+                    summary = self._call_model(self.prompt + "\n" + prompt)
+                
+                # 清空当前对话历史，但保留系统消息
+                self.conversation_length = 0  # Reset conversation length
+                
+                # 添加总结作为新的上下文
+                self.prompt = f"""以下是之前对话的关键信息总结：
 
-{summary}
+    {summary}
 
-请基于以上信息继续完成任务。
-"""
-            self.conversation_length = len(self.prompt)  # 设置新的起始长度
-            
-        except Exception as e:
-            PrettyOutput.print(f"总结对话历史失败: {str(e)}", OutputType.ERROR)
+    请基于以上信息继续完成任务。
+    """
+                self.conversation_length = len(self.prompt)  # 设置新的起始长度
+                spinner.text = "总结对话历史完成"
+                spinner.ok("✅")
+            except Exception as e:
+                spinner.text = "总结对话历史失败"
+                spinner.fail("❌")
 
     def _call_tools(self, response: str) -> Tuple[bool, Any]:
         tool_list = []
@@ -225,7 +230,12 @@ class Agent:
         if len(tool_list) == 0:
             return False, ""
         if not self.execute_tool_confirm or user_confirm(f"需要执行{tool_list[0].name()}确认执行？", True):
-            return tool_list[0].handle(response)
+            with yaspin(text=f"正在执行{tool_list[0].name()}...", color="cyan") as spinner:
+                with spinner.hidden():
+                    result = tool_list[0].handle(response)
+                spinner.text = f"{tool_list[0].name()}执行完成"
+                spinner.ok("✅")
+                return result
         return False, ""
         
 
@@ -239,33 +249,40 @@ class Agent:
             - For main agent: May generate methodology if enabled
             - For sub-agent: May generate summary if enabled
         """
-        PrettyOutput.section("任务完成", OutputType.SUCCESS)
-        
         if not self.is_sub_agent:
             if self.record_methodology:
-
-                try:
-                    # 让模型判断是否需要生成方法论
-                    analysis_prompt = """当前任务已结束，请分析是否需要生成方法论。
-    如果你认为需要生成方法论，请先确定是创建新方法论还是更新现有方法论。如果是更新现有方法论，请使用'update'，否则使用'add'。
-    如果你认为不需要方法论，请解释原因。
-    方法论应适用于通用场景，不要包含任务特定信息，如代码提交信息等。
-    方法论应包含：问题重述、最优解决方案、注意事项（如有），除此之外不要包含其他内容。
-    只输出方法论工具调用指令，或不生成方法论的解释。不要输出其他内容。
-    """
-                    self.prompt = analysis_prompt
-                    response = self._call_model(self.prompt)
-                    
-                    self._call_tools(response)
-                    
-                except Exception as e:
-                    PrettyOutput.print(f"生成方法论失败: {str(e)}", OutputType.ERROR)
-            
+                with yaspin(text="正在生成方法论...", color="cyan") as spinner:
+                    try:
+                        
+                        # 让模型判断是否需要生成方法论
+                        analysis_prompt = """当前任务已结束，请分析是否需要生成方法论。
+        如果你认为需要生成方法论，请先确定是创建新方法论还是更新现有方法论。如果是更新现有方法论，请使用'update'，否则使用'add'。
+        如果你认为不需要方法论，请解释原因。
+        方法论应适用于通用场景，不要包含任务特定信息，如代码提交信息等。
+        方法论应包含：问题重述、最优解决方案、注意事项（如有），除此之外不要包含其他内容。
+        只输出方法论工具调用指令，或不生成方法论的解释。不要输出其他内容。
+        """
+                        self.prompt = analysis_prompt
+                        with spinner.hidden():
+                            response = self._call_model(self.prompt)
+
+                        with spinner.hidden():
+                            self._call_tools(response)
+                        spinner.text = "方法论生成完成"
+                        spinner.ok("✅")
+                    except Exception as e:
+                        spinner.text = "方法论生成失败"
+                        spinner.fail("❌")
             return "任务完成"
         
         if self.need_summary:
-            self.prompt = self.summary_prompt
-            return self._call_model(self.prompt)
+            with yaspin(text="正在生成总结...", color="cyan") as spinner:
+                self.prompt = self.summary_prompt
+                with spinner.hidden():
+                    ret = self._call_model(self.prompt)
+                    spinner.text = "总结生成完成"
+                    spinner.ok("✅")
+                    return ret
         
         return "任务完成"
 
@@ -282,13 +299,12 @@ class Agent:
         """
         try:
             set_agent(self.name, self)
-            PrettyOutput.section("准备环境", OutputType.PLANNING)
-            if file_list:
-                self.model.upload_files(file_list) # type: ignore
-
-            # 显示任务开始
-            PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
-
+            with yaspin(text="准备环境...", color="cyan") as spinner:
+                if file_list:
+                    self.model.upload_files(file_list) # type: ignore
+                    spinner.text = "环境准备完成"
+                    spinner.ok("✅")
+            
             self.prompt = f"{user_input}"
 
             if self.first:
@@ -298,9 +314,6 @@ class Agent:
 
             while True:
                 try:
-                    # 显示思考状态
-                    PrettyOutput.print("正在分析任务...", OutputType.PROGRESS)
-                    
                     # 累加对话长度
                     self.conversation_length += get_context_token_count(self.prompt)
                     
@@ -360,41 +373,46 @@ class Agent:
 def _load_tasks() -> dict:
     """Load tasks from .jarvis files in user home and current directory."""
     tasks = {}
-    
+
     # Check .jarvis/pre-command in user directory
     user_jarvis = os.path.expanduser("~/.jarvis/pre-command")
     if os.path.exists(user_jarvis):
-        try:
-            with open(user_jarvis, "r", encoding="utf-8") as f:
-                user_tasks = yaml.safe_load(f)
-                
-            if isinstance(user_tasks, dict):
-                # Validate and add user directory tasks
-                for name, desc in user_tasks.items():
-                    if desc:  # Ensure description is not empty
-                        tasks[str(name)] = str(desc)
-            else:
-                PrettyOutput.print("警告: ~/.jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.WARNING)
-        except Exception as e:
-            PrettyOutput.print(f"加载 ~/.jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
-    
+        with yaspin(text=f"从{user_jarvis}加载预定义任务...", color="cyan") as spinner:
+            try:
+                with open(user_jarvis, "r", encoding="utf-8") as f:
+                    user_tasks = yaml.safe_load(f)
+                    
+                if isinstance(user_tasks, dict):
+                    # Validate and add user directory tasks
+                    for name, desc in user_tasks.items():
+                        if desc:  # Ensure description is not empty
+                            tasks[str(name)] = str(desc)
+                spinner.text = "预定义任务加载完成"
+                spinner.ok("✅")
+            except Exception as e:
+                spinner.text = "预定义任务加载失败"
+                spinner.fail("❌")
+        
     # Check .jarvis/pre-command in current directory
     if os.path.exists(".jarvis/pre-command"):
-        try:
-            with open(".jarvis/pre-command", "r", encoding="utf-8") as f:
-                local_tasks = yaml.safe_load(f)
-                
-            if isinstance(local_tasks, dict):
-                # Validate and add current directory tasks, overwrite user directory tasks if there is a name conflict
-                for name, desc in local_tasks.items():
-                    if desc:  # Ensure description is not empty
-                        tasks[str(name)] = str(desc)
-            else:
-                PrettyOutput.print("警告: .jarvis/pre-command 文件应该包含一个字典，键为任务名称，值为任务描述", OutputType.WARNING)
-        except Exception as e:
-            PrettyOutput.print(f"加载 .jarvis/pre-command 文件失败: {str(e)}", OutputType.ERROR)
+        with yaspin(text=f"从{os.path.abspath('.jarvis/pre-command')}加载预定义任务...", color="cyan") as spinner:
+            try:
+                with open(".jarvis/pre-command", "r", encoding="utf-8") as f:
+                    local_tasks = yaml.safe_load(f)
+                    
+                if isinstance(local_tasks, dict):
+                    # Validate and add current directory tasks, overwrite user directory tasks if there is a name conflict
+                    for name, desc in local_tasks.items():
+                        if desc:  # Ensure description is not empty
+                            tasks[str(name)] = str(desc)
+                spinner.text = "预定义任务加载完成"
+                spinner.ok("✅")
+            except Exception as e:
+                spinner.text = "预定义任务加载失败"
+                spinner.fail("❌")
 
     return tasks
+
 def _select_task(tasks: dict) -> str:
     """Let user select a task from the list or skip. Returns task description if selected."""
     if not tasks:

{jarvis_ai_assistant-0.1.126 → jarvis_ai_assistant-0.1.128}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -3,6 +3,8 @@ import subprocess
 import os
 from typing import Any, Tuple
 
+from yaspin import yaspin
+
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_code_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_code_agent.patch import PatchOutputHandler
@@ -83,12 +85,15 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                     "start_line": 1,  # 1-based
                     "end_line": -1
                 })
-    
+        
     # Read and process files if any were found
     if files:
-        result = FileOperationTool().execute({"operation":"read","files": files})
-        if result["success"]:
-            return result["stdout"] + "\n" + prompt, False
+        with yaspin(text="正在读取文件...", color="cyan") as spinner:
+            result = FileOperationTool().execute({"operation":"read","files": files})
+            if result["success"]:
+                spinner.text = "文件读取完成"
+                spinner.ok("✅")
+                return result["stdout"] + "\n" + prompt, False
     
     return prompt, False
 
@@ -209,12 +214,17 @@ class CodeAgent:
     
 
     def _init_env(self):
-        curr_dir = os.getcwd()
-        git_dir = find_git_root(curr_dir)
-        self.root_dir = git_dir
-        if has_uncommitted_changes():
-            git_commiter = GitCommitTool()
-            git_commiter.execute({})
+        with yaspin(text="正在初始化环境...", color="cyan") as spinner: 
+            curr_dir = os.getcwd()
+            git_dir = find_git_root(curr_dir)
+            self.root_dir = git_dir
+            if has_uncommitted_changes():
+                with spinner.hidden():
+                    git_commiter = GitCommitTool()
+                    git_commiter.execute({})
+            else:
+                spinner.text = "环境初始化完成"
+            spinner.ok("✅")
 
     
 
@@ -229,6 +239,7 @@ class CodeAgent:
         """
         try:
             self._init_env()
+            
             start_commit = get_latest_commit_hash()
             
             try:

jarvis_ai_assistant-0.1.128/src/jarvis/jarvis_code_agent/patch.py

@@ -0,0 +1,275 @@
+import re
+from typing import Dict, Any, Tuple
+import os
+
+from yaspin import yaspin
+
+from jarvis.jarvis_agent.output_handler import OutputHandler
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_tools.git_commiter import GitCommitTool
+from jarvis.jarvis_tools.execute_shell_script import ShellScriptTool
+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
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import user_confirm
+
+class PatchOutputHandler(OutputHandler):
+    def name(self) -> str:
+        return "PATCH"
+    def handle(self, response: str) -> Tuple[bool, Any]:
+        return False, apply_patch(response)
+    
+    def can_handle(self, response: str) -> bool:
+        if _parse_patch(response):
+            return True
+        return False
+    
+    def prompt(self) -> str:
+        return """
+# 🛠️ 上下文代码补丁规范
+使用<PATCH>块来指定代码更改：
+--------------------------------
+<PATCH>
+File: [文件路径]
+Reason: [修改原因]
+[上下文代码片段]
+</PATCH>
+--------------------------------
+规则：
+1. 代码片段必须包含足够的上下文（前后各3行）
+2. 我可以看到完整代码，所以只需显示修改的代码部分
+3. 保留原始缩进和格式
+4. 对于新文件，提供完整代码
+5. 修改现有文件时，保留周围未更改的代码
+示例：
+<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
+</PATCH>
+"""
+
+def _parse_patch(patch_str: str) -> Dict[str, str]:
+    """解析新的上下文补丁格式"""
+    result = {}
+    patches = re.findall(r'<PATCH>\n?(.*?)\n?</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:
+                PrettyOutput.print("无效的补丁格式", OutputType.WARNING)
+                continue
+            filepath = sm.group(1).strip()
+            result[filepath] = patch
+    return result
+
+def apply_patch(output_str: str) -> str:
+    """Apply patches to files"""
+    with yaspin(text="正在应用补丁...", color="cyan") as spinner:
+        try:
+            patches = _parse_patch(output_str)
+        except Exception as e:
+            PrettyOutput.print(f"解析补丁失败: {str(e)}", OutputType.ERROR)
+            return ""
+        
+        # 获取当前提交hash作为起始点
+        spinner.text= "开始获取当前提交hash..."
+        start_hash = get_latest_commit_hash()
+        spinner.write("✅ 当前提交hash获取完成")
+        
+        # 按文件逐个处理
+        for filepath, patch_content in patches.items():
+            try:
+                spinner.text = f"正在处理文件: {filepath}"
+                with spinner.hidden():
+                    handle_code_operation(filepath, patch_content)
+                spinner.write(f"✅ 文件 {filepath} 处理完成")
+            except Exception as e:
+                spinner.text = f"文件 {filepath} 处理失败: {str(e)}, 回滚文件"
+                revert_file(filepath)  # 回滚单个文件
+                spinner.write(f"✅ 文件 {filepath} 回滚完成")
+        
+        final_ret = ""
+        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}"
+                    
+                else:
+                    final_ret += "✅ 补丁已应用（没有新的提交）"
+            else:
+                final_ret += "❌ 我不想提交代码\n"
+                final_ret += "补丁预览:\n"
+                final_ret += diff
+        else:
+            final_ret += "❌ 没有要提交的更改\n"
+        # 用户确认最终结果
+        PrettyOutput.print(final_ret, OutputType.USER)
+        if not is_confirm_before_apply_patch() or user_confirm("是否使用此回复？", default=True):
+            return final_ret
+        return get_multiline_input("请输入自定义回复")
+def revert_file(filepath: str):
+    """增强版git恢复，处理新文件"""
+    import subprocess
+    try:
+        # 检查文件是否在版本控制中
+        result = subprocess.run(
+            ['git', 'ls-files', '--error-unmatch', filepath],
+            stderr=subprocess.PIPE
+        )
+        if result.returncode == 0:
+            subprocess.run(['git', 'checkout', 'HEAD', '--', filepath], check=True)
+        else:
+            if os.path.exists(filepath):
+                os.remove(filepath)
+        subprocess.run(['git', 'clean', '-f', '--', filepath], check=True)
+    except subprocess.CalledProcessError as e:
+        PrettyOutput.print(f"恢复文件失败: {str(e)}", OutputType.ERROR)
+# 修改后的恢复函数
+def revert_change():
+    import subprocess
+    subprocess.run(['git', 'reset', '--hard', 'HEAD'], check=True)
+    subprocess.run(['git', 'clean', '-fd'], check=True)
+# 修改后的获取差异函数
+def get_diff() -> str:
+    """使用git获取暂存区差异"""
+    import subprocess
+    try:
+        subprocess.run(['git', 'add', '.'], check=True)
+        result = subprocess.run(
+            ['git', 'diff', '--cached'],
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        ret = result.stdout
+        subprocess.run(['git', "reset", "--soft", "HEAD"], check=True)
+        return ret
+    except subprocess.CalledProcessError as e:
+        return f"获取差异失败: {str(e)}"
+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)
+    """
+    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"]
+
+# New handler functions below ▼▼▼
+def handle_code_operation(filepath: str, patch_content: str) -> bool:
+    """处理基于上下文的代码片段"""
+    with yaspin(text=f"正在修改文件 {filepath}...", color="cyan") as spinner:
+        try:
+            if not os.path.exists(filepath):
+                # 新建文件
+                spinner.text = "文件不存在，正在创建文件..."
+                os.makedirs(os.path.dirname(filepath), exist_ok=True)
+                open(filepath, 'w', encoding='utf-8').close()
+                spinner.write("✅ 文件创建完成")
+            old_file_content = FileOperationTool().execute({"operation": "read", "files": [{"path": filepath}]})
+            if not old_file_content["success"]:
+                spinner.write("❌ 文件读取失败")
+                return False
+            
+            prompt = f"""
+    你是一个代码审查员，请审查以下代码并将其与上下文合并。
+    原始代码:
+    {old_file_content["stdout"]}
+    补丁内容:
+    {patch_content}
+    """
+            prompt += f"""
+    请将代码与上下文合并并返回完整的合并代码，每次最多输出300行代码。
+
+    要求:
+    1. 严格保留原始代码的格式、空行和缩进
+    2. 仅在<MERGED_CODE>块中包含实际代码内容，包括空行和缩进
+    3. 绝对不要使用markdown代码块（```）或反引号，除非修改的是markdown文件
+    4. 除了合并后的代码，不要输出任何其他文本
+    5. 所有代码输出完成后，输出<!!!FINISHED!!!>
+
+    输出格式:
+    <MERGED_CODE>
+    [merged_code]
+    </MERGED_CODE>
+    """
+            PrettyOutput.section("代码生成", OutputType.SYSTEM)
+            model = PlatformRegistry().get_codegen_platform()
+            model.set_suppress_output(False)
+            count = 30
+            start_line = -1
+            end_line = -1
+            code = []
+            finished = False
+            with spinner.hidden():
+                while count>0:
+                    count -= 1
+                    response = model.chat_until_success(prompt).splitlines()
+                    try:
+                        start_line = response.index("<MERGED_CODE>") + 1
+                    except:
+                        return False
+                    try:
+                        end_line = response.index("</MERGED_CODE>")
+                    except:
+                        return False
+                    code = response[start_line:end_line]
+                    try: 
+                        response.index("<!!!FINISHED!!!>")
+                        finished = True
+                        break
+                    except:
+                        prompt += f"""继续输出接下来的300行代码
+                        要求：
+                        1. 严格保留原始代码的格式、空行和缩进
+                        2. 仅在<MERGED_CODE>块中包含实际代码内容，包括空行和缩进
+                        3. 绝对不要使用markdown代码块（```）或反引号，除非修改的是markdown文件
+                        4. 除了合并后的代码，不要输出任何其他文本
+                        5. 所有代码输出完成后，输出<!!!FINISHED!!!>
+                        """
+                        pass
+                if not finished:
+                    spinner.text = "生成代码失败"
+                    spinner.fail("❌")
+                    return False
+            # 写入合并后的代码
+            spinner.text = "写入合并后的代码..."
+            with open(filepath, 'w', encoding='utf-8') as f:
+                f.write("\n".join(code)+"\n")
+            spinner.write("✅ 合并后的代码写入完成")
+            spinner.text = "代码修改完成"
+            spinner.ok("✅")
+            return True
+        except Exception as e:
+            spinner.text = "代码修改失败"
+            spinner.fail("❌")
+            return False