jarvis-ai-assistant 0.1.212__py3-none-any.whl → 0.1.214__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -119,13 +119,17 @@ origin_agent_system_prompt = f"""
 
 
 class OutputHandlerProtocol(Protocol):
-    def name(self) -> str: ...
+    def name(self) -> str:
+        ...
 
-    def can_handle(self, response: str) -> bool: ...
+    def can_handle(self, response: str) -> bool:
+        ...
 
-    def prompt(self) -> str: ...
+    def prompt(self) -> str:
+        ...
 
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
+        ...
 
 
 class Agent:
@@ -191,9 +195,7 @@ class Agent:
             if isinstance(platform, str):
                 self.model = PlatformRegistry().create_platform(platform)
                 if self.model is None:
-                    PrettyOutput.print(
-                        f"平台 {platform} 不存在，将使用普通模型", OutputType.WARNING
-                    )
+                    PrettyOutput.print(f"平台 {platform} 不存在，将使用普通模型", OutputType.WARNING)
                     self.model = PlatformRegistry().get_normal_platform()
             else:
                 self.model = platform
@@ -356,6 +358,33 @@ class Agent:
         """
         self.after_tool_call_cb = cb
 
+    def save_session(self) -> bool:
+        """保存当前会话状态到文件"""
+        if not self.model:
+            PrettyOutput.print("没有可用的模型实例来保存会话。", OutputType.ERROR)
+            return False
+        session_dir = os.path.join(os.getcwd(), ".jarvis")
+        os.makedirs(session_dir, exist_ok=True)
+        session_file = os.path.join(session_dir, "saved_session.json")
+        return self.model.save(session_file)
+
+    def restore_session(self) -> bool:
+        """从文件恢复会话状态"""
+        if not self.model:
+            return False  # No model, cannot restore
+        session_file = os.path.join(os.getcwd(), ".jarvis", "saved_session.json")
+        if not os.path.exists(session_file):
+            return False
+
+        if self.model.restore(session_file):
+            try:
+                os.remove(session_file)
+                PrettyOutput.print("会话已恢复，并已删除会话文件。", OutputType.SUCCESS)
+            except OSError as e:
+                PrettyOutput.print(f"删除会话文件失败: {e}", OutputType.ERROR)
+            return True
+        return False
+
     def get_tool_registry(self) -> Optional[Any]:
         """获取工具注册表实例"""
         from jarvis.jarvis_tools.registry import ToolRegistry
@@ -781,18 +810,14 @@ arguments:
 
                     if get_interrupt():
                         set_interrupt(False)
-                        user_input = self.multiline_inputer(
-                            f"模型交互期间被中断，请输入用户干预信息："
-                        )
+                        user_input = self.multiline_inputer(f"模型交互期间被中断，请输入用户干预信息：")
                         if user_input:
                             # 如果有工具调用且用户确认继续，则将干预信息和工具执行结果拼接为prompt
                             if any(
                                 handler.can_handle(current_response)
                                 for handler in self.output_handler
                             ):
-                                if user_confirm(
-                                    "检测到有工具调用，是否继续处理工具调用？", True
-                                ):
+                                if user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
                                     self.prompt = f"{user_input}\n\n{current_response}"
                                     continue
                             self.prompt += f"{user_input}"
@@ -838,9 +863,7 @@ arguments:
             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:
@@ -848,14 +871,14 @@ arguments:
                     self.prompt = f"{self.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
                 else:
                     if self.files:
-                        self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                        self.prompt = (
+                            f"{self.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                        )
                     else:
                         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/jarvis_agent/builtin_input_handler.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import re
+import sys
 from typing import Any, Tuple
 
 from jarvis.jarvis_utils.config import get_replace_map
@@ -29,7 +30,6 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
     replace_map = get_replace_map()
     # 处理每个标记
     for tag in special_tags:
-
         # 优先处理特殊标记
         if tag == "Summary":
             agent._summarize_and_clear_history()
@@ -51,6 +51,17 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
 
             load_config()
             return "", True
+        elif tag == "SaveSession":
+            if agent.save_session():
+                from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+                PrettyOutput.print("会话已成功保存。正在退出...", OutputType.SUCCESS)
+                sys.exit(0)
+            else:
+                from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+                PrettyOutput.print("保存会话失败。", OutputType.ERROR)
+            return "", True
 
         processed_tag = set()
         add_on_prompt = ""

jarvis/jarvis_agent/edit_file_handler.py

@@ -206,48 +206,60 @@ class EditFileHandler(OutputHandler):
                 exact_search = search_text
 
                 if exact_search in modified_content:
-                    if modified_content.count(exact_search) > 1:
-                        PrettyOutput.print(
-                            f"搜索文本在文件中存在多处匹配：\n{exact_search}",
-                            output_type=OutputType.WARNING,
-                        )
-                        return False, f"搜索文本在文件中存在多处匹配：\n{exact_search}"
-
                     # 直接执行替换（保留所有原始格式）
                     modified_content = modified_content.replace(
                         exact_search, replace_text
                     )
                     print(f"✅ 补丁 #{patch_count} 应用成功")
                 else:
-                    # 尝试增加缩进重试
                     found = False
-                    for space_count in range(1, 17):
-                        indented_search = "\n".join(
-                            " " * space_count + line if line.strip() else line
-                            for line in search_text.split("\n")
-                        )
-                        indented_replace = "\n".join(
-                            " " * space_count + line if line.strip() else line
-                            for line in replace_text.split("\n")
-                        )
-                        if indented_search in modified_content:
-                            if modified_content.count(indented_search) > 1:
-                                PrettyOutput.print(
-                                    f"搜索文本在文件中存在多处匹配：\n{indented_search}",
-                                    output_type=OutputType.WARNING,
-                                )
-                                return (
-                                    False,
-                                    f"搜索文本在文件中存在多处匹配：\n{indented_search}",
-                                )
+                    # 如果匹配不到，并且search与replace块的首尾都是换行，尝试去掉第一个和最后一个换行
+                    if (
+                        search_text.startswith("\n")
+                        and search_text.endswith("\n")
+                        and replace_text.startswith("\n")
+                        and replace_text.endswith("\n")
+                    ):
+                        stripped_search = search_text[1:-1]
+                        stripped_replace = replace_text[1:-1]
+                        if stripped_search in modified_content:
                             modified_content = modified_content.replace(
-                                indented_search, indented_replace
-                            )
-                            print(
-                                f"✅ 补丁 #{patch_count} 应用成功 (自动增加 {space_count} 个空格缩进)"
+                                stripped_search, stripped_replace
                             )
+                            print(f"✅ 补丁 #{patch_count} 应用成功 (自动去除首尾换行)")
                             found = True
-                            break
+
+                    if not found:
+                        # 尝试增加缩进重试
+                        current_search = search_text
+                        current_replace = replace_text
+                        if (
+                            current_search.startswith("\n")
+                            and current_search.endswith("\n")
+                            and current_replace.startswith("\n")
+                            and current_replace.endswith("\n")
+                        ):
+                            current_search = current_search[1:-1]
+                            current_replace = current_replace[1:-1]
+
+                        for space_count in range(1, 17):
+                            indented_search = "\n".join(
+                                " " * space_count + line if line.strip() else line
+                                for line in current_search.split("\n")
+                            )
+                            indented_replace = "\n".join(
+                                " " * space_count + line if line.strip() else line
+                                for line in current_replace.split("\n")
+                            )
+                            if indented_search in modified_content:
+                                modified_content = modified_content.replace(
+                                    indented_search, indented_replace
+                                )
+                                print(
+                                    f"✅ 补丁 #{patch_count} 应用成功 (自动增加 {space_count} 个空格缩进)"
+                                )
+                                found = True
+                                break
 
                     if not found:
                         PrettyOutput.print(

jarvis/jarvis_code_agent/code_agent.py

@@ -131,7 +131,7 @@ class CodeAgent:
             input_handler=[shell_input_handler, builtin_input_handler],
             need_summary=need_summary,
             use_methodology=False,  # 禁用方法论
-            use_analysis=False      # 禁用分析
+            use_analysis=False,  # 禁用分析
         )
 
         self.agent.set_after_tool_call_cb(self.after_tool_call_cb)
@@ -359,9 +359,7 @@ class CodeAgent:
 
                 # 添加提交信息到final_ret
                 if commits:
-                    final_ret += (
-                        f"\n\n代码已修改完成\n补丁内容:\n```diff\n{diff}\n```\n"
-                    )
+                    final_ret += f"\n\n代码已修改完成\n补丁内容:\n```diff\n{diff}\n```\n"
                     # 修改后的提示逻辑
                     lint_tools_info = "\n".join(
                         f"   - {file}: 使用 {'、'.join(get_lint_tools(file))}"
@@ -380,6 +378,7 @@ class CodeAgent:
 {file_list}
 {tool_info}
 如果本次修改引入了警告和错误，请根据警告和错误信息修复代码
+注意：如果要进行静态检查，需要在所有的修改都完成之后进行集中检查
                     """
                         agent.set_addon_prompt(addon_prompt)
                 else:
@@ -428,6 +427,13 @@ def main() -> None:
 
     try:
         agent = CodeAgent(platform=args.platform, model=args.model, need_summary=False)
+
+        # 尝试恢复会话
+        if agent.agent.restore_session():
+            PrettyOutput.print(
+                "已从 .jarvis/saved_session.json 恢复会话。", OutputType.SUCCESS
+            )
+
         if args.requirement:
             agent.run(args.requirement)
         else: