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

jarvis/__init__.py

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

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 (
@@ -249,8 +249,23 @@ class Agent:
     def clear_history(self):
         """
         Clears the current conversation history by delegating to the session manager.
+        Emits BEFORE_HISTORY_CLEAR/AFTER_HISTORY_CLEAR and reapplies system prompt to preserve constraints.
         """
+        # 广播清理历史前事件（不影响主流程）
+        try:
+            self.event_bus.emit(BEFORE_HISTORY_CLEAR, agent=self)
+        except Exception:
+            pass
+
+        # 清理会话历史并重置模型状态
         self.session.clear_history()
+
+        # 重置后重新设置系统提示词，确保系统约束仍然生效
+        try:
+            self._setup_system_prompt()
+        except Exception:
+            pass
+
         # 广播清理历史后的事件
         try:
             self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
@@ -282,6 +297,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 +305,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 +326,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 +370,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 +384,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 +484,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 +743,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
 
@@ -1011,7 +1018,6 @@ class Agent:
     {complete_prompt}
     如果没有完成，请进行下一步操作：
     - 仅包含一个操作
-    - 不要询问用户是否继续，直接继续执行直至完成
     - 如果信息不明确，请请求用户补充
     - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
     - 操作列表：{action_handlers}{memory_prompts}
@@ -1095,7 +1101,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 +1328,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_agent/share_manager.py

@@ -49,7 +49,14 @@ class ShareManager(ABC):
     def __init__(self, central_repo_url: str, repo_name: str):
         self.central_repo_url = central_repo_url
         self.repo_name = repo_name
-        self.repo_path = os.path.join(get_data_dir(), repo_name)
+        # 支持将中心仓库配置为本地目录（含git子路径）
+        expanded = os.path.expanduser(os.path.expandvars(central_repo_url))
+        if os.path.isdir(expanded):
+            # 直接使用本地目录作为中心仓库路径（支持git仓库子目录）
+            self.repo_path = expanded
+        else:
+            # 仍按原逻辑使用数据目录中的克隆路径
+            self.repo_path = os.path.join(get_data_dir(), repo_name)
 
     def update_central_repo(self) -> None:
         """克隆或更新中心仓库"""

jarvis/jarvis_code_agent/code_agent.py

@@ -25,6 +25,7 @@ from jarvis.jarvis_utils.config import (
     is_enable_static_analysis,
     get_git_check_mode,
     set_config,
+    get_data_dir,
 )
 from jarvis.jarvis_utils.git_utils import (
     confirm_add_new_files,
@@ -86,6 +87,22 @@ class CodeAgent:
 
         tool_registry.use_tools(base_tools)
         code_system_prompt = self._get_system_prompt()
+        # 先加载全局规则（数据目录 rules），再加载项目规则（.jarvis/rules），并拼接为单一规则块注入
+        global_rules = self._read_global_rules()
+        project_rules = self._read_project_rules()
+
+        combined_parts: List[str] = []
+        if global_rules:
+            combined_parts.append(global_rules)
+        if project_rules:
+            combined_parts.append(project_rules)
+
+        if combined_parts:
+            merged_rules = "\n\n".join(combined_parts)
+            code_system_prompt = (
+                f"{code_system_prompt}\n\n"
+                f"<rules>\n{merged_rules}\n</rules>"
+            )
         self.agent = Agent(
             system_prompt=code_system_prompt,
             name="CodeAgent",
@@ -164,6 +181,32 @@ class CodeAgent:
 </say_to_llm>
 """
 
+    def _read_project_rules(self) -> Optional[str]:
+        """读取 .jarvis/rules 内容，如果存在则返回字符串，否则返回 None"""
+        try:
+            rules_path = os.path.join(self.root_dir, ".jarvis", "rules")
+            if os.path.exists(rules_path) and os.path.isfile(rules_path):
+                with open(rules_path, "r", encoding="utf-8", errors="replace") as f:
+                    content = f.read().strip()
+                return content if content else None
+        except Exception:
+            # 读取规则失败时忽略，不影响主流程
+            pass
+        return None
+
+    def _read_global_rules(self) -> Optional[str]:
+        """读取数据目录 rules 内容，如果存在则返回字符串，否则返回 None"""
+        try:
+            rules_path = os.path.join(get_data_dir(), "rules")
+            if os.path.exists(rules_path) and os.path.isfile(rules_path):
+                with open(rules_path, "r", encoding="utf-8", errors="replace") as f:
+                    content = f.read().strip()
+                return content if content else None
+        except Exception:
+            # 读取规则失败时忽略，不影响主流程
+            pass
+        return None
+
     def _check_git_config(self) -> None:
         """检查 git username 和 email 是否已设置，如果没有则提示并退出"""
         try:
@@ -672,12 +715,58 @@ class CodeAgent:
         def _build_per_file_patch_preview(modified_files: List[str]) -> str:
             status_map = _build_name_status_map()
             lines: List[str] = []
+
+            def _get_file_numstat(file_path: str) -> Tuple[int, int]:
+                """获取单文件的新增/删除行数，失败时返回(0,0)"""
+                head_exists = bool(get_latest_commit_hash())
+                try:
+                    # 让未跟踪文件也能统计到新增行数
+                    subprocess.run(["git", "add", "-N", "--", file_path], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    cmd = ["git", "diff", "--numstat"] + (["HEAD"] if head_exists else []) + ["--", file_path]
+                    res = subprocess.run(
+                        cmd,
+                        capture_output=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
+                        check=False,
+                    )
+                    if res.returncode == 0 and res.stdout:
+                        for line in res.stdout.splitlines():
+                            parts = line.strip().split("\t")
+                            if len(parts) >= 3:
+                                add_s, del_s = parts[0], parts[1]
+
+                                def to_int(x: str) -> int:
+                                    try:
+                                        return int(x)
+                                    except Exception:
+                                        # 二进制或无法解析时显示为0
+                                        return 0
+
+                                return to_int(add_s), to_int(del_s)
+                finally:
+                    subprocess.run(["git", "reset", "--", file_path], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                return (0, 0)
+
             for f in modified_files:
                 status = status_map.get(f, "")
-                # 删除文件：不展示diff，仅提示
+                adds, dels = _get_file_numstat(f)
+                total_changes = adds + dels
+
+                # 删除文件：不展示diff，仅提示（附带删除行数信息如果可用）
                 if (status.startswith("D")) or (not os.path.exists(f)):
-                    lines.append(f"- {f} 文件被删除")
+                    if dels > 0:
+                        lines.append(f"- {f} 文件被删除（删除{dels}行）")
+                    else:
+                        lines.append(f"- {f} 文件被删除")
                     continue
+
+                # 变更过大：仅提示新增/删除行数，避免输出超长diff
+                if total_changes > 300:
+                    lines.append(f"- {f} 新增{adds}行/删除{dels}行（变更过大，预览已省略）")
+                    continue
+
                 # 其它情况：展示该文件的diff
                 file_diff = _get_file_diff(f)
                 if file_diff.strip():