jarvis-ai-assistant 0.3.16__py3-none-any.whl → 0.3.18__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -791,6 +791,8 @@ class Agent:
         set_interrupt(False)
         user_input = self.multiline_inputer(f"模型交互期间被中断，请输入用户干预信息：")
 
+        self.run_input_handlers_next_turn = True
+
         if not user_input:
             # 用户输入为空，完成任务
             return self._complete_task(auto_completed=False)

jarvis/jarvis_agent/jarvis.py

@@ -10,6 +10,14 @@ from jarvis.jarvis_agent.config_editor import ConfigEditor
 from jarvis.jarvis_agent.methodology_share_manager import MethodologyShareManager
 from jarvis.jarvis_agent.tool_share_manager import ToolShareManager
 from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.config import (
+    is_enable_git_repo_jca_switch,
+    is_enable_builtin_config_selector,
+    get_agent_definition_dirs,
+    get_multi_agent_dirs,
+    get_roles_dirs,
+)
+import jarvis.jarvis_utils.utils as jutils
 from jarvis.jarvis_utils.input import user_confirm, get_single_line_input
 import os
 import sys
@@ -22,6 +30,347 @@ from rich.console import Console
 app = typer.Typer(help="Jarvis AI 助手")
 
 
+def print_commands_overview() -> None:
+    """打印命令与快捷方式总览表。"""
+    try:
+        cmd_table = Table(show_header=True, header_style="bold magenta")
+        cmd_table.add_column("命令", style="bold")
+        cmd_table.add_column("快捷方式", style="cyan")
+        cmd_table.add_column("功能描述", style="white")
+
+        cmd_table.add_row("jarvis", "jvs", "通用AI代理，适用于多种任务")
+        cmd_table.add_row("jarvis-agent", "ja", "AI代理基础功能，处理会话和任务")
+        cmd_table.add_row(
+            "jarvis-code-agent",
+            "jca",
+            "专注于代码分析、修改和生成的代码代理",
+        )
+        cmd_table.add_row("jarvis-code-review", "jcr", "智能代码审查工具")
+        cmd_table.add_row(
+            "jarvis-git-commit",
+            "jgc",
+            "自动化分析代码变更并生成规范的Git提交信息",
+        )
+        cmd_table.add_row("jarvis-git-squash", "jgs", "Git提交历史整理工具")
+        cmd_table.add_row(
+            "jarvis-platform-manager",
+            "jpm",
+            "管理和测试不同的大语言模型平台",
+        )
+        cmd_table.add_row("jarvis-multi-agent", "jma", "多智能体协作系统")
+        cmd_table.add_row("jarvis-tool", "jt", "工具管理与调用系统")
+        cmd_table.add_row("jarvis-methodology", "jm", "方法论知识库管理")
+        cmd_table.add_row(
+            "jarvis-rag",
+            "jrg",
+            "构建和查询本地化的RAG知识库",
+        )
+        cmd_table.add_row("jarvis-smart-shell", "jss", "实验性的智能Shell功能")
+        cmd_table.add_row(
+            "jarvis-stats",
+            "jst",
+            "通用统计模块，支持记录和可视化任意指标数据",
+        )
+        cmd_table.add_row(
+            "jarvis-memory-organizer",
+            "jmo",
+            "记忆管理工具，支持整理、合并、导入导出记忆",
+        )
+
+        Console().print(cmd_table)
+    except Exception:
+        # 静默忽略渲染异常，避免影响主流程
+        pass
+
+def handle_edit_option(edit: bool, config_file: Optional[str]) -> bool:
+    """处理配置文件编辑选项，返回是否已处理并需提前结束。"""
+    if edit:
+        ConfigEditor.edit_config(config_file)
+        return True
+    return False
+
+
+def handle_share_methodology_option(
+    share_methodology: bool, config_file: Optional[str]
+) -> bool:
+    """处理方法论分享选项，返回是否已处理并需提前结束。"""
+    if share_methodology:
+        init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
+        methodology_manager = MethodologyShareManager()
+        methodology_manager.run()
+        return True
+    return False
+
+
+def handle_share_tool_option(share_tool: bool, config_file: Optional[str]) -> bool:
+    """处理工具分享选项，返回是否已处理并需提前结束。"""
+    if share_tool:
+        init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
+        tool_manager = ToolShareManager()
+        tool_manager.run()
+        return True
+    return False
+
+
+def preload_config_for_flags(config_file: Optional[str]) -> None:
+    """预加载配置（仅用于读取功能开关），不会显示欢迎信息或影响后续 init_env。"""
+    try:
+        jutils.g_config_file = config_file
+        jutils.load_config()
+    except Exception:
+        # 静默忽略配置加载异常
+        pass
+
+
+def try_switch_to_jca_if_git_repo(
+    llm_type: str,
+    model_group: Optional[str],
+    tool_group: Optional[str],
+    config_file: Optional[str],
+    restore_session: bool,
+    task: Optional[str],
+) -> None:
+    """在初始化环境前检测Git仓库，并可选择自动切换到代码开发模式（jca）。"""
+    if is_enable_git_repo_jca_switch():
+        try:
+            res = subprocess.run(
+                ["git", "rev-parse", "--show-toplevel"],
+                capture_output=True,
+                text=True,
+            )
+            if res.returncode == 0:
+                git_root = res.stdout.strip()
+                if git_root and os.path.isdir(git_root):
+                    PrettyOutput.print(
+                        f"检测到当前位于 Git 仓库: {git_root}", OutputType.INFO
+                    )
+                    if user_confirm(
+                        "检测到Git仓库，是否切换到代码开发模式（jca）？", default=False
+                    ):
+                        # 构建并切换到 jarvis-code-agent 命令，传递兼容参数
+                        args = ["jarvis-code-agent"]
+                        if llm_type:
+                            args += ["-t", llm_type]
+                        if model_group:
+                            args += ["-g", model_group]
+                        if tool_group:
+                            args += ["-G", tool_group]
+                        if config_file:
+                            args += ["-f", config_file]
+                        if restore_session:
+                            args += ["--restore-session"]
+                        if task:
+                            args += ["-r", task]
+                        PrettyOutput.print(
+                            "正在切换到 'jca'（jarvis-code-agent）以进入代码开发模式...",
+                            OutputType.INFO,
+                        )
+                        os.execvp(args[0], args)
+        except Exception:
+            # 静默忽略检测异常，不影响主流程
+            pass
+
+
+def handle_builtin_config_selector(
+    llm_type: str,
+    model_group: Optional[str],
+    tool_group: Optional[str],
+    config_file: Optional[str],
+    task: Optional[str],
+) -> None:
+    """在进入默认通用代理前，列出内置配置供选择（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")
+
+            categories = [
+                ("agent", "jarvis-agent", "*.yaml"),
+                ("multi_agent", "jarvis-multi-agent", "*.yaml"),
+                ("roles", "jarvis-platform-manager", "*.yaml"),
+            ]
+
+            options = []
+            for cat, cmd, pattern in categories:
+                # 构建待扫描目录列表：优先使用配置中的目录，其次回退到内置目录
+                search_dirs = []
+                try:
+                    if cat == "agent":
+                        search_dirs.extend(
+                            [Path(p) for p in get_agent_definition_dirs() if p]
+                        )
+                    elif cat == "multi_agent":
+                        search_dirs.extend(
+                            [Path(p) for p in get_multi_agent_dirs() if p]
+                        )
+                    elif cat == "roles":
+                        search_dirs.extend([Path(p) for p in get_roles_dirs() if p])
+                except Exception:
+                    # 忽略配置读取异常
+                    pass
+
+                # 追加内置目录
+                search_dirs.append(builtin_root / cat)
+
+                # 去重并保留顺序
+                unique_dirs = []
+                seen = set()
+                for d in search_dirs:
+                    try:
+                        key = str(Path(d).resolve())
+                    except Exception:
+                        key = str(d)
+                    if key not in seen:
+                        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)
+                except Exception:
+                    # 忽略更新过程中的所有异常，避免影响主流程
+                    pass
+
+                for dir_path in unique_dirs:
+                    if not dir_path.exists():
+                        continue
+                    for fpath in sorted(dir_path.glob(pattern)):
+                        # 解析YAML以获取可读名称/描述（失败时静默降级为文件名）
+                        name = fpath.stem
+                        desc = ""
+                        roles_count = 0
+                        try:
+                            with open(
+                                fpath, "r", encoding="utf-8", errors="ignore"
+                            ) as fh:
+                                data = yaml.safe_load(fh) or {}
+                            if isinstance(data, dict):
+                                name = data.get("name") or data.get("title") or name
+                                desc = data.get("description") or data.get("desc") or ""
+                                if cat == "roles" and isinstance(
+                                    data.get("roles"), list
+                                ):
+                                    roles_count = len(data["roles"])
+                                    if not desc:
+                                        desc = f"{roles_count} 个角色"
+                        except Exception:
+                            # 忽略解析错误，使用默认显示
+                            pass
+
+                        # 为 roles 构建详细信息（每个角色的名称与描述）
+                        details = ""
+                        if cat == "roles":
+                            roles = (data or {}).get("roles", [])
+                            if isinstance(roles, list):
+                                lines = []
+                                for role in roles:
+                                    if isinstance(role, dict):
+                                        rname = str(role.get("name", "") or "")
+                                        rdesc = str(role.get("description", "") or "")
+                                        lines.append(
+                                            f"{rname} - {rdesc}" if rdesc else rname
+                                        )
+                                details = "\n".join([ln for ln in lines if ln])
+                            # 如果没有角色详情，退回到统计信息
+                            if not details and isinstance(
+                                (data or {}).get("roles"), list
+                            ):
+                                details = f"{len(data['roles'])} 个角色"
+
+                        options.append(
+                            {
+                                "category": cat,
+                                "cmd": cmd,
+                                "file": str(fpath),
+                                "name": str(name),
+                                "desc": str(desc),
+                                "details": str(details),
+                                "roles_count": int(roles_count),
+                            }
+                        )
+
+            if options:
+                PrettyOutput.section("可用的内置配置", OutputType.SUCCESS)
+                # 使用 rich Table 呈现
+                table = Table(show_header=True, header_style="bold magenta")
+                table.add_column("No.", style="cyan", no_wrap=True)
+                table.add_column("类型", style="green", no_wrap=True)
+                table.add_column("名称", style="bold")
+                table.add_column("文件", style="dim")
+                table.add_column("描述", style="white")
+
+                for idx, opt in enumerate(options, 1):
+                    category = opt.get("category", "")
+                    name = opt.get("name", "")
+                    file_path = opt.get("file", "")
+                    # 描述列显示配置描述；若为 roles 同时显示角色数量与列表
+                    if category == "roles":
+                        count = opt.get("roles_count")
+                        details = opt.get("details", "")
+                        parts = []
+                        if isinstance(count, int) and count > 0:
+                            parts.append(f"{count} 个角色")
+                        if details:
+                            parts.append(details)
+                        desc_display = "\n".join(parts) if parts else ""
+                    else:
+                        desc_display = opt.get("desc", "")
+                    table.add_row(str(idx), category, name, file_path, desc_display)
+
+                Console().print(table)
+
+                choice = get_single_line_input(
+                    "选择要启动的配置编号，直接回车使用默认通用代理(jvs): ", default=""
+                )
+
+                if choice.strip():
+                    try:
+                        index = int(choice.strip())
+                        if 1 <= index <= len(options):
+                            sel = options[index - 1]
+                            args = []
+
+                            if sel["category"] == "agent":
+                                # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
+                                args = [sel["cmd"], "-c", sel["file"]]
+                                if llm_type:
+                                    args += ["--llm-type", llm_type]
+                                if model_group:
+                                    args += ["-g", model_group]
+                                if config_file:
+                                    args += ["-f", config_file]
+                                if task:
+                                    args += ["--task", task]
+
+                            elif sel["category"] == "multi_agent":
+                                # jarvis-multi-agent 需要 -c/--config，用户输入通过 -i/--input 传递
+                                args = [sel["cmd"], "-c", sel["file"]]
+                                if task:
+                                    args += ["-i", task]
+
+                            elif sel["category"] == "roles":
+                                # jarvis-platform-manager role 子命令，支持 -c/-t/-g
+                                args = [sel["cmd"], "role", "-c", sel["file"]]
+                                if llm_type:
+                                    args += ["-t", llm_type]
+                                if model_group:
+                                    args += ["-g", model_group]
+
+                            if args:
+                                PrettyOutput.print(
+                                    f"正在启动: {' '.join(args)}", OutputType.INFO
+                                )
+                                os.execvp(args[0], args)
+                    except Exception:
+                        # 任何异常都不影响默认流程
+                        pass
+        except Exception:
+            # 静默忽略内置配置扫描错误，不影响主流程
+            pass
+
+
 @app.callback(invoke_without_command=True)
 def run_cli(
     ctx: typer.Context,
@@ -60,200 +409,31 @@ def run_cli(
     if ctx.invoked_subcommand is not None:
         return
 
+    # 使用 rich 输出命令与快捷方式总览
+    print_commands_overview()
+
     # 处理配置文件编辑
-    if edit:
-        ConfigEditor.edit_config(config_file)
+    if handle_edit_option(edit, config_file):
         return
 
     # 处理方法论分享
-    if share_methodology:
-        init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
-        methodology_manager = MethodologyShareManager()
-        methodology_manager.run()
+    if handle_share_methodology_option(share_methodology, config_file):
         return
 
     # 处理工具分享
-    if share_tool:
-        init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
-        tool_manager = ToolShareManager()
-        tool_manager.run()
+    if handle_share_tool_option(share_tool, config_file):
         return
 
+    # 预加载配置（仅用于读取功能开关），不会显示欢迎信息或影响后续 init_env
+    preload_config_for_flags(config_file)
+
     # 在初始化环境前检测Git仓库，并可选择自动切换到代码开发模式（jca）
-    try:
-        res = subprocess.run(
-            ["git", "rev-parse", "--show-toplevel"],
-            capture_output=True,
-            text=True,
-        )
-        if res.returncode == 0:
-            git_root = res.stdout.strip()
-            if git_root and os.path.isdir(git_root):
-                PrettyOutput.print(
-                    f"检测到当前位于 Git 仓库: {git_root}", OutputType.INFO
-                )
-                if user_confirm(
-                    "检测到Git仓库，是否切换到代码开发模式（jca）？", default=False
-                ):
-                    # 构建并切换到 jarvis-code-agent 命令，传递兼容参数
-                    args = ["jarvis-code-agent"]
-                    if llm_type:
-                        args += ["-t", llm_type]
-                    if model_group:
-                        args += ["-g", model_group]
-                    if tool_group:
-                        args += ["-G", tool_group]
-                    if config_file:
-                        args += ["-f", config_file]
-                    if restore_session:
-                        args += ["--restore-session"]
-                    if task:
-                        args += ["-r", task]
-                    PrettyOutput.print(
-                        "正在切换到 'jca'（jarvis-code-agent）以进入代码开发模式...",
-                        OutputType.INFO,
-                    )
-                    os.execvp(args[0], args)
-    except Exception:
-        # 静默忽略检测异常，不影响主流程
-        pass
+    try_switch_to_jca_if_git_repo(
+        llm_type, model_group, tool_group, config_file, restore_session, task
+    )
 
     # 在进入默认通用代理前，列出内置配置供选择（agent/multi_agent/roles）
-    try:
-        # 优先使用项目内置目录，若不存在则回退到指定的绝对路径
-        builtin_root = Path(__file__).resolve().parents[3] / "builtin"
-        if not builtin_root.exists():
-            builtin_root = Path("/home/skyfire/code/Jarvis/builtin")
-
-        categories = [
-            ("agent", "jarvis-agent", "*.yaml"),
-            ("multi_agent", "jarvis-multi-agent", "*.yaml"),
-            ("roles", "jarvis-platform-manager", "*.yaml"),
-        ]
-
-        options = []
-        for cat, cmd, pattern in categories:
-            dir_path = builtin_root / cat
-            if not dir_path.exists():
-                continue
-            for fpath in sorted(dir_path.glob(pattern)):
-                # 解析YAML以获取可读名称/描述（失败时静默降级为文件名）
-                name = fpath.stem
-                desc = ""
-                try:
-                    with open(fpath, "r", encoding="utf-8", errors="ignore") as fh:
-                        data = yaml.safe_load(fh) or {}
-                    if isinstance(data, dict):
-                        name = data.get("name") or data.get("title") or name
-                        desc = data.get("description") or data.get("desc") or ""
-                        if cat == "roles" and isinstance(data.get("roles"), list):
-                            if not desc:
-                                desc = f"{len(data['roles'])} 个角色"
-                except Exception:
-                    # 忽略解析错误，使用默认显示
-                    pass
-
-                # 为 roles 构建详细信息（每个角色的名称与描述）
-                details = ""
-                if cat == "roles":
-                    roles = (data or {}).get("roles", [])
-                    if isinstance(roles, list):
-                        lines = []
-                        for role in roles:
-                            if isinstance(role, dict):
-                                rname = str(role.get("name", "") or "")
-                                rdesc = str(role.get("description", "") or "")
-                                lines.append(f"{rname} - {rdesc}" if rdesc else rname)
-                        details = "\n".join([ln for ln in lines if ln])
-                    # 如果没有角色详情，退回到统计信息
-                    if not details and isinstance((data or {}).get("roles"), list):
-                        details = f"{len(data['roles'])} 个角色"
-
-                options.append(
-                    {
-                        "category": cat,
-                        "cmd": cmd,
-                        "file": str(fpath),
-                        "name": str(name),
-                        "desc": str(desc),
-                        "details": str(details),
-                    }
-                )
-
-        if options:
-            PrettyOutput.section("可用的内置配置", OutputType.SUCCESS)
-            # 使用 rich Table 呈现
-            table = Table(show_header=True, header_style="bold magenta")
-            table.add_column("No.", style="cyan", no_wrap=True)
-            table.add_column("类型", style="green", no_wrap=True)
-            table.add_column("名称", style="bold")
-            table.add_column("文件", style="dim")
-            table.add_column("描述/详情", style="white")
-
-            for idx, opt in enumerate(options, 1):
-                category = opt.get("category", "")
-                name = opt.get("name", "")
-                file_path = opt.get("file", "")
-                # multi_agent: 优先显示顶层描述
-                # roles: 显示每个角色名称与描述（多行）
-                # 其他：显示 desc
-                if category == "roles" and opt.get("details"):
-                    detail = opt["details"]
-                else:
-                    detail = opt.get("desc", "")
-
-                table.add_row(str(idx), category, name, file_path, detail)
-
-            Console().print(table)
-
-            choice = get_single_line_input(
-                "选择要启动的配置编号，直接回车使用默认通用代理(jvs): ", default=""
-            )
-
-            if choice.strip():
-                try:
-                    index = int(choice.strip())
-                    if 1 <= index <= len(options):
-                        sel = options[index - 1]
-                        args = []
-
-                        if sel["category"] == "agent":
-                            # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
-                            args = [sel["cmd"], "-c", sel["file"]]
-                            if llm_type:
-                                args += ["--llm-type", llm_type]
-                            if model_group:
-                                args += ["-g", model_group]
-                            if config_file:
-                                args += ["-f", config_file]
-                            if task:
-                                args += ["--task", task]
-
-                        elif sel["category"] == "multi_agent":
-                            # jarvis-multi-agent 需要 -c/--config，用户输入通过 -i/--input 传递
-                            args = [sel["cmd"], "-c", sel["file"]]
-                            if task:
-                                args += ["-i", task]
-
-                        elif sel["category"] == "roles":
-                            # jarvis-platform-manager role 子命令，支持 -c/-t/-g
-                            args = [sel["cmd"], "role", "-c", sel["file"]]
-                            if llm_type:
-                                args += ["-t", llm_type]
-                            if model_group:
-                                args += ["-g", model_group]
-
-                        if args:
-                            PrettyOutput.print(
-                                f"正在启动: {' '.join(args)}", OutputType.INFO
-                            )
-                            os.execvp(args[0], args)
-                except Exception:
-                    # 任何异常都不影响默认流程
-                    pass
-    except Exception:
-        # 静默忽略内置配置扫描错误，不影响主流程
-        pass
+    handle_builtin_config_selector(llm_type, model_group, tool_group, config_file, task)
 
     # 初始化环境
     init_env(

jarvis/jarvis_agent/methodology_share_manager.py

@@ -151,12 +151,12 @@ class MethodologyShareManager(ShareManager):
                     "没有找到新的方法论文件（所有方法论可能已存在于中心仓库）",
                     OutputType.WARNING,
                 )
-                raise typer.Exit(code=0)
+                return
 
             # 选择要分享的资源
             selected_resources = self.select_resources(local_resources)
             if not selected_resources:
-                raise typer.Exit(code=0)
+                return
 
             # 分享资源
             copied_list = self.share_resources(selected_resources)

jarvis/jarvis_agent/session_manager.py

@@ -67,10 +67,18 @@ class SessionManager:
             return True
         return False
 
-    def clear_history(self):
+    def clear_history(self) -> None:
         """
         Clears conversation history but keeps the system prompt by resetting the model state.
         """
         self.prompt = ""
         self.model.reset()
         self.conversation_length = 0
+
+    def clear(self) -> None:
+        """
+        Clears the session state, resetting prompt and conversation length while
+        preserving user_data. This method is an alias of clear_history for backward
+        compatibility with existing tests and callers.
+        """
+        self.clear_history()

jarvis/jarvis_agent/task_manager.py

@@ -3,8 +3,10 @@
 import os
 from typing import Dict
 
-import yaml
+import yaml  # type: ignore
 from prompt_toolkit import prompt
+from rich.table import Table
+from rich.console import Console
 
 from jarvis.jarvis_agent import (
     OutputType,
@@ -68,16 +70,19 @@ class TaskManager:
             return ""
 
         task_names = list(tasks.keys())
-        task_list = ["可用任务:"]
+        # 使用 rich.Table 展示预定义任务
+        table = Table(show_header=True, header_style="bold magenta")
+        table.add_column("No.", style="cyan", no_wrap=True)
+        table.add_column("任务名", style="bold")
         for i, name in enumerate(task_names, 1):
-            task_list.append(f"[{i}] {name}")
-        task_list.append("[0] 跳过预定义任务")
-        PrettyOutput.print("\n".join(task_list), OutputType.INFO)
+            table.add_row(str(i), name)
+        Console().print(table)
+        PrettyOutput.print("[0] 跳过预定义任务", OutputType.INFO)
 
         while True:
             try:
                 choice_str = prompt(
-                    "\n请选择一个任务编号（0 跳过预定义任务）："
+                    "\n请选择一个任务编号（0 或者直接回车跳过预定义任务）："
                 ).strip()
                 if not choice_str:
                     return ""

jarvis/jarvis_agent/tool_share_manager.py

@@ -112,12 +112,12 @@ class ToolShareManager(ShareManager):
                     "没有找到新的工具文件（所有工具可能已存在于中心仓库）",
                     OutputType.WARNING,
                 )
-                raise typer.Exit(code=0)
+                return
 
             # 选择要分享的资源
             selected_resources = self.select_resources(local_resources)
             if not selected_resources:
-                raise typer.Exit(code=0)
+                return
 
             # 分享资源
             moved_list = self.share_resources(selected_resources)