feat: Add hybrid mode and improve logging levels

Major changes:
- Add hybrid mode to run Magg with both stdio and HTTP simultaneously
- New --hybrid flag for `magg serve` command
- Concurrent task management for both transports
- Useful for mbro hosting Magg while using stdio connection

- Convert verbose INFO logs to DEBUG level throughout codebase
- Server mounting/unmounting operations
- Config reload operations
- Authentication key generation
- File watcher initialization

- Improve mbro CLI behavior
- Clean exit on Ctrl+C with empty buffer
- Better multiline continuation handling
- Consistent error message formatting with repr()

- Add documentation for hybrid mode
- Examples for Claude Code integration
- Examples for mbro hosting scenarios
- Updated readme.md with third running mode

- Bump version to 0.9.1

This release improves production readiness with quieter logging
and enables powerful hybrid connectivity scenarios.

Signed-off-by: Phillip Sitbon <phillip.sitbon@gmail.com>

Author: sitbon

.github/workflows/publish.yml

@@ -131,7 +131,7 @@ jobs:
           
           # Get changelog since last release with rich formatting
           echo "CHANGELOG<<EOFEOF" >> $GITHUB_ENV
-          git log ${LATEST_TAG}..${{ github.sha }} --pretty=format:'### [%s](https://github.com/${{ github.repository }}/commit/%H)%nDate: %ad*%n%n%b%n' | sed '/^Signed-off-by:/d' | sed 's/^$/>/g' >> $GITHUB_ENV
+          git log ${LATEST_TAG}..${{ github.sha }} --pretty=format:'### [%s](https://github.com/${{ github.repository }}/commit/%H)%nDate: %ad%n%n%b%n' | sed '/^Signed-off-by:/d' | sed 's/^$/>/g' >> $GITHUB_ENV
           echo "EOFEOF" >> $GITHUB_ENV
           
           # Delete remote latest-publish tag FIRST (before creating new one)

docs/index.md

@@ -112,10 +112,37 @@ magg serve
 # Or for HTTP mode
 magg serve --http
 
+# Or for hybrid mode (both stdio and HTTP simultaneously)
+magg serve --hybrid
+magg serve --hybrid --port 8080  # Custom port
+
 # Or run directly without installation (if you have uvx)
 uvx magg serve
 ```
 
+#### Hybrid Mode
+
+Magg supports running in hybrid mode where it accepts connections via both stdio and HTTP simultaneously. This is particularly useful when you want to:
+
+- Use Magg through an MCP client (stdio) while also accessing it via HTTP API
+- Have mbro host the server while connecting to it via stdio
+- Test both interfaces without running multiple instances
+
+**Example with mbro:**
+```bash
+# mbro can host Magg in hybrid mode and connect to it via stdio
+mbro connect magg "magg serve --hybrid --port 8080"
+
+# Now Magg is:
+# - Connected to mbro via stdio
+# - Also accessible via HTTP at http://localhost:8080
+
+# Other mbro instances can now connect via HTTP
+mbro connect magg-remote http://localhost:8080
+```
+
+This allows you to use mbro's interactive features while other clients (including other mbro instances) can connect via HTTP.
+
 ## Usage Flows
 
 ### 1. Discovering and Adding Servers

examples/config_reload.py

@@ -24,20 +24,21 @@ async def demo_config_reload():
     config_path = Path(".magg") / "config.json"
 
     logger.setLevel(logging.INFO)
-    logger.info("Starting Magg server with config reloading enabled")
-    logger.info("Config path: %s", config_path)
-    logger.info("You can:")
-    logger.info("  1. Modify the config file to see automatic reload")
-    logger.info("  2. Send SIGHUP signal to trigger reload: kill -HUP %d", os.getpid())
-    logger.info("  3. Use the magg_reload_config tool via MCP client")
-    logger.info("")
-    logger.info("Press Ctrl+C to stop")
-
-    # Create runner with signal handling
+    logger.info(
+        """Starting Magg server with config reloading enabled
+Config path: %s
+You can:
+  1. Modify the config file to see automatic reload
+  2. Send SIGHUP signal to trigger reload: kill -HUP %d
+  3. Use the magg_reload_config tool via MCP client
+
+Press Ctrl+C to stop""",
+        config_path, os.getpid(),
+    )
+
     runner = MaggRunner(config_path)
 
     try:
-        # Run the server
         await runner.run_http("localhost", 8000)
     except KeyboardInterrupt:
         logger.info("Shutting down...")

magg/auth.py

@@ -111,7 +111,7 @@ def _generate_keypair(self) -> Optional[rsa.RSAPrivateKey]:
                     format=serialization.PublicFormat.OpenSSH
                 ))
 
-            logger.info("Generated new RSA keypair in %s", self.bearer_config.key_path)
+            logger.debug("Generated new RSA keypair in %s", self.bearer_config.key_path)
             return private_key
 
         except Exception as e:

magg/cli.py

@@ -33,15 +33,18 @@
 
 async def cmd_serve(args) -> None:
     """Start Magg server."""
+    mode = 'hybrid' if args.hybrid else 'http' if args.http else 'stdio'
+    logger.info("Starting Magg server (mode: %s)", mode)
 
-    logger.info("Starting Magg server (mode: %s)", 'http' if args.http else 'stdio')
-
-    if args.http:
+    if args.http or args.hybrid:
         print_startup_banner()
 
     runner = MaggRunner(args.config)
 
-    if args.http:
+    if args.hybrid:
+        logger.info("Starting hybrid server (stdio + HTTP on %s:%s)", args.host, args.port)
+        await runner.run_hybrid(host=args.host, port=args.port)
+    elif args.http:
         logger.info("Starting HTTP server on %s:%s", args.host, args.port)
         await runner.run_http(host=args.host, port=args.port)
     else:
@@ -55,6 +58,11 @@ def cmd_serve_args(parser: argparse.ArgumentParser) -> None:
         action='store_true',
         help='Run as HTTP server instead of stdio mode'
     )
+    parser.add_argument(
+        '--hybrid',
+        action='store_true',
+        help='Run in hybrid mode (both stdio and HTTP)'
+    )
     parser.add_argument(
         '--host',
         type=str,
@@ -166,7 +174,7 @@ async def cmd_remove_server(args) -> None:
     config.remove_server(args.name)
 
     if config_manager.save_config(config):
-        logger.info("Successfully removed server '%s'", args.name)
+        logger.debug("Successfully removed server '%s'", args.name)
         print_success(f"Removed server '{args.name}'")
     else:
         print_error("Failed to save configuration")

magg/kit.py

@@ -167,11 +167,11 @@ def load_kits_from_config(self, config: 'MaggConfig') -> None:
                 kit_config = self.load_kit(kit_path)
                 if kit_config:
                     self.add_kit(kit_name, kit_config)
-                    logger.info("Loaded kit %r from %s", kit_name, kit_path)
+                    logger.debug("Loaded kit %r from %s", kit_name, kit_path)
                 else:
                     logger.error("Failed to load kit %r from %s", kit_name, kit_path)
             else:
-                logger.info("Kit %r not found in any kit.d directory - creating in memory", kit_name)
+                logger.debug("Kit %r not found in any kit.d directory - creating in memory", kit_name)
                 kit_config = KitConfig(name=kit_name)
                 self.add_kit(kit_name, kit_config)
 

magg/mbro/cli.py

@@ -146,30 +146,39 @@ def _create_key_bindings(self):
 
         @kb.add('c-c')
         def _(event):
-            """Handle Ctrl+C - cancel completion or multiline input or interrupt."""
+            """Handle Ctrl+C - cancel completion, clear buffer, or exit cleanly."""
             buffer = event.app.current_buffer
             if buffer.complete_state:
                 buffer.cancel_completion()
             elif buffer.text.strip():
                 buffer.reset()
             else:
-                raise KeyboardInterrupt()
+                # Exit cleanly when buffer is empty
+                event.app.exit()
 
         @kb.add('enter')
         def _(event):
-            """Handle Enter key - submit complete commands immediately."""
+            """Handle Enter key - submit on empty line or continue multiline."""
             buffer = event.app.current_buffer
             document = buffer.document
             text = document.text.strip()
+            current_line = document.current_line.strip()
+
+            # Empty buffer - just submit (prevents multiline on empty enter)
+            if not text:
+                buffer.validate_and_handle()
+                return
 
             validator_instance = self._create_input_validator()
 
+            # Single line command that's complete - submit immediately
             if text and not validator_instance._needs_continuation(text):
                 if '\n' not in document.text:
                     buffer.validate_and_handle()
                     return
 
-            if not buffer.document.current_line.strip() and buffer.text.strip():
+            # Multiline: empty line after content means submit
+            if not current_line and text:
                 buffer.validate_and_handle()
             else:
                 buffer.insert_text('\n')
@@ -352,8 +361,7 @@ async def start(self, repl: bool = False):
                 await self.handle_command(command)
 
             except KeyboardInterrupt:
-                if not self.formatter.json_only:
-                    self.formatter.print("\nUse 'quit' to exit.")
+                continue
             except CancelledError:
                 pass
             except EOFError:
@@ -391,7 +399,7 @@ async def handle_command(self, command: str):
         cmd = self.ALIASES.get(cmd, cmd)
 
         if cmd not in self.COMMANDS:
-            self.formatter.format_error(f"Unknown command: {cmd}")
+            self.formatter.format_error(f"Unknown command: {cmd!r}")
             self.formatter.format_info("Type 'help' for available commands")
             return
 
@@ -441,11 +449,9 @@ async def handle_commands(cli: MCPBrowserCLI, args) -> bool:
 class ScriptAction(argparse.Action):
     """Custom action to track script execution order."""
     def __call__(self, parser, namespace, values, option_string=None):
-        # Initialize script_order list if not present
         if not hasattr(namespace, 'script_order'):
             namespace.script_order = []
-        
-        # Track order with type indicator
+
         is_non_interactive = option_string in ['-X', '--execute-script-n']
         namespace.script_order.append((values, is_non_interactive))
 
@@ -486,7 +492,7 @@ async def main_async():
             has_non_interactive_script = any(is_non_interactive for _, is_non_interactive in args.script_order)
             if has_non_interactive_script:
                 args.no_interactive = True
-            
+
             for script_path, _ in args.script_order:
                 await cli.handle_command(f"script run {script_path}")
 
@@ -519,10 +525,8 @@ def main():
 
     try:
         asyncio.run(main_async())
-
     except KeyboardInterrupt:
         pass
-
     except Exception as e:
         print(f"Error: {e}", file=sys.stderr)
         exit(1)

magg/mbro/command.py

@@ -71,7 +71,7 @@ async def connect(self, args: list):
 
             await self.cli.refresh_completer_cache()
         else:
-            self.formatter.format_error(f"Failed to connect to '{name}'")
+            self.formatter.format_error(f"Failed to connect to {name!r}")
 
     async def switch(self, args: list):
         """Switch to a different connection."""
@@ -84,7 +84,7 @@ async def switch(self, args: list):
         if success:
             await self.cli.refresh_completer_cache()
         else:
-            self.formatter.format_error(f"Failed to switch to '{name}'")
+            self.formatter.format_error(f"Failed to switch to {name!r}")
 
     async def disconnect(self, args: list):
         """Disconnect from a server."""
@@ -95,7 +95,7 @@ async def disconnect(self, args: list):
         name = args[0]
         success = await self.browser.remove_connection(name)
         if not success:
-            self.formatter.format_error(f"Connection '{name}' not found")
+            self.formatter.format_error(f"Connection {name!r} not found")
 
     async def status(self):
         """Get status of the current connection.
@@ -231,7 +231,7 @@ async def call(self, args: list):
             if required:
                 missing = [param for param in required if param not in arguments]
                 if missing:
-                    self.formatter.format_error(f"Tool '{tool_name}' missing required parameters: {missing}")
+                    self.formatter.format_error(f"Tool {tool_name!r} missing required parameters: {missing}")
 
                     properties = schema.get('properties', {})
                     if properties and not self.formatter.json_only:
@@ -375,7 +375,7 @@ async def info(self, args: list):
             tools = await conn.get_tools()
             tool = next((t for t in tools if t["name"] == name), None)
             if not tool:
-                self.formatter.format_error(f"Tool '{name}' not found.")
+                self.formatter.format_error(f"Tool {name!r} not found.")
                 return
 
             self.formatter.format_tool_info(tool)
@@ -384,7 +384,7 @@ async def info(self, args: list):
             resources = await conn.get_resources()
             resource = next((r for r in resources if r["name"] == name), None)
             if not resource:
-                self.formatter.format_error(f"Resource '{name}' not found.")
+                self.formatter.format_error(f"Resource {name!r} not found.")
                 return
 
             self.formatter.format_resource_info(resource)
@@ -393,7 +393,7 @@ async def info(self, args: list):
             prompts = await conn.get_prompts()
             prompt = next((p for p in prompts if p["name"] == name), None)
             if not prompt:
-                self.formatter.format_error(f"Prompt '{name}' not found.")
+                self.formatter.format_error(f"Prompt {name!r} not found.")
                 return
 
             self.formatter.format_prompt_info(prompt)
@@ -430,7 +430,7 @@ async def _handle_proxy_query_result(self, tool_name: str, result: list) -> bool
         proxy_type = getattr(result.annotations, "proxyType", None)
 
         if (result := ProxyMCP.get_proxy_query_result(result)) is None:
-            self.formatter.format_error(f"Failed to handle apparent proxy query result for tool '{tool_name}'")
+            self.formatter.format_error(f"Failed to handle apparent proxy query result for tool {tool_name!r}")
             return True
 
         match proxy_type:

magg/mbro/parser.py

@@ -130,6 +130,14 @@ def parse_command_line(line: str) -> list[str]:
         if not cleaned.strip():
             return []
 
+        # Strip trailing backslash from single-line continuation
+        cleaned = cleaned.rstrip()
+        if cleaned.endswith('\\'):
+            cleaned = cleaned[:-1].rstrip()
+
+        if not cleaned:
+            return []
+
         try:
             return shlex.split(cleaned)
         except ValueError:

magg/mbro/scripts.py

@@ -88,7 +88,7 @@ async def handle_script_command(self, args: List[str]):
         elif subcmd == "dump":
             await self.dump_script(subargs)
         else:
-            self.formatter.format_error(f"Unknown script command: {subcmd}\nCommands: run, list, search, dump")
+            self.formatter.format_error(f"Unknown script command: {subcmd!r}\nCommands: run, list, search, dump")
 
     async def run_script(self, args: List[str]):
         """Run a script file."""
@@ -100,7 +100,7 @@ async def run_script(self, args: List[str]):
 
         script_path = self.find_script(script_ref)
         if not script_path:
-            self.formatter.format_error(f"Script not found: {script_ref}")
+            self.formatter.format_error(f"Script not found: {script_ref!r}")
             exit(1)
 
         try:
@@ -201,7 +201,7 @@ async def dump_script(self, args: List[str]):
 
         script_path = self.find_script(script_ref)
         if not script_path:
-            self.formatter.format_error(f"Script not found: {script_ref}")
+            self.formatter.format_error(f"Script not found: {script_ref!r}")
             exit(1)
 
         try: