jarvis-ai-assistant 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -9,6 +9,7 @@ from pathlib import Path
 from enum import Enum
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
+
 # 第三方库导入
 from rich.align import Align
 from rich.console import Console
@@ -35,7 +36,6 @@ from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 from jarvis.jarvis_agent.rewrite_file_handler import RewriteFileHandler
 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,
@@ -67,7 +67,6 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 # jarvis_utils 相关
 from jarvis.jarvis_utils.config import (
     get_data_dir,
-    get_max_token_count,
     get_normal_model_name,
     get_normal_platform_name,
     is_execute_tool_confirm,
@@ -76,7 +75,8 @@ from jarvis.jarvis_utils.config import (
     is_use_methodology,
     get_tool_filter_threshold,
     get_after_tool_call_cb_dirs,
-    set_config,
+
+
 )
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.globals import (
@@ -282,6 +282,7 @@ class Agent:
         use_tools: Optional[List[str]] = None,
         execute_tool_confirm: Optional[bool] = None,
         need_summary: bool = True,
+        auto_summary_rounds: Optional[int] = None,
         multiline_inputer: Optional[Callable[[str], str]] = None,
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
@@ -289,6 +290,7 @@ class Agent:
         files: Optional[List[str]] = None,
         confirm_callback: Optional[Callable[[str, bool], bool]] = None,
         non_interactive: Optional[bool] = None,
+        in_multi_agent: Optional[bool] = None,
         **kwargs,
     ):
         """初始化Jarvis Agent实例
@@ -309,20 +311,36 @@ class Agent:
             confirm_callback: 用户确认回调函数，签名为 (tip: str, default: bool) -> bool；默认使用CLI的user_confirm
             non_interactive: 是否以非交互模式运行（优先级最高，覆盖环境变量与配置）
         """
-        # 基础属性初始化
-        self.files = files or []
+        # 基础属性初始化（仅根据入参设置原始值；实际生效的默认回退在 _init_config 中统一解析）
+        # 标识与描述
         self.name = make_agent_name(name)
         self.description = description
         self.system_prompt = system_prompt
-        self.need_summary = need_summary
-        self.auto_complete = auto_complete
+        # 行为控制开关（原始入参值）
+        self.auto_complete = bool(auto_complete)
+        self.need_summary = bool(need_summary)
+        # 自动摘要轮次：None 表示使用配置文件中的默认值，由 AgentRunLoop 决定最终取值
+        self.auto_summary_rounds = auto_summary_rounds
+        self.use_methodology = use_methodology
+        self.use_analysis = use_analysis
+        self.execute_tool_confirm = execute_tool_confirm
+        self.summary_prompt = summary_prompt
+        self.force_save_memory = force_save_memory
+        # 资源与环境
+        self.model_group = model_group
+        self.files = files or []
+        self.use_tools = use_tools
+        self.non_interactive = non_interactive
+        # 多智能体运行标志：用于控制非交互模式下的自动完成行为
+        self.in_multi_agent = bool(in_multi_agent)
+        # 运行时状态
         self.first = True
         self.run_input_handlers_next_turn = False
         self.user_data: Dict[str, Any] = {}
 
 
         # 用户确认回调：默认使用 CLI 的 user_confirm，可由外部注入以支持 TUI/GUI
-        self.user_confirm: Callable[[str, bool], bool] = (
+        self.confirm_callback: Callable[[str, bool], bool] = (
             confirm_callback or user_confirm  # type: ignore[assignment]
         )
 
@@ -337,9 +355,9 @@ class Agent:
             use_tools or [],
         )
         # 初始化用户交互封装，保持向后兼容
-        self.user_interaction = UserInteractionHandler(self.multiline_inputer, self.user_confirm)
+        self.user_interaction = UserInteractionHandler(self.multiline_inputer, self.confirm_callback)
         # 将确认函数指向封装后的 confirm，保持既有调用不变
-        self.user_confirm = self.user_interaction.confirm  # type: ignore[assignment]
+        self.confirm_callback = self.user_interaction.confirm  # type: ignore[assignment]
         # 非交互模式参数支持：允许通过构造参数显式控制，便于其他Agent调用时设置
         try:
             # 优先使用构造参数，其次回退到环境变量
@@ -351,24 +369,43 @@ class Agent:
             # 如果构造参数显式提供，则同步到环境变量与全局配置，供下游组件读取
             if non_interactive is not None:
                 os.environ["JARVIS_NON_INTERACTIVE"] = "true" if self.non_interactive else "false"
-                try:
-                    set_config("JARVIS_NON_INTERACTIVE", self.non_interactive)
-                except Exception:
-                    # 配置同步失败不影响主流程
-                    pass
+
         except Exception:
             # 防御式回退
             self.non_interactive = False
 
-        # 初始化配置
-        self._init_config(
-            use_methodology,
-            use_analysis,
-            execute_tool_confirm,
-            summary_prompt,
-            model_group,
-            force_save_memory,
-        )
+        # 初始化配置（直接解析，不再依赖 _init_config）
+        try:
+            resolved_use_methodology = bool(use_methodology if use_methodology is not None else is_use_methodology())
+        except Exception:
+            resolved_use_methodology = bool(use_methodology) if use_methodology is not None else True
+
+        try:
+            resolved_use_analysis = bool(use_analysis if use_analysis is not None else is_use_analysis())
+        except Exception:
+            resolved_use_analysis = bool(use_analysis) if use_analysis is not None else True
+
+        try:
+            resolved_execute_tool_confirm = bool(execute_tool_confirm if execute_tool_confirm is not None else is_execute_tool_confirm())
+        except Exception:
+            resolved_execute_tool_confirm = bool(execute_tool_confirm) if execute_tool_confirm is not None else False
+
+        try:
+            resolved_force_save_memory = bool(force_save_memory if force_save_memory is not None else is_force_save_memory())
+        except Exception:
+            resolved_force_save_memory = bool(force_save_memory) if force_save_memory is not None else False
+
+        self.use_methodology = resolved_use_methodology
+        self.use_analysis = resolved_use_analysis
+        self.execute_tool_confirm = resolved_execute_tool_confirm
+        self.summary_prompt = (summary_prompt or DEFAULT_SUMMARY_PROMPT)
+        self.force_save_memory = resolved_force_save_memory
+        # 多智能体模式下，默认不自动完成（即使是非交互），仅在明确传入 auto_complete=True 时开启
+        if self.in_multi_agent:
+            self.auto_complete = bool(self.auto_complete)
+        else:
+            # 非交互模式下默认自动完成；否则保持传入的 auto_complete 值
+            self.auto_complete = bool(self.auto_complete or (self.non_interactive or False))
 
         # 初始化事件总线需先于管理器，以便管理器在构造中安全订阅事件
         self.event_bus = EventBus()
@@ -432,46 +469,6 @@ class Agent:
         ]
         self.multiline_inputer = multiline_inputer or get_multiline_input
 
-    def _init_config(
-        self,
-        use_methodology: Optional[bool],
-        use_analysis: Optional[bool],
-        execute_tool_confirm: Optional[bool],
-        summary_prompt: Optional[str],
-        model_group: Optional[str],
-        force_save_memory: Optional[bool],
-    ):
-        """初始化配置选项"""
-        # 使用集中配置解析，保持与原逻辑一致
-        cfg = AgentConfig(
-            system_prompt=self.system_prompt,
-            name=self.name,
-            description=self.description,
-            model_group=model_group,
-            auto_complete=self.auto_complete,
-            need_summary=self.need_summary,
-            summary_prompt=summary_prompt,
-            execute_tool_confirm=execute_tool_confirm,
-            use_methodology=use_methodology,
-            use_analysis=use_analysis,
-            force_save_memory=force_save_memory,
-            files=self.files,
-            max_token_count=None,
-        ).resolve_defaults()
-
-        # 将解析结果回填到 Agent 实例属性，保持向后兼容
-        self.use_methodology = bool(cfg.use_methodology)
-        self.use_analysis = bool(cfg.use_analysis)
-        self.execute_tool_confirm = bool(cfg.execute_tool_confirm)
-        self.summary_prompt = cfg.summary_prompt or DEFAULT_SUMMARY_PROMPT
-        self.max_token_count = int(cfg.max_token_count or get_max_token_count(model_group))
-        self.force_save_memory = bool(cfg.force_save_memory)
-        # 非交互模式下自动完成标志需要同步到 Agent 实例，避免循环
-        self.auto_complete = bool(cfg.auto_complete)
-
-        # 聚合配置到 AgentConfig，作为后续单一事实来源（保持兼容，不改变既有属性使用）
-        self.config = cfg
-
     def _setup_system_prompt(self):
         """设置系统提示词"""
         try:
@@ -731,14 +728,9 @@ class Agent:
         return message
 
     def _manage_conversation_length(self, message: str) -> str:
-        """管理对话长度，必要时进行摘要"""
+        """管理对话长度计数；摘要触发由轮次在 AgentRunLoop 中统一处理。"""
         self.session.conversation_length += get_context_token_count(message)
 
-        if self.session.conversation_length > self.max_token_count:
-            summary = self._summarize_and_clear_history()
-            if summary:
-                message = join_prompts([summary, message])
-            self.session.conversation_length = get_context_token_count(message)
 
         return message
 
@@ -1095,7 +1087,7 @@ class Agent:
             return self._complete_task(auto_completed=False)
 
         if any(handler.can_handle(current_response) for handler in self.output_handler):
-            if self.user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
+            if self.confirm_callback("检测到有工具调用，是否继续处理工具调用？", True):
                 self.session.prompt = join_prompts([
                     f"被用户中断，用户补充信息为：{user_input}",
                     "用户同意继续工具调用。"
@@ -1322,7 +1314,7 @@ class Agent:
             f"并且存在3个以上标签重叠的记忆。\n"
             f"是否立即整理记忆库以优化性能和相关性？"
         )
-        if self.user_confirm(prompt, True):
+        if self.confirm_callback(prompt, True):
             PrettyOutput.print(
                 f"正在开始整理 '{scope_name}' ({memory_type}) 记忆库...",
                 OutputType.INFO,

jarvis/jarvis_agent/run_loop.py

@@ -14,6 +14,7 @@ from typing import Any, TYPE_CHECKING
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_agent.events import BEFORE_TOOL_CALL, AFTER_TOOL_CALL
 from jarvis.jarvis_agent.utils import join_prompts, is_auto_complete, normalize_next_action
+from jarvis.jarvis_utils.config import get_auto_summary_rounds
 
 if TYPE_CHECKING:
     # 仅用于类型标注，避免运行时循环依赖
@@ -25,6 +26,12 @@ class AgentRunLoop:
         self.agent = agent
         self.conversation_rounds = 0
         self.tool_reminder_rounds = int(os.environ.get("JARVIS_TOOL_REMINDER_ROUNDS", 20))
+        # 基于轮次的自动总结阈值：优先使用 Agent 入参，否则回落到全局配置（默认20轮）
+        self.auto_summary_rounds = (
+            self.agent.auto_summary_rounds
+            if getattr(self.agent, "auto_summary_rounds", None) is not None
+            else get_auto_summary_rounds()
+        )
 
     def run(self) -> Any:
         """主运行循环（委派到传入的 agent 实例的方法与属性）"""
@@ -37,6 +44,17 @@ class AgentRunLoop:
                     self.agent.session.addon_prompt = join_prompts(
                         [self.agent.session.addon_prompt, self.agent.get_tool_usage_prompt()]
                     )
+                # 基于轮次的自动总结判断：达到阈值后执行一次总结与历史清理
+                if self.conversation_rounds >= self.auto_summary_rounds:
+                    summary_text = self.agent._summarize_and_clear_history()
+                    if summary_text:
+                        # 将摘要作为下一轮的附加提示加入，从而维持上下文连续性
+                        self.agent.session.addon_prompt = join_prompts(
+                            [self.agent.session.addon_prompt, summary_text]
+                        )
+                    # 重置轮次计数与对话长度计数器，开始新一轮周期
+                    self.conversation_rounds = 0
+                    self.agent.session.conversation_length = 0
 
                 ag = self.agent
 

jarvis/jarvis_data/config_schema.json

@@ -193,6 +193,11 @@
       "description": "脚本执行的超时时间（秒），仅在非交互模式下生效。",
       "default": 300
     },
+    "JARVIS_AUTO_SUMMARY_ROUNDS": {
+      "type": "number",
+      "description": "基于对话轮次的自动总结阈值（达到该轮次后自动总结并清理历史）",
+      "default": 20
+    },
     "JARVIS_CONFIRM_BEFORE_APPLY_PATCH": {
       "type": "boolean",
       "description": "应用补丁前是否需要确认",

jarvis/jarvis_multi_agent/__init__.py

@@ -287,6 +287,11 @@ content: |2
             return None
 
         config = self.agents_config_map[name].copy()
+        # 标记为多智能体运行，避免在非交互模式下自动开启 auto_complete
+        config.setdefault("in_multi_agent", True)
+        # 非主智能体统一禁用自动补全，防止多智能体并行时误触发自动交互
+        if name != self.main_agent_name:
+            config["auto_complete"] = False
 
         # Prepend common system prompt if configured
         common_sp = getattr(self, "common_system_prompt", "")
@@ -328,9 +333,14 @@ content: |2
                 break
 
             # Generate a brief summary via direct model call to avoid run-loop recursion
-            try:
-                # 参照 Agent.generate_summary 的实现思路：基于当前 session.prompt 追加请求提示，直接调用底层模型
-                multi_agent_summary_prompt = """
+            # 如果在配置中显式设置了 summary_on_send=False，则不生成摘要
+            sender_config = self.agents_config_map.get(last_agent_name, {}) if hasattr(self, "agents_config_map") else {}
+            summary_on_send = sender_config.get("summary_on_send", True)
+            summary_text = ""
+            if summary_on_send:
+                try:
+                    # 参照 Agent.generate_summary 的实现思路：基于当前 session.prompt 追加请求提示，直接调用底层模型
+                    multi_agent_summary_prompt = """
 请基于当前会话，为即将发送给其他智能体的协作交接写一段摘要，包含：
 - 已完成的主要工作与产出
 - 关键决策及其理由
@@ -341,12 +351,12 @@ content: |2
 - 仅输出纯文本，不包含任何指令或工具调用
 - 使用简洁的要点式表述
 """.strip()
-                summary_any: Any = agent.model.chat_until_success(  # type: ignore[attr-defined]
-                    f"{agent.session.prompt}\n{multi_agent_summary_prompt}"
-                )
-                summary_text = summary_any.strip() if isinstance(summary_any, str) else ""
-            except Exception:
-                summary_text = ""
+                    summary_any: Any = agent.model.chat_until_success(  # type: ignore[attr-defined]
+                        f"{agent.session.prompt}\n{multi_agent_summary_prompt}"
+                    )
+                    summary_text = summary_any.strip() if isinstance(summary_any, str) else ""
+                except Exception:
+                    summary_text = ""
             prompt = f"""
 Please handle this message:
 from: {last_agent_name}
@@ -373,6 +383,9 @@ content: {msg['content']}
                 f"{last_agent_name} 正在向 {to_agent_name} 发送消息...", OutputType.INFO
             )
 
+            # Keep a reference to the sender before switching to the receiver
+            sender_agent = agent
+
             agent = self._get_agent(to_agent_name)
             if not agent:
                 return f"智能体 {to_agent_name} 未找到"
@@ -380,9 +393,9 @@ content: {msg['content']}
             # Check if the sending agent should be cleared
             sender_config = self.agents_config_map.get(last_agent_name, {})
             if sender_config.get("clear_after_send_message"):
-                if agent:
+                if sender_agent:
                     PrettyOutput.print(f"清除智能体 {last_agent_name} 在发送消息后的历史记录...", OutputType.INFO)
-                    agent.clear_history()
+                    sender_agent.clear_history()
 
             last_agent_name = agent.name
             msg = agent.run(prompt)

jarvis/jarvis_tools/registry.py

@@ -633,6 +633,12 @@ class ToolRegistry(OutputHandlerProtocol):
         异常:
             Exception: 如果工具调用缺少必要字段
         """
+        # 如果</TOOL_CALL>出现在响应的末尾，但是前面没有换行符，自动插入一个换行符进行修复
+        if content.rstrip().endswith(ct("TOOL_CALL")):
+            pos = content.rfind(ct("TOOL_CALL"))
+            if pos > 0 and content[pos - 1] not in ("\n", "\r"):
+                content = content[:pos] + "\n" + content[pos:]
+
         # 将内容拆分为行
         pattern = rf'(?ms){re.escape(ot("TOOL_CALL"))}(.*?)^{re.escape(ct("TOOL_CALL"))}'
         data = re.findall(pattern, content)

jarvis/jarvis_tools/sub_agent.py

@@ -51,6 +51,10 @@ class SubAgentTool:
                 "type": "string",
                 "description": "覆盖子Agent的总结提示词（必填）",
             },
+            "non_interactive": {
+                "type": "boolean",
+                "description": "是否启用无交互模式（可选，默认继承父Agent或系统默认）",
+            },
         },
         "required": [
             "task",
@@ -131,6 +135,11 @@ class SubAgentTool:
                 # 安全兜底：无法从父Agent获取配置则保持为None，使用系统默认
                 pass
 
+            # 可选参数：允许显式覆盖无交互模式
+            explicit_non_interactive = args.get("non_interactive", None)
+            if explicit_non_interactive is not None:
+                parent_non_interactive = bool(explicit_non_interactive)
+
             agent = Agent(
                 system_prompt=system_prompt,
                 name=agent_name,

jarvis/jarvis_utils/config.py

@@ -76,17 +76,6 @@ def get_replace_map() -> dict:
         return {**BUILTIN_REPLACE_MAP, **file_map}
 
 
-def get_max_token_count(model_group_override: Optional[str] = None) -> int:
-    """
-    获取模型允许的最大token数量。
-
-    返回:
-        int: 模型能处理的最大token数量，为最大输入token数量的30倍。
-    """
-    max_input_tokens = get_max_input_token_count(model_group_override)
-    return max_input_tokens * 30
-
-
 def get_max_input_token_count(model_group_override: Optional[str] = None) -> int:
     """
     获取模型允许的最大输入token数量。
@@ -712,6 +701,22 @@ def get_tool_filter_threshold() -> int:
     return int(GLOBAL_CONFIG_DATA.get("JARVIS_TOOL_FILTER_THRESHOLD", 30))
 
 
+def get_auto_summary_rounds() -> int:
+    """
+    获取基于对话轮次的自动总结阈值。
+
+    返回:
+        int: 轮次阈值，默认20
+    """
+    try:
+        return int(GLOBAL_CONFIG_DATA.get("JARVIS_AUTO_SUMMARY_ROUNDS", 20))
+    except Exception:
+        return 20
+
+
+
+
+
 def get_script_execution_timeout() -> int:
     """
     获取脚本执行的超时时间（秒）。

jarvis/jarvis_utils/input.py

@@ -363,11 +363,50 @@ class FileCompleter(Completer):
         return tag
 
 
-def user_confirm(tip: str, default: bool = True) -> bool:
-    """提示用户确认是/否问题"""
+# ---------------------
+# 公共判定辅助函数（按当前Agent优先）
+# ---------------------
+def _get_current_agent_for_input():
+    try:
+        import jarvis.jarvis_utils.globals as g
+        current_name = getattr(g, "current_agent_name", "")
+        if current_name:
+            return g.get_agent(current_name)
+    except Exception:
+        pass
+    return None
+
+def _is_non_interactive_for_current_agent() -> bool:
     try:
         from jarvis.jarvis_utils.config import is_non_interactive
-        if is_non_interactive():
+        ag = _get_current_agent_for_input()
+        try:
+            return bool(getattr(ag, "non_interactive", False)) if ag else bool(is_non_interactive())
+        except Exception:
+            return bool(is_non_interactive())
+    except Exception:
+        return False
+
+def _is_auto_complete_for_current_agent() -> bool:
+    try:
+        from jarvis.jarvis_utils.config import GLOBAL_CONFIG_DATA
+        ag = _get_current_agent_for_input()
+        if ag is not None and hasattr(ag, "auto_complete"):
+            try:
+                return bool(getattr(ag, "auto_complete", False))
+            except Exception:
+                pass
+        env_v = os.getenv("JARVIS_AUTO_COMPLETE")
+        if env_v is not None:
+            return str(env_v).strip().lower() in ("1", "true", "yes", "on")
+        return bool(GLOBAL_CONFIG_DATA.get("JARVIS_AUTO_COMPLETE", False))
+    except Exception:
+        return False
+
+def user_confirm(tip: str, default: bool = True) -> bool:
+    """提示用户确认是/否问题（按当前Agent优先判断非交互）"""
+    try:
+        if _is_non_interactive_for_current_agent():
             return default
         suffix = "[Y/n]" if default else "[y/N]"
         ret = get_single_line_input(f"{tip} {suffix}: ")
@@ -666,9 +705,41 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
     preset: Optional[str] = None
     preset_cursor: Optional[int] = None
     while True:
-        from jarvis.jarvis_utils.config import is_non_interactive
-        if is_non_interactive():
-            return "我无法与你交互，所有的事情你都自我决策，如果无法决策，就完成任务"
+        from jarvis.jarvis_utils.config import is_non_interactive, GLOBAL_CONFIG_DATA
+        # 基于“当前Agent”精确判断非交互与自动完成，避免多Agent相互干扰
+        if _is_non_interactive_for_current_agent():
+            # 在多Agent系统中，无论是否启用自动完成，均提示可用智能体并建议使用 SEND_MESSAGE 转移控制权
+            hint = ""
+            try:
+                ag = _get_current_agent_for_input()
+                ohs = getattr(ag, "output_handler", [])
+                available_agents: List[str] = []
+                for oh in (ohs or []):
+                    cfgs = getattr(oh, "agents_config", None)
+                    if isinstance(cfgs, list):
+                        for c in cfgs:
+                            try:
+                                name = c.get("name")
+                            except Exception:
+                                name = None
+                            if isinstance(name, str) and name.strip():
+                                available_agents.append(name.strip())
+                if available_agents:
+                    # 去重但保留顺序
+                    seen = set()
+                    ordered = []
+                    for n in available_agents:
+                        if n not in seen:
+                            seen.add(n)
+                            ordered.append(n)
+                    hint = "\n当前可用智能体: " + ", ".join(ordered) + f"\n如需将任务交给其他智能体，请使用 {ot('SEND_MESSAGE')} 块。"
+            except Exception:
+                hint = ""
+            if _is_auto_complete_for_current_agent():
+                base_msg = "我无法与你交互，所有的事情你都自我决策，如果无法决策，就完成任务。输出" + ot("!!!COMPLETE!!!")
+                return base_msg + hint
+            else:
+                return "我无法与你交互，所有的事情你都自我决策" + hint
         user_input = _get_multiline_input_internal(
             tip, preset=preset, preset_cursor=preset_cursor
         )

{jarvis_ai_assistant-0.4.1.dist-info → jarvis_ai_assistant-0.4.2.dist-info}/METADATA

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

@@ -1,8 +1,7 @@
-jarvis/__init__.py,sha256=AruQMrAiWbon9fxEdGwHgikJfqVwLLpY-3aXhycGePc,73
-jarvis/jarvis_agent/__init__.py,sha256=NzMMY4H73aPvRAsK-1G7iNN8beEH1RCkkXK6A9NSAts,51029
+jarvis/__init__.py,sha256=NIbT8I8sAw3cCWWXtArSe6_eWeB17Gf7WmiF9nyxdKs,73
+jarvis/jarvis_agent/__init__.py,sha256=OOoHubIIQ3A9xB7jHFRpJKDtAk0or8Y7TmUkdq00l4Q,51386
 jarvis/jarvis_agent/agent_manager.py,sha256=Q0S-mYTPt8Xd7RKGoLWoWU_RP_wEXFWxCjve8_t2f2A,3807
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=wS-FqpT3pIXwHn1dfL3SpXonUKWgVThbQueUIeyRc2U,2917
-jarvis/jarvis_agent/config.py,sha256=f_VmSfdEtl4a32y-fVxhcZYkni4RznBAUKjv6kET1LU,3517
 jarvis/jarvis_agent/config_editor.py,sha256=hlb9EYxKWcR_qdW2O89CgNDdciR9Isi743JU_1gD8j4,1927
 jarvis/jarvis_agent/edit_file_handler.py,sha256=8j7SRSWTw468fTuR-ueNKFK_0pR1GwDxTvsGGmm3zlA,24714
 jarvis/jarvis_agent/event_bus.py,sha256=pRdfk7d0OG18K6yNfWlCvAh_dW5p9sBtT2Yc3jGmzgo,1519
@@ -19,7 +18,7 @@ jarvis/jarvis_agent/prompt_manager.py,sha256=_1qLBSA3yn4nT_N3X2npTpW40Cp-pMeyvnz
 jarvis/jarvis_agent/prompts.py,sha256=CvbPYx_klEz6OQrxVReZAnC2uQNo53rWkkucmh30uKg,9531
 jarvis/jarvis_agent/protocols.py,sha256=YFJaC9MHi7JfLzmvlyotJDjiCO4Z07XJXy1gKhVdUy4,956
 jarvis/jarvis_agent/rewrite_file_handler.py,sha256=FVSrfrC115_cGvdPW9RIn3A-gQAhok7GyyBfnOFdpXs,5276
-jarvis/jarvis_agent/run_loop.py,sha256=kxVwFdzhzP7ZY5_aWl4-HvoQtGr4eYr8SytzvJDEDnU,5006
+jarvis/jarvis_agent/run_loop.py,sha256=iGfa28J2K6I07k6p66O3WJFSk9z4uOarqe6CLqALIsk,6167
 jarvis/jarvis_agent/session_manager.py,sha256=5wVcaZGwJ9cEKTQglSbqyxUDJ2fI5KxYN8C8L16UWLw,3024
 jarvis/jarvis_agent/share_manager.py,sha256=MF2RlomcgPxF8nVUk28DP6IRddZ_tot5l_YRvy0qXSQ,8726
 jarvis/jarvis_agent/shell_input_handler.py,sha256=wiAPjB-9uTkcLszbO5dlOUwIfaeR39RgRcZhahIGqoA,2018
@@ -57,7 +56,7 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=aRFYhQQvTgbYd-uY5pc8UHIUA
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZEQXPG1Jqc2sNTGp5c,2355
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
-jarvis/jarvis_data/config_schema.json,sha256=zfQni3t9KjfFd4gb6shJA0bqaVDSqBA72VMokMFQJ9c,14682
+jarvis/jarvis_data/config_schema.json,sha256=VlPqakEXx7k2wm5Uv-ZlbKeIPbHNc98r1pHFtXEBBBY,14884
 jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=BRbsEQVXwseVFKliVqV8_JPh1om6QT6dLTHw0jQ7OE0,2474
@@ -69,7 +68,7 @@ jarvis/jarvis_mcp/streamable_mcp_client.py,sha256=BenOeZGNHdUOJT5Z3cc5MhS6aOeKQg
 jarvis/jarvis_memory_organizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_memory_organizer/memory_organizer.py,sha256=CMFL46vvtpcTI6oS3CAlYteR6xAlwCkvVJmMT22uDRw,26295
 jarvis/jarvis_methodology/main.py,sha256=uiNzk5b5O6xdvRhsOuD7ubxdd2tPcDsFFnvmes8uH8I,11370
-jarvis/jarvis_multi_agent/__init__.py,sha256=Hr3AHSrxKGJjbq2r9wrK1eONiIn1Pu-4Q9rROLBW4HQ,15886
+jarvis/jarvis_multi_agent/__init__.py,sha256=frH5ufVMasKFz_jbVsBk2wH5nq4D0sfDcmfBWQ-DLoA,16726
 jarvis/jarvis_multi_agent/main.py,sha256=vqLzHesgQkpScVvbgOSyi6X7XoEDQYq3dJ9gZfGiPZw,3351
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
 jarvis/jarvis_platform/ai8.py,sha256=g8JkqPGs9SEbqstNMCc5rCHO0QcPHX9LNvb7HMWwB-Q,11471
@@ -109,11 +108,11 @@ jarvis/jarvis_tools/generate_new_tool.py,sha256=tJz0YtfDwyH9y00VEWw3Btqr9JCNhvtI
 jarvis/jarvis_tools/methodology.py,sha256=_K4GIDUodGEma3SvNRo7Qs5rliijgNespVLyAPN35JU,5233
 jarvis/jarvis_tools/read_code.py,sha256=F1RuO0c69t0h7CvrUGqrTyNcOCcUrFQPACc61O_YSso,6382
 jarvis/jarvis_tools/read_webpage.py,sha256=dfyXJ9vaX-ZRbua1P5ZlaU_SlSzKkeNw-1kI_3-gxFE,5433
-jarvis/jarvis_tools/registry.py,sha256=yVXBrJ7plyn7Dr3dD6mPmgd6eiBftmd19Cc84-PwVN8,33312
+jarvis/jarvis_tools/registry.py,sha256=9gIhiyh7jAAnLeGBIDyUUHwOeDtgOx3UUWk6kRN1sJg,33670
 jarvis/jarvis_tools/retrieve_memory.py,sha256=hhhGSr7jebPHICY9oEKICyI8mfqsRtKjh58qZNZApKc,8624
 jarvis/jarvis_tools/save_memory.py,sha256=RQtNxcpU53FFv_EBjH0i0oyQ7jWubm-trD1BHuqaGjI,6985
 jarvis/jarvis_tools/search_web.py,sha256=Hi8WBxcRH02qjOF1qcJP2qSqs3kVOKGFAARfh548Ii4,6370
-jarvis/jarvis_tools/sub_agent.py,sha256=Qjr5Ikul0gmtwGehCjy1yOSsbwE9hWiGQvwrOWPef_g,8028
+jarvis/jarvis_tools/sub_agent.py,sha256=Fn2RZ7jLD4cZCWt0HnpSLkdIbeqeZq-1h97Nfg2RAqE,8485
 jarvis/jarvis_tools/sub_code_agent.py,sha256=KpwTCU89kq_RGNpfyA1C0bTl-f0dTvsCyDKplU-hrds,9600
 jarvis/jarvis_tools/virtual_tty.py,sha256=L7-J00ARQvIa25T45Hhqg2eCBl6W2LFgqDlWMWf-7dk,25275
 jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -121,21 +120,21 @@ jarvis/jarvis_tools/cli/main.py,sha256=WL2GNV7WqYl7G1-btRGvCkzDCMk4fPfNvzCrnUFVP
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=z8iAqsbZUiGFaozxG1xSu128op8udqHOeEw-GxNt4bU,1708
 jarvis/jarvis_utils/clipboard.py,sha256=D3wzQeqg_yiH7Axs4d6MRxyNa9XxdnenH-ND2uj2WVQ,2967
-jarvis/jarvis_utils/config.py,sha256=Pk-ddQELZ5-vJgRdkwrBbstJJghhGsD_5BtNk5-UO3k,22638
+jarvis/jarvis_utils/config.py,sha256=jOVCrlD597U6FTu8j-lyO93Mpoyqv3Do7Seja_XrRfE,22580
 jarvis/jarvis_utils/embedding.py,sha256=x6mrkL7Bc3qgfuBDsjc4fg4nKG8ofGxVLVVydbsb8PY,2838
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
 jarvis/jarvis_utils/fzf.py,sha256=vCs0Uh5dUqGbWzXn2JCtLLCOYE2B39ZNdNveR9PK4DA,1681
 jarvis/jarvis_utils/git_utils.py,sha256=zxjdxbFb_X6aYo-w1fbMx3d2n1ScbmmaAYlE3wGaaSg,24071
 jarvis/jarvis_utils/globals.py,sha256=7Xvf9HY6jYJL4vSD1F1WCoxHkHCAyltJUYt4V9gGVU4,8865
 jarvis/jarvis_utils/http.py,sha256=eRhV3-GYuWmQ0ogq9di9WMlQkFcVb1zGCrySnOgT1x0,4392
-jarvis/jarvis_utils/input.py,sha256=muopeZc68N-_tM7ERI2aazqernLumF-sQqS_JfWI0jI,36879
+jarvis/jarvis_utils/input.py,sha256=4VXpUZoAocW1mldlZd4bmXI8a_CmcQj7IPLBNgNLGSI,40045
 jarvis/jarvis_utils/methodology.py,sha256=z_renvRGgHiC-XTQPuN6rvrJ_ffHlwxK_b1BU_jmNAQ,12800
 jarvis/jarvis_utils/output.py,sha256=y2fVcao_2ZowFl0IxUrJZCi8T6ZM0z-iPzpk8T8eLxc,13623
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=uMtfaStxDtp2i9AFIxwtPKgSxLwQxw8Z2rXsX-ZGlis,72728
-jarvis_ai_assistant-0.4.1.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.4.1.dist-info/METADATA,sha256=DR0N8vMawLJe7n5NdIYeeuE-cFC2xBqxXiBvVcUT148,18751
-jarvis_ai_assistant-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.4.1.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.4.1.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.4.1.dist-info/RECORD,,
+jarvis_ai_assistant-0.4.2.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.4.2.dist-info/METADATA,sha256=etNq0w20riwTP8aha2pt_wXBdC6SZHhrjTVeV5K4K38,18751
+jarvis_ai_assistant-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.4.2.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.4.2.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.4.2.dist-info/RECORD,,

jarvis/jarvis_agent/config.py

@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-AgentConfig: 聚合 Agent 的初始化配置并提供默认值解析。
-
-目标（阶段一，最小变更）：
-- 提供独立的配置承载类，封装 __init__ 中的配置项
-- 支持从全局配置与上下文推导默认值
-- 暂不强制替换 Agent 的现有参数与流程，后续逐步接入
-"""
-from dataclasses import dataclass, field
-from typing import List, Optional
-
-from jarvis.jarvis_agent.prompts import DEFAULT_SUMMARY_PROMPT
-from jarvis.jarvis_utils.config import (
-    get_max_token_count,
-    is_execute_tool_confirm,
-    is_force_save_memory,
-    is_use_analysis,
-    is_use_methodology,
-    is_non_interactive,
-)
-
-
-@dataclass
-class AgentConfig:
-    # 核心身份与系统参数
-    system_prompt: str
-    name: str = "Jarvis"
-    description: str = ""
-    model_group: Optional[str] = None
-
-    # 运行行为
-    auto_complete: bool = False
-    non_interactive: bool = False
-    need_summary: bool = True
-
-    # 可选配置（None 表示使用默认策略解析）
-    summary_prompt: Optional[str] = None
-    execute_tool_confirm: Optional[bool] = None
-    use_methodology: Optional[bool] = None
-    use_analysis: Optional[bool] = None
-    force_save_memory: Optional[bool] = None
-    files: Optional[List[str]] = field(default_factory=list)
-    max_token_count: Optional[int] = None
-
-    def resolve_defaults(self) -> "AgentConfig":
-        """
-        解析并填充默认值，返回新的 AgentConfig 实例，不修改原对象。
-        策略与 Agent._init_config 中的逻辑保持一致，确保兼容。
-        """
-        # 复制当前实例的浅拷贝数据
-        cfg = AgentConfig(
-            system_prompt=self.system_prompt,
-            name=self.name,
-            description=self.description,
-            model_group=self.model_group,
-            auto_complete=self.auto_complete,
-            non_interactive=self.non_interactive,
-            need_summary=self.need_summary,
-            summary_prompt=self.summary_prompt,
-            execute_tool_confirm=self.execute_tool_confirm,
-            use_methodology=self.use_methodology,
-            use_analysis=self.use_analysis,
-            force_save_memory=self.force_save_memory,
-            files=list(self.files or []),
-            max_token_count=self.max_token_count,
-        )
-
-        # use_methodology: 若存在上传文件则禁用；否则按照外部传入或全局默认
-        if cfg.files:
-            cfg.use_methodology = False
-        elif cfg.use_methodology is None:
-            cfg.use_methodology = is_use_methodology()
-
-        # use_analysis
-        if cfg.use_analysis is None:
-            cfg.use_analysis = is_use_analysis()
-
-        # execute_tool_confirm
-        if cfg.execute_tool_confirm is None:
-            cfg.execute_tool_confirm = is_execute_tool_confirm()
-
-        # summary_prompt
-        # Treat None or whitespace-only string as unset, fallback to default
-        if cfg.summary_prompt is None or (isinstance(cfg.summary_prompt, str) and cfg.summary_prompt.strip() == ""):
-            cfg.summary_prompt = DEFAULT_SUMMARY_PROMPT
-
-        # max_token_count
-        if cfg.max_token_count is None:
-            cfg.max_token_count = get_max_token_count(cfg.model_group)
-
-        # force_save_memory
-        if cfg.force_save_memory is None:
-            cfg.force_save_memory = is_force_save_memory()
-
-        # 非交互模式下默认开启自动完成
-        if is_non_interactive():
-            cfg.auto_complete = True
-
-        return cfg