jarvis-ai-assistant 0.3.20__py3-none-any.whl → 0.3.22__py3-none-any.whl

jarvis/jarvis_utils/utils.py

@@ -29,6 +29,9 @@ from jarvis.jarvis_utils.globals import get_in_chat, get_interrupt, set_interrup
 from jarvis.jarvis_utils.input import user_confirm
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+# 向后兼容：导出 get_yes_no 供外部模块引用
+get_yes_no = user_confirm
+
 g_config_file = None
 
 COMMAND_MAPPING = {
@@ -601,6 +604,19 @@ def init_env(welcome_str: str, config_file: Optional[str] = None) -> None:
         welcome_str: 欢迎信息字符串
         config_file: 配置文件路径，默认为None(使用~/.jarvis/config.yaml)
     """
+    # 0. 检查是否处于Jarvis打开的终端环境，避免嵌套
+    try:
+        if os.environ.get("JARVIS_TERMINAL") == "1":
+            PrettyOutput.print(
+                "检测到当前终端由 Jarvis 打开。再次启动可能导致嵌套。",
+                OutputType.WARNING,
+            )
+            if not user_confirm("是否仍要继续启动 Jarvis？", default=False):
+                PrettyOutput.print("已取消启动以避免终端嵌套。", OutputType.INFO)
+                sys.exit(0)
+    except Exception:
+        pass
+
     # 1. 设置信号处理
     _setup_signal_handler()
 
@@ -717,7 +733,7 @@ def _interactive_config_setup(config_file_path: Path):
     except Exception:
         PrettyOutput.print("测试失败", OutputType.ERROR)
 
-    # 5. 生成并保存配置
+    # 5. 交互式确认并应用配置（不直接生成配置文件）
     config_data = {
         "ENV": env_vars,
         "JARVIS_PLATFORM": platform_name,
@@ -726,57 +742,36 @@ def _interactive_config_setup(config_file_path: Path):
         "JARVIS_THINKING_MODEL": model_name,
     }
 
-    if test_passed:
-        PrettyOutput.print("配置已测试通过，将为您生成配置文件。", OutputType.SUCCESS)
-    else:
-        if not get_yes_no("配置测试失败，您确定要保存这个配置吗？"):
-            PrettyOutput.print("配置未保存。", OutputType.INFO)
+    if not test_passed:
+        if not get_yes_no("配置测试失败，是否仍要应用该配置并继续？", default=False):
+            PrettyOutput.print("已取消配置。", OutputType.INFO)
             sys.exit(0)
 
+    # 6. 选择其他功能开关与可选项（复用统一逻辑）
+    _collect_optional_config_interactively(config_data)
+
+    # 7. 应用到当前会话并写入配置文件（基于交互结果，不从默认值生成）
+    set_global_env_data(config_data)
+    _process_env_variables(config_data)
     try:
         schema_path = (
             Path(__file__).parent.parent / "jarvis_data" / "config_schema.json"
         )
+        config_file_path.parent.mkdir(parents=True, exist_ok=True)
+        header = ""
         if schema_path.exists():
-            config_file_path.parent.mkdir(parents=True, exist_ok=True)
-            # 使用现有的函数生成默认结构，然后覆盖引导配置
-            generate_default_config(str(schema_path.absolute()), str(config_file_path))
-
-            # 读取刚生成的默认配置
-            with open(config_file_path, "r", encoding="utf-8") as f:
-                content = f.read()
-                default_config = yaml.safe_load(
-                    content.split("\n", 1)[1]
-                )  # 跳过 schema 行
-
-            # 合并用户配置
-            if default_config is None:
-                default_config = {}
-            default_config.update(config_data)
-
-            # 写回合并后的配置
-            final_content = (
-                f"# yaml-language-server: $schema={str(schema_path.absolute())}\n"
-            )
-            final_content += yaml.dump(
-                default_config, allow_unicode=True, sort_keys=False
-            )
-            with open(config_file_path, "w", encoding="utf-8") as f:
-                f.write(final_content)
-
-            PrettyOutput.print(
-                f"配置文件已生成: {config_file_path}", OutputType.SUCCESS
-            )
-            PrettyOutput.print("配置完成，请重新启动Jarvis。", OutputType.INFO)
-            sys.exit(0)
-        else:
-            PrettyOutput.print(
-                "未找到config schema，无法生成配置文件。", OutputType.ERROR
-            )
-            sys.exit(1)
-
+            header = f"# yaml-language-server: $schema={str(schema_path.absolute())}\n"
+        _prune_defaults_with_schema(config_data)
+        yaml_str = yaml.dump(config_data, allow_unicode=True, sort_keys=False)
+        with open(config_file_path, "w", encoding="utf-8") as f:
+            if header:
+                f.write(header)
+            f.write(yaml_str)
+        PrettyOutput.print(f"配置文件已生成: {config_file_path}", OutputType.SUCCESS)
+        PrettyOutput.print("配置完成，请重新启动Jarvis。", OutputType.INFO)
+        sys.exit(0)
     except Exception:
-        PrettyOutput.print("生成配置文件失败", OutputType.ERROR)
+        PrettyOutput.print("写入配置文件失败", OutputType.ERROR)
         sys.exit(1)
 
 
@@ -857,152 +852,410 @@ def _process_env_variables(config_data: dict) -> None:
         )
 
 
-def _load_and_process_config(jarvis_dir: str, config_file: str) -> None:
-    """加载并处理配置文件
-
-    功能：
-    1. 读取配置文件
-    2. 确保schema声明存在
-    3. 保存配置到全局变量
-    4. 处理环境变量
-
-    参数:
-        jarvis_dir: Jarvis数据目录路径
-        config_file: 配置文件路径
+def _collect_optional_config_interactively(
+    config_data: dict, ask_all: bool = False
+) -> bool:
+    """
+    复用的交互式配置收集逻辑：
+    - ask_all=False（默认）：仅对缺省的新功能开关/可选项逐项询问，已存在项跳过
+    - ask_all=True：对所有项进行询问，默认值取自当前配置文件，可覆盖现有设置
+    - 修改传入的 config_data
+    - 包含更多来自 config.py 的可选项
+    返回:
+        bool: 是否有变更
     """
     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)
+    def _ask_and_set(_key, _tip, _default, _type="bool"):
+        try:
+            if not ask_all and _key in config_data:
+                return False
+            if _type == "bool":
+                cur = bool(config_data.get(_key, _default))
+                val = get_yes_no(_tip, default=cur)
+                # 与当前值相同则不写入，避免冗余
+                if bool(val) == cur:
+                    return False
+                config_data[_key] = bool(val)
+            else:
+                cur = str(config_data.get(_key, _default or ""))
+                val = get_single_line_input(f"{_tip}", default=cur)
+                v = ("" if val is None else str(val)).strip()
+                # 输入与当前值相同则不写入
+                if v == cur:
+                    return False
+                config_data[_key] = v
+            return True
+        except Exception:
+            # 异常时不写入，保持精简
+            return False
+
+    def _ask_and_set_optional_str(_key, _tip, _default: str = "") -> bool:
+        try:
+            if not ask_all and _key in config_data:
+                return False
+            cur = str(config_data.get(_key, _default or ""))
+            val = get_single_line_input(f"{_tip}", default=cur)
+            if val is None:
+                return False
+            s = str(val).strip()
+            # 空输入表示不改变
+            if s == "":
+                return False
+            if s == cur:
+                return False
+            config_data[_key] = s
+            return True
+        except Exception:
+            return False
 
-        # 首次运行提示：为新功能开关询问用户（默认值见各配置的getter）
-        def _ask_and_set(_key, _tip, _default, _type="bool"):
+    def _ask_and_set_int(_key, _tip, _default: int) -> bool:
+        try:
+            if not ask_all and _key in config_data:
+                return False
+            cur = str(config_data.get(_key, _default))
+            val_str = get_single_line_input(f"{_tip}", default=cur)
+            s = "" if val_str is None else str(val_str).strip()
+            if s == "" or s == cur:
+                return False
             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
+                v = int(s)
             except Exception:
-                # 出现异常时按默认值设置，避免中断流程
-                config_data[_key] = (
-                    bool(_default) if _type == "bool" else str(_default or "")
-                )
-                return True
+                return False
+            if str(v) == cur:
+                return False
+            config_data[_key] = v
+            return True
+        except Exception:
+            return False
 
-        changed = False
-        # 现有两个开关
-        changed = (
-            _ask_and_set(
-                "JARVIS_ENABLE_GIT_JCA_SWITCH",
-                "是否在检测到Git仓库时，提示并可自动切换到代码开发模式（jca）？",
-                False,
-                "bool",
-            )
-            or changed
+    def _ask_and_set_list(_key, _tip) -> bool:
+        try:
+            if not ask_all and _key in config_data:
+                return False
+            cur_val = config_data.get(_key, [])
+            if isinstance(cur_val, list):
+                cur_display = ", ".join([str(x) for x in cur_val])
+            else:
+                cur_display = str(cur_val or "")
+            val = get_single_line_input(f"{_tip}", default=cur_display)
+            if val is None:
+                return False
+            s = str(val).strip()
+            if s == cur_display.strip():
+                return False
+            if not s:
+                # 输入为空表示不改变
+                return False
+            items = [x.strip() for x in s.split(",") if x.strip()]
+            if isinstance(cur_val, list) and items == cur_val:
+                return False
+            config_data[_key] = items
+            return True
+        except Exception:
+            return False
+
+    changed = False
+    # 现有两个开关
+    changed = (
+        _ask_and_set(
+            "JARVIS_ENABLE_GIT_JCA_SWITCH",
+            "是否在检测到Git仓库时，提示并可自动切换到代码开发模式（jca）？",
+            False,
+            "bool",
         )
-        changed = (
-            _ask_and_set(
-                "JARVIS_ENABLE_STARTUP_CONFIG_SELECTOR",
-                "在进入默认通用代理前，是否先列出可用配置（agent/multi_agent/roles）供选择？",
-                False,
-                "bool",
-            )
-            or changed
+        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_PRETTY_OUTPUT",
+            "是否启用更美观的终端输出（Pretty Output）？",
+            False,
+            "bool",
         )
-        changed = (
-            _ask_and_set(
-                "JARVIS_PRINT_PROMPT",
-                "是否打印发送给模型的提示词（Prompt）？",
-                False,
-                "bool",
-            )
-            or changed
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_PRINT_PROMPT",
+            "是否打印发送给模型的提示词（Prompt）？",
+            False,
+            "bool",
         )
-        changed = (
-            _ask_and_set(
-                "JARVIS_IMMEDIATE_ABORT",
-                "是否启用立即中断？\n- 选择 是/true：在对话输出流的每次迭代中检测到用户中断（例如 Ctrl+C）时，立即返回当前已生成的内容并停止继续输出。\n- 选择 否/false：不会在输出过程中立刻返回，而是按既有流程处理（不中途打断输出）。",
-                False,
-                "bool",
-            )
-            or changed
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_IMMEDIATE_ABORT",
+            "是否启用立即中断？\n- 选择 是/true：在对话输出流的每次迭代中检测到用户中断（例如 Ctrl+C）时，立即返回当前已生成的内容并停止继续输出。\n- 选择 否/false：不会在输出过程中立刻返回，而是按既有流程处理（不中途打断输出）。",
+            False,
+            "bool",
         )
-        changed = (
-            _ask_and_set(
-                "JARVIS_ENABLE_STATIC_ANALYSIS",
-                "是否启用静态代码分析（Static Analysis）？",
-                True,
-                "bool",
-            )
-            or changed
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_ENABLE_STATIC_ANALYSIS",
+            "是否启用静态代码分析（Static Analysis）？",
+            True,
+            "bool",
         )
-        changed = (
-            _ask_and_set(
-                "JARVIS_USE_METHODOLOGY",
-                "是否启用方法论系统（Methodology）？",
-                True,
-                "bool",
-            )
-            or changed
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_USE_METHODOLOGY",
+            "是否启用方法论系统（Methodology）？",
+            True,
+            "bool",
         )
-        changed = (
-            _ask_and_set(
-                "JARVIS_USE_ANALYSIS",
-                "是否启用分析流程（Analysis）？",
-                True,
-                "bool",
-            )
-            or changed
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_USE_ANALYSIS",
+            "是否启用分析流程（Analysis）？",
+            True,
+            "bool",
         )
-        changed = (
-            _ask_and_set(
-                "JARVIS_FORCE_SAVE_MEMORY",
-                "是否强制保存会话记忆？",
-                True,
-                "bool",
-            )
-            or changed
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_FORCE_SAVE_MEMORY",
+            "是否强制保存会话记忆？",
+            True,
+            "bool",
         )
-        changed = (
-            _ask_and_set(
-                "JARVIS_CENTRAL_METHODOLOGY_REPO",
-                "请输入中心方法论仓库地址（可留空跳过）：",
-                "",
-                "str",
-            )
-            or changed
+        or changed
+    )
+
+    # 代码与工具操作安全提示
+    changed = (
+        _ask_and_set(
+            "JARVIS_EXECUTE_TOOL_CONFIRM",
+            "执行工具前是否需要确认？",
+            False,
+            "bool",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_CONFIRM_BEFORE_APPLY_PATCH",
+            "应用补丁前是否需要确认？",
+            False,
+            "bool",
+        )
+        or changed
+    )
+
+    # 数据目录与最大输入Token
+    from jarvis.jarvis_utils.config import get_data_dir as _get_data_dir  # lazy import
+
+    changed = (
+        _ask_and_set_optional_str(
+            "JARVIS_DATA_PATH",
+            f"是否自定义数据目录路径(JARVIS_DATA_PATH)？留空使用默认: {_get_data_dir()}",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set_int(
+            "JARVIS_MAX_INPUT_TOKEN_COUNT",
+            "自定义最大输入Token数量（留空使用默认: 32000）",
+            32000,
+        )
+        or changed
+    )
+
+    # 目录类配置（逗号分隔）
+    changed = (
+        _ask_and_set_list(
+            "JARVIS_TOOL_LOAD_DIRS",
+            "指定工具加载目录（逗号分隔，留空跳过）：",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set_list(
+            "JARVIS_METHODOLOGY_DIRS",
+            "指定方法论加载目录（逗号分隔，留空跳过）：",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set_list(
+            "JARVIS_AGENT_DEFINITION_DIRS",
+            "指定 agent 定义加载目录（逗号分隔，留空跳过）：",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set_list(
+            "JARVIS_MULTI_AGENT_DIRS",
+            "指定 multi_agent 加载目录（逗号分隔，留空跳过）：",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set_list(
+            "JARVIS_ROLES_DIRS",
+            "指定 roles 加载目录（逗号分隔，留空跳过）：",
+        )
+        or changed
+    )
+
+    # Web 搜索配置（可选）
+    changed = (
+        _ask_and_set_optional_str(
+            "JARVIS_WEB_SEARCH_PLATFORM",
+            "配置 Web 搜索平台名称（留空跳过）：",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set_optional_str(
+            "JARVIS_WEB_SEARCH_MODEL",
+            "配置 Web 搜索模型名称（留空跳过）：",
+        )
+        or changed
+    )
+
+    # Git 提交提示词（可选）
+    changed = (
+        _ask_and_set_optional_str(
+            "JARVIS_GIT_COMMIT_PROMPT",
+            "自定义 Git 提交提示模板（留空跳过）：",
+        )
+        or changed
+    )
+
+    # RAG 配置（可选）
+    try:
+        from jarvis.jarvis_utils.config import (
+            get_rag_embedding_model as _get_rag_embedding_model,
+            get_rag_rerank_model as _get_rag_rerank_model,
+        )
+
+        rag_default_embed = _get_rag_embedding_model()
+        rag_default_rerank = _get_rag_rerank_model()
+    except Exception:
+        rag_default_embed = "BAAI/bge-m3"
+        rag_default_rerank = "BAAI/bge-reranker-v2-m3"
+
+    try:
+        if "JARVIS_RAG" not in config_data:
+            if get_yes_no("是否配置 RAG 检索增强参数？", default=False):
+                rag_conf = {}
+                emb = get_single_line_input(
+                    f"RAG 嵌入模型（留空使用默认: {rag_default_embed}）：",
+                    default="",
+                ).strip()
+                rerank = get_single_line_input(
+                    f"RAG rerank 模型（留空使用默认: {rag_default_rerank}）：",
+                    default="",
+                ).strip()
+                use_bm25 = get_yes_no("RAG 是否使用 BM25？", default=True)
+                use_rerank = get_yes_no("RAG 是否使用 rerank？", default=True)
+                if emb:
+                    rag_conf["embedding_model"] = emb
+                else:
+                    rag_conf["embedding_model"] = rag_default_embed
+                if rerank:
+                    rag_conf["rerank_model"] = rerank
+                else:
+                    rag_conf["rerank_model"] = rag_default_rerank
+                rag_conf["use_bm25"] = bool(use_bm25)
+                rag_conf["use_rerank"] = bool(use_rerank)
+                config_data["JARVIS_RAG"] = rag_conf
+                changed = True
+    except Exception:
+        pass
+
+    # 中心仓库配置
+    changed = (
+        _ask_and_set(
+            "JARVIS_CENTRAL_METHODOLOGY_REPO",
+            "请输入中心方法论仓库地址（可留空跳过）：",
+            "",
+            "str",
+        )
+        or changed
+    )
+    changed = (
+        _ask_and_set(
+            "JARVIS_CENTRAL_TOOL_REPO",
+            "请输入中心工具仓库地址（可留空跳过）：",
+            "",
+            "str",
         )
+        or changed
+    )
+
+    # 已移除 LLM 组配置交互
+
+    # 已移除 RAG 组配置交互
+
+    # 已移除 工具组配置交互
+
+    # 已移除：替换映射（JARVIS_REPLACE_MAP）的交互式配置，保持最简交互
+    # SHELL 覆盖（可选）
+    try:
+        default_shell = os.getenv("SHELL", "/bin/bash")
         changed = (
-            _ask_and_set(
-                "JARVIS_CENTRAL_TOOL_REPO",
-                "请输入中心工具仓库地址（可留空跳过）：",
-                "",
-                "str",
+            _ask_and_set_optional_str(
+                "SHELL",
+                f"覆盖 SHELL 路径（留空使用系统默认: {default_shell}）：",
+                default_shell,
             )
             or changed
         )
+    except Exception:
+        pass
+
+    # 已移除：MCP（JARVIS_MCP）的交互式配置，保持最简交互
+    return changed
+
+
+def _load_and_process_config(jarvis_dir: str, config_file: str) -> None:
+    """加载并处理配置文件
+
+    功能：
+    1. 读取配置文件
+    2. 确保schema声明存在
+    3. 保存配置到全局变量
+    4. 处理环境变量
+
+    参数:
+        jarvis_dir: Jarvis数据目录路径
+        config_file: 配置文件路径
+    """
+    from jarvis.jarvis_utils.input import user_confirm as get_yes_no
+    from jarvis.jarvis_utils.input import get_single_line_input
 
-        if changed:
+    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)
+
+        # 加载 schema 默认并剔除等于默认值的项
+        pruned = _prune_defaults_with_schema(config_data)
+
+        if pruned:
             # 保留schema声明，如无则自动补充
             header = ""
             try:
@@ -1079,6 +1332,69 @@ def generate_default_config(schema_path: str, output_path: str) -> None:
         f.write(content)
 
 
+def _load_default_config_from_schema() -> dict:
+    """从 schema 生成默认配置字典，用于对比并剔除等于默认值的键"""
+    try:
+        schema_path = (
+            Path(__file__).parent.parent / "jarvis_data" / "config_schema.json"
+        )
+        if not schema_path.exists():
+            return {}
+        with open(schema_path, "r", encoding="utf-8") as f:
+            schema = json.load(f)
+
+        def _generate_from_schema(schema_dict: Dict[str, Any]) -> Dict[str, Any]:
+            cfg: Dict[str, Any] = {}
+            if isinstance(schema_dict, dict) and "properties" in schema_dict:
+                for key, value in schema_dict["properties"].items():
+                    if "default" in value:
+                        cfg[key] = value["default"]
+                    elif value.get("type") == "array":
+                        cfg[key] = []
+                    elif "properties" in value:
+                        cfg[key] = _generate_from_schema(value)
+            return cfg
+
+        return _generate_from_schema(schema)
+    except Exception:
+        return {}
+
+
+def _prune_defaults_with_schema(config_data: dict) -> bool:
+    """
+    删除与 schema 默认值一致的配置项，返回是否发生了变更
+    仅处理 schema 中定义的键，未在 schema 中的键不会被修改
+    """
+    defaults = _load_default_config_from_schema()
+    if not defaults or not isinstance(config_data, dict):
+        return False
+
+    changed = False
+
+    def _prune_node(node: dict, default_node: dict):
+        nonlocal changed
+        for key in list(node.keys()):
+            if key in default_node:
+                dv = default_node[key]
+                v = node[key]
+                if isinstance(dv, dict) and isinstance(v, dict):
+                    _prune_node(v, dv)
+                    if not v:
+                        del node[key]
+                        changed = True
+                elif isinstance(dv, list) and isinstance(v, list):
+                    if v == dv:
+                        del node[key]
+                        changed = True
+                else:
+                    if v == dv:
+                        del node[key]
+                        changed = True
+
+    _prune_node(config_data, defaults)
+    return changed
+
+
 def _read_old_config_file(config_file):
     """读取并解析旧格式的env配置文件
 
@@ -1151,9 +1467,7 @@ def while_success(func: Callable[[], Any], sleep_time: float = 0.1) -> Any:
         try:
             return func()
         except Exception as e:
-            PrettyOutput.print(
-                f"重试中，等待 {sleep_time}s...", OutputType.WARNING
-            )
+            PrettyOutput.print(f"重试中，等待 {sleep_time}s...", OutputType.WARNING)
             time.sleep(sleep_time)
             continue
 
@@ -1258,7 +1572,6 @@ def _pull_git_repo(repo_path: Path, repo_type: str):
     if not git_dir.is_dir():
         return
 
-
     try:
         # 检查是否有远程仓库
         remote_result = subprocess.run(