sitbon
diff --git a/‎docs/proxy.md
Copy file name to clipboard
+37-3Lines changed: 37 additions & 3 deletions b/‎docs/proxy.md
Copy file name to clipboard
+37-3Lines changed: 37 additions & 3 deletions
diff --git a/‎magg/cli.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎magg/cli.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎magg/logs/defaults.py
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion b/‎magg/logs/defaults.py
Copy file name to clipboard
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/‎magg/mbro/cli.py
Copy file name to clipboard
+42-3Lines changed: 42 additions & 3 deletions b/‎magg/mbro/cli.py
Copy file name to clipboard
+42-3Lines changed: 42 additions & 3 deletions
diff --git a/‎magg/mbro/client.py
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎magg/mbro/client.py
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎magg/proxy/mixin.py
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/‎magg/proxy/mixin.py
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
diff --git a/‎magg/server/defaults.py
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions b/‎magg/server/defaults.py
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
diff --git a/‎magg/server/manager.py
Copy file name to clipboard
+7-2Lines changed: 7 additions & 2 deletions b/‎magg/server/manager.py
Copy file name to clipboard
+7-2Lines changed: 7 additions & 2 deletions
diff --git a/‎magg/settings.py
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎magg/settings.py
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎magg/test/test_basic.py
Copy file name to clipboard
+15-9Lines changed: 15 additions & 9 deletions b/‎magg/test/test_basic.py
Copy file name to clipboard
+15-9Lines changed: 15 additions & 9 deletions
@@ -40,15 +40,45 @@ The proxy tool accepts the following parameters:
   - For resources: typically not used (URI is in path)
   - For prompts: prompt-specific arguments
 
+- **limit** (optional): integer (1-1000)
+  - Maximum number of items to return
+  - Only allowed for `list` action
+  - Default: 100
+
+- **offset** (optional): integer (≥0)
+  - Number of items to skip
+  - Only allowed for `list` action
+  - Default: 0
+
+- **filter_server** (optional): string
+  - Filter results by server name prefix
+  - Only allowed for `list` action
+  - Example: `"serena_"` to show only tools from the serena server
+
 ### Examples
 
 ```json
-// List all tools
+// List all tools (with default pagination: limit=100, offset=0)
 {
   "action": "list",
   "type": "tool"
 }
 
+// List tools with pagination
+{
+  "action": "list",
+  "type": "tool",
+  "limit": 50,
+  "offset": 50
+}
+
+// List tools from a specific server only
+{
+  "action": "list",
+  "type": "tool",
+  "filter_server": "serena_"
+}
+
 // Get info about a specific tool
 {
   "action": "info", 
@@ -101,7 +131,10 @@ Example list response structure:
             proxyAction="list",
             proxyType="tool",
             pythonType="Tool",  # Or "Resource | ResourceTemplate", "Prompt"
-            many=True  # For list actions
+            many=True,  # For list actions
+            totalCount=250,  # Total number of items available
+            offset=0,        # Current offset
+            limit=100        # Current limit
         )
     )
 ]
@@ -333,7 +366,8 @@ Proxy errors are returned as standard MCP errors:
 
 - Self-client connection is reused across calls
 - Use targeted queries when possible
-- Consider implementing pagination for large result sets
+- Pagination is implemented with `limit`, `offset`, and `filter_server` parameters
+- Default limit is 100 items to prevent token limit issues
 - Transparent mode adds minimal overhead (one extra tool call)
 
 ## Future Extensions
 
@@ -206,7 +206,7 @@ async def cmd_disable_server(args) -> None:
 
     if config_manager.save_config(config):
         print_success(f"Disabled server '{args.name}'")
-        print_warning("The server will remain mounted until Magg is restarted")
+        print_info("If Magg is running, the server will be automatically unmounted")
     else:
         print_error("Failed to save configuration")
         sys.exit(1)
 
@@ -54,7 +54,12 @@
         },
         "FastMCP": {
             "handlers": ["default"],
-            "level": (os.getenv("FASTMCP_LOG_LEVEL") or "WARNING").upper(),
+            "level": (os.getenv("FASTMCP_LOG_LEVEL") or "ERROR").upper(),
+            "propagate": False,
+        },
+        "mcp": {
+            "handlers": ["default"],
+            "level": "ERROR",
             "propagate": False,
         },
         "uvicorn": {
 
@@ -17,6 +17,7 @@
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.filters import completion_is_selected, has_completions
 from prompt_toolkit.shortcuts import CompleteStyle
 from prompt_toolkit.styles import Style
 from prompt_toolkit.validation import Validator, ValidationError
@@ -141,9 +142,12 @@ def _create_key_bindings(self):
 
         @kb.add('c-c')
         def _(event):
-            """Handle Ctrl+C - cancel multiline input or interrupt."""
+            """Handle Ctrl+C - cancel completion or multiline input or interrupt."""
             buffer = event.app.current_buffer
-            if buffer.text.strip():
+            # First priority: cancel completion if open
+            if buffer.complete_state:
+                buffer.cancel_completion()
+            elif buffer.text.strip():
                 # Clear the buffer and cancel current input
                 buffer.reset()
             else:
@@ -182,6 +186,41 @@ def _(event):
             buffer = event.app.current_buffer
             buffer.validate_and_handle()
 
+        @kb.add('tab')
+        def _(event):
+            """Custom TAB handling for completion control."""
+            buffer = event.app.current_buffer
+            
+            # If completion menu is already open, navigate through it
+            if buffer.complete_state:
+                buffer.complete_next()
+            else:
+                # Start completion (always show menu, even for single items)
+                buffer.start_completion(select_first=False)
+        
+        @kb.add('s-tab')  # Shift+Tab
+        def _(event):
+            """Navigate backward through completions."""
+            buffer = event.app.current_buffer
+            if buffer.complete_state:
+                buffer.complete_previous()
+        
+        @kb.add('enter', filter=completion_is_selected)  # Enter when completion is active
+        def _(event):
+            """Apply selected completion and close menu."""
+            buffer = event.app.current_buffer
+            if buffer.complete_state and buffer.complete_state.current_completion:
+                # Apply the completion
+                buffer.apply_completion(buffer.complete_state.current_completion)
+                # Close the completion menu
+                buffer.cancel_completion()
+        
+        @kb.add('escape', filter=has_completions, eager=True)
+        def _(event):
+            """Cancel completion menu without applying (ESC when menu is open)."""
+            buffer = event.app.current_buffer
+            buffer.cancel_completion()
+        
         return kb
 
     def _create_smart_auto_suggest(self):
@@ -193,7 +232,7 @@ def _create_bottom_toolbar(self):
         if self.use_enhanced:
             conn = self.browser.current_connection
             if conn:
-                return f" Connected: {conn} | TAB: complete | Ctrl+C: cancel "
+                return f" Connected: {conn} | TAB: complete | Shift+TAB: navigate | Enter: apply | ESC/Ctrl+C: cancel "
             else:
                 return " No connection | TAB: complete | Type 'connect <name> <connection>' to start "
         return ""
 
@@ -8,6 +8,7 @@
 from fastmcp.client import BearerAuth
 from mcp.types import TextContent, ImageContent, EmbeddedResource, BlobResourceContents, TextResourceContents, Tool, \
     Resource, ResourceTemplate, Prompt, GetPromptResult
+from magg.util.transport import get_transport_for_command_string
 
 logger = logging.getLogger(__name__)
 
@@ -82,9 +83,9 @@ async def connect(self) -> bool:
                 url = url.rstrip("/") + "/mcp/"
             client = Client(url, auth=auth)  # type: ignore[call-arg]
         else:
-            # For command connections, pass the string directly
-            # FastMCP Client will handle the parsing
-            client = Client(self.connection_string, auth=auth)  # type: ignore[call-arg]
+            # For command connections, use Magg's transport inference
+            transport = get_transport_for_command_string(self.connection_string)
+            client = Client(transport, auth=auth)  # type: ignore[call-arg]
 
         try:
             async with client as conn:
 
@@ -82,6 +82,18 @@ async def _proxy_tool(
                         "Not allowed for 'list' and 'info' actions.",
             # validation_alias=AliasChoices("name", "uri"),
         )] = None,
+        limit: Annotated[int | None, Field(
+            description="Maximum number of items to return (for 'list' action only). Default: 100",
+            ge=1,
+            le=1000
+        )] = None,
+        offset: Annotated[int | None, Field(
+            description="Number of items to skip (for 'list' action only). Default: 0",
+            ge=0
+        )] = None,
+        filter_server: Annotated[str | None, Field(
+            description="Filter results by server name prefix (for 'list' action only)"
+        )] = None,
     ) -> Any:
         """Main proxy tool for dynamic access to mounted MCP servers.
 
@@ -110,9 +122,25 @@ async def _proxy_tool(
             raise ValueError(
                 "Parameter 'path' should not be provided for action 'list'"
             )
+            
+        if action != "list" and (limit is not None or offset is not None or filter_server is not None):
+            raise ValueError(
+                "Parameters 'limit', 'offset', and 'filter_server' are only allowed for 'list' action"
+            )
 
         if action == "list":
             result, result_type = await self._proxy_list(a_type)
+            
+            # Apply filtering if requested
+            if filter_server and result:
+                result = [item for item in result if hasattr(item, 'name') and item.name.startswith(filter_server)]
+            
+            # Apply pagination
+            total_count = len(result) if result else 0
+            if result and (limit or offset):
+                offset_val = offset or 0
+                limit_val = limit or 100
+                result = result[offset_val:offset_val + limit_val]
 
             if result:
                 # Send results as a single json/object-encoded EmbeddedResource result
@@ -122,6 +150,9 @@ async def _proxy_tool(
                     uri=f"{self.PROXY_TOOL_NAME}:{action}/{a_type}",
                     proxyAction=action,
                     proxyType=a_type,
+                    totalCount=total_count,
+                    offset=offset or 0,
+                    limit=limit or 100,
                 )
 
         elif action == "info":
 
@@ -125,10 +125,22 @@
   path (string | null) (optional)
     Name or URI of the specific tool/resource/prompt (with FastMCP prefixing).
     Not allowed for 'list' and 'info' actions.
+  limit (integer | null) (optional)
+    Maximum number of items to return (for 'list' action only). Default: 100, Max: 1000
+  offset (integer | null) (optional)
+    Number of items to skip (for 'list' action only). Default: 0
+  filter_server (string | null) (optional)
+    Filter results by server name prefix (for 'list' action only)
 
 Example usage (MBRO commands):
   - List all tools:
     -  `call proxy {"action": "list", "type": "tool"}`
+    
+  - List tools with pagination:
+    -  `call proxy {"action": "list", "type": "tool", "limit": 50, "offset": 0}`
+    
+  - List tools from a specific server:
+    -  `call proxy {"action": "list", "type": "tool", "filter_server": "serena_"}`
 
   - Get info about a specific tool:
     -  `call proxy {"action": "info", "type": "tool", "path": "calc:add"}`
 
@@ -2,6 +2,7 @@
 """
 import asyncio
 import logging
+import os
 from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING, Annotated
@@ -17,6 +18,7 @@
 from ..proxy.server import ProxyFastMCP
 from ..settings import ConfigManager, MaggConfig, ServerConfig
 from ..util.transport import get_transport_for_command, get_transport_for_uri
+from ..util.stdio_patch import patch_stdio_transport_stderr
 
 logger = logging.getLogger(__name__)
 
@@ -98,6 +100,9 @@ async def mount_server(self, server: ServerConfig) -> bool:
                     cwd=server.cwd,
                     transport_config=server.transport
                 )
+                # Suppress stderr from subprocess servers by default
+                if not self.config.stderr_show:
+                    transport = patch_stdio_transport_stderr(transport)
                 client = Client(transport, message_handler=message_handler)
 
             elif server.uri:
@@ -425,12 +430,12 @@ async def setup(self):
     async def run_stdio(self):
         """Run Magg in stdio mode."""
         await self.setup()
-        await self.mcp.run_stdio_async()
+        await self.mcp.run_stdio_async(show_banner=False)
 
     async def run_http(self, host: str = "localhost", port: int = 8000, log_level: str = "CRITICAL"):
         """Run Magg in HTTP mode."""
         await self.setup()
-        await self.mcp.run_http_async(host=host, port=port, log_level=log_level)
+        await self.mcp.run_http_async(host=host, port=port, log_level=log_level, show_banner=False)
 
     async def reload_config(self) -> bool:
         """Manually trigger a configuration reload.
 
@@ -217,6 +217,7 @@ class MaggConfig(BaseSettings):
     auto_reload: bool = Field(default=True, description="Enable automatic config reloading on file changes (env: MAGG_AUTO_RELOAD)")
     reload_poll_interval: float = Field(default=1.0, description="Config file poll interval in seconds (env: MAGG_RELOAD_POLL_INTERVAL)")
     reload_use_watchdog: bool | None = Field(default=None, description="Use file system notifications if available, None=auto-detect (env: MAGG_RELOAD_USE_WATCHDOG)")
+    stderr_show: bool = Field(default=False, description="Show stderr output from subprocess MCP servers (env: MAGG_STDERR_SHOW)")
     servers: dict[str, ServerConfig] = Field(default_factory=dict, description="Servers configuration (loaded from config_path)")
     kits: list[str] = Field(default_factory=list, description="List of loaded kits")
 
 
@@ -48,9 +48,10 @@ async def test_list_servers(self, tmp_path):
         async with server:
             async with Client(server.mcp) as client:
                 result = await client.call_tool("magg_list_servers", {})
-                assert len(result) > 0
-                assert hasattr(result[0], 'text')
-                assert isinstance(result[0].text, str)
+                assert hasattr(result, 'content')
+                assert len(result.content) > 0
+                assert hasattr(result.content[0], 'text')
+                assert isinstance(result.content[0].text, str)
 
 
 class TestMaggServerManagement:
@@ -76,11 +77,15 @@ async def test_add_server(self, tmp_path):
                     "enable": False  # Don't try to mount it
                 })
 
-                assert len(result) > 0
-                assert hasattr(result[0], 'text')
+                assert hasattr(result, 'content')
+                assert len(result.content) > 0
+                assert hasattr(result.content[0], 'text')
 
-                result = await client.call_tool("magg_list_servers", {})
-                assert server_name in result[0].text
+                list_result = await client.call_tool("magg_list_servers", {})
+                assert hasattr(list_result, 'content')
+                assert len(list_result.content) > 0
+                assert hasattr(list_result.content[0], 'text')
+                assert server_name in list_result.content[0].text
 
 
 class TestMaggServerSearch:
@@ -100,7 +105,8 @@ async def test_search_servers(self, tmp_path):
                         "query": "filesystem",
                         "limit": 3
                     })
-                    assert len(result) > 0
-                    assert hasattr(result[0], 'text')
+                    assert hasattr(result, 'content')
+                    assert len(result.content) > 0
+                    assert hasattr(result.content[0], 'text')
                 except Exception as e:
                     pytest.skip(f"Search test failed (requires internet): {e}")