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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ayder-cli
-Version: 2.1.2
+Version: 2.1.4
 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

{ayder_cli-2.1.2 → ayder_cli-2.1.4}/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.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ayder-cli"
-version = "2.1.2"
+version = "2.1.4"
 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.4}/src/ayder_cli/core/config.py

@@ -288,7 +288,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.4}/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.4}/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.4}/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.4}/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.4}/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.4/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.4}/src/ayder_cli/tui/app.py

@@ -42,6 +42,7 @@ from ayder_cli.agents.tool import (
 from ayder_cli.tui.widgets import (
     AgentPanel,
     ChatView,
+    ThinkingPanel,
     ToolPanel,
     ActivityBar,
     CLIInputBar,
@@ -77,6 +78,8 @@ class AppCallbacks:
     def on_thinking_start(self) -> None:
         activity = self._app.query_one("#activity-bar", ActivityBar)
         activity.set_thinking(True)
+        # Separate this reasoning phase from any earlier one in the same turn.
+        self._app.query_one("#thinking-panel", ThinkingPanel).start_phase()
         self._app._start_activity_timer()
 
     def on_thinking_stop(self) -> None:
@@ -90,8 +93,10 @@ class AppCallbacks:
         chat_view.add_assistant_message(text)
 
     def on_thinking_content(self, text: str) -> None:
-        chat_view = self._app.query_one("#chat-view", ChatView)
-        chat_view.add_thinking_message(text)
+        # Reasoning streams silently into the dedicated panel (Ctrl+T to view),
+        # the same way tools stream into the tool panel. The ActivityBar spinner
+        # provides ambient "Thinking..." status in the meantime.
+        self._app.query_one("#thinking-panel", ThinkingPanel).add_thinking(text)
 
     def on_token_usage(self, total_tokens: int) -> None:
         # Show LIVE context-window fill (current / window size), not the
@@ -148,6 +153,29 @@ class AppCallbacks:
         return ev is not None and ev.is_set()
 
 
+def _enable_installed_plugin_tags(tool_tags, plugin_defs, status_names) -> frozenset | None:
+    """Auto-enable installed plugins' capability tags at startup.
+
+    A plugin the user deliberately installed (e.g. mcp-tool) should work without a
+    manual /plugin toggle, so its capability tags are merged into the effective
+    ``tool_tags``. Tags come from loaded plugin tool definitions and from any
+    status badge a plugin published (so an installed-but-disconnected plugin like
+    mcp-tool is still enabled). Builtin/optional tags stay governed by config.
+
+    ``tool_tags`` of ``None`` means "no filter / everything enabled" — left as-is.
+    """
+    if tool_tags is None:
+        return None
+    extra = {
+        tag
+        for td in plugin_defs
+        for tag in td.tags
+        if tag not in ("core", "metadata")
+    }
+    extra.update(name for name in status_names if name not in ("core", "metadata"))
+    return frozenset(tool_tags | extra) if extra else tool_tags
+
+
 class AyderApp(App):
     """
     Main CLI-style application for ayder-cli.
@@ -340,6 +368,13 @@ class AyderApp(App):
             raw_tags = getattr(self.config, "tool_tags", ["core", "metadata"])
             tool_tags_list = list(raw_tags) if raw_tags is not None else []
         tool_tags = frozenset(tool_tags_list) if tool_tags_list else None
+        # Auto-enable installed plugins so they work without a manual /plugin toggle.
+        from ayder_cli.tools import plugin_status
+        from ayder_cli.tools.definition import _GLOBAL_PLUGIN_DEFS
+
+        tool_tags = _enable_installed_plugin_tags(
+            tool_tags, _GLOBAL_PLUGIN_DEFS, plugin_status.get_all().keys()
+        )
         self.chat_loop = ChatLoop(
             llm=self.llm,
             registry=self.registry,
@@ -352,7 +387,7 @@ class AyderApp(App):
                 stop_sequences=stop_sequences,
                 permissions=self.permissions,
                 tool_tags=tool_tags,
-                max_history=getattr(self.config, 'max_history_messages', 30),
+                max_history=getattr(self.config, 'max_history_messages', 0),
             ),
             callbacks=self._callbacks,
             context_manager=self.context_manager,
@@ -433,11 +468,19 @@ class AyderApp(App):
         self._active_skill = skill_name
 
     def _animate_activity(self) -> None:
-        """Animate spinners in the activity bar and tool panel."""
+        """Animate spinners in the activity bar and tool panel.
+
+        Both updates are wrapped in a single ``batch_update`` so the 10fps tick
+        produces one repaint instead of two, and the tool panel is skipped when
+        it is empty — under load (streaming + tools + agents) this keeps the
+        per-tick redraw cost (and the flicker that comes with it) down.
+        """
         activity = self.query_one("#activity-bar", ActivityBar)
-        activity.update_spinners()
         tool_panel = self.query_one("#tool-panel", ToolPanel)
-        tool_panel.update_spinners()
+        with self.batch_update():
+            activity.update_spinners()
+            if tool_panel._tools:
+                tool_panel.update_spinners()
 
     def _start_activity_timer(self) -> None:
         """Start the shared activity animation timer if not running."""
@@ -570,6 +613,7 @@ class AyderApp(App):
         """Compose the UI layout - terminal style with scrolling content."""
         yield ChatView(id="chat-view")
         yield ToolPanel(id="tool-panel")
+        yield ThinkingPanel(id="thinking-panel")
         yield AgentPanel(id="agent-panel")
         yield ActivityBar(id="activity-bar")
         yield CLIInputBar(commands=self.commands, id="input-bar")
@@ -716,6 +760,8 @@ class AyderApp(App):
             return
         try:
             self.query_one("#chat-view", ChatView).add_user_message(user_input)  # echo now
+            # Start each turn's reasoning fresh in the thinking panel.
+            self.query_one("#thinking-panel", ThinkingPanel).clear()
         except Exception:
             pass
 
@@ -789,12 +835,13 @@ class AyderApp(App):
         chat_view.add_system_message(f"Tool panel {state} (Ctrl+O to toggle)")
 
     def action_toggle_thinking(self) -> None:
-        """Toggle thinking/reasoning block visibility."""
-        self._show_thinking = not self._show_thinking
+        """Toggle the thinking/reasoning panel (mirrors Ctrl+O / Ctrl+G)."""
+        thinking_panel = self.query_one("#thinking-panel", ThinkingPanel)
+        visible = thinking_panel.toggle()
+        self._show_thinking = visible
         chat_view = self.query_one("#chat-view", ChatView)
-        chat_view.set_thinking_visible(self._show_thinking)
-        state = "visible" if self._show_thinking else "hidden"
-        chat_view.add_system_message(f"Thinking blocks {state} (Ctrl+T to toggle)")
+        state = "visible" if visible else "hidden"
+        chat_view.add_system_message(f"Thinking panel {state} (Ctrl+T to toggle)")
 
     def action_toggle_agents(self) -> None:
         """Toggle the agent panel."""
@@ -809,41 +856,48 @@ class AyderApp(App):
         self.push_screen(CLIHelpScreen())
 
     def action_scroll_chat_up(self) -> None:
-        """PageUp: scroll the agents panel if it is open, else the chat view."""
-        if self._scroll_agent_panel("page_up"):
+        """PageUp: scroll an open panel (agents/thinking) if any, else the chat view."""
+        if self._scroll_open_panel("page_up"):
             return
         chat_view = self.query_one("#chat-view", ChatView)
         chat_view.disable_follow_mode()
         chat_view.scroll_page_up(animate=False)
 
     def action_scroll_chat_down(self) -> None:
-        """PageDown: scroll the agents panel if it is open, else the chat view."""
-        if self._scroll_agent_panel("page_down"):
+        """PageDown: scroll an open panel (agents/thinking) if any, else the chat view."""
+        if self._scroll_open_panel("page_down"):
             return
         chat_view = self.query_one("#chat-view", ChatView)
         chat_view.scroll_page_down(animate=False)
         if chat_view.scroll_offset.y >= chat_view.max_scroll_y:
             chat_view.enable_follow_mode()
 
-    def _scroll_agent_panel(self, motion: str) -> bool:
-        """Scroll the agents panel when it is visible (Ctrl+G).
+    def _scroll_open_panel(self, motion: str) -> bool:
+        """Scroll a visible scrollable panel — the agents (Ctrl+G) or thinking
+        (Ctrl+T) panel — instead of the chat view.
 
         ``motion`` is a Widget.scroll_* suffix ('page_up', 'page_down', 'up',
-        'down', 'home', 'end'). Returns True when the panel handled the scroll
-        so the caller leaves the chat view alone; False otherwise (hidden/absent).
+        'down', 'home', 'end'). Returns True when a panel handled the scroll so
+        the caller leaves the chat view alone; False otherwise (none open).
         """
-        try:
-            panel = self.query_one("#agent-panel", AgentPanel)
-        except Exception:
-            return False
-        if not panel.display:
-            return False
-        getattr(panel, f"scroll_{motion}")(animate=False)
-        return True
+        for panel_id, panel_cls in (
+            ("#agent-panel", AgentPanel),
+            ("#thinking-panel", ThinkingPanel),
+        ):
+            try:
+                panel = self.query_one(panel_id, panel_cls)
+            except Exception:
+                continue
+            if not panel.display:
+                continue
+            getattr(panel, f"scroll_{motion}")(animate=False)
+            return True
+        return False
 
     def action_clear(self) -> None:
         """Clear chat history."""
         chat_view = self.query_one("#chat-view", ChatView)
+        self.query_one("#thinking-panel", ThinkingPanel).clear()
         do_clear(self, chat_view)
 
     def on_app_focus(self) -> None:

{ayder_cli-2.1.2 → ayder_cli-2.1.4}/src/ayder_cli/tui/commands.py

@@ -988,18 +988,46 @@ def handle_context_stats(app: AyderApp, args: str, chat_view: ChatView) -> None:
 
 
 
+def _available_plugin_tags(
+    tool_definitions, statuses: dict[str, tuple[str, str]]
+) -> list[str]:
+    """Capability tags to offer in /plugin.
+
+    Combines tags from currently-loaded tools with tags for installed plugins
+    that published a status badge but contribute no live tools right now (e.g.
+    the mcp-tool plugin when its MCP server is configured but unreachable) — so
+    an installed plugin stays visible/toggleable regardless of live state. The
+    always-on ``core``/``metadata`` tags are excluded.
+    """
+    tags = {
+        tag
+        for td in tool_definitions
+        for tag in td.tags
+        if tag not in ("core", "metadata")
+    }
+    tags.update(name for name in statuses if name not in ("core", "metadata"))
+    return sorted(tags)
+
+
+def _refresh_status_badges(app: "AyderApp") -> None:
+    """Re-render status-bar plugin badges after the enabled tags change, so a
+    disabled plugin (e.g. mcp) greys out and a re-enabled one regains its colour."""
+    try:
+        from ayder_cli.tui.widgets import StatusBar
+
+        app.query_one("#status-bar", StatusBar).refresh_plugin_badges()
+    except Exception:
+        pass
+
+
 def handle_plugin(app: "AyderApp", args: str, chat_view: ChatView) -> None:
     """Toggle dynamic tool plugins (e.g. venv, http, background, temporal)."""
     from ayder_cli.tools.definition import TOOL_DEFINITIONS
+    from ayder_cli.tools import plugin_status
 
-    # Discover available non-core tags
-    available_plugins = set()
-    for td in TOOL_DEFINITIONS:
-        for tag in td.tags:
-            if tag not in ("core", "metadata"):
-                available_plugins.add(tag)
-
-    available_plugins_list = sorted(list(available_plugins))
+    available_plugins_list = _available_plugin_tags(
+        TOOL_DEFINITIONS, plugin_status.get_all()
+    )
 
     # Read current tags for the (eager) picker display; the MUTATION of
     # chat_loop.config.tool_tags is deferred into prepare (run_loop=False).
@@ -1026,6 +1054,7 @@ def handle_plugin(app: "AyderApp", args: str, chat_view: ChatView) -> None:
                 tags.add(plugin_name)
                 status = "enabled"
             app.chat_loop.config.tool_tags = frozenset(tags)
+            _refresh_status_badges(app)
             chat_view.add_system_message(f"Plugin '{plugin_name}' {status}.")
 
         app.request_turn(prepare=_prepare, run_loop=False)
@@ -1048,6 +1077,7 @@ def handle_plugin(app: "AyderApp", args: str, chat_view: ChatView) -> None:
                 base_tags = {"core", "metadata"}
                 new_tags = base_tags | result
                 app.chat_loop.config.tool_tags = frozenset(new_tags)
+                _refresh_status_badges(app)
                 enabled = sorted(result)
                 chat_view.add_system_message(
                     f"Plugins updated: {', '.join(enabled) if enabled else 'none enabled'}"

{ayder_cli-2.1.2 → ayder_cli-2.1.4}/src/ayder_cli/tui/keybindings.py

@@ -13,12 +13,12 @@ KEYBINDING_REGISTRY: list[tuple[str, str, str]] = [
     ("Home/End", "Top/Bottom of chat", "Navigation"),
     # Chat
     ("Enter", "Send message", "Chat"),
-    ("Shift+Enter", "New line", "Chat"),
-    ("\u2191/\u2193", "Command history", "Chat"),
+    ("Shift+Enter / Ctrl+J", "New line", "Chat"),
+    ("\u2191/\u2193", "History (at first/last char) / move line", "Chat"),
     ("Tab", "Complete /command", "Chat"),
     # Panels
     ("Ctrl+O", "Toggle Tools panel", "Panels"),
-    ("Ctrl+T", "Toggle Thinking", "Panels"),
+    ("Ctrl+T", "Toggle Thinking panel", "Panels"),
     ("Ctrl+G", "Toggle Agents panel", "Panels"),
     # General
     ("Ctrl+L", "Clear chat", "General"),