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

jarvis/__init__.py

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

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,337 @@ 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 = ""
+                        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", "")
+                    # 描述列显示配置描述；若为 roles 则显示角色列表
+                    if category == "roles":
+                        desc_display = opt.get("details", "")
+                    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 +399,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/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_data/config_schema.json

@@ -235,6 +235,30 @@
       },
       "default": []
     },
+    "JARVIS_AGENT_DEFINITION_DIRS": {
+      "type": "array",
+      "description": "agent 定义加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "JARVIS_MULTI_AGENT_DIRS": {
+      "type": "array",
+      "description": "multi_agent 加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "JARVIS_ROLES_DIRS": {
+      "type": "array",
+      "description": "roles 加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
     "JARVIS_CENTRAL_METHODOLOGY_REPO": {
       "type": "string",
       "description": "中心方法论Git仓库地址，该仓库会自动添加到方法论加载路径中",
@@ -260,6 +284,16 @@
       "description": "是否强制保存记忆",
       "default": true
     },
+    "JARVIS_ENABLE_GIT_JCA_SWITCH": {
+      "type": "boolean",
+      "description": "在初始化环境前检测Git仓库并提示可切换到代码开发模式（jca）",
+      "default": false
+    },
+    "JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR": {
+      "type": "boolean",
+      "description": "在进入默认通用代理前，列出可用配置（agent/multi_agent/roles）供选择",
+      "default": false
+    },
     "JARVIS_TOOL_GROUP": {
       "type": "string",
       "description": "选择一个预定义的工具配置组",

jarvis/jarvis_utils/config.py

@@ -309,6 +309,36 @@ def get_methodology_dirs() -> List[str]:
     return GLOBAL_CONFIG_DATA.get("JARVIS_METHODOLOGY_DIRS", [])
 
 
+def get_agent_definition_dirs() -> List[str]:
+    """
+    获取 agent 定义的加载目录。
+
+    返回:
+        List[str]: agent 定义加载目录列表
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_AGENT_DEFINITION_DIRS", [])
+
+
+def get_multi_agent_dirs() -> List[str]:
+    """
+    获取 multi_agent 的加载目录。
+
+    返回:
+        List[str]: multi_agent 加载目录列表
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_MULTI_AGENT_DIRS", [])
+
+
+def get_roles_dirs() -> List[str]:
+    """
+    获取 roles 的加载目录。
+
+    返回:
+        List[str]: roles 加载目录列表
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_ROLES_DIRS", [])
+
+
 def get_central_methodology_repo() -> str:
     """
     获取中心方法论Git仓库地址。
@@ -576,3 +606,21 @@ def get_tool_dont_use_list() -> List[str]:
     """
     config = _get_resolved_tool_config()
     return config.get("dont_use", [])
+
+
+def is_enable_git_repo_jca_switch() -> bool:
+    """
+    是否启用：在初始化环境前检测Git仓库并提示可切换到代码开发模式（jca）
+    默认关闭
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_GIT_JCA_SWITCH", False) 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
+    )

jarvis/jarvis_utils/input.py

@@ -15,7 +15,7 @@ from colorama import Fore
 from colorama import Style as ColoramaStyle
 from fuzzywuzzy import process
 from prompt_toolkit import PromptSession
-from prompt_toolkit.application import Application
+from prompt_toolkit.application import Application, run_in_terminal
 from prompt_toolkit.completion import CompleteEvent
 from prompt_toolkit.completion import (
     Completer,
@@ -40,6 +40,28 @@ from jarvis.jarvis_utils.tag import ot
 # Sentinel value to indicate that Ctrl+O was pressed
 CTRL_O_SENTINEL = "__CTRL_O_PRESSED__"
 
+# Persistent hint marker for multiline input (shown only once across runs)
+_MULTILINE_HINT_MARK_FILE = os.path.join(get_data_dir(), "multiline_enter_hint_shown")
+
+
+def _multiline_hint_already_shown() -> bool:
+    """Check if the multiline Enter hint has been shown before (persisted)."""
+    try:
+        return os.path.exists(_MULTILINE_HINT_MARK_FILE)
+    except Exception:
+        return False
+
+
+def _mark_multiline_hint_shown() -> None:
+    """Persist that the multiline Enter hint has been shown."""
+    try:
+        os.makedirs(os.path.dirname(_MULTILINE_HINT_MARK_FILE), exist_ok=True)
+        with open(_MULTILINE_HINT_MARK_FILE, "w", encoding="utf-8") as f:
+            f.write("1")
+    except Exception:
+        # Non-critical persistence failure; ignore to avoid breaking input flow
+        pass
+
 
 def get_single_line_input(tip: str, default: str = "") -> str:
     """
@@ -315,8 +337,32 @@ def _get_multiline_input_internal(tip: str) -> str:
     """
     bindings = KeyBindings()
 
+    # Show a one-time hint on the first Enter press in this invocation
+    first_enter_hint_shown = False
+
     @bindings.add("enter")
     def _(event):
+        nonlocal first_enter_hint_shown
+        if not first_enter_hint_shown and not _multiline_hint_already_shown():
+            first_enter_hint_shown = True
+
+            def _show_notice():
+                print(
+                    f"{Fore.YELLOW}提示：当前支持多行输入。输入完成请使用 Ctrl+J 确认；Enter 仅用于换行。{ColoramaStyle.RESET_ALL}"
+                )
+                try:
+                    input("按回车继续...")
+                except Exception:
+                    pass
+                # Persist the hint so it won't be shown again in future runs
+                try:
+                    _mark_multiline_hint_shown()
+                except Exception:
+                    pass
+
+            run_in_terminal(_show_notice)
+            return
+
         if event.current_buffer.complete_state:
             completion = event.current_buffer.complete_state.current_completion
             if completion:
@@ -363,7 +409,7 @@ def get_multiline_input(tip: str) -> str:
     此函数处理控制流，允许在不破坏终端状态的情况下处理历史记录复制。
     """
     PrettyOutput.section(
-        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，Ctrl+O 从历史记录中选择消息复制，按 Ctrl+C/D 取消输入",
+        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 确认，Ctrl+O 从历史记录中选择消息复制，按 Ctrl+C/D 取消输入",
         OutputType.USER,
     )
 
@@ -372,7 +418,7 @@ def get_multiline_input(tip: str) -> str:
 
         if user_input == CTRL_O_SENTINEL:
             _show_history_and_copy()
-            tip = "请继续输入（或按Ctrl+J提交）:"
+            tip = "请继续输入（或按Ctrl+J确认）:"
             continue
         else:
             if not user_input:

jarvis/jarvis_utils/utils.py

@@ -880,12 +880,154 @@ def _load_and_process_config(jarvis_dir: str, config_file: str) -> None:
         config_file: 配置文件路径
     """
     from jarvis.jarvis_utils.input import user_confirm as get_yes_no
+    from jarvis.jarvis_utils.input import get_single_line_input
 
     try:
         content, config_data = _load_config_file(config_file)
         _ensure_schema_declaration(jarvis_dir, config_file, content, config_data)
         set_global_env_data(config_data)
         _process_env_variables(config_data)
+
+        # 首次运行提示：为新功能开关询问用户（默认值见各配置的getter）
+        def _ask_and_set(_key, _tip, _default, _type="bool"):
+            try:
+                if _key in config_data:
+                    return False
+                if _type == "bool":
+                    val = get_yes_no(_tip, default=bool(_default))
+                    config_data[_key] = bool(val)
+                else:
+                    val = get_single_line_input(f"{_tip}", default=str(_default or ""))
+                    config_data[_key] = val.strip()
+                return True
+            except Exception:
+                # 出现异常时按默认值设置，避免中断流程
+                config_data[_key] = (
+                    bool(_default) if _type == "bool" else str(_default or "")
+                )
+                return True
+
+        changed = False
+        # 现有两个开关
+        changed = (
+            _ask_and_set(
+                "JARVIS_ENABLE_GIT_JCA_SWITCH",
+                "是否在检测到Git仓库时，提示并可自动切换到代码开发模式（jca）？",
+                False,
+                "bool",
+            )
+            or changed
+        )
+        changed = (
+            _ask_and_set(
+                "JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR",
+                "在进入默认通用代理前，是否先列出可用配置（agent/multi_agent/roles）供选择？",
+                False,
+                "bool",
+            )
+            or changed
+        )
+
+        # 新增的配置项交互
+        changed = (
+            _ask_and_set(
+                "JARVIS_PRETTY_OUTPUT",
+                "是否启用更美观的终端输出（Pretty Output）？",
+                False,
+                "bool",
+            )
+            or changed
+        )
+        changed = (
+            _ask_and_set(
+                "JARVIS_PRINT_PROMPT",
+                "是否打印发送给模型的提示词（Prompt）？",
+                False,
+                "bool",
+            )
+            or changed
+        )
+        changed = (
+            _ask_and_set(
+                "JARVIS_ENABLE_STATIC_ANALYSIS",
+                "是否启用静态代码分析（Static Analysis）？",
+                True,
+                "bool",
+            )
+            or changed
+        )
+        changed = (
+            _ask_and_set(
+                "JARVIS_USE_METHODOLOGY",
+                "是否启用方法论系统（Methodology）？",
+                True,
+                "bool",
+            )
+            or changed
+        )
+        changed = (
+            _ask_and_set(
+                "JARVIS_USE_ANALYSIS",
+                "是否启用分析流程（Analysis）？",
+                True,
+                "bool",
+            )
+            or changed
+        )
+        changed = (
+            _ask_and_set(
+                "JARVIS_FORCE_SAVE_MEMORY",
+                "是否强制保存会话记忆？",
+                True,
+                "bool",
+            )
+            or changed
+        )
+        changed = (
+            _ask_and_set(
+                "JARVIS_CENTRAL_METHODOLOGY_REPO",
+                "请输入中心方法论仓库地址（可留空跳过）：",
+                "",
+                "str",
+            )
+            or changed
+        )
+        changed = (
+            _ask_and_set(
+                "JARVIS_CENTRAL_TOOL_REPO",
+                "请输入中心工具仓库地址（可留空跳过）：",
+                "",
+                "str",
+            )
+            or changed
+        )
+
+        if changed:
+            # 保留schema声明，如无则自动补充
+            header = ""
+            try:
+                with open(config_file, "r", encoding="utf-8") as rf:
+                    first_line = rf.readline()
+                    if first_line.startswith("# yaml-language-server: $schema="):
+                        header = first_line
+            except Exception:
+                header = ""
+            yaml_str = yaml.dump(config_data, allow_unicode=True, sort_keys=False)
+            if not header:
+                schema_path = Path(
+                    os.path.relpath(
+                        Path(__file__).parent.parent
+                        / "jarvis_data"
+                        / "config_schema.json",
+                        start=jarvis_dir,
+                    )
+                )
+                header = f"# yaml-language-server: $schema={schema_path}\n"
+            with open(config_file, "w", encoding="utf-8") as wf:
+                wf.write(header)
+                wf.write(yaml_str)
+            # 更新全局配置
+            set_global_env_data(config_data)
     except Exception:
         PrettyOutput.print("加载配置文件失败", OutputType.ERROR)
         if get_yes_no("配置文件格式错误，是否删除并重新配置？"):

{jarvis_ai_assistant-0.3.16.dist-info → jarvis_ai_assistant-0.3.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.16
+Version: 0.3.17
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.16.dist-info → jarvis_ai_assistant-0.3.17.dist-info}/RECORD

@@ -1,11 +1,11 @@
-jarvis/__init__.py,sha256=5JlEGGjW7DTnB2ahsKZhnkQHtdqbBlTqmnALZllbEWw,74
+jarvis/__init__.py,sha256=B3aeVws2GyKWNL5gcAastwUvTv8_xzc1QrhuTZ8zGJs,74
 jarvis/jarvis_agent/__init__.py,sha256=CkFa66l5lM0-_zlzApwBxTYbrnbC4_NqdD4QuK3H1VQ,32614
 jarvis/jarvis_agent/agent_manager.py,sha256=YzpMiF0H2-eyk2kn2o24Bkj3bXsQx7Pv2vfD4gWepo0,2893
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=wS-FqpT3pIXwHn1dfL3SpXonUKWgVThbQueUIeyRc2U,2917
 jarvis/jarvis_agent/config_editor.py,sha256=Ctk82sO6w2cNW0-_5L7Bomj-hgM4U7WwMc52fwhAJyg,1809
 jarvis/jarvis_agent/edit_file_handler.py,sha256=w-byNJ4TN_SlV3djjfFC7OksySOFGrM8ku49w662dzc,11854
 jarvis/jarvis_agent/file_methodology_manager.py,sha256=PwDUQwq7HVIyPInsN8fgWyMXLwi8heIXPrqfBZJhVHs,4260
-jarvis/jarvis_agent/jarvis.py,sha256=wi5V-pIMoXuWMcd1JgZ9G912SHnbabrF6osAK-ClcDk,11524
+jarvis/jarvis_agent/jarvis.py,sha256=SrlAZdt6kad78dRbCbIdrus16PL1rE2QE9i54qItSmk,18789
 jarvis/jarvis_agent/main.py,sha256=Hu5u0mq0owuzt965IqaGP6TtVGFXHE4E4Tg1TzCtGYE,3552
 jarvis/jarvis_agent/memory_manager.py,sha256=F7HTNzdN1_-cSygnz7zKSJRJvPLUOosqcXQeiW8zG4U,5266
 jarvis/jarvis_agent/methodology_share_manager.py,sha256=vwWNexluTXSI3qeNP3zJAemOjWW37o_1AlqDR1C8wCI,6910
@@ -13,11 +13,11 @@ jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5p
 jarvis/jarvis_agent/prompt_builder.py,sha256=PH1fPDVa8z_RXkoXHJFNDf8PQjUoLNLYwkh2lC__p40,1705
 jarvis/jarvis_agent/prompts.py,sha256=X6cXa-n0xqBQ8LDTgLsD0kqziAh1s0cNp89i4mxcvHg,9444
 jarvis/jarvis_agent/protocols.py,sha256=JWnJDikFEuwvFUv7uzXu0ggJ4O9K2FkMnfVCwIJ5REw,873
-jarvis/jarvis_agent/session_manager.py,sha256=xPeQcQRBmAlc-CGAzVz4MTOKhZKb27rTS-5De3Oauwg,2713
+jarvis/jarvis_agent/session_manager.py,sha256=5wVcaZGwJ9cEKTQglSbqyxUDJ2fI5KxYN8C8L16UWLw,3024
 jarvis/jarvis_agent/share_manager.py,sha256=wFcdULSog1mMxDyB94ofbqitFL8DCX8i1u6qVzSEuAk,8704
 jarvis/jarvis_agent/shell_input_handler.py,sha256=1IboqdxcJuoIqRpmDU10GugR9fWXUHyCEbVF4nIWbyo,1328
 jarvis/jarvis_agent/task_analyzer.py,sha256=-fQ9YBYFcc-Z1FSoDIPzRfAgkREFoIOXtU2TdBkB-e0,4656
-jarvis/jarvis_agent/task_manager.py,sha256=HJm4_SMpsFbQMUUsAZeHm7cZuhNbz28YW-DRLYgoarc,4422
+jarvis/jarvis_agent/task_manager.py,sha256=IRfkjkeSjSo5rDKmzICdsJtJiVfTOf3Xc13qMVwl5ZM,4689
 jarvis/jarvis_agent/tool_executor.py,sha256=k73cKhZEZpljvui4ZxALlFEIE-iLzJ32Softsmiwzqk,1896
 jarvis/jarvis_agent/tool_share_manager.py,sha256=R5ONIQlDXX9pFq3clwHFhEW8BAJ3ECaR2DqWCEC9tzM,5205
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,7 +44,7 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=aRFYhQQvTgbYd-uY5pc8UHIUA
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZEQXPG1Jqc2sNTGp5c,2355
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
-jarvis/jarvis_data/config_schema.json,sha256=Mw8LveVXoyTaHEgn4d8HOuH-uUEbgjE0yuJJCnppEgo,11700
+jarvis/jarvis_data/config_schema.json,sha256=MdVuj0zSFlo0X5mA-Oxtj0S5tx9GslFN9VInQQwrmbQ,12660
 jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=6PECdAbTbrsJBRLK1pXBh4hdJ_LADh-XXSic1xJi97E,2255
@@ -108,20 +108,20 @@ jarvis/jarvis_tools/cli/main.py,sha256=GsfZJ4OS4Hvxh0H2XiLkgbzm-ajBsb4c0LyjuIAAa
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=4BurljGuiG_I93EBs7mlFlPm9wYC_4CmdTG5tQWpF6g,1712
 jarvis/jarvis_utils/clipboard.py,sha256=WgbQIQR2sh7_5ZzeX04eT3zXx_mxQbKyJOZXgGX_TcI,2907
-jarvis/jarvis_utils/config.py,sha256=HwMd5_JgdqubIo050BDG0kfQ_7ySzzZRPgiGEAWxT8s,16083
+jarvis/jarvis_utils/config.py,sha256=dB6zivA66fPjoTmSXxvu5Y5R0MF-ERP9aUPA4fxkD64,17320
 jarvis/jarvis_utils/embedding.py,sha256=oEOEM2qf16DMYwPsQe6srET9BknyjOdY2ef0jsp3Or8,2714
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
 jarvis/jarvis_utils/git_utils.py,sha256=AkczUiRcGcOnPfz2v3mdLwV1S41IopiAYD2tjeMTDrE,23586
 jarvis/jarvis_utils/globals.py,sha256=aTrOHcCgPAeZFLFIWMAMiJCYlmr4XhdFZf5gZ745hnE,8900
 jarvis/jarvis_utils/http.py,sha256=eRhV3-GYuWmQ0ogq9di9WMlQkFcVb1zGCrySnOgT1x0,4392
-jarvis/jarvis_utils/input.py,sha256=pl8SanShzaEJZybvNHTjnFdKC2VxDPS1IwONtbwe-7U,12765
+jarvis/jarvis_utils/input.py,sha256=YO1jdK9HObkGO44XfXHNNN3HNneD_WrbANYkfJmrdJU,14489
 jarvis/jarvis_utils/methodology.py,sha256=IIMU17WVSunsWXsnXROd4G77LxgYs4xEC_xm_0CDkjw,12554
 jarvis/jarvis_utils/output.py,sha256=QRLlKObQKT0KuRSeZRqYb7NlTQvsd1oZXZ41WxeWEuU,10894
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
-jarvis/jarvis_utils/utils.py,sha256=LiVui9RMsbfUdzbvBBwbGNC4uniGnLp3LFsk7LXGrQE,47370
-jarvis_ai_assistant-0.3.16.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.16.dist-info/METADATA,sha256=wawbsyujbiRROXrHycIuMhIZsvp2hbt3UT5Mco3xPw4,18216
-jarvis_ai_assistant-0.3.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.16.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.16.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.16.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=UMDOAQsIdlgobTN14ToKarLq3HeKUQrhUsSbfrFUPYo,52132
+jarvis_ai_assistant-0.3.17.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.17.dist-info/METADATA,sha256=Vb3yaWH1VcDsh5G_4EAt4UzSZS1N_HZ22wdzyJN05x8,18216
+jarvis_ai_assistant-0.3.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.17.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.17.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.17.dist-info/RECORD,,