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

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,21 @@
       "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_IMMEDIATE_ABORT": {
+      "type": "boolean",
+      "description": "是否启用立即中断：在对话迭代中检测到中断信号时立即返回",
+      "default": false
+    },
     "JARVIS_TOOL_GROUP": {
       "type": "string",
       "description": "选择一个预定义的工具配置组",

jarvis/jarvis_platform/base.py

@@ -15,9 +15,10 @@ from jarvis.jarvis_utils.config import (
     get_max_input_token_count,
     get_pretty_output,
     is_print_prompt,
+    is_immediate_abort,
 )
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
-from jarvis.jarvis_utils.globals import set_in_chat
+from jarvis.jarvis_utils.globals import set_in_chat, get_interrupt
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
@@ -137,6 +138,8 @@ class BasePlatform(ABC):
                     with Live(panel, refresh_per_second=10, transient=False) as live:
                         for s in self.chat(message):
                             response += s
+                            if is_immediate_abort() and get_interrupt():
+                                return response
                             text_content.append(s, style="bright_white")
                             panel.subtitle = "[yellow]正在回答...[/yellow]"
                             live.update(panel)
@@ -150,10 +153,14 @@ class BasePlatform(ABC):
                     for s in self.chat(message):
                         print(s, end="", flush=True)
                         response += s
+                        if is_immediate_abort() and get_interrupt():
+                            return response
                     print()
             else:
                 for s in self.chat(message):
                     response += s
+                    if is_immediate_abort() and get_interrupt():
+                        return response
         # Keep original think tag handling
         response = re.sub(
             ot("think") + r".*?" + ct("think"), "", response, flags=re.DOTALL

jarvis/jarvis_platform_manager/main.py

@@ -26,9 +26,7 @@ app = typer.Typer(help="Jarvis AI 平台")
 
 @app.command("info")
 def list_platforms(
-    platform: Optional[str] = typer.Option(
-        None, "--platform", "-p", help="指定要查看的平台"
-    )
+    platform: Optional[str] = typer.Option(None, "--platform", "-p", help="指定要查看的平台")
 ) -> None:
     """列出所有支持的平台和模型，或指定平台的详细信息。"""
     registry = PlatformRegistry.get_global_platform_registry()
@@ -219,13 +217,9 @@ def chat_with_model(
                         for entry in conversation_history:
                             file_obj.write(f"{entry['role']}: {entry['content']}\n\n")
 
-                    PrettyOutput.print(
-                        f"所有对话已保存到 {file_path}", OutputType.SUCCESS
-                    )
+                    PrettyOutput.print(f"所有对话已保存到 {file_path}", OutputType.SUCCESS)
                 except Exception as exc:
-                    PrettyOutput.print(
-                        f"保存所有对话失败: {str(exc)}", OutputType.ERROR
-                    )
+                    PrettyOutput.print(f"保存所有对话失败: {str(exc)}", OutputType.ERROR)
                 continue
 
             # Check if it is a save_session command
@@ -246,9 +240,7 @@ def chat_with_model(
                         file_path = file_path[1:-1]
 
                     if platform.save(file_path):
-                        PrettyOutput.print(
-                            f"会话已保存到 {file_path}", OutputType.SUCCESS
-                        )
+                        PrettyOutput.print(f"会话已保存到 {file_path}", OutputType.SUCCESS)
                     else:
                         PrettyOutput.print("保存会话失败", OutputType.ERROR)
                 except Exception as exc:
@@ -274,9 +266,7 @@ def chat_with_model(
 
                     if platform.restore(file_path):
                         conversation_history = []  # Clear local history after loading
-                        PrettyOutput.print(
-                            f"会话已从 {file_path} 加载", OutputType.SUCCESS
-                        )
+                        PrettyOutput.print(f"会话已从 {file_path} 加载", OutputType.SUCCESS)
                     else:
                         PrettyOutput.print("加载会话失败", OutputType.ERROR)
                 except Exception as exc:
@@ -356,9 +346,7 @@ def validate_platform_model(platform: Optional[str], model: Optional[str]) -> bo
 
 @app.command("chat")
 def chat_command(
-    platform: Optional[str] = typer.Option(
-        None, "--platform", "-p", help="指定要使用的平台"
-    ),
+    platform: Optional[str] = typer.Option(None, "--platform", "-p", help="指定要使用的平台"),
     model: Optional[str] = typer.Option(None, "--model", "-m", help="指定要使用的模型"),
     llm_type: str = typer.Option(
         "normal",
@@ -441,9 +429,7 @@ def role_command(
     platform: Optional[str] = typer.Option(
         None, "--platform", "-p", help="指定要使用的平台，覆盖角色配置"
     ),
-    model: Optional[str] = typer.Option(
-        None, "--model", "-m", help="指定要使用的模型，覆盖角色配置"
-    ),
+    model: Optional[str] = typer.Option(None, "--model", "-m", help="指定要使用的模型，覆盖角色配置"),
     llm_type: Optional[str] = typer.Option(
         None,
         "-t",
@@ -472,8 +458,12 @@ def role_command(
     PrettyOutput.print(output_str, OutputType.INFO)
 
     # 让用户选择角色
+    raw_choice = get_single_line_input("请选择角色(输入编号，直接回车退出): ")
+    if not raw_choice.strip():
+        PrettyOutput.print("已取消，退出程序", OutputType.INFO)
+        raise typer.Exit(code=0)
     try:
-        choice = int(get_single_line_input("请选择角色(输入编号): "))
+        choice = int(raw_choice)
         selected_role = config["roles"][choice - 1]
     except (ValueError, IndexError):
         PrettyOutput.print("无效的选择", OutputType.ERROR)

jarvis/jarvis_tools/read_webpage.py

@@ -3,6 +3,13 @@ from typing import Any, Dict
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.config import (
+    get_web_search_platform_name,
+    get_web_search_model_name,
+)
+from jarvis.jarvis_utils.http import get as http_get
+from markdownify import markdownify as md  # type: ignore
+import requests
 
 
 class WebpageTool:
@@ -22,28 +29,82 @@ class WebpageTool:
     }
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        """Read webpage content using Yuanbao model"""
+        """
+        读取网页内容。
+        优先使用配置的 web_search_platform 与模型的原生web能力；若不支持，则使用requests抓取页面并调用模型进行分析。
+        """
         try:
-            url = args["url"].strip()
-            want = args.get("want", "请总结这个网页的主要内容")
+            url = str(args.get("url", "")).strip()
+            want = str(args.get("want", "请总结这个网页的主要内容"))
 
-            # Create Yuanbao model instance
-            model = PlatformRegistry().get_normal_platform()
-            model.set_web(True)
-            model.set_suppress_output(False)  # type: ignore
+            if not url:
+                return {"success": False, "stdout": "", "stderr": "缺少必需参数：url"}
+
+            # 1) 优先使用配置的 Web 搜索平台与模型（若支持web）
+            web_search_platform = get_web_search_platform_name()
+            web_search_model = get_web_search_model_name()
+            if web_search_platform and web_search_model:
+                model = PlatformRegistry().create_platform(web_search_platform)
+                if model:
+                    model.set_model_name(web_search_model)
+                    if model.support_web():
+                        PrettyOutput.print("▶️ 使用配置的 Web 搜索平台读取网页...", OutputType.INFO)
+                        model.set_web(True)
+                        model.set_suppress_output(False)  # type: ignore
+                        prompt = f"""请帮我处理这个网页：{url}
+用户的具体需求是：{want}
+请按照以下要求输出结果：
+1. 使用Markdown格式
+2. 包含网页标题
+3. 根据用户需求提供准确、完整的信息"""
+                        response = model.chat_until_success(prompt)  # type: ignore
+                        return {"success": True, "stdout": response, "stderr": ""}
 
-            # Construct prompt based on want parameter
-            prompt = f"""请帮我处理这个网页：{url}
+            # 2) 然后尝试使用默认平台（normal）的 web 能力
+            model = PlatformRegistry().get_normal_platform()
+            if model.support_web():
+                PrettyOutput.print("▶️ 使用默认平台的 Web 能力读取网页...", OutputType.INFO)
+                model.set_web(True)
+                model.set_suppress_output(False)  # type: ignore
+                prompt = f"""请帮我处理这个网页：{url}
 用户的具体需求是：{want}
 请按照以下要求输出结果：
 1. 使用Markdown格式
 2. 包含网页标题
 3. 根据用户需求提供准确、完整的信息"""
+                response = model.chat_until_success(prompt)  # type: ignore
+                return {"success": True, "stdout": response, "stderr": ""}
+
+            # 3) 回退：使用 requests 抓取网页，再用模型分析
+            PrettyOutput.print("ℹ️ 当前模型不支持Web，使用requests抓取网页并进行分析。", OutputType.INFO)
+            try:
+                resp = http_get(url, timeout=10.0, allow_redirects=True)
+                content_md = md(resp.text, strip=["script", "style"])
+            except requests.exceptions.HTTPError as e:
+                PrettyOutput.print(f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}", OutputType.WARNING)
+                return {"success": False, "stdout": "", "stderr": f"HTTP错误：{e.response.status_code}"}
+            except requests.exceptions.RequestException as e:
+                PrettyOutput.print(f"⚠️ 请求错误: {e}", OutputType.WARNING)
+                return {"success": False, "stdout": "", "stderr": f"请求错误：{e}"}
+
+            if not content_md or not content_md.strip():
+                return {"success": False, "stdout": "", "stderr": "无法从网页抓取有效内容。"}
 
-            # Get response from Yuanbao model
-            response = model.chat_until_success(prompt)  # type: ignore
+            PrettyOutput.print("🧠 正在分析抓取到的网页内容...", OutputType.INFO)
+            summary_prompt = f"""以下是网页 {url} 的内容（已转换为Markdown）：
+----------------
+{content_md}
+----------------
+请根据用户的具体需求“{want}”进行总结与回答：
+- 使用Markdown格式
+- 包含网页标题（若可推断）
+- 提供准确、完整的信息"""
+
+            model = PlatformRegistry().get_normal_platform()
+            model.set_suppress_output(False)  # type: ignore
+            summary = model.chat_until_success(summary_prompt)  # type: ignore
 
-            return {"success": True, "stdout": response, "stderr": ""}
+            return {"success": True, "stdout": summary, "stderr": ""}
 
         except Exception as e:
             PrettyOutput.print(f"读取网页失败: {str(e)}", OutputType.ERROR)
@@ -55,5 +116,5 @@ class WebpageTool:
 
     @staticmethod
     def check() -> bool:
-        """检查当前平台是否支持web功能"""
-        return PlatformRegistry().get_normal_platform().support_web()
+        """工具可用性检查：始终可用；若模型不支持web将回退到requests抓取。"""
+        return True

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,29 @@ 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
+    )
+
+
+def is_immediate_abort() -> bool:
+    """
+    是否启用立即中断：当在对话过程中检测到用户中断信号时，立即停止输出并返回。
+    默认关闭
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_IMMEDIATE_ABORT", 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,163 @@ 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_IMMEDIATE_ABORT",
+                "是否启用立即中断？\n- 选择 是/true：在对话输出流的每次迭代中检测到用户中断（例如 Ctrl+C）时，立即返回当前已生成的内容并停止继续输出。\n- 选择 否/false：不会在输出过程中立刻返回，而是按既有流程处理（不中途打断输出）。",
+                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.18.dist-info}/METADATA

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