jarvis-ai-assistant 0.3.27__tar.gz → 0.3.29__tar.gz

{jarvis_ai_assistant-0.3.27/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.29}/PKG-INFO

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

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

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

{jarvis_ai_assistant-0.3.27 → jarvis_ai_assistant-0.3.29}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.27 → jarvis_ai_assistant-0.3.29}/src/jarvis/jarvis_agent/__init__.py

@@ -34,7 +34,23 @@ from jarvis.jarvis_agent.prompt_manager import PromptManager
 from jarvis.jarvis_agent.event_bus import EventBus
 from jarvis.jarvis_agent.config import AgentConfig
 from jarvis.jarvis_agent.run_loop import AgentRunLoop
+from jarvis.jarvis_agent.events import (
+    BEFORE_SUMMARY,
+    AFTER_SUMMARY,
+    TASK_COMPLETED,
+    TASK_STARTED,
+    BEFORE_ADDON_PROMPT,
+    AFTER_ADDON_PROMPT,
+    BEFORE_HISTORY_CLEAR,
+    AFTER_HISTORY_CLEAR,
+    BEFORE_MODEL_CALL,
+    AFTER_MODEL_CALL,
+    INTERRUPT_TRIGGERED,
+    BEFORE_TOOL_FILTER,
+    TOOL_FILTERED,
+)
 from jarvis.jarvis_agent.user_interaction import UserInteractionHandler
+from jarvis.jarvis_agent.utils import join_prompts
 from jarvis.jarvis_utils.methodology import _load_all_methodologies
 
 # jarvis_platform 相关
@@ -67,7 +83,10 @@ from jarvis.jarvis_utils.tag import ot
 
 
 def show_agent_startup_stats(
-    agent_name: str, model_name: str, tool_registry_instance: Optional[Any] = None
+    agent_name: str,
+    model_name: str,
+    tool_registry_instance: Optional[Any] = None,
+    platform_name: Optional[str] = None,
 ) -> None:
     """输出启动时的统计信息
 
@@ -112,7 +131,8 @@ def show_agent_startup_stats(
         current_dir = os.getcwd()
 
         # 构建欢迎信息
-        welcome_message = f"{agent_name} 初始化完成 - 使用 {model_name} 模型"
+        platform = platform_name or get_normal_platform_name()
+        welcome_message = f"{agent_name} 初始化完成 - 使用 {platform} 平台 {model_name} 模型"
 
         stats_parts = [
             f"📚  本地方法论: [bold cyan]{methodology_count}[/bold cyan]",
@@ -208,6 +228,15 @@ class LoopAction(Enum):
 
 
 class Agent:
+    # Attribute type annotations to satisfy static type checkers
+    event_bus: EventBus
+    memory_manager: MemoryManager
+    task_analyzer: TaskAnalyzer
+    file_methodology_manager: FileMethodologyManager
+    prompt_manager: PromptManager
+    model: BasePlatform
+    session: SessionManager
+
     def clear_history(self):
         """
         Clears the current conversation history by delegating to the session manager.
@@ -215,7 +244,7 @@ class Agent:
         self.session.clear_history()
         # 广播清理历史后的事件
         try:
-            self.event_bus.emit("after_history_clear", agent=self)
+            self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
         except Exception:
             pass
 
@@ -326,19 +355,27 @@ class Agent:
         self._setup_system_prompt()
 
         # 输出统计信息（包含欢迎信息）
-        show_agent_startup_stats(name, self.model.name(), self.get_tool_registry())  # type: ignore
+        show_agent_startup_stats(
+            name,
+            self.model.name(),
+            self.get_tool_registry(),  # type: ignore
+            platform_name=self.model.platform_name(),  # type: ignore
+        )
 
     def _init_model(self, model_group: Optional[str]):
         """初始化模型平台（统一使用 normal 平台/模型）"""
         platform_name = get_normal_platform_name(model_group)
         model_name = get_normal_model_name(model_group)
 
-        self.model = PlatformRegistry().create_platform(platform_name)
-        if self.model is None:
+        maybe_model = PlatformRegistry().create_platform(platform_name)
+        if maybe_model is None:
             PrettyOutput.print(
                 f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING
             )
-            self.model = PlatformRegistry().get_normal_platform()
+            maybe_model = PlatformRegistry().get_normal_platform()
+
+        # 在此处收敛为非可选类型，确保后续赋值满足类型检查
+        self.model = maybe_model
 
         if model_name:
             self.model.set_model_name(model_name)
@@ -546,7 +583,7 @@ class Agent:
         # 广播添加附加提示前事件（不影响主流程）
         try:
             self.event_bus.emit(
-                "before_addon_prompt",
+                BEFORE_ADDON_PROMPT,
                 agent=self,
                 need_complete=need_complete,
                 current_message=message,
@@ -558,16 +595,16 @@ class Agent:
         addon_text = ""
         if self.session.addon_prompt:
             addon_text = self.session.addon_prompt
-            message += f"\n\n{addon_text}"
+            message = join_prompts([message, addon_text])
             self.session.addon_prompt = ""
         else:
             addon_text = self.make_default_addon_prompt(need_complete)
-            message += f"\n\n{addon_text}"
+            message = join_prompts([message, addon_text])
 
         # 广播添加附加提示后事件（不影响主流程）
         try:
             self.event_bus.emit(
-                "after_addon_prompt",
+                AFTER_ADDON_PROMPT,
                 agent=self,
                 need_complete=need_complete,
                 addon_text=addon_text,
@@ -584,7 +621,7 @@ class Agent:
         if self.session.conversation_length > self.max_token_count:
             summary = self._summarize_and_clear_history()
             if summary:
-                message = summary + "\n\n" + message
+                message = join_prompts([summary, message])
             self.session.conversation_length = get_context_token_count(message)
 
         return message
@@ -597,7 +634,7 @@ class Agent:
         # 事件：模型调用前
         try:
             self.event_bus.emit(
-                "before_model_call",
+                BEFORE_MODEL_CALL,
                 agent=self,
                 message=message,
             )
@@ -609,7 +646,7 @@ class Agent:
         # 事件：模型调用后
         try:
             self.event_bus.emit(
-                "after_model_call",
+                AFTER_MODEL_CALL,
                 agent=self,
                 message=message,
                 response=response,
@@ -639,7 +676,7 @@ class Agent:
             )  # type: ignore
 
             return summary
-        except Exception as e:
+        except Exception:
             PrettyOutput.print("总结对话历史失败", OutputType.ERROR)
             return ""
 
@@ -688,7 +725,7 @@ class Agent:
         if self.model:
             # 广播清理历史前事件
             try:
-                self.event_bus.emit("before_history_clear", agent=self)
+                self.event_bus.emit(BEFORE_HISTORY_CLEAR, agent=self)
             except Exception:
                 pass
             self.model.reset()
@@ -698,7 +735,7 @@ class Agent:
         self.session.clear_history()
         # 广播清理历史后的事件
         try:
-            self.event_bus.emit("after_history_clear", agent=self)
+            self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
         except Exception:
             pass
 
@@ -708,13 +745,13 @@ class Agent:
         """使用文件上传方式处理历史"""
         # 广播清理历史前事件
         try:
-            self.event_bus.emit("before_history_clear", agent=self)
+            self.event_bus.emit(BEFORE_HISTORY_CLEAR, agent=self)
         except Exception:
             pass
         result = self.file_methodology_manager.handle_history_with_file_upload()
         # 广播清理历史后的事件
         try:
-            self.event_bus.emit("after_history_clear", agent=self)
+            self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
         except Exception:
             pass
         return result
@@ -762,7 +799,7 @@ class Agent:
             # 广播将要生成总结事件
             try:
                 self.event_bus.emit(
-                    "before_summary",
+                    BEFORE_SUMMARY,
                     agent=self,
                     prompt=self.session.prompt,
                     auto_completed=auto_completed,
@@ -779,7 +816,7 @@ class Agent:
             # 广播完成总结事件
             try:
                 self.event_bus.emit(
-                    "after_summary",
+                    AFTER_SUMMARY,
                     agent=self,
                     summary=result,
                 )
@@ -789,7 +826,7 @@ class Agent:
         # 广播任务完成事件（不影响主流程）
         try:
             self.event_bus.emit(
-                "task_completed",
+                TASK_COMPLETED,
                 agent=self,
                 auto_completed=auto_completed,
                 need_summary=self.need_summary,
@@ -833,6 +870,7 @@ class Agent:
     {complete_prompt}
     如果没有完成，请进行下一步操作：
     - 仅包含一个操作
+    - 不要询问用户是否继续，直接继续执行直至完成
     - 如果信息不明确，请请求用户补充
     - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
     - 操作列表：{action_handlers}{memory_prompts}
@@ -864,7 +902,7 @@ class Agent:
             # 广播任务开始事件（不影响主流程）
             try:
                 self.event_bus.emit(
-                    "task_started",
+                    TASK_STARTED,
                     agent=self,
                     name=self.name,
                     description=self.description,
@@ -901,7 +939,7 @@ class Agent:
         # 广播中断事件（包含用户输入，可能为空字符串）
         try:
             self.event_bus.emit(
-                "interrupt_triggered",
+                INTERRUPT_TRIGGERED,
                 agent=self,
                 current_response=current_response,
                 user_input=user_input,
@@ -917,10 +955,16 @@ class Agent:
 
         if any(handler.can_handle(current_response) for handler in self.output_handler):
             if self.user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
-                self.session.prompt = f"被用户中断，用户补充信息为：{user_input}\n\n用户同意继续工具调用。"
+                self.session.prompt = join_prompts([
+                    f"被用户中断，用户补充信息为：{user_input}",
+                    "用户同意继续工具调用。"
+                ])
                 return None  # 继续执行工具调用
             else:
-                self.session.prompt = f"被用户中断，用户补充信息为：{user_input}\n\n检测到有工具调用，但被用户拒绝执行。请根据用户的补充信息重新考虑下一步操作。"
+                self.session.prompt = join_prompts([
+                    f"被用户中断，用户补充信息为：{user_input}",
+                    "检测到有工具调用，但被用户拒绝执行。请根据用户的补充信息重新考虑下一步操作。"
+                ])
                 return LoopAction.SKIP_TURN  # 请求主循环 continue
         else:
             self.session.prompt = f"被用户中断，用户补充信息为：{user_input}"
@@ -1011,7 +1055,7 @@ class Agent:
         # 广播工具筛选开始事件
         try:
             self.event_bus.emit(
-                "before_tool_filter",
+                BEFORE_TOOL_FILTER,
                 agent=self,
                 task=task,
                 total_tools=len(all_tools),
@@ -1050,7 +1094,7 @@ class Agent:
                 # 广播工具筛选事件
                 try:
                     self.event_bus.emit(
-                        "tool_filtered",
+                        TOOL_FILTERED,
                         agent=self,
                         task=task,
                         selected_tools=selected_tool_names,
@@ -1066,7 +1110,7 @@ class Agent:
                 # 广播工具筛选事件（无筛选结果）
                 try:
                     self.event_bus.emit(
-                        "tool_filtered",
+                        TOOL_FILTERED,
                         agent=self,
                         task=task,
                         selected_tools=[],

{jarvis_ai_assistant-0.3.27 → jarvis_ai_assistant-0.3.29}/src/jarvis/jarvis_agent/agent_manager.py

@@ -25,10 +25,14 @@ class AgentManager:
         model_group: Optional[str] = None,
         tool_group: Optional[str] = None,
         restore_session: bool = False,
+        use_methodology: Optional[bool] = None,
+        use_analysis: Optional[bool] = None,
     ):
         self.model_group = model_group
         self.tool_group = tool_group
         self.restore_session = restore_session
+        self.use_methodology = use_methodology
+        self.use_analysis = use_analysis
         self.agent: Optional[Agent] = None
 
     def initialize(self) -> Agent:
@@ -45,6 +49,8 @@ class AgentManager:
             input_handler=[shell_input_handler, builtin_input_handler],
             output_handler=[ToolRegistry()],  # type: ignore
             need_summary=False,
+            use_methodology=self.use_methodology,
+            use_analysis=self.use_analysis,
         )
 
         # 尝试恢复会话

{jarvis_ai_assistant-0.3.27 → jarvis_ai_assistant-0.3.29}/src/jarvis/jarvis_agent/config_editor.py

@@ -51,7 +51,7 @@ class ConfigEditor:
                 raise typer.Exit(code=1)
         else:
             PrettyOutput.print(
-                f"No suitable editor found. Please install one of: vim, nano, emacs, code",
+                "No suitable editor found. Please install one of: vim, nano, emacs, code",
                 OutputType.ERROR,
             )
             raise typer.Exit(code=1)

{jarvis_ai_assistant-0.3.27 → jarvis_ai_assistant-0.3.29}/src/jarvis/jarvis_agent/event_bus.py

@@ -8,7 +8,7 @@
 - 不引入额外依赖，便于在 Agent 中渐进集成
 """
 from collections import defaultdict
-from typing import Callable, DefaultDict, Dict, List
+from typing import Callable, DefaultDict, Dict, List, Any
 
 
 
@@ -36,7 +36,7 @@ class EventBus:
         except ValueError:
             pass
 
-    def emit(self, event: str, **payload: Dict) -> None:
+    def emit(self, event: str, **payload: Any) -> None:
         """
         广播事件。回调中的异常将被捕获并忽略，以保证主流程稳定。
         """

jarvis_ai_assistant-0.3.29/src/jarvis/jarvis_agent/events.py

@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+"""
+事件主题与负载类型定义（jarvis_agent.events）
+
+目的：
+- 统一事件名称，避免在代码各处硬编码字符串导致的漂移
+- 提供事件负载的类型提示，便于静态检查与后续文档化
+- 本文件仅提供常量与类型定义，不改变现有行为
+"""
+from typing import Any, TypedDict, List
+
+# 事件主题常量
+BEFORE_TOOL_CALL = "before_tool_call"
+AFTER_TOOL_CALL = "after_tool_call"
+
+# 会话与任务生命周期相关
+TASK_STARTED = "task_started"
+TASK_COMPLETED = "task_completed"
+
+# 总结阶段
+BEFORE_SUMMARY = "before_summary"
+AFTER_SUMMARY = "after_summary"
+
+# 附加提示
+BEFORE_ADDON_PROMPT = "before_addon_prompt"
+AFTER_ADDON_PROMPT = "after_addon_prompt"
+
+# 历史清理
+BEFORE_HISTORY_CLEAR = "before_history_clear"
+AFTER_HISTORY_CLEAR = "after_history_clear"
+
+# 模型调用
+BEFORE_MODEL_CALL = "before_model_call"
+AFTER_MODEL_CALL = "after_model_call"
+
+# 其他
+INTERRUPT_TRIGGERED = "interrupt_triggered"
+BEFORE_TOOL_FILTER = "before_tool_filter"
+TOOL_FILTERED = "tool_filtered"
+
+
+# 事件负载类型（仅用于类型提示）
+class BeforeToolCallEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+
+class AfterToolCallEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+    need_return: bool
+    tool_prompt: str
+
+# 任务生命周期
+class TaskStartedEvent(TypedDict, total=False):
+    agent: Any
+    name: str
+    description: str
+    user_input: str
+
+class TaskCompletedEvent(TypedDict, total=False):
+    agent: Any
+    auto_completed: bool
+    need_summary: bool
+
+# 总结阶段
+class BeforeSummaryEvent(TypedDict, total=False):
+    agent: Any
+    prompt: str
+    auto_completed: bool
+    need_summary: bool
+
+class AfterSummaryEvent(TypedDict, total=False):
+    agent: Any
+    summary: str
+
+# 附加提示
+class BeforeAddonPromptEvent(TypedDict, total=False):
+    agent: Any
+    need_complete: bool
+    current_message: str
+    has_session_addon: bool
+
+class AfterAddonPromptEvent(TypedDict, total=False):
+    agent: Any
+    need_complete: bool
+    addon_text: str
+    final_message: str
+
+# 历史清理
+class BeforeHistoryClearEvent(TypedDict, total=False):
+    agent: Any
+
+class AfterHistoryClearEvent(TypedDict, total=False):
+    agent: Any
+
+# 模型调用
+class BeforeModelCallEvent(TypedDict, total=False):
+    agent: Any
+    message: str
+
+class AfterModelCallEvent(TypedDict, total=False):
+    agent: Any
+    message: str
+    response: str
+
+# 中断
+class InterruptTriggeredEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+    user_input: str
+
+# 工具筛选
+class BeforeToolFilterEvent(TypedDict, total=False):
+    agent: Any
+    task: str
+    total_tools: int
+    threshold: int
+
+class ToolFilteredEvent(TypedDict, total=False):
+    agent: Any
+    task: str
+    selected_tools: List[str]
+    total_tools: int
+    threshold: int
+
+__all__ = [
+    "BEFORE_TOOL_CALL",
+    "AFTER_TOOL_CALL",
+    "TASK_STARTED",
+    "TASK_COMPLETED",
+    "BEFORE_SUMMARY",
+    "AFTER_SUMMARY",
+    "BEFORE_ADDON_PROMPT",
+    "AFTER_ADDON_PROMPT",
+    "BEFORE_HISTORY_CLEAR",
+    "AFTER_HISTORY_CLEAR",
+    "BEFORE_MODEL_CALL",
+    "AFTER_MODEL_CALL",
+    "INTERRUPT_TRIGGERED",
+    "BEFORE_TOOL_FILTER",
+    "TOOL_FILTERED",
+    "BeforeToolCallEvent",
+    "AfterToolCallEvent",
+    "TaskStartedEvent",
+    "TaskCompletedEvent",
+    "BeforeSummaryEvent",
+    "AfterSummaryEvent",
+    "BeforeAddonPromptEvent",
+    "AfterAddonPromptEvent",
+    "BeforeHistoryClearEvent",
+    "AfterHistoryClearEvent",
+    "BeforeModelCallEvent",
+    "AfterModelCallEvent",
+    "InterruptTriggeredEvent",
+    "BeforeToolFilterEvent",
+    "ToolFilteredEvent",
+]

{jarvis_ai_assistant-0.3.27 → jarvis_ai_assistant-0.3.29}/src/jarvis/jarvis_agent/file_methodology_manager.py

@@ -5,10 +5,10 @@
 """
 import os
 import tempfile
-from typing import List, Optional
 
 from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_agent.utils import join_prompts
 
 
 class FileMethodologyManager:
@@ -46,19 +46,27 @@ class FileMethodologyManager:
             self._load_local_methodology()
         else:
             # 上传成功
-            from jarvis.jarvis_agent.memory_manager import MemoryManager
 
             if self.agent.files:
-                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                self.agent.session.prompt = join_prompts([
+                    self.agent.session.prompt,
+                    "上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                ])
             else:
-                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+                self.agent.session.prompt = join_prompts([
+                    self.agent.session.prompt,
+                    "上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+                ])
 
     def _handle_files_upload(self):
         """处理普通文件上传"""
         if not self.agent.model.upload_files(self.agent.files):  # type: ignore
             PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
         else:
-            self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+            self.agent.session.prompt = join_prompts([
+                self.agent.session.prompt,
+                "上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+            ])
 
     def _handle_local_mode(self):
         """处理本地模式（不支持文件上传）"""
@@ -75,14 +83,17 @@ class FileMethodologyManager:
 
         from jarvis.jarvis_agent.memory_manager import MemoryManager
 
-        memory_manager = MemoryManager(self.agent)
+        MemoryManager(self.agent)
         methodology = load_methodology(
             msg,
             self.agent.get_tool_registry(),
             platform_name=self.agent.model.platform_name(),
             model_name=self.agent.model.name(),
         )
-        self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}"
+        self.agent.session.prompt = join_prompts([
+            self.agent.session.prompt,
+            f"以下是历史类似问题的执行经验，可参考：\n{methodology}"
+        ])
 
     def handle_history_with_file_upload(self) -> str:
         """使用文件上传方式处理历史"""

{jarvis_ai_assistant-0.3.27 → jarvis_ai_assistant-0.3.29}/src/jarvis/jarvis_agent/jarvis.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI 助手主入口模块"""
-from typing import Optional
+from typing import Optional, List
 
 import typer
 
@@ -21,7 +21,6 @@ import jarvis.jarvis_utils.utils as jutils
 from jarvis.jarvis_utils.input import user_confirm, get_single_line_input
 from jarvis.jarvis_utils.fzf import fzf_select
 import os
-import sys
 import subprocess
 from pathlib import Path
 import yaml  # type: ignore
@@ -392,7 +391,7 @@ def handle_builtin_config_selector(
                     if category == "roles":
                         count = opt.get("roles_count")
                         details_val = opt.get("details", "")
-                        parts: list[str] = []
+                        parts: List[str] = []
                         if isinstance(count, int) and count > 0:
                             parts.append(f"{count} 个角色")
                         if isinstance(details_val, str) and details_val:
@@ -443,7 +442,7 @@ def handle_builtin_config_selector(
                 if choice_index != -1:
                     try:
                         sel = options[choice_index]
-                        args: list[str] = []
+                        args: List[str] = []
 
                         if sel["category"] == "agent":
                             # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
@@ -516,6 +515,12 @@ def run_cli(
         "--interactive-config",
         help="启动交互式配置向导（基于当前配置补充设置）",
     ),
+    disable_methodology_analysis: bool = typer.Option(
+        False,
+        "-D",
+        "--disable-methodology-analysis",
+        help="禁用方法论和任务分析（覆盖配置文件设置）",
+    ),
 ) -> None:
     """Jarvis AI assistant command-line interface."""
     if ctx.invoked_subcommand is not None:
@@ -562,6 +567,8 @@ def run_cli(
             model_group=model_group,
             tool_group=tool_group,
             restore_session=restore_session,
+            use_methodology=False if disable_methodology_analysis else None,
+            use_analysis=False if disable_methodology_analysis else None,
         )
         agent_manager.initialize()
         agent_manager.run_task(task)

{jarvis_ai_assistant-0.3.27 → jarvis_ai_assistant-0.3.29}/src/jarvis/jarvis_agent/memory_manager.py

@@ -3,10 +3,10 @@
 记忆管理器模块
 负责处理Agent的记忆保存和检索功能
 """
-from typing import Optional, Dict, List, Any
 
 from jarvis.jarvis_utils.globals import get_all_memory_tags
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_agent.events import TASK_STARTED, BEFORE_HISTORY_CLEAR, TASK_COMPLETED
 
 
 class MemoryManager:
@@ -160,11 +160,11 @@ class MemoryManager:
     def _subscribe_events(self) -> None:
         bus = self.agent.get_event_bus()  # type: ignore[attr-defined]
         # 任务开始时重置去重标记
-        bus.subscribe("task_started", self._on_task_started)
+        bus.subscribe(TASK_STARTED, self._on_task_started)
         # 在清理历史前尝试保存记忆（若开启强制保存且尚未处理）
-        bus.subscribe("before_history_clear", self._ensure_memory_prompt)
+        bus.subscribe(BEFORE_HISTORY_CLEAR, self._ensure_memory_prompt)
         # 任务完成时作为兜底再尝试一次
-        bus.subscribe("task_completed", self._ensure_memory_prompt)
+        bus.subscribe(TASK_COMPLETED, self._ensure_memory_prompt)
 
     def _on_task_started(self, **payload) -> None:
         self._memory_prompted = False