sitbon
diff --git a/‎magg/cli.py
Copy file name to clipboard
+16-5Lines changed: 16 additions & 5 deletions b/‎magg/cli.py
Copy file name to clipboard
+16-5Lines changed: 16 additions & 5 deletions
diff --git a/‎magg/contrib/magg.mbro
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎magg/contrib/magg.mbro
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎magg/contrib/readme.md
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎magg/contrib/readme.md
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎magg/kit.py
Copy file name to clipboard
+17-24Lines changed: 17 additions & 24 deletions b/‎magg/kit.py
Copy file name to clipboard
+17-24Lines changed: 17 additions & 24 deletions
diff --git a/‎magg/mbro/cli.py
Copy file name to clipboard
+4-190Lines changed: 4 additions & 190 deletions b/‎magg/mbro/cli.py
Copy file name to clipboard
+4-190Lines changed: 4 additions & 190 deletions
@@ -7,12 +7,18 @@
 import logging
 import os
 import sys
+import traceback
 from pathlib import Path
 
 from . import __version__, process
 from .auth import BearerAuthManager
 from .kit import KitManager
-from .settings import ConfigManager, ServerConfig, BearerAuthConfig, AuthConfig
+from .settings import ConfigManager, ServerConfig, BearerAuthConfig, AuthConfig, KitInfo
+
+try:
+    from cryptography.hazmat.primitives import serialization
+except ImportError:
+    serialization = None
 from .server.runner import MaggRunner
 from .util.terminal import (
     print_success, print_error, print_warning, print_startup_banner,
@@ -296,7 +302,12 @@ async def cmd_kit(args) -> None:
 
         # Add kit to config's kits list if not already there
         if args.name not in config.kits:
-            config.kits.append(args.name)
+            config.kits[args.name] = KitInfo(
+                name=args.name,
+                description=kit_config.description,
+                path=str(kit_path),
+                source="file"
+            )
 
         # Add servers from kit to configuration
         added_servers = []
@@ -429,7 +440,6 @@ async def cmd_server_info(args) -> None:
 
     if server.transport:
         print("Transport Configuration:")
-        import json
         print(f"  {json.dumps(server.transport, indent=2)}")
 
     if server.notes:
@@ -590,7 +600,9 @@ async def cmd_auth(args) -> None:
 
         private_key = auth_manager.get_private_key()
         if private_key:
-            from cryptography.hazmat.primitives import serialization
+            if serialization is None:
+                print_error("cryptography package not available")
+                sys.exit(1)
             pem = private_key.private_bytes(
                 encoding=serialization.Encoding.PEM,
                 format=serialization.PrivateFormat.TraditionalOpenSSL,
@@ -832,7 +844,6 @@ def main():
     except Exception as e:
         print_error(f"Unexpected error: {e}")
         if os.getenv('MAGG_DEBUG', '').lower() in {'1', 'true', 'yes'}:
-            import traceback
             traceback.print_exc()
         sys.exit(1)
 
 
@@ -0,0 +1,2 @@
+# A simple MBro script to load up a Magg stdio server.
+connect name=magg magg serve
@@ -0,0 +1,5 @@
+# Magg Contrib
+
+This is a place to develop new features and provide shared data like kits, scripts, and other resources for the Magg ecosystem.
+
+It's a namespace package, so you can develop your own contrib packages without needing to work with the main Magg repository.
@@ -1,16 +1,15 @@
 """Kit management for Magg - bundling related MCP servers."""
 import json
 import logging
-import os
 from pathlib import Path
 from typing import Any, TYPE_CHECKING
 from pydantic import Field, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-from .settings import ConfigManager, ServerConfig
+from .settings import ConfigManager, ServerConfig, MaggConfig, KitInfo
 
 if TYPE_CHECKING:
-    from .settings import MaggConfig
+    pass
 
 logger = logging.getLogger(__name__)
 
@@ -72,25 +71,14 @@ class KitManager:
     def __init__(self, config_manager: ConfigManager, kitd_paths: list[Path] | None = None):
         """Initialize kit manager with search paths."""
         self.config_manager = config_manager
-        self.kitd_paths = kitd_paths or self._get_default_paths(config_manager.config_path)
+        if kitd_paths:
+            self.kitd_paths = kitd_paths
+        else:
+            # Use MaggConfig's path system to find kit.d directories
+            config = MaggConfig()
+            self.kitd_paths = config.get_kitd_paths()
         self._kits: dict[str, KitConfig] = {}
 
-    @staticmethod
-    def _get_default_paths(config_path: Path) -> list[Path]:
-        """Get default kit.d search paths."""
-        paths = []
-
-        env_path = Path.expanduser(Path(os.environ.get('MAGG_KITD_PATH', '~/.magg/kit.d')))
-        if env_path.exists() and env_path.is_dir():
-            paths.append(env_path)
-
-        # Path next to config.json
-        config_dir = config_path.parent
-        local_kitd = config_dir / 'kit.d'
-        if local_kitd.exists() and local_kitd.is_dir():
-            paths.append(local_kitd)
-
-        return paths
 
     def discover_kits(self) -> dict[str, Path]:
         """Discover all available kit files."""
@@ -179,7 +167,7 @@ def load_kits_from_config(self, config: 'MaggConfig') -> None:
         """
         available_kits = self.discover_kits()
 
-        for kit_name in config.kits:
+        for kit_name in config.kits.keys():
             if kit_name in available_kits:
                 kit_path = available_kits[kit_name]
                 kit_config = self.load_kit(kit_path)
@@ -233,8 +221,13 @@ def load_kit_to_config(self, kit_name: str, config: 'MaggConfig') -> tuple[bool,
                 config.servers[server_name] = server_config
                 servers_added.append(server_name)
 
-        # Add kit to config's kit list
-        config.kits.append(kit_name)
+        # Add kit to config's kit list with metadata
+        config.kits[kit_name] = KitInfo(
+            name=kit_name,
+            description=kit_config.description,
+            path=str(kit_path),
+            source="file"
+        )
 
         msg_parts = [f"Kit '{kit_name}' loaded successfully"]
         if servers_added:
@@ -275,7 +268,7 @@ def unload_kit_from_config(self, kit_name: str, config: 'MaggConfig') -> tuple[b
             del config.servers[server_name]
 
         # Remove kit from config
-        config.kits.remove(kit_name)
+        del config.kits[kit_name]
         self.remove_kit(kit_name)
 
         msg_parts = [f"Kit '{kit_name}' unloaded successfully"]
 
@@ -4,6 +4,7 @@
 import argparse
 import asyncio
 import codeop
+import shlex
 import sys
 from asyncio import CancelledError
 from functools import cached_property
@@ -17,7 +18,6 @@
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.shortcuts import CompleteStyle
 from prompt_toolkit.styles import Style
-from prompt_toolkit.validation import Validator, ValidationError
 
 try:
     from . import arepl
@@ -32,6 +32,7 @@
 from .parser import ArgumentParser
 from .multiline import MultilineInputHandler
 from .command import Command
+from .validator import InputValidator
 
 
 class MCPBrowserCLI:
@@ -273,196 +274,10 @@ def _create_continuation_prompt(self, width, line_number, wrap_count):
 
     def _create_input_validator(self):
         """Create validator that detects incomplete input for multiline support."""
-        class InputValidator(Validator):
-            def __init__(self, cli_instance):
-                self.cli = cli_instance
-
-            def validate(self, document):
-                text = document.text.strip()
-                if not text:
-                    return
-
-                # Check for incomplete input patterns
-                if self._needs_continuation(text):
-                    # Don't raise error - allow multiline continuation
-                    return
-
-                # Check for obvious syntax errors in Python-style arguments
-                if self._has_syntax_errors(text):
-                    raise ValidationError(
-                        message="Incomplete input - press Enter to continue or fix syntax",
-                        cursor_position=len(text)
-                    )
-
-            def _needs_continuation(self, text: str) -> bool:
-                """Check if input needs continuation like Python REPL."""
-                # Empty input or whitespace-only should not continue
-                if not text.strip():
-                    return False
-
-                # Backslash continuation
-                if text.endswith('\\'):
-                    return True
-
-                # Unclosed quotes
-                if self._has_unclosed_quotes(text):
-                    return True
-
-                # Unclosed brackets/braces
-                if self._has_unclosed_brackets(text):
-                    return True
-
-                # For mbro commands, we're done if quotes/brackets are balanced
-                # Don't use _is_complete_mbro_command check here since it doesn't
-                # consider quotes/brackets properly
-
-                # Try Python compilation check for complex cases
-                # This is mainly for Python-style dict/list arguments
-                try:
-                    # First check if it's an mbro command
-                    words = text.strip().split(maxsplit=1)
-                    if words and words[0] in {
-                        'help', 'quit', 'exit', 'connect', 'connections', 'conns', 'switch',
-                        'disconnect', 'tools', 'resources', 'prompts', 'call', 'resource',
-                        'prompt', 'status', 'search', 'info'
-                    }:
-                        # For mbro commands, if quotes/brackets are balanced, we're done
-                        return False
-
-                    # For other input, use Python compilation check
-                    result = codeop.compile_command(text, '<input>', 'exec')
-                    return result is None  # None means incomplete
-                except SyntaxError:
-                    return False  # Syntax error, don't continue
-
-                return False
-
-            def _is_complete_mbro_command(self, text: str) -> bool:
-                """Check if text is a complete mbro command."""
-                text = text.strip()
-                if not text:
-                    return False
-
-                # All known mbro commands
-                mbro_commands = {
-                    'help', 'quit', 'exit', 'connect', 'connections', 'conns', 'switch',
-                    'disconnect', 'tools', 'resources', 'prompts', 'call', 'resource',
-                    'prompt', 'status', 'search', 'info'
-                }
-
-                # Commands that are complete with just the command word
-                standalone_commands = {
-                    'help', 'quit', 'exit', 'connections', 'conns', 'disconnect',
-                    'tools', 'resources', 'prompts', 'status'
-                }
-
-                # Split and check first word
-                words = text.split()
-                if not words or words[0] not in mbro_commands:
-                    return False  # Not a recognized mbro command
-
-                command = words[0]
-
-                # Check standalone commands
-                if command in standalone_commands:
-                    return True
-
-                # For commands that need arguments, check if they look complete
-                if command == 'call':
-                    # call command needs tool name, args are optional
-                    # call tool_name {...} or call tool_name key=value
-                    return len(words) >= 2
-                elif command in ['connect', 'switch', 'resource', 'prompt', 'search', 'info']:
-                    # These commands need at least one argument
-                    return len(words) >= 2
-
-                return True  # Default to complete for other commands
-
-            def _has_unclosed_quotes(self, text: str) -> bool:
-                """Check for unclosed string literals."""
-                in_single = False
-                in_double = False
-                escaped = False
-
-                for char in text:
-                    if escaped:
-                        escaped = False
-                        continue
-
-                    if char == '\\' and (in_single or in_double):
-                        escaped = True
-                    elif char == '"' and not in_single:
-                        in_double = not in_double
-                    elif char == "'" and not in_double:
-                        in_single = not in_single
-
-                return in_single or in_double
-
-            def _has_unclosed_brackets(self, text: str) -> bool:
-                """Check for unclosed brackets or braces."""
-                stack = []
-                pairs = {'(': ')', '[': ']', '{': '}'}
-                in_string = False
-                string_char = None
-                escaped = False
-
-                for char in text:
-                    if escaped:
-                        escaped = False
-                        continue
-
-                    if char == '\\' and in_string:
-                        escaped = True
-                        continue
-
-                    if not in_string:
-                        if char in ['"', "'"]:
-                            in_string = True
-                            string_char = char
-                        elif char in pairs:
-                            stack.append(char)
-                        elif char in pairs.values():
-                            if not stack:
-                                return False  # Closing without opening
-                            if pairs[stack[-1]] == char:
-                                stack.pop()
-                            else:
-                                return False  # Mismatched
-                    else:
-                        if char == string_char:
-                            in_string = False
-                            string_char = None
-
-                return len(stack) > 0 or in_string
-
-            def _has_syntax_errors(self, text: str) -> bool:
-                """Check for obvious syntax errors."""
-                # Very basic syntax error detection
-                # This is mainly to catch malformed key=value pairs
-                if 'call ' in text and '=' in text:
-                    # Check for malformed key=value syntax
-                    parts = text.split()
-                    if len(parts) >= 3:  # call tool_name params...
-                        params = ' '.join(parts[2:])
-                        if not params.startswith('{') and '=' in params:
-                            # Check each key=value pair
-                            pairs = params.split()
-                            for pair in pairs:
-                                if '=' in pair and not self._is_valid_pair(pair):
-                                    return True
-
-                return False
-
-            def _is_valid_pair(self, pair: str) -> bool:
-                """Check if key=value pair is valid."""
-                if '=' not in pair:
-                    return False
-                key, value = pair.split('=', 1)
-                return bool(key.strip()) and bool(value.strip())
-
         return InputValidator(self)
 
-    def _parse_shell_args(self, args: list[str]) -> dict:
+    @classmethod
+    def _parse_shell_args(cls, args: list[str]) -> dict:
         """Parse shell-style key=value arguments.
 
         Examples:
@@ -626,7 +441,6 @@ async def handle_command(self, command: str):
         # If special JSON handling didn't work, use regular parsing
         if cmd is None:
             # Use shlex to properly handle quoted strings and shell-style parsing
-            import shlex
             try:
                 # shlex handles the actual parsing
                 parts = shlex.split(command)
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# A simple MBro script to load up a Magg stdio server.`
	`2`	`+connect name=magg magg serve`