jarvis-ai-assistant 0.4.2__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.2"
+__version__ = "0.5.0"

jarvis/jarvis_agent/__init__.py

@@ -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)
@@ -1003,7 +1018,6 @@ class Agent:
     {complete_prompt}
     如果没有完成，请进行下一步操作：
     - 仅包含一个操作
-    - 不要询问用户是否继续，直接继续执行直至完成
     - 如果信息不明确，请请求用户补充
     - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
     - 操作列表：{action_handlers}{memory_prompts}

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():