jarvis-ai-assistant 0.3.12__py3-none-any.whl → 0.3.14__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -51,10 +51,12 @@ from jarvis.jarvis_utils.globals import (
 )
 from jarvis.jarvis_utils.input import get_multiline_input, user_confirm
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.tag import ct, ot
+from jarvis.jarvis_utils.tag import ot
 
 
-def show_agent_startup_stats(agent_name: str, model_name: str) -> None:
+def show_agent_startup_stats(
+    agent_name: str, model_name: str, tool_registry_instance: Optional[Any] = None
+) -> None:
     """输出启动时的统计信息
 
     参数:
@@ -87,8 +89,11 @@ def show_agent_startup_stats(agent_name: str, model_name: str) -> None:
         total_tool_count = len(tool_registry_all.tools)
 
         # 获取可用工具的数量（应用过滤）
-        tool_registry = ToolRegistry()
-        available_tool_count = len(tool_registry.get_all_tools())
+        if tool_registry_instance is not None:
+            available_tool_count = len(tool_registry_instance.get_all_tools())
+        else:
+            tool_registry = ToolRegistry()
+            available_tool_count = len(tool_registry.get_all_tools())
 
         global_memory_dir = Path(get_data_dir()) / "memory" / "global_long_term"
         global_memory_count = 0
@@ -180,15 +185,20 @@ origin_agent_system_prompt = f"""
 
 
 class Agent:
-    def clear(self):
+    def clear_history(self):
         """
         Clears the current conversation history by delegating to the session manager.
         """
-        self.session.clear()
+        self.session.clear_history()
 
     def __del__(self):
         # 只有在记录启动时才停止记录
-        delete_agent(self.name)
+        try:
+            name = getattr(self, "name", None)
+            if name:
+                delete_agent(name)
+        except Exception:
+            pass
 
     def get_tool_usage_prompt(self) -> str:
         """获取工具使用提示"""
@@ -203,8 +213,8 @@ class Agent:
         model_group: Optional[str] = None,
         summary_prompt: Optional[str] = None,
         auto_complete: bool = False,
-        output_handler: List[OutputHandlerProtocol] = [],
-        use_tools: List[str] = [],
+        output_handler: Optional[List[OutputHandlerProtocol]] = None,
+        use_tools: Optional[List[str]] = None,
         input_handler: Optional[List[Callable[[str, Any], Tuple[str, bool]]]] = None,
         execute_tool_confirm: Optional[bool] = None,
         need_summary: bool = True,
@@ -212,7 +222,7 @@ class Agent:
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
         force_save_memory: Optional[bool] = None,
-        files: List[str] = [],
+        files: Optional[List[str]] = None,
     ):
         """初始化Jarvis Agent实例
 
@@ -225,7 +235,6 @@ class Agent:
             auto_complete: 是否自动完成任务
             output_handler: 输出处理器列表
             input_handler: 输入处理器列表
-            max_context_length: 最大上下文长度
             execute_tool_confirm: 执行工具前是否需要确认
             need_summary: 是否需要生成总结
             multiline_inputer: 多行输入处理器
@@ -234,7 +243,7 @@ class Agent:
             force_save_memory: 是否强制保存记忆
         """
         # 基础属性初始化
-        self.files = files
+        self.files = files or []
         self.name = make_agent_name(name)
         self.description = description
         self.system_prompt = system_prompt
@@ -250,7 +259,15 @@ class Agent:
         self._init_session()
 
         # 初始化处理器
-        self._init_handlers(output_handler, input_handler, multiline_inputer, use_tools)
+        safe_output_handlers: List[OutputHandlerProtocol] = []
+        if output_handler:
+            safe_output_handlers = output_handler
+        safe_use_tools: List[str] = []
+        if use_tools:
+            safe_use_tools = use_tools
+        self._init_handlers(
+            safe_output_handlers, input_handler, multiline_inputer, safe_use_tools
+        )
 
         # 初始化配置
         self._init_config(
@@ -271,7 +288,7 @@ class Agent:
         self._setup_system_prompt()
 
         # 输出统计信息（包含欢迎信息）
-        show_agent_startup_stats(name, self.model.name())  # type: ignore
+        show_agent_startup_stats(name, self.model.name(), self.get_tool_registry())  # type: ignore
 
     def _init_model(self, llm_type: str, model_group: Optional[str]):
         """初始化模型平台"""
@@ -284,7 +301,9 @@ class Agent:
 
         self.model = PlatformRegistry().create_platform(platform_name)
         if self.model is None:
-            PrettyOutput.print(f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING)
+            PrettyOutput.print(
+                f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING
+            )
             self.model = PlatformRegistry().get_normal_platform()
 
         if model_name:
@@ -526,7 +545,7 @@ class Agent:
 
         该方法将:
         1. 提示用户保存重要记忆
-        2. 调用_generate_summary生成摘要
+        2. 调用 generate_summary 生成摘要
         3. 清除对话历史
         4. 保留系统消息
         5. 添加摘要作为新上下文
@@ -564,6 +583,8 @@ class Agent:
         # 清理历史（但不清理prompt，因为prompt会在builtin_input_handler中设置）
         if self.model:
             self.model.reset()
+            # 重置后重新设置系统提示词，确保系统约束仍然生效
+            self._setup_system_prompt()
         # 重置会话
         self.session.clear_history()
 
@@ -715,12 +736,18 @@ class Agent:
                     if isinstance(interrupt_result, tuple):
                         run_input_handlers, should_continue = interrupt_result
                         if should_continue:
+                            self.run_input_handlers_next_turn = True
                             continue
                     else:
                         return interrupt_result
 
                 # 处理工具调用
-                need_return, self.session.prompt = self._call_tools(current_response)
+                need_return, prompt = self._call_tools(current_response)
+                if self.session.prompt and prompt:
+                    self.session.prompt += "\n\n" + prompt
+                else:
+                    self.session.prompt = prompt
+
                 if need_return:
                     return self.session.prompt
 
@@ -785,7 +812,9 @@ class Agent:
         返回:
             str: "continue" 或 "complete"
         """
-        user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
+        user_input = self.multiline_inputer(
+            f"{self.name}: 请输入，或输入空行来结束当前任务："
+        )
 
         if user_input:
             self.session.prompt = user_input
@@ -871,9 +900,3 @@ class Agent:
             organizer.organize_memories(memory_type, min_overlap=3)
         else:
             PrettyOutput.print(f"已取消 '{scope_name}' 记忆库整理。", OutputType.INFO)
-
-    def clear_history(self):
-        """
-        Clears conversation history by delegating to the session manager.
-        """
-        self.session.clear_history()

jarvis/jarvis_agent/builtin_input_handler.py

@@ -43,7 +43,7 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
                 prompt = memory_tags_prompt
             return prompt, True
         elif tag == "Clear":
-            agent.clear()
+            agent.clear_history()
             return "", True
         elif tag == "ToolUsage":
             agent.set_addon_prompt(agent.get_tool_usage_prompt())

jarvis/jarvis_agent/session_manager.py

@@ -34,14 +34,6 @@ class SessionManager:
         """Sets the addon prompt for the next model call."""
         self.addon_prompt = addon_prompt
 
-    def clear(self):
-        """
-        Clears the current conversation history, prompt, and length counter.
-        """
-        self.model.reset()
-        self.conversation_length = 0
-        self.prompt = ""
-
     def save_session(self) -> bool:
         """Saves the current session state to a file."""
         session_dir = os.path.join(os.getcwd(), ".jarvis")

jarvis/jarvis_code_agent/code_agent.py

@@ -68,13 +68,15 @@ class CodeAgent:
             "retrieve_memory",
             "clear_memory",
         ]
-        
+
         if append_tools:
-            additional_tools = [tool.strip() for tool in append_tools.split(",")]
+            additional_tools = [
+                t for t in (tool.strip() for tool in append_tools.split(",")) if t
+            ]
             base_tools.extend(additional_tools)
             # 去重
             base_tools = list(dict.fromkeys(base_tools))
-            
+
         tool_registry.use_tools(base_tools)
         code_system_prompt = self._get_system_prompt()
         self.agent = Agent(
@@ -412,18 +414,23 @@ class CodeAgent:
                     return
 
                 # 获取当前分支的提交总数
-                commit_result = subprocess.run(
-                    ["git", "rev-list", "--count", "HEAD"],
-                    capture_output=True,
-                    text=True,
-                    encoding="utf-8",
-                    errors="replace",
-                    check=True,
-                )
-                if commit_result.returncode != 0:
-                    return
-
-                commit_count = int(commit_result.stdout.strip())
+                # 兼容空仓库或无 HEAD 的场景：失败时将提交计数视为 0，继续执行提交流程
+                commit_count = 0
+                try:
+                    commit_result = subprocess.run(
+                        ["git", "rev-list", "--count", "HEAD"],
+                        capture_output=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
+                        check=False,
+                    )
+                    if commit_result.returncode == 0:
+                        out = commit_result.stdout.strip()
+                        if out.isdigit():
+                            commit_count = int(out)
+                except Exception:
+                    commit_count = 0
 
                 # 暂存所有修改
                 subprocess.run(["git", "add", "."], check=True)
@@ -634,11 +641,12 @@ class CodeAgent:
         ):
             agent.session.prompt += final_ret
             return
-        agent.session.prompt += final_ret
+        # 用户未确认，允许输入自定义回复作为附加提示
         custom_reply = get_multiline_input("请输入自定义回复")
-        if custom_reply.strip():  # 如果自定义回复为空，返回空字符串
+        if custom_reply.strip():  # 如果自定义回复为空，不设置附加提示
             agent.set_addon_prompt(custom_reply)
         agent.session.prompt += final_ret
+        return
 
 
 @app.command()

{jarvis_ai_assistant-0.3.12.dist-info → jarvis_ai_assistant-0.3.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.12
+Version: 0.3.14
 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.3.12.dist-info → jarvis_ai_assistant-0.3.14.dist-info}/RECORD

@@ -1,7 +1,7 @@
-jarvis/__init__.py,sha256=hKFiP0Zvdw8obyd8zdfmd9Lpchych2UJUzD76YYyLMY,74
-jarvis/jarvis_agent/__init__.py,sha256=stw0ptywcW6DwUjLHd8gjdvRwlIkL26W5OqoqwLvg9g,31738
+jarvis/__init__.py,sha256=VWGr6Ejq9BZqFLJznrElHDghpbCaBnkgpyMgrmU4ysk,74
+jarvis/jarvis_agent/__init__.py,sha256=CkFa66l5lM0-_zlzApwBxTYbrnbC4_NqdD4QuK3H1VQ,32614
 jarvis/jarvis_agent/agent_manager.py,sha256=YzpMiF0H2-eyk2kn2o24Bkj3bXsQx7Pv2vfD4gWepo0,2893
-jarvis/jarvis_agent/builtin_input_handler.py,sha256=0rrztbSWDyCVTAPGHMSkTMWdwdcb4zhRwkq19lQ8anY,2909
+jarvis/jarvis_agent/builtin_input_handler.py,sha256=wS-FqpT3pIXwHn1dfL3SpXonUKWgVThbQueUIeyRc2U,2917
 jarvis/jarvis_agent/config_editor.py,sha256=Ctk82sO6w2cNW0-_5L7Bomj-hgM4U7WwMc52fwhAJyg,1809
 jarvis/jarvis_agent/edit_file_handler.py,sha256=w-byNJ4TN_SlV3djjfFC7OksySOFGrM8ku49w662dzc,11854
 jarvis/jarvis_agent/file_methodology_manager.py,sha256=PwDUQwq7HVIyPInsN8fgWyMXLwi8heIXPrqfBZJhVHs,4260
@@ -13,7 +13,7 @@ jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5p
 jarvis/jarvis_agent/prompt_builder.py,sha256=PH1fPDVa8z_RXkoXHJFNDf8PQjUoLNLYwkh2lC__p40,1705
 jarvis/jarvis_agent/prompts.py,sha256=X6cXa-n0xqBQ8LDTgLsD0kqziAh1s0cNp89i4mxcvHg,9444
 jarvis/jarvis_agent/protocols.py,sha256=JWnJDikFEuwvFUv7uzXu0ggJ4O9K2FkMnfVCwIJ5REw,873
-jarvis/jarvis_agent/session_manager.py,sha256=DnvI9rWkVmkyO1XfKZyo9lTn4ajg4ccwzEkoRHFPOJM,2925
+jarvis/jarvis_agent/session_manager.py,sha256=xPeQcQRBmAlc-CGAzVz4MTOKhZKb27rTS-5De3Oauwg,2713
 jarvis/jarvis_agent/share_manager.py,sha256=wFcdULSog1mMxDyB94ofbqitFL8DCX8i1u6qVzSEuAk,8704
 jarvis/jarvis_agent/shell_input_handler.py,sha256=1IboqdxcJuoIqRpmDU10GugR9fWXUHyCEbVF4nIWbyo,1328
 jarvis/jarvis_agent/task_analyzer.py,sha256=-fQ9YBYFcc-Z1FSoDIPzRfAgkREFoIOXtU2TdBkB-e0,4656
@@ -21,7 +21,7 @@ jarvis/jarvis_agent/task_manager.py,sha256=HJm4_SMpsFbQMUUsAZeHm7cZuhNbz28YW-DRL
 jarvis/jarvis_agent/tool_executor.py,sha256=k73cKhZEZpljvui4ZxALlFEIE-iLzJ32Softsmiwzqk,1896
 jarvis/jarvis_agent/tool_share_manager.py,sha256=R5ONIQlDXX9pFq3clwHFhEW8BAJ3ECaR2DqWCEC9tzM,5205
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=KEku3DaunvjLVX7lIvTRsHT-DlN2K5bZT0ypfgYtLmA,29555
+jarvis/jarvis_code_agent/code_agent.py,sha256=GPmCMlAERHC3yPy0LEv3ATdPsZm99MUz1XxcNB9_p2o,29972
 jarvis/jarvis_code_agent/lint.py,sha256=LZPsfyZPMo7Wm7LN4osZocuNJwZx1ojacO3MlF870x8,4009
 jarvis/jarvis_code_analysis/code_review.py,sha256=OLoMtXz7Kov6cVTdBoxq_OsX_j0rb7Rk3or5tKgiLpo,36023
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
@@ -119,9 +119,9 @@ jarvis/jarvis_utils/methodology.py,sha256=IIMU17WVSunsWXsnXROd4G77LxgYs4xEC_xm_0
 jarvis/jarvis_utils/output.py,sha256=QRLlKObQKT0KuRSeZRqYb7NlTQvsd1oZXZ41WxeWEuU,10894
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=LiVui9RMsbfUdzbvBBwbGNC4uniGnLp3LFsk7LXGrQE,47370
-jarvis_ai_assistant-0.3.12.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.12.dist-info/METADATA,sha256=cuuexl5WsxPeiGwbal3UnCBnK2lolNhK-G8d6J2PjbY,18216
-jarvis_ai_assistant-0.3.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.12.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.12.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.12.dist-info/RECORD,,
+jarvis_ai_assistant-0.3.14.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.14.dist-info/METADATA,sha256=jPFjzOOpjbCDOcVVwpNJCWax51_2VcfMRg3AnuGnbHo,18216
+jarvis_ai_assistant-0.3.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.14.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.14.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.14.dist-info/RECORD,,