jarvis-ai-assistant 0.3.32__tar.gz → 0.3.34__tar.gz

{jarvis_ai_assistant-0.3.32/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.32
+Version: 0.3.34
 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.32 → jarvis_ai_assistant-0.3.34}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.32"
+version = "0.3.34"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.32",
+    version="0.3.34",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/src/jarvis/jarvis_agent/__init__.py

@@ -439,6 +439,8 @@ class Agent:
         self.summary_prompt = cfg.summary_prompt or DEFAULT_SUMMARY_PROMPT
         self.max_token_count = int(cfg.max_token_count or get_max_token_count(model_group))
         self.force_save_memory = bool(cfg.force_save_memory)
+        # 非交互模式下自动完成标志需要同步到 Agent 实例，避免循环
+        self.auto_complete = bool(cfg.auto_complete)
 
         # 聚合配置到 AgentConfig，作为后续单一事实来源（保持兼容，不改变既有属性使用）
         self.config = cfg

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/src/jarvis/jarvis_agent/agent_manager.py

@@ -12,9 +12,11 @@ from jarvis.jarvis_agent import (
     origin_agent_system_prompt,
 )
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
+from jarvis.jarvis_agent.file_context_handler import file_context_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_agent.task_manager import TaskManager
 from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.jarvis_utils.config import is_non_interactive
 
 
 class AgentManager:
@@ -46,7 +48,11 @@ class AgentManager:
         self.agent = Agent(
             system_prompt=origin_agent_system_prompt,
             model_group=self.model_group,
-            input_handler=[shell_input_handler, builtin_input_handler],
+            input_handler=[
+                shell_input_handler,
+                file_context_handler,
+                builtin_input_handler,
+            ],
             output_handler=[ToolRegistry()],  # type: ignore
             need_summary=False,
             use_methodology=self.use_methodology,
@@ -72,8 +78,8 @@ class AgentManager:
             self.agent.run(task_content)
             raise typer.Exit(code=0)
 
-        # 处理预定义任务
-        if self.agent.first:
+        # 处理预定义任务（非交互模式下跳过）
+        if not is_non_interactive() and self.agent.first:
             task_manager = TaskManager()
             tasks = task_manager.load_tasks()
             if tasks and (selected_task := task_manager.select_task(tasks)):

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/src/jarvis/jarvis_agent/config.py

@@ -17,6 +17,7 @@ from jarvis.jarvis_utils.config import (
     is_force_save_memory,
     is_use_analysis,
     is_use_methodology,
+    is_non_interactive,
 )
 
 
@@ -30,6 +31,7 @@ class AgentConfig:
 
     # 运行行为
     auto_complete: bool = False
+    non_interactive: bool = False
     need_summary: bool = True
 
     # 可选配置（None 表示使用默认策略解析）
@@ -53,6 +55,7 @@ class AgentConfig:
             description=self.description,
             model_group=self.model_group,
             auto_complete=self.auto_complete,
+            non_interactive=self.non_interactive,
             need_summary=self.need_summary,
             summary_prompt=self.summary_prompt,
             execute_tool_confirm=self.execute_tool_confirm,
@@ -89,4 +92,8 @@ class AgentConfig:
         if cfg.force_save_memory is None:
             cfg.force_save_memory = is_force_save_memory()
 
+        # 非交互模式下默认开启自动完成
+        if is_non_interactive():
+            cfg.auto_complete = True
+
         return cfg

jarvis_ai_assistant-0.3.34/src/jarvis/jarvis_agent/file_context_handler.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+import re
+import os
+from typing import Any, Tuple
+
+from jarvis.jarvis_tools.read_code import ReadCodeTool
+
+
+def is_text_file(filepath: str) -> bool:
+    """
+    Check if a file is a text file.
+    """
+    try:
+        with open(filepath, "r", encoding="utf-8") as f:
+            f.read(1024)  # Try to read a small chunk
+        return True
+    except (UnicodeDecodeError, IOError):
+        return False
+
+
+def count_lines(filepath: str) -> int:
+    """
+    Count the number of lines in a file.
+    """
+    try:
+        with open(filepath, "r", encoding="utf-8", errors="ignore") as f:
+            return sum(1 for _ in f)
+    except IOError:
+        return 0
+
+
+def file_context_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
+    """
+    Extracts file paths from the input, reads their content if they are valid text files
+    and appends the content to the input.
+
+    Args:
+        user_input: The user's input string.
+        agent_: The agent instance.
+
+    Returns:
+        A tuple containing the modified user input and a boolean indicating if
+        further processing should be skipped.
+    """
+    # Regex to find paths in single quotes
+    file_paths = re.findall(r"'([^']+)'", user_input)
+
+    if not file_paths:
+        return user_input, False
+
+    added_context = ""
+    read_code_tool = ReadCodeTool()
+
+    for path in file_paths:
+        if os.path.isfile(path) and is_text_file(path):
+            line_count = count_lines(path)
+            if line_count > 0:
+                # Use ReadCodeTool to get formatted content
+                result = read_code_tool._handle_single_file(path)
+                if result["success"]:
+                    # Remove the file path from the original input to avoid redundancy
+                    user_input = user_input.replace(f"'{path}'", "")
+                    # Append the full, formatted output from the tool, which includes headers and line numbers
+                    added_context += "\n" + result["stdout"]
+
+    if added_context:
+        user_input = user_input.strip() + added_context
+
+    return user_input, False

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/src/jarvis/jarvis_agent/jarvis.py

@@ -19,6 +19,8 @@ from jarvis.jarvis_utils.config import (
     get_multi_agent_dirs,
     get_roles_dirs,
     get_data_dir,
+    set_config,
+    is_non_interactive,
 )
 import jarvis.jarvis_utils.utils as jutils
 from jarvis.jarvis_utils.input import user_confirm, get_single_line_input
@@ -30,6 +32,32 @@ import yaml  # type: ignore
 from rich.table import Table
 from rich.console import Console
 
+import sys
+
+
+def _normalize_backup_data_argv(argv: List[str]) -> None:
+    """
+    兼容旧版 Click/Typer 对可选参数的解析差异：
+    若用户仅提供 --backup-data 而不跟参数，则在解析前注入默认目录。
+    """
+    try:
+        i = 0
+        while i < len(argv):
+            tok = argv[i]
+            if tok == "--backup-data":
+                # 情况1：位于末尾，无参数
+                # 情况2：后续是下一个选项（以 '-' 开头），表示未提供参数
+                if i == len(argv) - 1 or (i + 1 < len(argv) and argv[i + 1].startswith("-")):
+                    argv.insert(i + 1, "~/jarvis_backups")
+                    i += 1  # 跳过我们插入的默认值，避免重复插入
+            i += 1
+    except Exception:
+        # 静默忽略任何异常，避免影响主流程
+        pass
+
+
+_normalize_backup_data_argv(sys.argv)
+
 app = typer.Typer(help="Jarvis AI 助手")
 
 
@@ -187,9 +215,9 @@ def handle_interactive_config_option(
         return True
 
 
-def handle_backup_option(backup: bool) -> bool:
+def handle_backup_option(backup_dir_path: Optional[str]) -> bool:
     """处理数据备份选项，返回是否已处理并需提前结束。"""
-    if not backup:
+    if backup_dir_path is None:
         return False
 
     init_env("", config_file=None)
@@ -198,7 +226,8 @@ def handle_backup_option(backup: bool) -> bool:
         PrettyOutput.print(f"数据目录不存在: {data_dir}", OutputType.ERROR)
         return True
 
-    backup_dir = Path(os.path.expanduser("~/jarvis_backups"))
+    backup_dir_str = backup_dir_path if backup_dir_path.strip() else "~/jarvis_backups"
+    backup_dir = Path(os.path.expanduser(backup_dir_str))
     backup_dir.mkdir(exist_ok=True)
 
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
@@ -215,18 +244,37 @@ def handle_backup_option(backup: bool) -> bool:
     return True
 
 
-def handle_restore_option(restore_path: Optional[str]) -> bool:
+def handle_restore_option(restore_path: Optional[str], config_file: Optional[str]) -> bool:
     """处理数据恢复选项，返回是否已处理并需提前结束。"""
     if not restore_path:
         return False
 
-    restore_file = Path(restore_path)
+    restore_file = Path(os.path.expanduser(os.path.expandvars(restore_path)))
+    # 兼容 ~ 与环境变量，避免用户输入未展开路径导致找不到文件
     if not restore_file.is_file():
-        PrettyOutput.print(f"指定的恢复文件不存在: {restore_path}", OutputType.ERROR)
+        PrettyOutput.print(f"指定的恢复文件不存在: {restore_file}", OutputType.ERROR)
         return True
 
-    init_env("", config_file=None)
-    data_dir = Path(get_data_dir())
+    # 在恢复数据时不要触发完整环境初始化，避免引导流程或网络请求
+    # 优先从配置文件解析 JARVIS_DATA_PATH，否则回退到默认数据目录
+    data_dir_str: Optional[str] = None
+    try:
+        if config_file:
+            cfg_path = Path(os.path.expanduser(os.path.expandvars(config_file)))
+            if cfg_path.is_file():
+                with open(cfg_path, "r", encoding="utf-8", errors="ignore") as cf:
+                    cfg_data = yaml.safe_load(cf) or {}
+                if isinstance(cfg_data, dict):
+                    val = cfg_data.get("JARVIS_DATA_PATH")
+                    if isinstance(val, str) and val.strip():
+                        data_dir_str = val.strip()
+    except Exception:
+        data_dir_str = None
+
+    if not data_dir_str:
+        data_dir_str = get_data_dir()
+
+    data_dir = Path(os.path.expanduser(os.path.expandvars(str(data_dir_str))))
 
     if data_dir.exists():
         if not user_confirm(
@@ -271,6 +319,9 @@ def try_switch_to_jca_if_git_repo(
     task: Optional[str],
 ) -> None:
     """在初始化环境前检测Git仓库，并可选择自动切换到代码开发模式（jca）。"""
+    # 非交互模式下跳过代码模式切换提示与相关输出
+    if is_non_interactive():
+        return
     if is_enable_git_repo_jca_switch():
         try:
             res = subprocess.run(
@@ -443,6 +494,20 @@ def handle_builtin_config_selector(
                         )
 
             if options:
+                # Add a default option to skip selection
+                options.insert(
+                    0,
+                    {
+                        "category": "skip",
+                        "cmd": "",
+                        "file": "",
+                        "name": "跳过选择 (使用默认通用代理)",
+                        "desc": "直接按回车或ESC也可跳过",
+                        "details": "",
+                        "roles_count": 0,
+                    },
+                )
+
                 PrettyOutput.section("可用的内置配置", OutputType.SUCCESS)
                 # 使用 rich Table 呈现
                 table = Table(show_header=True, header_style="bold magenta")
@@ -511,35 +576,44 @@ def handle_builtin_config_selector(
                 if choice_index != -1:
                     try:
                         sel = options[choice_index]
-                        args: List[str] = []
-
-                        if sel["category"] == "agent":
-                            # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
-                            args = [str(sel["cmd"]), "-c", str(sel["file"])]
-                            if model_group:
-                                args += ["-g", str(model_group)]
-                            if config_file:
-                                args += ["-f", str(config_file)]
-                            if task:
-                                args += ["--task", str(task)]
-
-                        elif sel["category"] == "multi_agent":
-                            # jarvis-multi-agent 需要 -c/--config，用户输入通过 -i/--input 传递
-                            args = [str(sel["cmd"]), "-c", str(sel["file"])]
-                            if task:
-                                args += ["-i", str(task)]
-
-                        elif sel["category"] == "roles":
-                            # jarvis-platform-manager role 子命令，支持 -c/-t/-g
-                            args = [str(sel["cmd"]), "role", "-c", str(sel["file"])]
-                            if model_group:
-                                args += ["-g", str(model_group)]
-
-                        if args:
-                            PrettyOutput.print(
-                                f"正在启动: {' '.join(args)}", OutputType.INFO
-                            )
-                            os.execvp(args[0], args)
+                        # If the "skip" option is chosen, do nothing and proceed to default agent
+                        if sel["category"] == "skip":
+                            pass
+                        else:
+                            args: List[str] = []
+
+                            if sel["category"] == "agent":
+                                # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
+                                args = [str(sel["cmd"]), "-c", str(sel["file"])]
+                                if model_group:
+                                    args += ["-g", str(model_group)]
+                                if config_file:
+                                    args += ["-f", str(config_file)]
+                                if task:
+                                    args += ["--task", str(task)]
+
+                            elif sel["category"] == "multi_agent":
+                                # jarvis-multi-agent 需要 -c/--config，用户输入通过 -i/--input 传递
+                                args = [str(sel["cmd"]), "-c", str(sel["file"])]
+                                if task:
+                                    args += ["-i", str(task)]
+
+                            elif sel["category"] == "roles":
+                                # jarvis-platform-manager role 子命令，支持 -c/-t/-g
+                                args = [
+                                    str(sel["cmd"]),
+                                    "role",
+                                    "-c",
+                                    str(sel["file"]),
+                                ]
+                                if model_group:
+                                    args += ["-g", str(model_group)]
+
+                            if args:
+                                PrettyOutput.print(
+                                    f"正在启动: {' '.join(args)}", OutputType.INFO
+                                )
+                                os.execvp(args[0], args)
                     except Exception:
                         # 任何异常都不影响默认流程
                         pass
@@ -590,12 +664,19 @@ def run_cli(
         "--disable-methodology-analysis",
         help="禁用方法论和任务分析（覆盖配置文件设置）",
     ),
-    backup_data: bool = typer.Option(
-        False, "--backup-data", help="备份 Jarvis 数据目录 (~/.jarvis)"
+    backup_data: Optional[str] = typer.Option(
+        None,
+        "--backup-data",
+        help="备份 Jarvis 数据目录. 可选地传入备份目录. 默认为 '~/jarvis_backups'",
+        show_default=False,
+        flag_value="~/jarvis_backups",
     ),
     restore_data: Optional[str] = typer.Option(
         None, "--restore-data", help="从指定的压缩包恢复 Jarvis 数据"
     ),
+    non_interactive: bool = typer.Option(
+        False, "-n", "--non-interactive", help="启用非交互模式：用户无法与命令交互，脚本执行超时限制为5分钟"
+    ),
 ) -> None:
     """Jarvis AI assistant command-line interface."""
     if ctx.invoked_subcommand is not None:
@@ -604,12 +685,43 @@ def run_cli(
     # 使用 rich 输出命令与快捷方式总览
     print_commands_overview()
 
+    # CLI 标志：非交互模式（不依赖配置文件）
+    if non_interactive:
+        try:
+            os.environ["JARVIS_NON_INTERACTIVE"] = "true"
+        except Exception:
+            pass
+        # 注意：全局配置同步在 init_env 之后执行，避免被覆盖
+
+    # 同步其他 CLI 选项到全局配置，确保后续模块读取一致
+    try:
+        if model_group:
+            set_config("JARVIS_LLM_GROUP", str(model_group))
+        if tool_group:
+            set_config("JARVIS_TOOL_GROUP", str(tool_group))
+        if disable_methodology_analysis:
+            set_config("JARVIS_USE_METHODOLOGY", False)
+            set_config("JARVIS_USE_ANALYSIS", False)
+        if restore_session:
+            set_config("JARVIS_RESTORE_SESSION", True)
+    except Exception:
+        # 静默忽略同步异常，不影响主流程
+        pass
+
+    # 非交互模式要求从命令行传入任务
+    if non_interactive and not (task and str(task).strip()):
+        PrettyOutput.print(
+            "非交互模式已启用：必须使用 --task 传入任务内容，因多行输入不可用。",
+            OutputType.ERROR,
+        )
+        raise typer.Exit(code=2)
+
     # 处理数据备份
     if handle_backup_option(backup_data):
         return
 
     # 处理数据恢复
-    if handle_restore_option(restore_data):
+    if handle_restore_option(restore_data, config_file):
         return
 
     # 处理配置文件编辑
@@ -632,18 +744,39 @@ def run_cli(
     preload_config_for_flags(config_file)
 
     # 在初始化环境前检测Git仓库，并可选择自动切换到代码开发模式（jca）
-    try_switch_to_jca_if_git_repo(
-        model_group, tool_group, config_file, restore_session, task
-    )
+    if not non_interactive:
+        try_switch_to_jca_if_git_repo(
+            model_group, tool_group, config_file, restore_session, task
+        )
 
     # 在进入默认通用代理前，列出内置配置供选择（agent/multi_agent/roles）
-    handle_builtin_config_selector(model_group, tool_group, config_file, task)
+    # 非交互模式下跳过内置角色/配置选择
+    if not non_interactive:
+        handle_builtin_config_selector(model_group, tool_group, config_file, task)
 
     # 初始化环境
     init_env(
         "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file
     )
 
+    # 在初始化环境后同步 CLI 选项到全局配置，避免被 init_env 覆盖
+    try:
+        if model_group:
+            set_config("JARVIS_LLM_GROUP", str(model_group))
+        if tool_group:
+            set_config("JARVIS_TOOL_GROUP", str(tool_group))
+        if disable_methodology_analysis:
+            set_config("JARVIS_USE_METHODOLOGY", False)
+            set_config("JARVIS_USE_ANALYSIS", False)
+        if restore_session:
+            set_config("JARVIS_RESTORE_SESSION", True)
+        if non_interactive:
+            # 保持运行期非交互标志
+            set_config("JARVIS_NON_INTERACTIVE", True)
+    except Exception:
+        # 静默忽略同步异常，不影响主流程
+        pass
+
     # 运行主流程
     try:
         agent_manager = AgentManager(

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/src/jarvis/jarvis_agent/main.py

@@ -9,6 +9,7 @@ from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.config import set_config
 
 app = typer.Typer(help="Jarvis AI 助手")
 
@@ -46,16 +47,45 @@ def cli(
         None, "-c", "--agent-definition", help="代理定义文件路径"
     ),
     task: Optional[str] = typer.Option(None, "-T", "--task", help="初始任务内容"),
-
+    
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
+    non_interactive: bool = typer.Option(
+        False, "-n", "--non-interactive", help="启用非交互模式：用户无法与命令交互，脚本执行超时限制为5分钟"
+    ),
 ):
     """Main entry point for Jarvis agent"""
-    # Initialize environment
+    # CLI 标志：非交互模式（不依赖配置文件）
+    if non_interactive:
+        try:
+            os.environ["JARVIS_NON_INTERACTIVE"] = "true"
+        except Exception:
+            pass
+        try:
+            set_config("JARVIS_NON_INTERACTIVE", True)
+        except Exception:
+            pass
+    # 非交互模式要求从命令行传入任务
+    if non_interactive and not (task and str(task).strip()):
+        PrettyOutput.print(
+            "非交互模式已启用：必须使用 --task 传入任务内容，因多行输入不可用。",
+            OutputType.ERROR,
+        )
+        raise typer.Exit(code=2)
+    # Initialize环境
     init_env(
         "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file
     )
+    # 在初始化环境后同步 CLI 选项到全局配置，避免被 init_env 覆盖
+    try:
+        if model_group:
+            set_config("JARVIS_LLM_GROUP", str(model_group))
+        if non_interactive:
+            set_config("JARVIS_NON_INTERACTIVE", True)
+    except Exception:
+        # 静默忽略同步异常，不影响主流程
+        pass
 
     # Load configuration
     config = load_config(agent_definition) if agent_definition else {}

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/src/jarvis/jarvis_agent/run_loop.py

@@ -7,6 +7,7 @@ AgentRunLoop: 承载 Agent 的主运行循环逻辑。
 - 暂不变更外部调用入口，后续在 Agent._main_loop 中委派到该类
 - 保持与现有异常处理、工具调用、用户交互完全一致
 """
+import os
 from enum import Enum
 from typing import Any, TYPE_CHECKING
 
@@ -22,6 +23,8 @@ if TYPE_CHECKING:
 class AgentRunLoop:
     def __init__(self, agent: "Agent") -> None:
         self.agent = agent
+        self.conversation_rounds = 0
+        self.tool_reminder_rounds = int(os.environ.get("JARVIS_TOOL_REMINDER_ROUNDS", 20))
 
     def run(self) -> Any:
         """主运行循环（委派到传入的 agent 实例的方法与属性）"""
@@ -29,6 +32,12 @@ class AgentRunLoop:
 
         while True:
             try:
+                self.conversation_rounds += 1
+                if self.conversation_rounds % self.tool_reminder_rounds == 0:
+                    self.agent.session.addon_prompt = join_prompts(
+                        [self.agent.session.addon_prompt, self.agent.get_tool_usage_prompt()]
+                    )
+
                 ag = self.agent
 
                 # 更新输入处理器标志

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.34}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -14,6 +14,7 @@ import typer
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.events import AFTER_TOOL_CALL
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
+from jarvis.jarvis_agent.file_context_handler import file_context_handler
 from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_code_agent.lint import get_lint_tools
@@ -23,6 +24,7 @@ from jarvis.jarvis_utils.config import (
     is_confirm_before_apply_patch,
     is_enable_static_analysis,
     get_git_check_mode,
+    set_config,
 )
 from jarvis.jarvis_utils.git_utils import (
     confirm_add_new_files,
@@ -89,7 +91,11 @@ class CodeAgent:
             auto_complete=False,
             output_handler=[tool_registry, EditFileHandler()],  # type: ignore
             model_group=model_group,
-            input_handler=[shell_input_handler, builtin_input_handler],
+            input_handler=[
+                shell_input_handler,
+                file_context_handler,
+                builtin_input_handler,
+            ],
             need_summary=need_summary,
             use_methodology=False,  # 禁用方法论
             use_analysis=False,  # 禁用分析
@@ -770,7 +776,6 @@ class CodeAgent:
 
 @app.command()
 def cli(
-
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
@@ -801,13 +806,44 @@ def cli(
         "--suffix",
         help="提交信息后缀（用换行分隔）",
     ),
+    non_interactive: bool = typer.Option(
+        False, "-n", "--non-interactive", help="启用非交互模式：用户无法与命令交互，脚本执行超时限制为5分钟"
+    ),
 ) -> None:
     """Jarvis主入口点。"""
+    # CLI 标志：非交互模式（不依赖配置文件）
+    if non_interactive:
+        try:
+            os.environ["JARVIS_NON_INTERACTIVE"] = "true"
+        except Exception:
+            pass
+        # 注意：全局配置同步放在 init_env 之后执行，避免被 init_env 覆盖
+    # 非交互模式要求从命令行传入任务
+    if non_interactive and not (requirement and str(requirement).strip()):
+        PrettyOutput.print(
+            "非交互模式已启用：必须使用 --requirement 传入任务内容，因多行输入不可用。",
+            OutputType.ERROR,
+        )
+        raise typer.Exit(code=2)
     init_env(
         "欢迎使用 Jarvis-CodeAgent，您的代码工程助手已准备就绪！",
         config_file=config_file,
     )
 
+    # 在初始化环境后同步 CLI 选项到全局配置，避免被 init_env 覆盖
+    try:
+        if model_group:
+            set_config("JARVIS_LLM_GROUP", str(model_group))
+        if tool_group:
+            set_config("JARVIS_TOOL_GROUP", str(tool_group))
+        if restore_session:
+            set_config("JARVIS_RESTORE_SESSION", True)
+        if non_interactive:
+            set_config("JARVIS_NON_INTERACTIVE", True)
+    except Exception:
+        # 静默忽略同步异常，不影响主流程
+        pass
+
     try:
         subprocess.run(
             ["git", "rev-parse", "--git-dir"],