jarvis-ai-assistant 0.5.0__tar.gz → 0.7.0__tar.gz

{jarvis_ai_assistant-0.5.0/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.5.0
+Version: 0.7.0
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -78,6 +78,88 @@ Requires-Dist: sentence-transformers==2.7.0; extra == "rag"
 Requires-Dist: torch>=2.6; extra == "rag"
 Requires-Dist: unstructured[md]; extra == "rag"
 Requires-Dist: rank-bm25; extra == "rag"
+Provides-Extra: clang16
+Requires-Dist: clang==16.*; extra == "clang16"
+Provides-Extra: clang17
+Requires-Dist: clang==17.*; extra == "clang17"
+Provides-Extra: clang18
+Requires-Dist: clang==18.*; extra == "clang18"
+Provides-Extra: clang19
+Requires-Dist: clang==19.*; extra == "clang19"
+Provides-Extra: clang20
+Requires-Dist: clang==20.*; extra == "clang20"
+Provides-Extra: clang21
+Requires-Dist: clang==21.*; extra == "clang21"
+Provides-Extra: tree-sitter-python
+Requires-Dist: tree-sitter; extra == "tree-sitter-python"
+Requires-Dist: tree-sitter-python; extra == "tree-sitter-python"
+Provides-Extra: tree-sitter-javascript
+Requires-Dist: tree-sitter; extra == "tree-sitter-javascript"
+Requires-Dist: tree-sitter-javascript; extra == "tree-sitter-javascript"
+Provides-Extra: tree-sitter-typescript
+Requires-Dist: tree-sitter; extra == "tree-sitter-typescript"
+Requires-Dist: tree-sitter-typescript; extra == "tree-sitter-typescript"
+Provides-Extra: tree-sitter-rust
+Requires-Dist: tree-sitter; extra == "tree-sitter-rust"
+Requires-Dist: tree-sitter-rust; extra == "tree-sitter-rust"
+Provides-Extra: tree-sitter-go
+Requires-Dist: tree-sitter; extra == "tree-sitter-go"
+Requires-Dist: tree-sitter-go; extra == "tree-sitter-go"
+Provides-Extra: tree-sitter-java
+Requires-Dist: tree-sitter; extra == "tree-sitter-java"
+Requires-Dist: tree-sitter-java; extra == "tree-sitter-java"
+Provides-Extra: tree-sitter-cpp
+Requires-Dist: tree-sitter; extra == "tree-sitter-cpp"
+Requires-Dist: tree-sitter-cpp; extra == "tree-sitter-cpp"
+Provides-Extra: tree-sitter-c
+Requires-Dist: tree-sitter; extra == "tree-sitter-c"
+Requires-Dist: tree-sitter-c; extra == "tree-sitter-c"
+Provides-Extra: tree-sitter-json
+Requires-Dist: tree-sitter; extra == "tree-sitter-json"
+Requires-Dist: tree-sitter-json; extra == "tree-sitter-json"
+Provides-Extra: tree-sitter-yaml
+Requires-Dist: tree-sitter; extra == "tree-sitter-yaml"
+Requires-Dist: tree-sitter-yaml; extra == "tree-sitter-yaml"
+Provides-Extra: tree-sitter-markdown
+Requires-Dist: tree-sitter; extra == "tree-sitter-markdown"
+Requires-Dist: tree-sitter-markdown; extra == "tree-sitter-markdown"
+Provides-Extra: tree-sitter-html
+Requires-Dist: tree-sitter; extra == "tree-sitter-html"
+Requires-Dist: tree-sitter-html; extra == "tree-sitter-html"
+Provides-Extra: tree-sitter-css
+Requires-Dist: tree-sitter; extra == "tree-sitter-css"
+Requires-Dist: tree-sitter-css; extra == "tree-sitter-css"
+Provides-Extra: tree-sitter-bash
+Requires-Dist: tree-sitter; extra == "tree-sitter-bash"
+Requires-Dist: tree-sitter-bash; extra == "tree-sitter-bash"
+Provides-Extra: tree-sitter-ruby
+Requires-Dist: tree-sitter; extra == "tree-sitter-ruby"
+Requires-Dist: tree-sitter-ruby; extra == "tree-sitter-ruby"
+Provides-Extra: tree-sitter-php
+Requires-Dist: tree-sitter; extra == "tree-sitter-php"
+Requires-Dist: tree-sitter-php; extra == "tree-sitter-php"
+Provides-Extra: tree-sitter-sql
+Requires-Dist: tree-sitter; extra == "tree-sitter-sql"
+Requires-Dist: tree-sitter-sql; extra == "tree-sitter-sql"
+Provides-Extra: tree-sitter-all
+Requires-Dist: tree-sitter; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-python; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-javascript; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-typescript; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-rust; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-go; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-java; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-cpp; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-c; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-json; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-yaml; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-markdown; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-html; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-css; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-bash; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-ruby; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-php; extra == "tree-sitter-all"
+Requires-Dist: tree-sitter-sql; extra == "tree-sitter-all"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -262,6 +344,8 @@ Jarvis 包含一系列专注于不同任务的工具。以下是主要命令及
 | `jarvis-smart-shell` | `jss` | 实验性的智能Shell功能 |
 | `jarvis-stats` | `jst` | 通用统计模块，支持记录和可视化任意指标数据 |
 | `jarvis-memory-organizer` | `jmo` | 记忆管理工具，支持整理、合并、导入导出记忆 |
+| `jarvis-sec` | `jsec` | 安全分析套件，对代码工程进行安全扫描和分析 |
+| `jarvis-c2rust` | `jc2r` | C→Rust 迁移套件，将 C/C++ 代码迁移到 Rust |
 
 更多详细用法和参数，请查阅我们的 [**使用指南**](docs/jarvis_book/4.使用指南.md)。
 

{jarvis_ai_assistant-0.5.0 → jarvis_ai_assistant-0.7.0}/README.md

@@ -177,6 +177,8 @@ Jarvis 包含一系列专注于不同任务的工具。以下是主要命令及
 | `jarvis-smart-shell` | `jss` | 实验性的智能Shell功能 |
 | `jarvis-stats` | `jst` | 通用统计模块，支持记录和可视化任意指标数据 |
 | `jarvis-memory-organizer` | `jmo` | 记忆管理工具，支持整理、合并、导入导出记忆 |
+| `jarvis-sec` | `jsec` | 安全分析套件，对代码工程进行安全扫描和分析 |
+| `jarvis-c2rust` | `jc2r` | C→Rust 迁移套件，将 C/C++ 代码迁移到 Rust |
 
 更多详细用法和参数，请查阅我们的 [**使用指南**](docs/jarvis_book/4.使用指南.md)。
 

{jarvis_ai_assistant-0.5.0 → jarvis_ai_assistant-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.5.0"
+version = "0.7.0"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -43,7 +43,7 @@ dependencies = [
     "typer",
     "pathspec",
     "plotext==5.2.8",
-    "packaging>=24.2",
+    "packaging>=24.2"
 ]
 requires-python = ">=3.9,<3.13"
 
@@ -60,6 +60,49 @@ rag = [
     "unstructured[md]",
     "rank-bm25",
 ]
+clang16 = ["clang==16.*"]
+clang17 = ["clang==17.*"]
+clang18 = ["clang==18.*"]
+clang19 = ["clang==19.*"]
+clang20 = ["clang==20.*"]
+clang21 = ["clang==21.*"]
+tree-sitter-python = ["tree-sitter", "tree-sitter-python"]
+tree-sitter-javascript = ["tree-sitter", "tree-sitter-javascript"]
+tree-sitter-typescript = ["tree-sitter", "tree-sitter-typescript"]
+tree-sitter-rust = ["tree-sitter", "tree-sitter-rust"]
+tree-sitter-go = ["tree-sitter", "tree-sitter-go"]
+tree-sitter-java = ["tree-sitter", "tree-sitter-java"]
+tree-sitter-cpp = ["tree-sitter", "tree-sitter-cpp"]
+tree-sitter-c = ["tree-sitter", "tree-sitter-c"]
+tree-sitter-json = ["tree-sitter", "tree-sitter-json"]
+tree-sitter-yaml = ["tree-sitter", "tree-sitter-yaml"]
+tree-sitter-markdown = ["tree-sitter", "tree-sitter-markdown"]
+tree-sitter-html = ["tree-sitter", "tree-sitter-html"]
+tree-sitter-css = ["tree-sitter", "tree-sitter-css"]
+tree-sitter-bash = ["tree-sitter", "tree-sitter-bash"]
+tree-sitter-ruby = ["tree-sitter", "tree-sitter-ruby"]
+tree-sitter-php = ["tree-sitter", "tree-sitter-php"]
+tree-sitter-sql = ["tree-sitter", "tree-sitter-sql"]
+tree-sitter-all = [
+    "tree-sitter",
+    "tree-sitter-python",
+    "tree-sitter-javascript",
+    "tree-sitter-typescript",
+    "tree-sitter-rust",
+    "tree-sitter-go",
+    "tree-sitter-java",
+    "tree-sitter-cpp",
+    "tree-sitter-c",
+    "tree-sitter-json",
+    "tree-sitter-yaml",
+    "tree-sitter-markdown",
+    "tree-sitter-html",
+    "tree-sitter-css",
+    "tree-sitter-bash",
+    "tree-sitter-ruby",
+    "tree-sitter-php",
+    "tree-sitter-sql",
+]
 
 [project.urls]
 Homepage = "https://github.com/skyfireitdiy/Jarvis"
@@ -96,6 +139,13 @@ jarvis-rag = "jarvis.jarvis_rag.cli:main"
 jrg = "jarvis.jarvis_rag.cli:main"
 jarvis-stats = "jarvis.jarvis_stats.cli:main"
 jst = "jarvis.jarvis_stats.cli:main"
+jarvis-sec = "jarvis.jarvis_sec.cli:main"
+jsec = "jarvis.jarvis_sec.cli:main"
+jarvis-c2rust = "jarvis.jarvis_c2rust.cli:main"
+jc2r = "jarvis.jarvis_c2rust.cli:main"
+
+
+
 
 
 

{jarvis_ai_assistant-0.5.0 → jarvis_ai_assistant-0.7.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.5.0",
+    version="0.7.0",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -53,6 +53,49 @@ setup(
             "rank-bm25",
             "pathspec",
         ],
+        "clang16": ["clang==16.*"],
+        "clang17": ["clang==17.*"],
+        "clang18": ["clang==18.*"],
+        "clang19": ["clang==19.*"],
+        "clang20": ["clang==20.*"],
+        "clang21": ["clang==21.*"],
+        "tree-sitter-python": ["tree-sitter", "tree-sitter-python"],
+        "tree-sitter-javascript": ["tree-sitter", "tree-sitter-javascript"],
+        "tree-sitter-typescript": ["tree-sitter", "tree-sitter-typescript"],
+        "tree-sitter-rust": ["tree-sitter", "tree-sitter-rust"],
+        "tree-sitter-go": ["tree-sitter", "tree-sitter-go"],
+        "tree-sitter-java": ["tree-sitter", "tree-sitter-java"],
+        "tree-sitter-cpp": ["tree-sitter", "tree-sitter-cpp"],
+        "tree-sitter-c": ["tree-sitter", "tree-sitter-c"],
+        "tree-sitter-json": ["tree-sitter", "tree-sitter-json"],
+        "tree-sitter-yaml": ["tree-sitter", "tree-sitter-yaml"],
+        "tree-sitter-markdown": ["tree-sitter", "tree-sitter-markdown"],
+        "tree-sitter-html": ["tree-sitter", "tree-sitter-html"],
+        "tree-sitter-css": ["tree-sitter", "tree-sitter-css"],
+        "tree-sitter-bash": ["tree-sitter", "tree-sitter-bash"],
+        "tree-sitter-ruby": ["tree-sitter", "tree-sitter-ruby"],
+        "tree-sitter-php": ["tree-sitter", "tree-sitter-php"],
+        "tree-sitter-sql": ["tree-sitter", "tree-sitter-sql"],
+        "tree-sitter-all": [
+            "tree-sitter",
+            "tree-sitter-python",
+            "tree-sitter-javascript",
+            "tree-sitter-typescript",
+            "tree-sitter-rust",
+            "tree-sitter-go",
+            "tree-sitter-java",
+            "tree-sitter-cpp",
+            "tree-sitter-c",
+            "tree-sitter-json",
+            "tree-sitter-yaml",
+            "tree-sitter-markdown",
+            "tree-sitter-html",
+            "tree-sitter-css",
+            "tree-sitter-bash",
+            "tree-sitter-ruby",
+            "tree-sitter-php",
+            "tree-sitter-sql",
+        ],
     },
     entry_points={
         "console_scripts": [
@@ -84,6 +127,10 @@ setup(
             "jrg=jarvis.jarvis_rag.cli:main",
             "jarvis-stats=jarvis.jarvis_stats.cli:main",
             "jst=jarvis.jarvis_stats.cli:main",
+            "jarvis-sec=jarvis.jarvis_sec.cli:main",
+            "jsec=jarvis.jarvis_sec.cli:main",
+            "jarvis-c2rust=jarvis.jarvis_c2rust.cli:main",
+            "jc2r=jarvis.jarvis_c2rust.cli:main",
         ],
     },
     python_requires=">=3.9,<3.13",

{jarvis_ai_assistant-0.5.0 → jarvis_ai_assistant-0.7.0}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.5.0 → jarvis_ai_assistant-0.7.0}/src/jarvis/jarvis_agent/__init__.py

@@ -7,7 +7,7 @@ import re
 import sys
 from pathlib import Path
 from enum import Enum
-from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 
 # 第三方库导入
@@ -25,11 +25,12 @@ from jarvis.jarvis_agent.tool_executor import execute_tool_call
 from jarvis.jarvis_agent.memory_manager import MemoryManager
 from jarvis.jarvis_memory_organizer.memory_organizer import MemoryOrganizer
 from jarvis.jarvis_agent.task_analyzer import TaskAnalyzer
+from jarvis.jarvis_agent.task_planner import TaskPlanner
 from jarvis.jarvis_agent.file_methodology_manager import FileMethodologyManager
 from jarvis.jarvis_agent.prompts import (
     DEFAULT_SUMMARY_PROMPT,
     SUMMARY_REQUEST_PROMPT,
-    TASK_ANALYSIS_PROMPT,
+    TASK_ANALYSIS_PROMPT as TASK_ANALYSIS_PROMPT,
 )
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
@@ -75,8 +76,9 @@ from jarvis.jarvis_utils.config import (
     is_use_methodology,
     get_tool_filter_threshold,
     get_after_tool_call_cb_dirs,
-
-
+    get_plan_max_depth,
+    is_plan_enabled,
+    get_addon_prompt_threshold,
 )
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.globals import (
@@ -259,6 +261,8 @@ class Agent:
 
         # 清理会话历史并重置模型状态
         self.session.clear_history()
+        # 重置 addon_prompt 跳过轮数计数器
+        self._addon_prompt_skip_rounds = 0
 
         # 重置后重新设置系统提示词，确保系统约束仍然生效
         try:
@@ -285,6 +289,21 @@ class Agent:
         """获取工具使用提示"""
         return build_action_prompt(self.output_handler)  # type: ignore
 
+    def __new__(cls, *args, **kwargs):
+        if kwargs.get("agent_type") == "code":
+            try:
+                from jarvis.jarvis_code_agent.code_agent import CodeAgent
+            except ImportError as e:
+                raise RuntimeError(
+                    "CodeAgent could not be imported. Please ensure jarvis_code_agent is installed correctly."
+                ) from e
+
+            # 移除 agent_type 避免无限循环，并传递所有其他参数
+            kwargs.pop("agent_type", None)
+            return CodeAgent(**kwargs)
+        else:
+            return super().__new__(cls)
+
     def __init__(
         self,
         system_prompt: str,
@@ -302,10 +321,15 @@ class Agent:
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
         force_save_memory: Optional[bool] = None,
+        disable_file_edit: bool = False,
         files: Optional[List[str]] = None,
         confirm_callback: Optional[Callable[[str, bool], bool]] = None,
         non_interactive: Optional[bool] = None,
         in_multi_agent: Optional[bool] = None,
+        plan: Optional[bool] = None,
+        plan_max_depth: Optional[int] = None,
+        plan_depth: int = 0,
+        agent_type: str = "normal",
         **kwargs,
     ):
         """初始化Jarvis Agent实例
@@ -325,6 +349,9 @@ class Agent:
             force_save_memory: 是否强制保存记忆
             confirm_callback: 用户确认回调函数，签名为 (tip: str, default: bool) -> bool；默认使用CLI的user_confirm
             non_interactive: 是否以非交互模式运行（优先级最高，覆盖环境变量与配置）
+            plan: 是否启用任务规划与子任务拆分（默认从配置加载；启用后在进入主循环前评估是否需要将任务拆分为 <SUB_TASK> 列表，逐一由子Agent执行并汇总结果）
+            plan_max_depth: 任务规划的最大层数（默认3，可通过配置 JARVIS_PLAN_MAX_DEPTH 或入参覆盖）
+            plan_depth: 当前规划层数（内部用于递归控制，子Agent会在父基础上+1）
         """
         # 基础属性初始化（仅根据入参设置原始值；实际生效的默认回退在 _init_config 中统一解析）
         # 标识与描述
@@ -341,6 +368,7 @@ class Agent:
         self.execute_tool_confirm = execute_tool_confirm
         self.summary_prompt = summary_prompt
         self.force_save_memory = force_save_memory
+        self.disable_file_edit = bool(disable_file_edit)
         # 资源与环境
         self.model_group = model_group
         self.files = files or []
@@ -348,10 +376,25 @@ class Agent:
         self.non_interactive = non_interactive
         # 多智能体运行标志：用于控制非交互模式下的自动完成行为
         self.in_multi_agent = bool(in_multi_agent)
+        # 任务规划：优先使用入参，否则回退到配置
+        self.plan = bool(plan) if plan is not None else is_plan_enabled()
+        # 规划深度与上限
+        try:
+            self.plan_max_depth = (
+                int(plan_max_depth) if plan_max_depth is not None else int(get_plan_max_depth())
+            )
+        except Exception:
+            self.plan_max_depth = 2
+        try:
+            self.plan_depth = int(plan_depth)
+        except Exception:
+            self.plan_depth = 0
         # 运行时状态
         self.first = True
         self.run_input_handlers_next_turn = False
         self.user_data: Dict[str, Any] = {}
+        # 记录连续未添加 addon_prompt 的轮数
+        self._addon_prompt_skip_rounds: int = 0
 
 
         # 用户确认回调：默认使用 CLI 的 user_confirm，可由外部注入以支持 TUI/GUI
@@ -429,6 +472,8 @@ class Agent:
         self.task_analyzer = TaskAnalyzer(self)
         self.file_methodology_manager = FileMethodologyManager(self)
         self.prompt_manager = PromptManager(self)
+        # 任务规划器：封装规划与子任务调度逻辑
+        self.task_planner = TaskPlanner(self, plan_depth=self.plan_depth, plan_max_depth=self.plan_max_depth)
 
         # 设置系统提示词
         self._setup_system_prompt()
@@ -475,7 +520,13 @@ class Agent:
         use_tools: List[str],
     ):
         """初始化各种处理器"""
-        self.output_handler = output_handler or [ToolRegistry(),  EditFileHandler(), RewriteFileHandler()]
+        default_handlers: List[Any] = [ToolRegistry()]
+        if not getattr(self, "disable_file_edit", False):
+            default_handlers.extend([EditFileHandler(), RewriteFileHandler()])
+        handlers = output_handler or default_handlers
+        if getattr(self, "disable_file_edit", False):
+            handlers = [h for h in handlers if not isinstance(h, (EditFileHandler, RewriteFileHandler))]
+        self.output_handler = handlers
         self.set_use_tools(use_tools)
         self.input_handler = [
             builtin_input_handler,
@@ -707,7 +758,13 @@ class Agent:
         return message
 
     def _add_addon_prompt(self, message: str, need_complete: bool) -> str:
-        """添加附加提示到消息"""
+        """添加附加提示到消息
+        
+        规则：
+        1. 如果 session.addon_prompt 存在，优先使用它
+        2. 如果消息长度超过阈值，添加默认 addon_prompt
+        3. 如果连续10轮都没有添加过 addon_prompt，强制添加一次
+        """
         # 广播添加附加提示前事件（不影响主流程）
         try:
             self.event_bus.emit(
@@ -721,13 +778,32 @@ class Agent:
             pass
 
         addon_text = ""
+        should_add = False
+        
         if self.session.addon_prompt:
+            # 优先使用 session 中设置的 addon_prompt
             addon_text = self.session.addon_prompt
             message = join_prompts([message, addon_text])
             self.session.addon_prompt = ""
+            should_add = True
         else:
-            addon_text = self.make_default_addon_prompt(need_complete)
-            message = join_prompts([message, addon_text])
+            threshold = get_addon_prompt_threshold()
+            # 条件1：消息长度超过阈值
+            if len(message) > threshold:
+                addon_text = self.make_default_addon_prompt(need_complete)
+                message = join_prompts([message, addon_text])
+                should_add = True
+            # 条件2：连续10轮都没有添加过 addon_prompt，强制添加一次
+            elif self._addon_prompt_skip_rounds >= 10:
+                addon_text = self.make_default_addon_prompt(need_complete)
+                message = join_prompts([message, addon_text])
+                should_add = True
+        
+        # 更新计数器：如果添加了 addon_prompt，重置计数器；否则递增
+        if should_add:
+            self._addon_prompt_skip_rounds = 0
+        else:
+            self._addon_prompt_skip_rounds += 1
 
         # 广播添加附加提示后事件（不影响主流程）
         try:
@@ -801,9 +877,14 @@ class Agent:
         try:
             if not self.model:
                 raise RuntimeError("Model not initialized")
-            summary = self.model.chat_until_success(
-                self.session.prompt + "\n" + SUMMARY_REQUEST_PROMPT
-            )  # type: ignore
+            # 优先使用外部传入的 summary_prompt；如为空则回退到默认的会话摘要请求
+            safe_summary_prompt = self.summary_prompt or ""
+            if isinstance(safe_summary_prompt, str) and safe_summary_prompt.strip() != "":
+                prompt_to_use = safe_summary_prompt
+            else:
+                prompt_to_use = self.session.prompt + "\n" + SUMMARY_REQUEST_PROMPT
+
+            summary = self.model.chat_until_success(prompt_to_use)  # type: ignore
             # 防御: 可能返回空响应(None或空字符串)，统一为空字符串并告警
             if not summary:
                 try:
@@ -869,6 +950,8 @@ class Agent:
             self._setup_system_prompt()
         # 重置会话
         self.session.clear_history()
+        # 重置 addon_prompt 跳过轮数计数器
+        self._addon_prompt_skip_rounds = 0
         # 广播清理历史后的事件
         try:
             self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
@@ -885,6 +968,8 @@ class Agent:
         except Exception:
             pass
         result = self.file_methodology_manager.handle_history_with_file_upload()
+        # 重置 addon_prompt 跳过轮数计数器
+        self._addon_prompt_skip_rounds = 0
         # 广播清理历史后的事件
         try:
             self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
@@ -1057,6 +1142,13 @@ class Agent:
                 )
             except Exception:
                 pass
+            # 如启用规划模式，先判断是否需要拆分并调度子任务
+            if self.plan:
+                try:
+                    self._maybe_plan_and_dispatch(self.session.prompt)
+                except Exception:
+                    # 防御式处理，规划失败不影响主流程
+                    pass
             return self._main_loop()
         except Exception as e:
             PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
@@ -1164,6 +1256,56 @@ class Agent:
         temp_model.set_system_prompt(system_prompt)
         return temp_model
 
+    def _build_child_agent_params(self, name: str, description: str) -> Dict[str, Any]:
+        """构建子Agent参数，尽量继承父Agent配置，并确保子Agent非交互自动完成。"""
+        use_tools_param: Optional[List[str]] = None
+        try:
+            tr = self.get_tool_registry()
+            if isinstance(tr, ToolRegistry):
+                selected_tools = tr.get_all_tools()
+                use_tools_param = [t["name"] for t in selected_tools]
+        except Exception:
+            use_tools_param = None
+
+        return {
+            "system_prompt": origin_agent_system_prompt,
+            "name": name,
+            "description": description,
+            "model_group": self.model_group,
+            "summary_prompt": self.summary_prompt,
+            "auto_complete": True,
+            "use_tools": use_tools_param,
+            "execute_tool_confirm": self.execute_tool_confirm,
+            "need_summary": self.need_summary,
+            "auto_summary_rounds": self.auto_summary_rounds,
+            "multiline_inputer": self.multiline_inputer,
+            "use_methodology": self.use_methodology,
+            "use_analysis": self.use_analysis,
+            "force_save_memory": self.force_save_memory,
+            "disable_file_edit": self.disable_file_edit,
+            "files": self.files,
+            "confirm_callback": self.confirm_callback,
+            "non_interactive": True,
+            "in_multi_agent": True,
+            "plan": self.plan,  # 继承父Agent的规划开关
+            "plan_depth": self.plan_depth + 1,  # 子Agent层数+1
+            "plan_max_depth": self.plan_max_depth,  # 继承上限
+        }
+
+    def _maybe_plan_and_dispatch(self, task_text: str) -> None:
+        """委托给 TaskPlanner 执行任务规划与子任务调度，保持向后兼容。"""
+        try:
+            if hasattr(self, "task_planner") and self.task_planner:
+                # 优先使用初始化时注入的规划器
+                self.task_planner.maybe_plan_and_dispatch(task_text)  # type: ignore[attr-defined]
+            else:
+                # 防御式回退：临时创建规划器以避免因未初始化导致的崩溃
+                from jarvis.jarvis_agent.task_planner import TaskPlanner
+                TaskPlanner(self, plan_depth=self.plan_depth, plan_max_depth=self.plan_max_depth).maybe_plan_and_dispatch(task_text)
+        except Exception:
+            # 规划失败不影响主流程
+            pass
+
     def _filter_tools_if_needed(self, task: str):
         """如果工具数量超过阈值，使用大模型筛选相关工具"""
         tool_registry = self.get_tool_registry()

{jarvis_ai_assistant-0.5.0 → jarvis_ai_assistant-0.7.0}/src/jarvis/jarvis_agent/agent_manager.py

@@ -11,11 +11,7 @@ from jarvis.jarvis_agent import (
     get_multiline_input,
     origin_agent_system_prompt,
 )
-from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
-from jarvis.jarvis_agent.file_context_handler import file_context_handler
-from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_agent.task_manager import TaskManager
-from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.config import is_non_interactive, is_skip_predefined_tasks
 
 
@@ -32,6 +28,7 @@ class AgentManager:
         multiline_inputer: Optional[Callable[[str], str]] = None,
         confirm_callback: Optional[Callable[[str, bool], bool]] = None,
         non_interactive: Optional[bool] = None,
+        plan: Optional[bool] = None,
     ):
         self.model_group = model_group
         self.tool_group = tool_group
@@ -43,6 +40,7 @@ class AgentManager:
         self.multiline_inputer = multiline_inputer
         self.confirm_callback = confirm_callback
         self.non_interactive = non_interactive
+        self.plan = plan
 
     def initialize(self) -> Agent:
         """初始化Agent"""
@@ -61,6 +59,7 @@ class AgentManager:
             multiline_inputer=self.multiline_inputer,
             confirm_callback=self.confirm_callback,
             non_interactive=self.non_interactive,
+            plan=self.plan,
         )
 
         # 尝试恢复会话