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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ayder-cli
-Version: 2.1.2
+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
@@ -34,6 +34,8 @@ Provides-Extra: glm
 Requires-Dist: zhipuai; extra == 'glm'
 Provides-Extra: google
 Requires-Dist: google-genai; extra == 'google'
+Provides-Extra: mcp
+Requires-Dist: mcp; extra == 'mcp'
 Provides-Extra: qwen
 Requires-Dist: dashscope; extra == 'qwen'
 Description-Content-Type: text/markdown
@@ -286,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.2 → 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.2 → ayder_cli-2.1.5}/docs/config.toml.example

@@ -82,7 +82,12 @@ verbose = false
 prompt = "STANDARD"                 # MINIMAL | STANDARD | EXTENDED
 max_background_processes = 5        # cap on concurrent background processes (e.g. test runs)
 max_output_tokens = 8192            # orchestrator response cap
-max_history_messages = 30
+# Max conversation messages kept per turn. 0 = unlimited (default): the context
+# manager's token budget + compaction are the bound, so the model uses its real
+# window. A small fixed cap (the old default was 30) thrashes a tiny history
+# window on a large-context model and wastes most of it. Set a finite number
+# only if you want a hard message cap regardless of window size.
+max_history_messages = 0
 agent_timeout = 1800               # seconds before a background agent is cancelled (30 min; reasoning+coding can be slow)
 # Tools the agents inherit. A coding harness needs file/shell/search (core),
 # tasks/notes (metadata), background process control for test suites

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ayder-cli"
-version = "2.1.2"
+version = "2.1.5"
 description = "AI agent for any LLMs"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -37,6 +37,7 @@ google = ["google-genai"]
 qwen = ["dashscope"]
 glm = ["zhipuai"]
 all = ["ayder-cli[anthropic,google,qwen,glm]"]
+mcp = ["mcp"]
 
 [project.urls]
 Homepage = "https://github.com/ayder/ayder-cli"

{ayder_cli-2.1.2 → 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.2 → 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.2 → 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.2 → 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",
@@ -288,7 +300,10 @@ class Config(BaseModel):
     logging_retention: str = Field(default="7 days")
     max_background_processes: int = Field(default=5)
     max_output_tokens: int = Field(default=4096)
-    max_history_messages: int = Field(default=30)
+    # 0 = unlimited: let the context manager's token budget + compaction be the
+    # bound. The old fixed 30 predates large-context models and thrashes a tiny
+    # history window on a big context.
+    max_history_messages: int = Field(default=0)
     prompt: str = Field(default="STANDARD")
     chat_protocol: str = Field(default="ollama")
     stop_sequences: list[str] = Field(default_factory=list)

{ayder_cli-2.1.2 → ayder_cli-2.1.5}/src/ayder_cli/core/ollama_context_manager.py

@@ -237,8 +237,8 @@ class OllamaContextManager:
             cache_state = f", cache={status.state}({status.hit_ratio:.0%})"
 
         logger.info(
-            "Context: %d/%d tokens (%.0f%%), completion=%d, speed=%s%s",
-            self._real_prompt_tokens, ceiling, utilization,
+            "Context[%s]: %d/%d tokens (%.0f%%), completion=%d, speed=%s%s",
+            self._model or "?", self._real_prompt_tokens, ceiling, utilization,
             self._real_completion_tokens, prompt_speed, cache_state,
         )
 

{ayder_cli-2.1.2 → ayder_cli-2.1.5}/src/ayder_cli/themes/claude.py

@@ -633,6 +633,27 @@ AgentPanel .agent-detail {
     padding: 0 0 0 4;
 }
 
+/* ThinkingPanel - Scrollable panel showing the model's reasoning stream.
+   Toggled with Ctrl+T. Taller than the tool/agent panels because reasoning is
+   long-form. Targets 'ThinkingPanel' in widgets.py. */
+ThinkingPanel {
+    layout: vertical;
+    height: auto;
+    max-height: 60%;
+    background: #0a0a18;
+    border-top: solid #333350;
+    padding: 1 1;
+    overflow-y: scroll;
+    display: none;
+}
+
+ThinkingPanel .thinking-content {
+    height: auto;
+    color: #8888aa;
+    text-style: italic;
+    padding: 0 1;
+}
+
 /* AyderApp - The root application screen. */
 Screen {
     layout: vertical;
@@ -669,6 +690,12 @@ Screen:inline {
     width: 100%;
 }
 
+#thinking-panel {
+    min-height: 0;
+    max-height: 60%;
+    width: 100%;
+}
+
 #input-bar {
     height: auto;
     min-height: 1;

{ayder_cli-2.1.2 → ayder_cli-2.1.5}/src/ayder_cli/themes/original.py

@@ -514,6 +514,27 @@ ToolPanel .tool-item.completed {
     color: $success;
 }
 
+/* ThinkingPanel - Scrollable reasoning stream, toggled with Ctrl+T.
+   Taller than the tool/agent panels because reasoning is long-form. */
+ThinkingPanel {
+    layout: vertical;
+    height: auto;
+    min-height: 6;
+    max-height: 24;
+    background: $surface-darken-1;
+    border-top: heavy $primary;
+    padding: 1 1;
+    overflow-y: scroll;
+    display: none;
+}
+
+ThinkingPanel .thinking-content {
+    height: auto;
+    color: $text-muted;
+    text-style: italic;
+    padding: 0 1;
+}
+
 /* AyderApp - Main application */
 Screen {
     layout: vertical;

{ayder_cli-2.1.2 → ayder_cli-2.1.5}/src/ayder_cli/tools/definition.py

@@ -168,7 +168,15 @@ def _discover_definitions() -> Tuple["ToolDefinition", ...]:
 
 _BUILTIN_DEFINITIONS: Tuple[ToolDefinition, ...] = _discover_definitions()
 
-# Phase 1: Merge global plugins at import time
+# Phase 1: Merge global plugins at import time.
+#
+# Discovery runs *inside this module's own body*, so a plugin whose definitions
+# module reads ``TOOL_DEFINITIONS`` at import time (e.g. to avoid tool-name
+# collisions, as mcp-tool does) would otherwise hit a circular import — the name
+# isn't bound yet. Bind it provisionally to the builtins first; those are the
+# only definitions that exist during discovery anyway. It is reassigned to the
+# full set (builtins + plugins) immediately after discovery completes.
+TOOL_DEFINITIONS: Tuple[ToolDefinition, ...] = _BUILTIN_DEFINITIONS
 _GLOBAL_PLUGIN_DEFS: Tuple[ToolDefinition, ...] = ()
 _PLUGIN_HANDLERS: Dict[str, Any] = {}
 
@@ -179,9 +187,7 @@ try:
 except Exception as e:
     logger.warning(f"Failed to load global plugins: {e}")
 
-TOOL_DEFINITIONS: Tuple[ToolDefinition, ...] = (
-    _BUILTIN_DEFINITIONS + _GLOBAL_PLUGIN_DEFS
-)
+TOOL_DEFINITIONS = _BUILTIN_DEFINITIONS + _GLOBAL_PLUGIN_DEFS
 TOOL_DEFINITIONS_BY_NAME: Dict[str, ToolDefinition] = {
     td.name: td for td in TOOL_DEFINITIONS
 }

{ayder_cli-2.1.2 → ayder_cli-2.1.5}/src/ayder_cli/tools/plugin_manager.py

@@ -147,10 +147,15 @@ def install_plugin_from_local(
             "Use --force to overwrite."
         )
 
-    # Copy plugin files
-    if target_dir.exists():
-        shutil.rmtree(target_dir)
-    shutil.copytree(source_dir, target_dir)
+    # Copy plugin files. When the source IS the install target — e.g. reinstalling
+    # an already-installed plugin from its own directory with --force, which is
+    # exactly what the missing-dependency warning recommends — the files are
+    # already in place. Skip the copy so we don't rmtree the source out from under
+    # ourselves (the dependency reinstall + registry refresh below still run).
+    if source_dir.resolve() != target_dir.resolve():
+        if target_dir.exists():
+            shutil.rmtree(target_dir)
+        shutil.copytree(source_dir, target_dir)
 
     # Update plugins.json
     data = read_plugins_json(plugins_dir)

ayder_cli-2.1.5/src/ayder_cli/tools/plugin_status.py

@@ -0,0 +1,33 @@
+"""Plugin status-badge registry.
+
+A lightweight, process-global registry that plugins use to publish a status
+badge (a short label plus a colour) for display in the TUI status bar. The
+mcp-tool plugin, for example, calls ``set_status("mcp", "MCP: news-digest",
+"green")`` once it connects to its MCP servers, and ``set_status("mcp", "MCP",
+"red")`` when configured servers are unreachable.
+
+The TUI ``StatusBar`` reads :func:`get_all` to render the badges. Keeping this
+in ayder core (rather than inside a plugin) means the badge survives even when
+the plugin's own modules are loaded under throwaway names during discovery, and
+gives the plugin a stable import target instead of a no-op fallback.
+"""
+
+from __future__ import annotations
+
+# plugin name -> (label, colour). Colour is a Rich colour/style name ("green").
+_status: dict[str, tuple[str, str]] = {}
+
+
+def set_status(name: str, label: str, color: str) -> None:
+    """Register or update a plugin's status badge."""
+    _status[name] = (label, color)
+
+
+def get_all() -> dict[str, tuple[str, str]]:
+    """Return a copy of all registered status badges (name -> (label, color))."""
+    return dict(_status)
+
+
+def clear() -> None:
+    """Remove all registered badges (primarily for tests)."""
+    _status.clear()

{ayder_cli-2.1.2 → 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)