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

jarvis/jarvis_tools/sub_agent.py

@@ -5,7 +5,7 @@ sub_agent 工具
 
 约定：
 - 必填参数：task, name, background, system_prompt, summary_prompt, use_tools
-- 继承父 Agent 的部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer；其他参数需显式提供
+- 继承父 Agent 的部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer、non_interactive、use_methodology、use_analysis；其他参数需显式提供
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
 from typing import Any, Dict, List
@@ -27,7 +27,7 @@ class SubAgentTool:
 
     # 必须与文件名一致，供 ToolRegistry 自动注册
     name = "sub_agent"
-    description = "将子任务交给通用 Agent 执行，并返回执行结果（继承父Agent部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer；其他参数需显式提供，自动完成并生成总结）。"
+    description = "将子任务交给通用 Agent 执行，并返回执行结果（继承父Agent部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer、non_interactive、use_methodology、use_analysis；其他参数需显式提供，自动完成并生成总结）。"
     parameters = {
         "type": "object",
         "properties": {
@@ -51,16 +51,9 @@ class SubAgentTool:
                 "type": "string",
                 "description": "覆盖子Agent的总结提示词（必填）",
             },
-            "use_tools": {
-                "type": "array",
-                "items": {"type": "string"},
-                "description": "限制子Agent可用的工具名称列表（必填）。兼容以逗号分隔的字符串输入。可用的工具列表："
-                + "\n".join(
-                    [
-                        t["name"] + ": " + t["description"]
-                        for t in ToolRegistry().get_all_tools()
-                    ]
-                ),
+            "non_interactive": {
+                "type": "boolean",
+                "description": "是否启用无交互模式（可选，默认继承父Agent或系统默认）",
             },
         },
         "required": [
@@ -69,7 +62,6 @@ class SubAgentTool:
             "background",
             "system_prompt",
             "summary_prompt",
-            "use_tools",
         ],
     }
 
@@ -105,16 +97,6 @@ class SubAgentTool:
             summary_prompt = str(args.get("summary_prompt", "")).strip()
             agent_name = str(args.get("name", "")).strip()
 
-            # 解析可用工具列表（支持数组或以逗号分隔的字符串）
-            _use_tools = args.get("use_tools", None)
-            use_tools: List[str] = []
-            if isinstance(_use_tools, list):
-                use_tools = [str(x).strip() for x in _use_tools if str(x).strip()]
-            elif isinstance(_use_tools, str):
-                use_tools = [s.strip() for s in _use_tools.split(",") if s.strip()]
-            else:
-                use_tools = []
-
             errors = []
             if not system_prompt:
                 errors.append("system_prompt 不能为空")
@@ -122,8 +104,6 @@ class SubAgentTool:
                 errors.append("summary_prompt 不能为空")
             if not agent_name:
                 errors.append("name 不能为空")
-            if not use_tools:
-                errors.append("use_tools 不能为空")
             if not background:
                 errors.append("background 不能为空")
 
@@ -139,16 +119,27 @@ class SubAgentTool:
             parent_model_group = None
             parent_execute_tool_confirm = None
             parent_multiline_inputer = None
+            parent_non_interactive = None
+            parent_use_methodology = None
+            parent_use_analysis = None
             try:
                 if parent_agent is not None:
                     if getattr(parent_agent, "model", None):
                         parent_model_group = getattr(parent_agent.model, "model_group", None)
                     parent_execute_tool_confirm = getattr(parent_agent, "execute_tool_confirm", None)
                     parent_multiline_inputer = getattr(parent_agent, "multiline_inputer", None)
+                    parent_non_interactive = getattr(parent_agent, "non_interactive", None)
+                    parent_use_methodology = getattr(parent_agent, "use_methodology", None)
+                    parent_use_analysis = getattr(parent_agent, "use_analysis", None)
             except Exception:
                 # 安全兜底：无法从父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,
@@ -156,23 +147,17 @@ class SubAgentTool:
                 model_group=parent_model_group,
                 summary_prompt=summary_prompt,
                 auto_complete=auto_complete,
-                output_handler=None,
                 use_tools=None,
                 execute_tool_confirm=parent_execute_tool_confirm,
                 need_summary=need_summary,
                 multiline_inputer=parent_multiline_inputer,
-                use_methodology=None,
-                use_analysis=None,
+                use_methodology=parent_use_methodology,
+                use_analysis=parent_use_analysis,
                 force_save_memory=None,
                 files=None,
+                non_interactive=parent_non_interactive,
             )
 
-            # 设置可用工具列表
-            try:
-                agent.set_use_tools(use_tools)
-            except Exception:
-                pass
-
             # 校验子Agent所用模型是否有效，必要时回退到平台可用模型
             try:
                 platform = getattr(agent, "model", None)

jarvis/jarvis_tools/sub_code_agent.py

@@ -84,6 +84,7 @@ class SubCodeAgentTool:
                             parent_agent = None
                 except Exception:
                     parent_agent = None
+            parent_non_interactive = getattr(parent_agent, "non_interactive", None) if parent_agent is not None else None
             model_group = None
             use_tools: List[str] = []
             try:
@@ -115,7 +116,7 @@ class SubCodeAgentTool:
                     "search_web",
                     "ask_user",
                     "read_code",
-                    "rewrite_file",
+
                     "save_memory",
                     "retrieve_memory",
                     "clear_memory",
@@ -138,6 +139,7 @@ class SubCodeAgentTool:
                     need_summary=True,
                     append_tools=append_tools,
                     tool_group=tool_group,
+                    non_interactive=parent_non_interactive,
                 )
             except SystemExit as se:
                 # 将底层 sys.exit 转换为工具错误，避免终止进程

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:
     """
     获取脚本执行的超时时间（秒）。
@@ -779,3 +784,13 @@ def is_non_interactive() -> bool:
         # 忽略环境变量解析异常，回退到配置
         pass
     return GLOBAL_CONFIG_DATA.get("JARVIS_NON_INTERACTIVE", False) is True
+
+
+def is_skip_predefined_tasks() -> bool:
+    """
+    是否跳过预定义任务加载。
+    
+    返回：
+        bool: 如果跳过预定义任务加载则返回True，默认为False
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_SKIP_PREDEFINED_TASKS", False) is True

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.0.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.0
+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.0.dist-info → jarvis_ai_assistant-0.4.2.dist-info}/RECORD

@@ -1,15 +1,14 @@
-jarvis/__init__.py,sha256=nXZdIlK3JANzS2OXYhyGTfXHFCA3Sxt4SPv2LQJaElU,73
-jarvis/jarvis_agent/__init__.py,sha256=e3K_Ee9x6iadYIvZAurfBxMRGlCzxooGWQUl69_5YBg,49251
-jarvis/jarvis_agent/agent_manager.py,sha256=2VTGfwXViNF9y4xUYGPQA0LGzITdha3JDzOBLLFdSBM,3635
+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=7rSYmgx9hI-PnWA2PLjubOxAbH7_NEDmnDvy6iAnPbQ,3362
 jarvis/jarvis_agent/config_editor.py,sha256=hlb9EYxKWcR_qdW2O89CgNDdciR9Isi743JU_1gD8j4,1927
-jarvis/jarvis_agent/edit_file_handler.py,sha256=7xkEvlER6pNHtxyGad_ol23NeDGsYMunq4XmTAx86kw,24722
+jarvis/jarvis_agent/edit_file_handler.py,sha256=8j7SRSWTw468fTuR-ueNKFK_0pR1GwDxTvsGGmm3zlA,24714
 jarvis/jarvis_agent/event_bus.py,sha256=pRdfk7d0OG18K6yNfWlCvAh_dW5p9sBtT2Yc3jGmzgo,1519
 jarvis/jarvis_agent/events.py,sha256=rmFQ37PasImCh7OCdCzNBvubk-kHwcUiYLgzmL0t0_4,3689
 jarvis/jarvis_agent/file_context_handler.py,sha256=2MPn_O_2llX39meFg272Cjk3wMPn5nmgbGMUyX06YQo,2113
 jarvis/jarvis_agent/file_methodology_manager.py,sha256=LnhgTx5xQXCBK8esjCkFbgFm9iEyFX7TryUlC40Kzpw,4428
-jarvis/jarvis_agent/jarvis.py,sha256=GqLHYUMZRlr_W4A16NVZSA8YMBTqcMz87ZxnctlmcCQ,47142
+jarvis/jarvis_agent/jarvis.py,sha256=4HlG4Wfs0HRqLq3mLHx3kt5MV--yjLpAkK7KtIhskwQ,48591
 jarvis/jarvis_agent/main.py,sha256=IgS7d3rng2vFlu983OUeCkOAosKjFAn1sFCk3gT9J9Q,4563
 jarvis/jarvis_agent/memory_manager.py,sha256=WSyUffx9xTmkcj4QrSLEfsjI3sTMUwZmkkC9_N_gTjo,8042
 jarvis/jarvis_agent/methodology_share_manager.py,sha256=AB_J9BwRgaeENQfL6bH83FOLeLrgHhppMb7psJNevKs,6874
@@ -18,7 +17,8 @@ jarvis/jarvis_agent/prompt_builder.py,sha256=PH1fPDVa8z_RXkoXHJFNDf8PQjUoLNLYwkh
 jarvis/jarvis_agent/prompt_manager.py,sha256=_1qLBSA3yn4nT_N3X2npTpW40Cp-pMeyvnzu-pnG0iU,2720
 jarvis/jarvis_agent/prompts.py,sha256=CvbPYx_klEz6OQrxVReZAnC2uQNo53rWkkucmh30uKg,9531
 jarvis/jarvis_agent/protocols.py,sha256=YFJaC9MHi7JfLzmvlyotJDjiCO4Z07XJXy1gKhVdUy4,956
-jarvis/jarvis_agent/run_loop.py,sha256=OWdJSq1dLC6xPx4EQBfSnD_rb3IwszwZp4KbXYiJtcg,4747
+jarvis/jarvis_agent/rewrite_file_handler.py,sha256=FVSrfrC115_cGvdPW9RIn3A-gQAhok7GyyBfnOFdpXs,5276
+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
@@ -28,14 +28,14 @@ jarvis/jarvis_agent/task_manager.py,sha256=lme_aN8vaF_a4Tvv2kaSEnWATy8RPSjogTxeL
 jarvis/jarvis_agent/tool_executor.py,sha256=k73cKhZEZpljvui4ZxALlFEIE-iLzJ32Softsmiwzqk,1896
 jarvis/jarvis_agent/tool_share_manager.py,sha256=Do08FRxis0ynwR2a6iRoa6Yq0qCP8NkuhMbPrimaxMA,5169
 jarvis/jarvis_agent/user_interaction.py,sha256=tifFN49GkO_Q80sqOTVmhxwbNWTazF3K0cr8AnnvzdU,1453
-jarvis/jarvis_agent/utils.py,sha256=ldgfuNTNu4JU7Y1LtystBl85OC6H3A4OMycg0XBt_Cs,1615
+jarvis/jarvis_agent/utils.py,sha256=WJmKys_ceDALL73GdMCOgmjGHBzeRSPj7rmc8Pkrvzc,1784
 jarvis/jarvis_agent/web_bridge.py,sha256=h15PXuPWWfZynWt8bPW4BDeCpIVoIOlRXfO0je6HDx4,6673
 jarvis/jarvis_agent/web_output_sink.py,sha256=sZ6WbLZnuCdT5dS9d8msHY_g-pnj-dvML-I6uJ7-sbc,1733
-jarvis/jarvis_agent/web_server.py,sha256=U2A35vhaIoBCz0Gh37tpyYBLPaJnylOEZlOWEKf-Tho,23596
+jarvis/jarvis_agent/web_server.py,sha256=oZZy4nAOPhRWJn7K8VjBlho1F9AsvLEYiusKgipjO94,28204
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=hKna15DuCKUeosMYjARf6eajlQk3gl-rJDlJ9JpqqHc,37944
+jarvis/jarvis_code_agent/code_agent.py,sha256=UaYppteSUzwni-ZUDAKDrGTDijBrXU1Ia91OoLdfYLs,38072
 jarvis/jarvis_code_agent/lint.py,sha256=_qLJB_bC3PuoHG-j4EGOnYzNGO26jHlKLbkysfyQW1c,3954
-jarvis/jarvis_code_analysis/code_review.py,sha256=Z0JsvyVPPHPm6rfo4fqaQr7CdZKIllo9jqStzV0i_-o,34470
+jarvis/jarvis_code_analysis/code_review.py,sha256=A3LaxFAlIH5qCfMajIr02ExG6YiolIVpjl9blsLh4SY,34402
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=LIXAYa1sW3l7foP6kohLWnE98I_EQ0T7z5bYKHq6rJA,78
 jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=9t62bMqs6qTkFSio4SKkj88qyb5ZubWrw3MxJBQ4X1A,1317
 jarvis/jarvis_code_analysis/checklists/csharp.py,sha256=ShPXrl2_UPAnGaCHAG2wLl90COG3HK2XCSr1UK2dxN4,2420
@@ -56,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=IlQ2u6lNvn1y31NNr544cUkH8GS9wQSbWJCiOlGjZMo,14497
+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
@@ -68,11 +68,11 @@ 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=fBWmW5S9gpEEYzCBJizyE2q0Jj2LUzj4yh7sfoe3Qrc,7170
-jarvis/jarvis_multi_agent/main.py,sha256=vh3fV2YIrg5xJ9cj8jttYvjmqRqBlLW4RkSV6upxiGw,2995
+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
-jarvis/jarvis_platform/base.py,sha256=7T0m5acGo0hN9GxqqRkeNu77d7wTQ4AHwm9aYQVarCM,15983
+jarvis/jarvis_platform/base.py,sha256=ngaQXMMHYYALrrq1Llk7WryjGR67tEtZzOTr6TQfp-k,16620
 jarvis/jarvis_platform/human.py,sha256=jWjW8prEag79e6ddqTPV4nz_Gz6zFBfO4a1EbvP8QWA,4908
 jarvis/jarvis_platform/kimi.py,sha256=KLsf9udAsPRMbQ2JkBeiAlXkupCBwdtMaJ-hpH4Jdkc,15711
 jarvis/jarvis_platform/openai.py,sha256=4YapmkmJmPGfrjktORcIejlB98b83Wsi_48zjBymHAc,9500
@@ -102,41 +102,39 @@ jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 jarvis/jarvis_tools/ask_user.py,sha256=M6DdLNryCE8y1JcdZHEifUgZkPUEPNKc-zDW5p0Mb1k,2029
 jarvis/jarvis_tools/base.py,sha256=tFZkRlbV_a-pbjM-ci9AYmXVJm__FXuzVWKbQEyz4Ao,1639
 jarvis/jarvis_tools/clear_memory.py,sha256=8DOq6dHLemfKTJqu227PWBIp8Iu5K7EXwINzL8DYk8M,8205
-jarvis/jarvis_tools/edit_file.py,sha256=UcJNTVCDEmRaQsN_7_Ip2LjrTDm4wWzj2deuZHiBvLI,9026
 jarvis/jarvis_tools/execute_script.py,sha256=kjl-c6OmQPEeGqEjbuEGoGhb2nAiQoYzz2_2_Y3tIlY,8277
 jarvis/jarvis_tools/file_analyzer.py,sha256=jzVb8fAJn3dWwpCiYH-Wuxva4kpHqBB2_V3x3mzY0Gs,4158
 jarvis/jarvis_tools/generate_new_tool.py,sha256=tJz0YtfDwyH9y00VEWw3Btqr9JCNhvtI8BN9i5hYk_M,8560
 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/rewrite_file.py,sha256=CuvjWPTbUaPbex9FKSmw_Ru4r6R-CX_3vqTqCTp8nHA,6959
 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=mZqMyHgDXpZgFWxq8lwwCst2SDXbNyeX7_87fDuA_DQ,8725
-jarvis/jarvis_tools/sub_code_agent.py,sha256=vVPcGKfgyhbZzl8vp2HHbgR1oQzC0TlS0G3THoZgU5Q,9453
+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
 jarvis/jarvis_tools/cli/main.py,sha256=WL2GNV7WqYl7G1-btRGvCkzDCMk4fPfNvzCrnUFVPxs,9323
 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=vdScoPR-07nv9nJJV8kV5t-VQvvZhOH8eJUXfPG5IWs,22361
+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.0.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.4.0.dist-info/METADATA,sha256=K2JtrCGOAwMGOrFlsDW4D0rFQDNFMdjVbf02_GjhDkI,18751
-jarvis_ai_assistant-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.4.0.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.4.0.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.4.0.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,99 +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
-        if cfg.summary_prompt is None:
-            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