jarvis-ai-assistant 0.2.5__tar.gz → 0.2.7__tar.gz

{jarvis_ai_assistant-0.2.5/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.2.5
+Version: 0.2.7
 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.2.5 → jarvis_ai_assistant-0.2.7}/pyproject.toml

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

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.2.5",
+    version="0.2.7",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.2.5 → jarvis_ai_assistant-0.2.7}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.2.5 → jarvis_ai_assistant-0.2.7}/src/jarvis/jarvis_agent/__init__.py

@@ -396,7 +396,7 @@ class Agent:
         """
         return execute_tool_call(response, self)
 
-    def _complete_task(self) -> str:
+    def _complete_task(self, auto_completed: bool = False) -> str:
         """完成任务并生成总结(如果需要)
 
         返回:
@@ -407,8 +407,26 @@ class Agent:
             2. 对于子Agent: 可能会生成总结(如果启用)
             3. 使用spinner显示生成状态
         """
+        satisfaction_feedback = ""
+
+        if not auto_completed and self.use_analysis:
+            if user_confirm("您对本次任务的完成是否满意？", True):
+                satisfaction_feedback = "\n\n用户对本次任务的完成表示满意。"
+            else:
+                feedback = self.multiline_inputer(
+                    "请提供您的反馈意见（可留空直接回车）:"
+                )
+                if feedback:
+                    satisfaction_feedback = (
+                        f"\n\n用户对本次任务的完成不满意，反馈意见如下：\n{feedback}"
+                    )
+                else:
+                    satisfaction_feedback = (
+                        "\n\n用户对本次任务的完成不满意，未提供具体反馈意见。"
+                    )
+
         if self.use_analysis:
-            self._analysis_task()
+            self._analysis_task(satisfaction_feedback)
         if self.need_summary:
             print("📄 正在生成总结...")
             self.session.prompt = self.summary_prompt
@@ -420,11 +438,13 @@ class Agent:
 
         return "任务完成"
 
-    def _analysis_task(self):
+    def _analysis_task(self, satisfaction_feedback: str = ""):
         print("🔍 正在分析任务...")
         try:
             # 让模型判断是否需要生成方法论
             analysis_prompt = TASK_ANALYSIS_PROMPT
+            if satisfaction_feedback:
+                analysis_prompt += satisfaction_feedback
 
             self.session.prompt = analysis_prompt
             if not self.model:
@@ -452,6 +472,23 @@ class Agent:
             else ""
         )
 
+        # 检查工具列表并添加记忆工具相关提示
+        memory_prompts = ""
+        tool_registry = self.get_tool_registry()
+        if tool_registry:
+            tool_names = [tool.name for tool in tool_registry.tools.values()]
+            
+            # 如果有save_memory工具，添加相关提示
+            if "save_memory" in tool_names:
+                memory_prompts += "\n    - 如果有关键信息需要记忆，请调用save_memory工具进行记忆："
+                memory_prompts += "\n      * project_long_term: 保存与当前项目相关的长期信息"
+                memory_prompts += "\n      * global_long_term: 保存通用的信息、用户喜好、知识、方法等"
+                memory_prompts += "\n      * short_term: 保存当前任务相关的临时信息"
+            
+            # 如果有retrieve_memory工具，添加相关提示
+            if "retrieve_memory" in tool_names:
+                memory_prompts += "\n    - 如果需要检索相关记忆信息，请调用retrieve_memory工具"
+
         addon_prompt = f"""
 <system_prompt>
     请判断是否已经完成任务，如果已经完成：
@@ -461,7 +498,7 @@ class Agent:
     - 仅包含一个操作
     - 如果信息不明确，请请求用户补充
     - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
-    - 操作列表：{action_handlers}
+    - 操作列表：{action_handlers}{memory_prompts}
 </system_prompt>
 
 请继续。
@@ -547,7 +584,7 @@ class Agent:
                         continue
 
                     if self.auto_complete and ot("!!!COMPLETE!!!") in current_response:
-                        return self._complete_task()
+                        return self._complete_task(auto_completed=True)
 
                     # 获取用户输入
                     user_input = self.multiline_inputer(
@@ -560,7 +597,7 @@ class Agent:
                         continue
 
                     if not user_input:
-                        return self._complete_task()
+                        return self._complete_task(auto_completed=False)
 
                 except Exception as e:
                     PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
@@ -571,6 +608,34 @@ class Agent:
             return f"Task failed: {str(e)}"
 
     def _first_run(self):
+        # 获取所有记忆标签并添加到提示中
+        from jarvis.jarvis_utils.globals import get_all_memory_tags
+        
+        memory_tags = get_all_memory_tags()
+        memory_tags_prompt = ""
+        
+        # 检查是否有save_memory工具
+        tool_registry = self.get_tool_registry()
+        has_save_memory = False
+        if tool_registry:
+            tool_names = [tool.name for tool in tool_registry.tools.values()]
+            has_save_memory = "save_memory" in tool_names
+        
+        # 如果有save_memory工具，添加记录关键信息的提示
+        if has_save_memory:
+            memory_tags_prompt = "\n\n💡 提示：在分析任务之前，建议使用 save_memory 工具将关键信息记录下来，便于后续检索和复用。"
+        
+        if any(tags for tags in memory_tags.values()):
+            memory_tags_prompt += "\n\n系统中存在以下记忆标签，你可以使用 retrieve_memory 工具检索相关记忆："
+            for memory_type, tags in memory_tags.items():
+                if tags:
+                    type_name = {
+                        "short_term": "短期记忆",
+                        "project_long_term": "项目长期记忆", 
+                        "global_long_term": "全局长期记忆"
+                    }.get(memory_type, memory_type)
+                    memory_tags_prompt += f"\n- {type_name}: {', '.join(tags)}"
+        
         # 如果有上传文件，先上传文件
         if self.model and self.model.support_upload_files():
             if self.use_methodology:
@@ -583,12 +648,12 @@ class Agent:
                     msg = self.session.prompt
                     for handler in self.input_handler:
                         msg, _ = handler(msg, self)
-                    self.session.prompt = f"{self.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+                    self.session.prompt = f"{self.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}{memory_tags_prompt}"
                 else:
                     if self.files:
-                        self.session.prompt = f"{self.session.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                        self.session.prompt = f"{self.session.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。{memory_tags_prompt}"
                     else:
-                        self.session.prompt = f"{self.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+                        self.session.prompt = f"{self.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。{memory_tags_prompt}"
             elif self.files:
                 if not self.model.upload_files(self.files):
                     PrettyOutput.print(
@@ -604,6 +669,10 @@ class Agent:
                 for handler in self.input_handler:
                     msg, _ = handler(msg, self)
                 self.session.prompt = f"{self.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+        
+        # 添加记忆标签提示
+        if memory_tags_prompt:
+            self.session.prompt = f"{self.session.prompt}{memory_tags_prompt}"
 
         self.first = False
 

{jarvis_ai_assistant-0.2.5 → jarvis_ai_assistant-0.2.7}/src/jarvis/jarvis_agent/edit_file_handler.py

@@ -204,9 +204,9 @@ class EditFileHandler(OutputHandler):
                 found = False
 
                 if exact_search in modified_content:
-                    # 直接执行替换（保留所有原始格式）
+                    # 直接执行替换（保留所有原始格式），只替换第一个匹配
                     modified_content = modified_content.replace(
-                        exact_search, replace_text
+                        exact_search, replace_text, 1
                     )
                     print(f"✅ 补丁 #{patch_count} 应用成功")
                     found = True
@@ -222,7 +222,7 @@ class EditFileHandler(OutputHandler):
                         stripped_replace = replace_text[1:-1]
                         if stripped_search in modified_content:
                             modified_content = modified_content.replace(
-                                stripped_search, stripped_replace
+                                stripped_search, stripped_replace, 1
                             )
                             print(f"✅ 补丁 #{patch_count} 应用成功 (自动去除首尾换行)")
                             found = True
@@ -251,7 +251,7 @@ class EditFileHandler(OutputHandler):
                             )
                             if indented_search in modified_content:
                                 modified_content = modified_content.replace(
-                                    indented_search, indented_replace
+                                    indented_search, indented_replace, 1
                                 )
                                 print(
                                     f"✅ 补丁 #{patch_count} 应用成功 (自动增加 {space_count} 个空格缩进)"