ayder-cli 2.1.4__tar.gz → 2.1.5__tar.gz

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ayder-cli
-Version: 2.1.4
+Version: 2.1.5
 Summary: AI agent for any LLMs
 Project-URL: Homepage, https://github.com/ayder/ayder-cli
 Project-URL: Repository, https://github.com/ayder/ayder-cli.git
@@ -288,8 +288,9 @@ ayder -f instructions.txt
 # Explicit stdin mode
 ayder --stdin < prompt.txt
 
-# Use a custom system prompt file
-ayder --prompt prompt-file.md "refactor this code"
+# Override the main LLM system prompt with a file
+# (tool instructions + project structure are still appended)
+ayder --system-prompt prompt-file.md "refactor this code"
 ```
 
 ### Task Commands (CLI Mode)

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/README.md

@@ -246,8 +246,9 @@ ayder -f instructions.txt
 # Explicit stdin mode
 ayder --stdin < prompt.txt
 
-# Use a custom system prompt file
-ayder --prompt prompt-file.md "refactor this code"
+# Override the main LLM system prompt with a file
+# (tool instructions + project structure are still appended)
+ayder --system-prompt prompt-file.md "refactor this code"
 ```
 
 ### Task Commands (CLI Mode)

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ayder-cli"
-version = "2.1.4"
+version = "2.1.5"
 description = "AI agent for any LLMs"
 readme = "README.md"
 requires-python = ">=3.12"

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/src/ayder_cli/application/runtime_factory.py

@@ -44,6 +44,7 @@ def create_runtime(
     project_root: str = ".",
     model_name: str | None = None,
     prompt_tier: str | None = None,
+    system_prompt_override: str | None = None,
 ) -> RuntimeComponents:
     """Assemble and return all shared runtime components.
 
@@ -53,6 +54,9 @@ def create_runtime(
         model_name: Override model name from config when provided.
         prompt_tier: Override the system-prompt tier from config when provided
             (e.g. "AGENTIC" for `ayder-cli --agent`). See prompts.get_system_prompt.
+        system_prompt_override: When set, use this text as the system-prompt base
+            instead of prompts.get_system_prompt (ayder --system-prompt FILE). Tool
+            prompts and the project-structure macro are still appended.
 
     Returns:
         RuntimeComponents with all dependencies wired.
@@ -84,7 +88,10 @@ def create_runtime(
         macro = ""
 
     # Format the final prompt (protocol injection now handled dynamically by chat_loop and protocols)
-    base_prompt = get_system_prompt(cfg.prompt)
+    if system_prompt_override is not None:
+        base_prompt = system_prompt_override
+    else:
+        base_prompt = get_system_prompt(cfg.prompt)
     tool_tags = frozenset(cfg.tool_tags) if cfg.tool_tags else None
     tool_prompts = tool_registry.get_system_prompts(tags=tool_tags)
     system_prompt = base_prompt + tool_prompts + macro

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/src/ayder_cli/cli.py

@@ -56,11 +56,28 @@ def _add_common_args(parser: argparse.ArgumentParser) -> None:
         "--stdin", action="store_true", help="Read prompt from stdin"
     )
     parser.add_argument(
-        "--prompt",
+        "--temporal-prompt",
         type=str,
         default=None,
         metavar="FILE",
-        help="Inject custom system prompt from file",
+        help="Prompt file for the Temporal worker (only used with --temporal-task-queue)",
+    )
+    parser.add_argument(
+        "--system-prompt",
+        type=str,
+        default=None,
+        metavar="FILE",
+        help="Use FILE's contents as the main LLM system prompt, overriding the "
+        "built-in prompt from prompts.py (tool instructions and project structure "
+        "are still appended)",
+    )
+    parser.add_argument(
+        "-c",
+        "--config",
+        type=str,
+        default=None,
+        metavar="FILE",
+        help="Path to a config.toml to use instead of ~/.ayder/config.toml",
     )
 
     # Permission flags: r=read, w=write, x=execute, http=web/network
@@ -93,13 +110,10 @@ def _add_common_args(parser: argparse.ArgumentParser) -> None:
 
     parser.add_argument(
         "--verbose",
-        nargs="?",
-        const="INFO",
-        default=None,
-        type=str.upper,
-        choices=LOG_LEVELS,
-        metavar="LEVEL",
-        help="Enable verbose console output and logging; default level is INFO",
+        action="store_true",
+        help="Show logs on the console. The level comes from --logging-level (or "
+        "config); if neither is set, defaults to INFO. Does not otherwise change "
+        "the log level.",
     )
     parser.add_argument(
         "--logging-level",
@@ -214,6 +228,16 @@ def main():
         args = parser.parse_args()
         args.subcommand = None
 
+    # Apply the -c/--config override before anything reads the config file.
+    if getattr(args, "config", None):
+        from ayder_cli.core.config import set_config_path
+
+        config_file = Path(args.config).expanduser()
+        if not config_file.is_file():
+            print(f"Error: Config file not found: {args.config}", file=sys.stderr)
+            sys.exit(1)
+        set_config_path(config_file)
+
     # Handle plugin subcommands
     if args.subcommand == "install-plugin":
         from ayder_cli.tools.plugin_manager import (
@@ -310,13 +334,17 @@ def main():
 
     cfg = load_config(notify_migration=True, output=print)
     
-    # Priority: 1. --verbose level, 2. --logging-level, 3. config.logging_level
-    effective_log_level = args.verbose or args.logging_level
-    
+    # --verbose only enables console output; the level comes from --logging-level
+    # (or config.logging_level). When --verbose is used with no level configured
+    # anywhere, default the console to INFO so it isn't empty.
+    effective_log_level = args.logging_level
+    if args.verbose and effective_log_level is None and cfg.logging_level is None:
+        effective_log_level = "INFO"
+
     setup_logging(
         cfg,
         level_override=effective_log_level,
-        console_stream=sys.stdout if args.verbose is not None else None,
+        console_stream=sys.stdout if args.verbose else None,
     )
 
     # --agent: warn early if the harness has nothing to orchestrate.
@@ -342,11 +370,30 @@ def main():
         sys.exit(
             _run_temporal_queue_cli(
                 queue_name=args.temporal_task_queue,
-                prompt_path=args.prompt,
+                prompt_path=args.temporal_prompt,
                 permissions=granted,
             )
         )
 
+    # Read the --system-prompt override file (overrides prompts.py base prompt).
+    system_prompt_override = None
+    if args.system_prompt:
+        sp_file = Path(args.system_prompt).expanduser()
+        try:
+            system_prompt_override = sp_file.read_text()
+        except FileNotFoundError:
+            print(
+                f"Error: System prompt file not found: {args.system_prompt}",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+        except Exception as e:
+            print(
+                f"Error reading system prompt file {args.system_prompt}: {e}",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+
     # Handle file/stdin input
     context = None
     question = args.command
@@ -376,10 +423,21 @@ def main():
         # Default: TUI mode
         from ayder_cli.tui import run_tui
 
-        run_tui(permissions=granted, agent_mode=args.agent)
+        run_tui(
+            permissions=granted,
+            agent_mode=args.agent,
+            system_prompt_override=system_prompt_override,
+        )
         return
 
-    sys.exit(run_command(prompt, permissions=granted, agent_mode=args.agent))
+    sys.exit(
+        run_command(
+            prompt,
+            permissions=granted,
+            agent_mode=args.agent,
+            system_prompt_override=system_prompt_override,
+        )
+    )
 
 
 if __name__ == "__main__":

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/src/ayder_cli/cli_runner.py

@@ -36,6 +36,7 @@ def _run_loop(
     prompt: str,
     permissions: set | None = None,
     agent_mode: bool = False,
+    system_prompt_override: str | None = None,
 ) -> int:
     """Create a ChatLoop with CliCallbacks and run it.
 
@@ -47,11 +48,16 @@ def _run_loop(
         permissions: Granted permission categories.
         agent_mode: When True, inject the AGENTIC orchestrator system prompt
             (ayder-cli --agent) so the main LLM drives the multi-agent harness.
+        system_prompt_override: When set, use this text as the system prompt base
+            instead of the built-in prompts.py prompt (ayder --system-prompt FILE).
 
     Returns:
         Exit code (0 for success, 1 for error).
     """
-    rt = create_runtime(prompt_tier="AGENTIC" if agent_mode else None)
+    rt = create_runtime(
+        prompt_tier="AGENTIC" if agent_mode else None,
+        system_prompt_override=system_prompt_override,
+    )
 
     messages: list[dict] = [
         {"role": "system", "content": rt.system_prompt},
@@ -119,10 +125,12 @@ def _run_loop(
 class CommandRunner:
     """Runner for single command execution mode."""
 
-    def __init__(self, prompt: str, permissions=None, agent_mode: bool = False):
+    def __init__(self, prompt: str, permissions=None, agent_mode: bool = False,
+                 system_prompt_override: str | None = None):
         self.prompt = prompt
         self.permissions = permissions
         self.agent_mode = agent_mode
+        self.system_prompt_override = system_prompt_override
 
     def run(self) -> int:
         """Execute the command and return exit code.
@@ -135,6 +143,7 @@ class CommandRunner:
                 self.prompt,
                 permissions=self.permissions,
                 agent_mode=self.agent_mode,
+                system_prompt_override=self.system_prompt_override,
             )
         except ProviderUnavailableError as e:
             print(str(e), file=sys.stderr)   # message already starts with "Error:"
@@ -144,18 +153,24 @@ class CommandRunner:
             return 1
 
 
-def run_command(prompt: str, permissions=None, agent_mode: bool = False) -> int:
+def run_command(prompt: str, permissions=None, agent_mode: bool = False,
+                system_prompt_override: str | None = None) -> int:
     """Execute a single command and return exit code.
 
     Args:
         prompt: The command/prompt to execute
         permissions: Set of granted permission categories (e.g. {"r", "w", "x", "http"})
         agent_mode: When True, inject the AGENTIC orchestrator system prompt (ayder-cli --agent).
+        system_prompt_override: When set, use this text as the system prompt base
+            instead of the built-in prompts.py prompt (ayder --system-prompt FILE).
 
     Returns:
         Exit code (0 for success, 1 for error)
     """
-    runner = CommandRunner(prompt, permissions=permissions, agent_mode=agent_mode)
+    runner = CommandRunner(
+        prompt, permissions=permissions, agent_mode=agent_mode,
+        system_prompt_override=system_prompt_override,
+    )
     return runner.run()
 
 

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/src/ayder_cli/core/config.py

@@ -9,6 +9,18 @@ logger = logging.getLogger(__name__)
 CONFIG_DIR = Path("~/.ayder").expanduser()
 CONFIG_PATH = CONFIG_DIR / "config.toml"
 
+
+def set_config_path(path: "str | Path") -> None:
+    """Redirect the global config file location (used by the ``-c/--config`` flag).
+
+    Updates CONFIG_PATH and CONFIG_DIR so every subsequent ``load_config`` (and the
+    provider/profile loaders, which read these module globals at call time) use
+    *path* instead of the default ``~/.ayder/config.toml``.
+    """
+    global CONFIG_PATH, CONFIG_DIR
+    CONFIG_PATH = Path(path).expanduser().resolve()
+    CONFIG_DIR = CONFIG_PATH.parent
+
 # Maintained for test compatibility and initial file generation
 DEFAULTS: Dict[str, Any] = {
     "provider": "openai",

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/src/ayder_cli/tui/__init__.py

@@ -32,6 +32,7 @@ def run_tui(
     safe_mode: bool = False,
     permissions: set | None = None,
     agent_mode: bool = False,
+    system_prompt_override: str | None = None,
 ) -> None:
     """
     Run the CLI-style TUI application.
@@ -42,6 +43,8 @@ def run_tui(
         permissions: Set of granted permission levels ("r", "w", "x")
         agent_mode: When True, inject the AGENTIC orchestrator system prompt
             so the main LLM drives the multi-agent harness (ayder-cli --agent).
+        system_prompt_override: When set, use this text as the system-prompt base
+            instead of the built-in prompts.py prompt (ayder --system-prompt FILE).
     """
     import sys
     from ayder_cli.providers import ProviderUnavailableError
@@ -49,7 +52,7 @@ def run_tui(
     try:
         app = AyderApp(
             model=model, safe_mode=safe_mode, permissions=permissions,
-            agent_mode=agent_mode,
+            agent_mode=agent_mode, system_prompt_override=system_prompt_override,
         )
     except ProviderUnavailableError as e:
         print(str(e), file=sys.stderr)

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/src/ayder_cli/tui/app.py

@@ -210,6 +210,7 @@ class AyderApp(App):
         safe_mode: bool = False,
         permissions: set | None = None,
         agent_mode: bool = False,
+        system_prompt_override: str | None = None,
         **kwargs,
     ):
         """
@@ -221,10 +222,13 @@ class AyderApp(App):
             permissions: Set of granted permission levels ("r", "w", "x")
             agent_mode: When True, drive the multi-agent harness — inject the
                 AGENTIC orchestrator system prompt (ayder-cli --agent).
+            system_prompt_override: When set, use this text as the system-prompt base
+                instead of the built-in prompts.py prompt (ayder --system-prompt FILE).
         """
         super().__init__(**kwargs)
         self.safe_mode = safe_mode
         self.permissions = permissions or {"r"}
+        self._system_prompt_override = system_prompt_override
 
         self._requests: asyncio.Queue[TurnRequest] = asyncio.Queue()
         self._run_task: asyncio.Task | None = None
@@ -418,7 +422,10 @@ class AyderApp(App):
         except Exception:
             macro = ""
 
-        base_prompt = get_system_prompt(self.config.prompt)
+        if self._system_prompt_override is not None:
+            base_prompt = self._system_prompt_override
+        else:
+            base_prompt = get_system_prompt(self.config.prompt)
         raw_tags = getattr(self.config, "tool_tags", None) if not isinstance(self.config, dict) else self.config.get("tool_tags")
         tags = frozenset(raw_tags) if raw_tags else None
         tool_prompts = self.registry.get_system_prompts(tags=tags)
@@ -444,9 +451,11 @@ class AyderApp(App):
                 macro = ""
             tags = self.chat_loop.config.tool_tags
             tool_prompts = self.registry.get_system_prompts(tags=tags)
-            self.messages[0]["content"] = (
-                get_system_prompt(self.config.prompt) + tool_prompts + macro
-            )
+            if self._system_prompt_override is not None:
+                base_prompt = self._system_prompt_override
+            else:
+                base_prompt = get_system_prompt(self.config.prompt)
+            self.messages[0]["content"] = base_prompt + tool_prompts + macro
 
     def inject_skill(self, skill_name: str, skill_content: str) -> None:
         """Inject or replace the active skill system message."""

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/tests/application/test_runtime_factory.py

@@ -83,6 +83,38 @@ class TestRuntimeFactoryAssembly:
         assert components.config.model == "qwen3-coder:latest"
 
 
+class TestFactorySystemPromptOverride:
+    """Test the --system-prompt override path in create_runtime."""
+
+    def test_system_prompt_override_replaces_base_keeps_tools_and_macro(self):
+        """Override replaces the prompts.py base but tool prompts + project macro remain."""
+        with patch('ayder_cli.application.runtime_factory.create_default_registry') as mock_create, \
+             patch('ayder_cli.application.runtime_factory.get_system_prompt') as mock_get_prompt:
+            mock_registry = Mock()
+            mock_registry.execute.return_value = "src/\n  main.py"
+            mock_registry.get_system_prompts.return_value = "[TOOLS]"
+            mock_registry.get_schemas.return_value = []
+            mock_create.return_value = mock_registry
+
+            components = create_runtime(system_prompt_override="CUSTOM_BASE")
+
+            # prompts.py base prompt is NOT consulted when an override is given
+            mock_get_prompt.assert_not_called()
+            # override is the base; tool prompts + project structure macro still appended
+            assert components.system_prompt.startswith("CUSTOM_BASE")
+            assert "[TOOLS]" in components.system_prompt
+            assert "PROJECT STRUCTURE" in components.system_prompt
+
+    def test_no_override_uses_prompts_py_base(self):
+        """Without an override, the base prompt comes from prompts.py.get_system_prompt."""
+        with patch('ayder_cli.application.runtime_factory.get_system_prompt',
+                   return_value="DEFAULT_BASE") as mock_get_prompt:
+            components = create_runtime()
+
+        mock_get_prompt.assert_called_once()
+        assert components.system_prompt.startswith("DEFAULT_BASE")
+
+
 class TestFactoryTUIIntegration:
     """Test TUI uses factory-built dependencies."""
 
@@ -122,6 +154,36 @@ class TestFactoryTUIIntegration:
             assert app.registry is not None
             assert app.chat_loop is not None
 
+    def test_tui_system_prompt_override(self):
+        """AyderApp(system_prompt_override=...) uses it as the base, skipping prompts.py."""
+        with patch('ayder_cli.tui.app.create_runtime') as mock_create_runtime, \
+             patch('ayder_cli.prompts.get_system_prompt') as mock_get_prompt:
+            mock_components = Mock()
+            mock_components.config = Mock()
+            mock_components.config.model = "test-model"
+            mock_components.config.num_ctx = 65536
+            mock_components.config.max_iterations = 50
+            mock_components.config.max_background_processes = 5
+            mock_components.config.max_output_tokens = 4096
+            mock_components.config.stop_sequences = []
+            mock_components.config.tool_tags = ["core", "metadata"]
+            mock_components.config.driver = "openai"
+            mock_components.config.agents = {}
+            mock_components.llm_provider = Mock()
+            mock_components.tool_registry = Mock()
+            mock_components.tool_registry.execute.return_value = "src/\n  main.py"
+            mock_components.tool_registry.get_system_prompts.return_value = "[TOOLS]"
+            mock_create_runtime.return_value = mock_components
+
+            app = AyderApp(system_prompt_override="TUI_CUSTOM")
+
+            # prompts.py base prompt is not consulted
+            mock_get_prompt.assert_not_called()
+            sys_msg = app.messages[0]
+            assert sys_msg["role"] == "system"
+            assert sys_msg["content"].startswith("TUI_CUSTOM")
+            assert "[TOOLS]" in sys_msg["content"]
+
 
 class TestFactoryCompositionParity:
     """Test CLI and TUI get equivalent core dependencies."""

{ayder_cli-2.1.4 → ayder_cli-2.1.5}/tests/core/test_config_v2.py

@@ -101,6 +101,44 @@ num_ctx = 8192
     assert cfg.model == "claude-sonnet-4-5-20250929"
 
 
+def test_set_config_path_redirects_load_config(tmp_path, monkeypatch):
+    """set_config_path() makes load_config() read from a custom path (the -c flag)."""
+    import ayder_cli.core.config as config_mod
+
+    # Snapshot the module globals so they are restored at teardown even though
+    # set_config_path mutates them directly via `global`.
+    monkeypatch.setattr(config_mod, "CONFIG_PATH", config_mod.CONFIG_PATH)
+    monkeypatch.setattr(config_mod, "CONFIG_DIR", config_mod.CONFIG_DIR)
+
+    custom = tmp_path / "custom-config" / "ayder.toml"
+    custom.parent.mkdir()
+    custom.write_text(
+        """config_version = "2.0"
+
+[app]
+provider = "deepseek"
+
+[llm.deepseek]
+driver = "openai"
+base_url = "https://api.deepseek.com/v1"
+api_key = "sk-custom"
+model = "deepseek-custom"
+num_ctx = 4096
+""",
+        encoding="utf-8",
+    )
+
+    config_mod.set_config_path(custom)
+
+    assert config_mod.CONFIG_PATH == custom.resolve()
+    assert config_mod.CONFIG_DIR == custom.resolve().parent
+
+    cfg = config_mod.load_config()
+    assert cfg.provider == "deepseek"
+    assert cfg.model == "deepseek-custom"
+    assert cfg.api_key == "sk-custom"
+
+
 @pytest.mark.parametrize("drv", ["openai", "ollama", "deepseek", "anthropic",
                                  "google", "qwen", "dashscope", "glm", "zhipu"])
 def test_validate_driver_accepts_all_supported(drv):