jarvis-ai-assistant 0.5.1__tar.gz → 0.6.0__tar.gz

{jarvis_ai_assistant-0.5.1/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.6.0}/PKG-INFO

@@ -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

{jarvis_ai_assistant-0.5.1 → jarvis_ai_assistant-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.5.1"
+version = "0.6.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,12 @@ rag = [
     "unstructured[md]",
     "rank-bm25",
 ]
+clang16 = ["clang==16.*"]
+clang17 = ["clang==17.*"]
+clang18 = ["clang==18.*"]
+clang19 = ["clang==19.*"]
+clang20 = ["clang==20.*"]
+clang21 = ["clang==21.*"]
 
 [project.urls]
 Homepage = "https://github.com/skyfireitdiy/Jarvis"
@@ -98,6 +104,10 @@ 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.1 → jarvis_ai_assistant-0.6.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.5.1",
+    version="0.6.0",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -53,6 +53,12 @@ setup(
             "rank-bm25",
             "pathspec",
         ],
+        "clang16": ["clang==16.*"],
+        "clang17": ["clang==17.*"],
+        "clang18": ["clang==18.*"],
+        "clang19": ["clang==19.*"],
+        "clang20": ["clang==20.*"],
+        "clang21": ["clang==21.*"],
     },
     entry_points={
         "console_scripts": [
@@ -86,6 +92,8 @@ setup(
             "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.1 → jarvis_ai_assistant-0.6.0}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.5.1 → jarvis_ai_assistant-0.6.0}/src/jarvis/jarvis_agent/__init__.py

@@ -77,6 +77,7 @@ from jarvis.jarvis_utils.config import (
     get_tool_filter_threshold,
     get_after_tool_call_cb_dirs,
     get_plan_max_depth,
+    is_plan_enabled,
 )
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.globals import (
@@ -317,11 +318,12 @@ 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: bool = False,
+        plan: Optional[bool] = None,
         plan_max_depth: Optional[int] = None,
         plan_depth: int = 0,
         agent_type: str = "normal",
@@ -344,7 +346,7 @@ class Agent:
             force_save_memory: 是否强制保存记忆
             confirm_callback: 用户确认回调函数，签名为 (tip: str, default: bool) -> bool；默认使用CLI的user_confirm
             non_interactive: 是否以非交互模式运行（优先级最高，覆盖环境变量与配置）
-            plan: 是否启用任务规划与子任务拆分（默认 False；启用后在进入主循环前评估是否需要将任务拆分为 <SUB_TASK> 列表，逐一由子Agent执行并汇总结果）
+            plan: 是否启用任务规划与子任务拆分（默认从配置加载；启用后在进入主循环前评估是否需要将任务拆分为 <SUB_TASK> 列表，逐一由子Agent执行并汇总结果）
             plan_max_depth: 任务规划的最大层数（默认3，可通过配置 JARVIS_PLAN_MAX_DEPTH 或入参覆盖）
             plan_depth: 当前规划层数（内部用于递归控制，子Agent会在父基础上+1）
         """
@@ -363,6 +365,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 []
@@ -370,7 +373,8 @@ class Agent:
         self.non_interactive = non_interactive
         # 多智能体运行标志：用于控制非交互模式下的自动完成行为
         self.in_multi_agent = bool(in_multi_agent)
-        self.plan = bool(plan)
+        # 任务规划：优先使用入参，否则回退到配置
+        self.plan = bool(plan) if plan is not None else is_plan_enabled()
         # 规划深度与上限
         try:
             self.plan_max_depth = (
@@ -511,7 +515,13 @@ class Agent:
         use_tools: List[str],
     ):
         """初始化各种处理器"""
-        self.output_handler = output_handler or [ToolRegistry(),  EditFileHandler(), RewriteFileHandler()]
+        default_handlers = [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,
@@ -1238,6 +1248,7 @@ class Agent:
             "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,

{jarvis_ai_assistant-0.5.1 → jarvis_ai_assistant-0.6.0}/src/jarvis/jarvis_agent/agent_manager.py

@@ -32,6 +32,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 +44,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 +63,7 @@ class AgentManager:
             multiline_inputer=self.multiline_inputer,
             confirm_callback=self.confirm_callback,
             non_interactive=self.non_interactive,
+            plan=self.plan,
         )
 
         # 尝试恢复会话

{jarvis_ai_assistant-0.5.1 → jarvis_ai_assistant-0.6.0}/src/jarvis/jarvis_agent/jarvis.py

@@ -370,10 +370,30 @@ def handle_builtin_config_selector(
     """在进入默认通用代理前，列出内置配置供选择（agent/multi_agent/roles）。"""
     if is_enable_builtin_config_selector():
         try:
-            # 优先使用项目内置目录，若不存在则回退到指定的绝对路径
-            builtin_root = Path(__file__).resolve().parents[3] / "builtin"
-            if not builtin_root.exists():
-                builtin_root = Path("/home/skyfire/code/Jarvis/builtin")
+            # 查找可用的 builtin 目录（支持多候选）
+            builtin_dirs: List[Path] = []
+            try:
+                ancestors = list(Path(__file__).resolve().parents)
+                for anc in ancestors[:8]:
+                    p = anc / "builtin"
+                    if p.exists():
+                        builtin_dirs.append(p)
+            except Exception:
+                pass
+            # 去重，保留顺序
+            _seen = set()
+            _unique: List[Path] = []
+            for d in builtin_dirs:
+                try:
+                    key = str(d.resolve())
+                except Exception:
+                    key = str(d)
+                if key not in _seen:
+                    _seen.add(key)
+                    _unique.append(d)
+            builtin_dirs = _unique
+            # 向后兼容：保留第一个候选作为 builtin_root
+            builtin_root = builtin_dirs[0] if builtin_dirs else None  # type: ignore[assignment]
 
             categories = [
                 ("agent", "jarvis-agent", "*.yaml"),
@@ -414,8 +434,14 @@ def handle_builtin_config_selector(
                     # 忽略配置读取异常
                     pass
 
-                # 追加内置目录
-                search_dirs.append(builtin_root / cat)
+                # 追加内置目录（支持多个候选）
+                try:
+                    candidates = builtin_dirs if isinstance(builtin_dirs, list) and builtin_dirs else ([builtin_root] if builtin_root else [])
+                except Exception:
+                    candidates = ([builtin_root] if builtin_root else [])
+                for _bd in candidates:
+                    if _bd:
+                        search_dirs.append(Path(_bd) / cat)
 
                 # 去重并保留顺序
                 unique_dirs = []
@@ -429,11 +455,14 @@ def handle_builtin_config_selector(
                         seen.add(key)
                         unique_dirs.append(Path(d))
 
-                # 每日自动更新配置目录（如目录为Git仓库则执行git pull，每日仅一次）
+                # 可选调试输出：查看每类的搜索目录
                 try:
-                    jutils.daily_check_git_updates([str(p) for p in unique_dirs], cat)
+                    if os.environ.get("JARVIS_DEBUG_BUILTIN_SELECTOR") == "1":
+                        PrettyOutput.print(
+                            f"DEBUG: category={cat} search_dirs=" + ", ".join(str(p) for p in unique_dirs),
+                            OutputType.INFO,
+                        )
                 except Exception:
-                    # 忽略更新过程中的所有异常，避免影响主流程
                     pass
 
                 for dir_path in unique_dirs:
@@ -681,7 +710,7 @@ def run_cli(
     non_interactive: bool = typer.Option(
         False, "-n", "--non-interactive", help="启用非交互模式：用户无法与命令交互，脚本执行超时限制为5分钟"
     ),
-    plan: bool = typer.Option(False, "--plan/--no-plan", help="启用或禁用任务规划（拆分子任务并汇总执行结果）"),
+    plan: Optional[bool] = typer.Option(None, "--plan/--no-plan", help="启用或禁用任务规划（不指定则从配置加载）"),
     web: bool = typer.Option(False, "--web", help="以 Web 模式启动，通过浏览器 WebSocket 交互"),
     web_host: str = typer.Option("127.0.0.1", "--web-host", help="Web 服务主机"),
     web_port: int = typer.Option(8765, "--web-port", help="Web 服务端口"),
@@ -1024,10 +1053,11 @@ def run_cli(
         )
         agent = agent_manager.initialize()
         # CLI 开关：启用/禁用规划（不依赖 AgentManager 支持，直接设置 Agent 属性）
-        try:
-            agent.plan = bool(plan)
-        except Exception:
-            pass
+        if plan is not None:
+            try:
+                agent.plan = bool(plan)
+            except Exception:
+                pass
 
         if web:
             try:

{jarvis_ai_assistant-0.5.1 → jarvis_ai_assistant-0.6.0}/src/jarvis/jarvis_agent/run_loop.py

@@ -125,7 +125,12 @@ class AgentRunLoop:
 
                 # 检查自动完成
                 if ag.auto_complete and is_auto_complete(current_response):
-                    return ag._complete_task(auto_completed=True)
+                    # 先运行_complete_task，触发记忆整理/事件等副作用，再决定返回值
+                    result = ag._complete_task(auto_completed=True)
+                    # 若不需要summary，则将最后一条LLM输出作为返回值
+                    if not getattr(ag, "need_summary", True):
+                        return current_response
+                    return result
 
                 # 获取下一步用户输入
                 next_action = ag._get_next_user_action()

{jarvis_ai_assistant-0.5.1 → jarvis_ai_assistant-0.6.0}/src/jarvis/jarvis_agent/task_planner.py

@@ -75,6 +75,7 @@ class TaskPlanner:
                 "<PLAN>\n- 子任务1\n- 子任务2\n</PLAN>\n"
                 "示例：\n"
                 "<PLAN>\n- 分析当前任务，提取需要修改的文件列表\n- 修改配置默认值并更新相关 schema\n- 更新文档中对该默认值的描述\n</PLAN>\n"
+                "注意：不要将步骤拆分太细，一般不要超过4个步骤。\n"
                 "要求：<PLAN> 内必须是有效 YAML 列表，仅包含字符串项；禁止输出任何额外解释。\n"
                 "当不需要拆分时，仅输出：\n<DONT_NEED/>\n"
                 "禁止输出任何额外解释。"

jarvis_ai_assistant-0.6.0/src/jarvis/jarvis_c2rust/__init__.py

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+"""
+Jarvis C2Rust 工具集。
+
+模块:
+- scanner: C/C++ 函数扫描器和调用图提取器，将结果存储在
+           <scan_root>/.jarvis/c2rust/functions.jsonl 和 types.jsonl 的 JSONL 文件中。
+
+用法:
+  python -m jarvis.jarvis_c2rust.scanner --root /path/to/src
+"""
+
+__all__ = ["scanner"]