jarvis-ai-assistant 0.5.1__py3-none-any.whl → 0.6.0__py3-none-any.whl

jarvis/jarvis_code_agent/code_agent.py

@@ -26,6 +26,7 @@ from jarvis.jarvis_utils.config import (
     get_git_check_mode,
     set_config,
     get_data_dir,
+    is_plan_enabled,
 )
 from jarvis.jarvis_utils.git_utils import (
     confirm_add_new_files,
@@ -67,7 +68,6 @@ class CodeAgent:
 
         # 检测 git username 和 email 是否已设置
         self._check_git_config()
-        tool_registry = ToolRegistry()  # type: ignore
         base_tools = [
             "execute_script",
             "search_web",
@@ -87,7 +87,6 @@ class CodeAgent:
             # 去重
             base_tools = list(dict.fromkeys(base_tools))
 
-        tool_registry.use_tools(base_tools)
         code_system_prompt = self._get_system_prompt()
         # 先加载全局规则（数据目录 rules），再加载项目规则（.jarvis/rules），并拼接为单一规则块注入
         global_rules = self._read_global_rules()
@@ -114,7 +113,8 @@ class CodeAgent:
             use_methodology=False,  # 禁用方法论
             use_analysis=False,  # 禁用分析
             non_interactive=self.non_interactive,
-            plan=bool(plan) if plan is not None else False,
+            plan=bool(plan) if plan is not None else is_plan_enabled(),
+            use_tools=base_tools,  # 仅启用限定工具
         )
 
         self.agent.event_bus.subscribe(AFTER_TOOL_CALL, self._on_after_tool_call)
@@ -281,29 +281,148 @@ class CodeAgent:
         return git_dir
 
     def _update_gitignore(self, git_dir: str) -> None:
-        """检查并更新.gitignore文件，确保忽略.jarvis目录
+        """检查并更新.gitignore文件，确保忽略.jarvis目录，并追加常用语言的忽略规则（若缺失）
 
         参数:
             git_dir: git根目录路径
         """
-
         gitignore_path = os.path.join(git_dir, ".gitignore")
-        jarvis_ignore = ".jarvis"
+
+        # 常用忽略规则（按语言/场景分组）
+        sections = {
+            "General": [
+                ".jarvis",
+                ".DS_Store",
+                "Thumbs.db",
+                "*.log",
+                "*.tmp",
+                "*.swp",
+                "*.swo",
+                ".idea/",
+                ".vscode/",
+            ],
+            "Python": [
+                "__pycache__/",
+                "*.py[cod]",
+                "*$py.class",
+                ".Python",
+                "env/",
+                "venv/",
+                ".venv/",
+                "build/",
+                "dist/",
+                "develop-eggs/",
+                "downloads/",
+                "eggs/",
+                ".eggs/",
+                "lib/",
+                "lib64/",
+                "parts/",
+                "sdist/",
+                "var/",
+                "wheels/",
+                "pip-wheel-metadata/",
+                "share/python-wheels/",
+                "*.egg-info/",
+                ".installed.cfg",
+                "*.egg",
+                "MANIFEST",
+                ".mypy_cache/",
+                ".pytest_cache/",
+                ".ruff_cache/",
+                ".tox/",
+                ".coverage",
+                ".coverage.*",
+                "htmlcov/",
+                ".hypothesis/",
+                ".ipynb_checkpoints",
+                ".pyre/",
+                ".pytype/",
+            ],
+            "Rust": [
+                "target/",
+            ],
+            "Node": [
+                "node_modules/",
+                "npm-debug.log*",
+                "yarn-debug.log*",
+                "yarn-error.log*",
+                "pnpm-debug.log*",
+                "lerna-debug.log*",
+                "dist/",
+                "coverage/",
+                ".turbo/",
+                ".next/",
+                ".nuxt/",
+                "out/",
+            ],
+            "Go": [
+                "bin/",
+                "vendor/",
+                "coverage.out",
+            ],
+            "Java": [
+                "target/",
+                "*.class",
+                ".gradle/",
+                "build/",
+                "out/",
+            ],
+            "C/C++": [
+                "build/",
+                "cmake-build-*/",
+                "*.o",
+                "*.a",
+                "*.so",
+                "*.obj",
+                "*.dll",
+                "*.dylib",
+                "*.exe",
+                "*.pdb",
+            ],
+            ".NET": [
+                "bin/",
+                "obj/",
+            ],
+        }
+
+        existing_content = ""
+        if os.path.exists(gitignore_path):
+            with open(gitignore_path, "r", encoding="utf-8", errors="replace") as f:
+                existing_content = f.read()
+
+        # 已存在的忽略项（去除注释与空行）
+        existing_set = set(
+            ln.strip()
+            for ln in existing_content.splitlines()
+            if ln.strip() and not ln.strip().startswith("#")
+        )
+
+        # 计算缺失项并准备追加内容
+        new_lines: List[str] = []
+        for name, patterns in sections.items():
+            missing = [p for p in patterns if p not in existing_set]
+            if missing:
+                new_lines.append(f"# {name}")
+                new_lines.extend(missing)
+                new_lines.append("")  # 分组空行
 
         if not os.path.exists(gitignore_path):
-            with open(gitignore_path, "w", encoding="utf-8") as f:
-                f.write(f"{jarvis_ignore}\n")
-            PrettyOutput.print(
-                f"已创建 .gitignore 并添加 '{jarvis_ignore}'", OutputType.SUCCESS
-            )
+            # 新建 .gitignore（仅包含缺失项；此处即为全部常用规则）
+            with open(gitignore_path, "w", encoding="utf-8", newline="\n") as f:
+                content_to_write = "\n".join(new_lines).rstrip()
+                if content_to_write:
+                    f.write(content_to_write + "\n")
+            PrettyOutput.print("已创建 .gitignore 并添加常用忽略规则", OutputType.SUCCESS)
         else:
-            with open(gitignore_path, "r+", encoding="utf-8") as f:
-                content = f.read()
-                if jarvis_ignore not in content.splitlines():
-                    f.write(f"\n{jarvis_ignore}\n")
-                    PrettyOutput.print(
-                        f"已更新 .gitignore，添加 '{jarvis_ignore}'", OutputType.SUCCESS
-                    )
+            if new_lines:
+                # 追加缺失的规则
+                with open(gitignore_path, "a", encoding="utf-8", newline="\n") as f:
+                    # 若原文件不以换行结尾，先补一行
+                    if existing_content and not existing_content.endswith("\n"):
+                        f.write("\n")
+                    f.write("\n".join(new_lines).rstrip() + "\n")
+                PrettyOutput.print("已更新 .gitignore，追加常用忽略规则", OutputType.SUCCESS)
 
     def _handle_git_changes(self, prefix: str, suffix: str) -> None:
         """处理git仓库中的未提交修改"""
@@ -590,6 +709,7 @@ class CodeAgent:
         返回:
             str: 描述执行结果的输出，成功时返回None
         """
+        prev_dir = os.getcwd()
         try:
             self._init_env(prefix, suffix)
             start_commit = get_latest_commit_hash()
@@ -647,6 +767,12 @@ class CodeAgent:
 
         except RuntimeError as e:
             return f"Error during execution: {str(e)}"
+        finally:
+            # Ensure switching back to the original working directory after CodeAgent completes
+            try:
+                os.chdir(prev_dir)
+            except Exception:
+                pass
 
     def _on_after_tool_call(self, agent: Agent, current_response=None, need_return=None, tool_prompt=None, **kwargs) -> None:
         """工具调用后回调函数。"""

jarvis/jarvis_data/config_schema.json

@@ -188,9 +188,14 @@
       "description": "AI工具筛选阈值：当可用工具数量超过此值时触发AI筛选",
       "default": 30
     },
+    "JARVIS_PLAN_ENABLED": {
+      "type": "boolean",
+      "description": "是否默认启用任务规划。当 Agent 初始化时 plan 参数未指定，将从此配置加载。默认 false。",
+      "default": false
+    },
     "JARVIS_PLAN_MAX_DEPTH": {
       "type": "number",
-      "description": "任务规划的最大层数。用于限制 plan 模式的递归拆分深度。仅在启用规划时生效（通过 CLI --plan/--no-plan 控制），默认 3。",
+      "description": "任务规划的最大层数。用于限制 plan 模式的递归拆分深度。仅在启用规划时生效（通过 CLI --plan/--no-plan 控制），默认 2。",
       "default": 2
     },
     "JARVIS_SCRIPT_EXECUTION_TIMEOUT": {
@@ -315,12 +320,12 @@
     "JARVIS_ENABLE_GIT_JCA_SWITCH": {
       "type": "boolean",
       "description": "在初始化环境前检测Git仓库并提示可切换到代码开发模式（jca）",
-      "default": false
+      "default": true
     },
     "JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR": {
       "type": "boolean",
       "description": "在进入默认通用代理前，列出可用配置（agent/multi_agent/roles）供选择",
-      "default": false
+      "default": true
     },
     "JARVIS_IMMEDIATE_ABORT": {
       "type": "boolean",

jarvis/jarvis_tools/cli/main.py

@@ -11,6 +11,7 @@ from jarvis.jarvis_utils.utils import init_env
 app = typer.Typer(help="Jarvis 工具系统命令行界面")
 
 
+
 @app.command("list")
 def list_tools(
     as_json: bool = typer.Option(False, "--json", help="以JSON格式输出"),

jarvis/jarvis_tools/execute_script.py

@@ -210,7 +210,7 @@ class ScriptTool:
 if __name__ == "__main__":
     script_tool = ScriptTool()
     PrettyOutput.print(
-        script_tool.get_display_output("/home/wangmaobin/code/Jarvis/a.txt"),
+        script_tool.get_display_output("/path/to/a.txt"),
         OutputType.CODE,
         lang="text",
     )

jarvis/jarvis_tools/read_code.py

@@ -150,6 +150,7 @@ class ReadCodeTool:
 
             all_outputs = []
             overall_success = True
+            status_lines = []
 
             for file_info in args["files"]:
                 if not isinstance(file_info, dict) or "path" not in file_info:
@@ -164,13 +165,22 @@ class ReadCodeTool:
 
                 if result["success"]:
                     all_outputs.append(result["stdout"])
+                    status_lines.append(f"✅ {file_info['path']} 文件读取成功")
                 else:
                     all_outputs.append(f"❌ {file_info['path']}: {result['stderr']}")
+                    status_lines.append(f"❌ {file_info['path']} 文件读取失败")
                     overall_success = False
 
+            stdout_text = "\n".join(all_outputs)
+            # 仅打印每个文件的读取状态，不打印具体内容
+            try:
+                if status_lines:
+                    print("\n".join(status_lines), end="\n")
+            except Exception:
+                pass
             return {
                 "success": overall_success,
-                "stdout": "\n".join(all_outputs),
+                "stdout": stdout_text,
                 "stderr": "",
             }
 

jarvis/jarvis_tools/read_symbols.py

@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+"""
+按需读取 symbols.jsonl 的工具。
+
+用途:
+- 避免Agent直接完整读取体积较大的符号表文件；
+- 通过提供符号表路径与符号名称列表，仅返回匹配的符号记录。
+
+参数:
+- symbols_file (str): 符号表文件路径（.jsonl），或项目根目录/包含 .jarvis/c2rust 的目录
+- symbols (List[str]): 需要读取的符号名称列表（支持 name 与 qualified_name 匹配）
+
+返回:
+- success (bool)
+- stdout (str): JSON文本，包含查询结果
+- stderr (str)
+"""
+import json
+import os
+from pathlib import Path
+from typing import Any, Dict, List
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+
+class ReadSymbolsTool:
+    # 文件名必须与工具名一致，便于注册表自动加载
+    name = "read_symbols"
+    description = "从symbols.jsonl按需读取指定符号的记录，避免完整加载大文件。参数包含符号表路径和符号名列表（匹配 name 与 qualified_name）（C2Rust工具专用）"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "symbols_file": {
+                "type": "string",
+                "description": "符号表文件路径（.jsonl）。若为目录，则解析为 <dir>/.jarvis/c2rust/symbols.jsonl",
+            },
+            "symbols": {
+                "type": "array",
+                "items": {"type": "string"},
+                "description": "要检索的符号名称列表（支持 name 或 qualified_name 完全匹配）",
+            },
+        },
+        "required": ["symbols_file", "symbols"],
+    }
+
+    @staticmethod
+    def _resolve_symbols_jsonl_path(path_hint: str) -> Path:
+        """
+        解析符号表路径：
+        - 若为目录，返回 <dir>/.jarvis/c2rust/symbols.jsonl
+        - 若为文件，直接返回
+        """
+        p = Path(os.path.abspath(os.path.expanduser(path_hint)))
+        if p.is_dir():
+            candidate = p / ".jarvis" / "c2rust" / "symbols.jsonl"
+            return candidate
+        return p
+
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        try:
+            symbols_file_arg = args.get("symbols_file")
+            symbols_arg = args.get("symbols")
+
+            if not isinstance(symbols_file_arg, str) or not symbols_file_arg.strip():
+                return {"success": False, "stdout": "", "stderr": "缺少或无效的 symbols_file 参数"}
+
+            if not isinstance(symbols_arg, list) or not all(isinstance(s, str) for s in symbols_arg):
+                return {"success": False, "stdout": "", "stderr": "symbols 参数必须是字符串列表"}
+
+            symbols_path = self._resolve_symbols_jsonl_path(symbols_file_arg)
+            if not symbols_path.exists():
+                return {"success": False, "stdout": "", "stderr": f"符号表文件不存在: {symbols_path}"}
+            if not symbols_path.is_file():
+                return {"success": False, "stdout": "", "stderr": f"符号表路径不是文件: {symbols_path}"}
+
+            # 使用集合提升匹配效率；保持原请求顺序以便输出
+            requested: List[str] = [s.strip() for s in symbols_arg if s and s.strip()]
+            wanted_set = set(requested)
+
+            results: Dict[str, List[Dict[str, Any]]] = {s: [] for s in requested}
+
+            # 流式读取，避免载入整个大文件
+            with open(symbols_path, "r", encoding="utf-8") as f:
+                for line in f:
+                    line = line.strip()
+                    if not line:
+                        continue
+                    try:
+                        obj = json.loads(line)
+                    except Exception:
+                        continue
+
+                    name = obj.get("name") or ""
+                    qname = obj.get("qualified_name") or ""
+
+                    # 仅当命中请求的符号时才记录
+                    if name in wanted_set:
+                        results[name].append(obj)
+                    if qname in wanted_set and qname != name:
+                        results[qname].append(obj)
+
+            not_found = [s for s in requested if not results.get(s)]
+            found_counts = {s: len(results.get(s, [])) for s in requested}
+
+            out_obj: Dict[str, Any] = {
+                "symbols_file": str(symbols_path),
+                "requested": requested,
+                "found_counts": found_counts,
+                "not_found": not_found,
+                "items": results,
+            }
+
+            stdout = json.dumps(out_obj, ensure_ascii=False, indent=2)
+            # 简要状态打印（不包含具体内容）
+            try:
+                status_lines = []
+                for s in requested:
+                    cnt = found_counts.get(s, 0)
+                    status_lines.append(f"[read_symbols] {s}: {cnt} 条匹配")
+                if status_lines:
+                    print("\n".join(status_lines), end="\n")
+            except Exception:
+                pass
+
+            return {"success": True, "stdout": stdout, "stderr": ""}
+
+        except Exception as e:
+            PrettyOutput.print(str(e), OutputType.ERROR)
+            return {"success": False, "stdout": "", "stderr": f"读取符号表失败: {str(e)}"}

jarvis/jarvis_tools/registry.py

@@ -175,7 +175,15 @@ class ToolRegistry(OutputHandlerProtocol):
         try:
             tool_call, err_msg, auto_completed = self._extract_tool_calls(response)
             if err_msg:
-                return False, err_msg
+                # 只要工具解析错误，追加工具使用帮助信息（相当于一次 <ToolUsage>）
+                try:
+                    from jarvis.jarvis_agent import Agent
+                    agent: Agent = agent_
+                    tool_usage = agent.get_tool_usage_prompt()
+                    return False, f"{err_msg}\n\n{tool_usage}"
+                except Exception:
+                    # 兼容处理：无法获取Agent或ToolUsage时，至少返回工具系统帮助信息
+                    return False, f"{err_msg}\n\n{tool_call_help}"
             result = self.handle_tool_calls(tool_call, agent_)
             if auto_completed:
                 # 如果自动补全了结束标签，在结果中添加说明信息

jarvis/jarvis_utils/config.py

@@ -713,6 +713,16 @@ def get_plan_max_depth() -> int:
         return 2
 
 
+def is_plan_enabled() -> bool:
+    """
+    获取是否默认启用任务规划。
+
+    返回:
+        bool: 如果启用任务规划则返回True，默认为False
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_PLAN_ENABLED", False) is True
+
+
 def get_auto_summary_rounds() -> int:
     """
     获取基于对话轮次的自动总结阈值。
@@ -742,18 +752,18 @@ def get_script_execution_timeout() -> int:
 def is_enable_git_repo_jca_switch() -> bool:
     """
     是否启用：在初始化环境前检测Git仓库并提示可切换到代码开发模式（jca）
-    默认关闭
+    默认开启
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_GIT_JCA_SWITCH", False) is True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_GIT_JCA_SWITCH", True) is True
 
 
 def is_enable_builtin_config_selector() -> bool:
     """
     是否启用：在进入默认通用代理前，列出可用配置（agent/multi_agent/roles）供选择
-    默认关闭
+    默认开启
     """
     return (
-        GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR", False) is True
+        GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR", True) is True
     )
 
 

jarvis/jarvis_utils/git_utils.py

@@ -719,6 +719,45 @@ def confirm_add_new_files() -> None:
             "是否要添加这些变更（如果不需要请修改.gitignore文件以忽略不需要的文件）？",
             False,
         ):
+            # 用户选择 N：自动将未跟踪文件列表添加到仓库根目录的 .gitignore
+            try:
+                repo_root_result = subprocess.run(
+                    ["git", "rev-parse", "--show-toplevel"],
+                    capture_output=True,
+                    text=True,
+                    check=True,
+                )
+                repo_root = repo_root_result.stdout.strip() or "."
+            except Exception:
+                repo_root = "."
+            gitignore_path = os.path.join(repo_root, ".gitignore")
+
+            # 仅对未跟踪的新文件进行忽略（已跟踪文件无法通过 .gitignore 忽略）
+            files_to_ignore = sorted(set(new_files))
+
+            # 读取已存在的 .gitignore 以避免重复添加
+            existing_lines: Set[str] = set()
+            try:
+                if os.path.exists(gitignore_path):
+                    with open(gitignore_path, "r", encoding="utf-8") as f:
+                        existing_lines = set(line.strip() for line in f if line.strip())
+            except Exception:
+                existing_lines = set()
+
+            # 追加未存在的文件路径到 .gitignore（使用相对于仓库根目录的路径）
+            try:
+                with open(gitignore_path, "a", encoding="utf-8") as f:
+                    for file in files_to_ignore:
+                        abs_path = os.path.abspath(file)
+                        rel_path = os.path.relpath(abs_path, repo_root)
+                        # 避免无效的相对路径（不应出现 .. 前缀），有则回退用原始值
+                        entry = rel_path if not rel_path.startswith("..") else file
+                        if entry not in existing_lines:
+                            f.write(entry + "\n")
+                PrettyOutput.print("已将未跟踪文件添加到 .gitignore，正在重新检测...", OutputType.INFO)
+            except Exception as e:
+                PrettyOutput.print(f"更新 .gitignore 失败: {str(e)}", OutputType.WARNING)
+
             continue
 
         break

jarvis/jarvis_utils/utils.py

@@ -464,14 +464,22 @@ def _check_jarvis_updates() -> bool:
     返回:
         bool: 是否需要重启进程
     """
-    script_dir = Path(os.path.dirname(os.path.dirname(__file__)))
+    # 从当前文件目录向上查找包含 .git 的仓库根目录，修复原先只检查 src/jarvis 的问题
+    try:
+        script_path = Path(__file__).resolve()
+        repo_root: Optional[Path] = None
+        for d in [script_path.parent] + list(script_path.parents):
+            if (d / ".git").exists():
+                repo_root = d
+                break
+    except Exception:
+        repo_root = None
 
-    # 先检查是否是git源码安装
-    git_dir = script_dir / ".git"
-    if git_dir.exists():
+    # 先检查是否是git源码安装（找到仓库根目录即认为是源码安装）
+    if repo_root and (repo_root / ".git").exists():
         from jarvis.jarvis_utils.git_utils import check_and_update_git_repo
 
-        return check_and_update_git_repo(str(script_dir))
+        return check_and_update_git_repo(str(repo_root))
 
     # 检查是否是pip/uv pip安装的版本
     return _check_pip_updates()

{jarvis_ai_assistant-0.5.1.dist-info → jarvis_ai_assistant-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.5.1
+Version: 0.6.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,18 @@ 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"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file