Release v0.7.1

Signed-off-by: Phillip Sitbon <[email protected]>

Author: sitbon

docs/index.md

@@ -9,12 +9,13 @@
 5. [Tools Reference](#tools-reference)
 6. [Resources Reference](#resources-reference)
 7. [Prompts Reference](#prompts-reference)
-8. [Authentication](#authentication)
-9. [Configuration Reload](#configuration-reload)
-10. [Messaging and Notifications](#messaging-and-notifications)
-11. [Proxy Documentation](#proxy-documentation)
-12. [Example Sessions](#example-sessions)
-13. [Advanced Configuration](#advanced-configuration)
+8. [Kit Management](#kit-management)
+9. [Authentication](#authentication)
+10. [Configuration Reload](#configuration-reload)
+11. [Messaging and Notifications](#messaging-and-notifications)
+12. [Proxy Documentation](#proxy-documentation)
+13. [Example Sessions](#example-sessions)
+14. [Advanced Configuration](#advanced-configuration)
 
 ## Overview
 
@@ -26,6 +27,7 @@ Magg (MCP Aggregator) is a meta-MCP server that acts as a central hub for managi
 - **Prefix**: A namespace prefix for tools from a specific server
 - **Mounting**: The process of connecting to an MCP server and exposing its tools
 - **Tool Delegation**: Proxying tool calls to the appropriate server
+- **Kit**: A bundle of related MCP servers that can be loaded/unloaded as a group
 
 ## Project Components
 
@@ -324,6 +326,73 @@ Analyze configured servers and provide insights/recommendations.
 
 **Note:** Requires MCP client support for sampling.
 
+### Kit Management Tools
+
+#### `magg_load_kit`
+Load a kit and all its servers into the configuration.
+
+**Parameters:**
+- `name` (str, required): Kit name to load (filename without .json)
+
+**Returns:**
+```json
+{
+    "action": "kit_loaded",
+    "kit": "web-tools",
+    "message": "Kit 'web-tools' loaded successfully. Added servers: browser, scraper"
+}
+```
+
+#### `magg_unload_kit`
+Unload a kit and optionally remove its servers.
+
+**Parameters:**
+- `name` (str, required): Kit name to unload
+
+**Returns:**
+```json
+{
+    "action": "kit_unloaded",
+    "kit": "web-tools",
+    "message": "Kit 'web-tools' unloaded successfully. Removed servers: browser"
+}
+```
+
+#### `magg_list_kits`
+List all available kits with their status.
+
+**Returns:**
+```json
+{
+    "kits": {
+        "web-tools": {
+            "loaded": true,
+            "description": "Web automation and scraping tools",
+            "author": "Magg Team",
+            "servers": ["browser", "scraper"]
+        },
+        "dev-tools": {
+            "loaded": false,
+            "description": "Development tools",
+            "servers": ["git", "github"]
+        }
+    },
+    "summary": {
+        "total": 2,
+        "loaded": 1,
+        "available": 1
+    }
+}
+```
+
+#### `magg_kit_info`
+Get detailed information about a specific kit.
+
+**Parameters:**
+- `name` (str, required): Kit name to get information about
+
+**Returns:** Detailed kit metadata including all servers and their configurations.
+
 ### Proxy Tool
 
 #### `proxy`
@@ -383,6 +452,70 @@ Interactive prompt for configuring a server with LLM assistance.
 
 **Usage:** The LLM can use this prompt to help determine optimal configuration for a server based on its URL. The prompt includes metadata collection and guides the LLM to generate a complete JSON configuration.
 
+## Kit Management
+
+Kits are a way to bundle related MCP servers together for easy installation and management. Think of them as "packages" or "toolkits" that group servers with similar functionality.
+
+### What are Kits?
+
+- JSON files stored in `~/.magg/kit.d/` or `.magg/kit.d/`
+- Bundle related servers with metadata (description, author, version, etc.)
+- Can be loaded/unloaded as a group
+- Servers track which kits they came from
+- Servers shared by multiple kits are only removed when their last kit is unloaded
+
+### Kit Discovery
+
+Magg looks for kits in these locations:
+1. `$MAGG_KITD_PATH` (defaults to `~/.magg/kit.d`)
+2. `.magg/kit.d` in the same directory as your `config.json`
+
+### Creating Kits
+
+Example kit file (`~/.magg/kit.d/web-tools.json`):
+```json
+{
+  "name": "web-tools",
+  "description": "Web automation and scraping tools",
+  "author": "Your Name",
+  "version": "1.0.0",
+  "keywords": ["web", "browser", "scraping"],
+  "links": {
+    "homepage": "https://github.com/example/web-tools-kit"
+  },
+  "servers": {
+    "playwright": {
+      "source": "https://github.com/microsoft/playwright-mcp",
+      "command": "npx",
+      "args": ["@playwright/mcp@latest"],
+      "enabled": true
+    },
+    "scraper": {
+      "source": "https://github.com/example/scraper-mcp",
+      "uri": "http://localhost:8080/mcp"
+    }
+  }
+}
+```
+
+### Using Kits
+
+```bash
+# List all available kits
+mbro:magg> call magg_list_kits
+
+# Load a kit (adds all its servers)
+mbro:magg> call magg_load_kit name="web-tools"
+
+# Get detailed info about a kit
+mbro:magg> call magg_kit_info name="web-tools"
+
+# Unload a kit
+mbro:magg> call magg_unload_kit name="web-tools"
+```
+
+For complete documentation, see **[Kit Management Guide](kits.md)**.
+
 ## Authentication
 
 Magg supports optional bearer token authentication using RSA keypairs and JWT tokens. When enabled, all clients must provide a valid JWT token to access the server.

docs/kits.md

@@ -0,0 +1,171 @@
+# Magg Kits
+
+Kits are a way to bundle related MCP servers together for easy installation and management. Think of them as "packages" or "toolkits" that group servers with similar functionality.
+
+## Overview
+
+A kit is a JSON file that contains:
+- Metadata about the kit (name, description, author, version, etc.)
+- One or more server configurations
+- Links to documentation and resources
+
+When you load a kit into Magg, all its servers are added to your configuration. When you unload a kit, servers that were only loaded from that kit are removed (servers shared by multiple kits are preserved).
+
+## Kit Discovery
+
+Magg looks for kits in these locations:
+1. `$MAGG_KITD_PATH` (defaults to `~/.magg/kit.d`)
+2. `.magg/kit.d` in the same directory as your `config.json`
+
+Kit files must have a `.json` extension and follow the kit schema.
+
+## Kit File Format
+
+```json
+{
+  "name": "calculator",
+  "description": "Basic calculator functionality for MCP",
+  "author": "Magg Team",
+  "version": "1.0.0",
+  "keywords": ["math", "calculator", "arithmetic"],
+  "links": {
+    "homepage": "https://github.com/example/calculator-kit",
+    "docs": "https://github.com/example/calculator-kit/wiki"
+  },
+  "servers": {
+    "calc": {
+      "source": "https://github.com/example/mcp-calc-server",
+      "command": "python",
+      "args": ["-m", "mcp_calc_server"],
+      "notes": "Basic calculator server",
+    }
+  }
+}
+```
+
+## Kit Management Tools
+
+Magg provides these tools for managing kits:
+
+### List Available Kits
+```bash
+# Using mbro
+mbro call magg_list_kits
+
+# Shows all kits with their status (loaded/available)
+```
+
+### Load a Kit
+```bash
+# Load a kit and all its servers
+mbro call magg_load_kit name="calculator"
+
+# This will:
+# 1. Load the kit from calculator.json
+# 2. Add all servers from the kit
+# 3. Mount any enabled servers
+# 4. Update config.json
+```
+
+### Unload a Kit
+```bash
+# Unload a kit
+mbro call magg_unload_kit name="calculator"
+
+# This will:
+# 1. Remove servers that only belong to this kit
+# 2. Update servers that belong to multiple kits
+# 3. Unmount removed servers
+# 4. Update config.json
+```
+
+### Get Kit Information
+```bash
+# Get detailed info about a kit
+mbro call magg_kit_info name="web-tools"
+
+# Shows:
+# - Kit metadata
+# - All servers in the kit
+# - Whether the kit is loaded
+```
+
+## Server Tracking
+
+Each server in `config.json` now has a `kits` field that tracks which kits it was loaded from:
+
+```json
+{
+  "servers": {
+    "calc": {
+      "source": "...",
+      "command": "python",
+      "kits": ["calculator", "math-tools"]
+    }
+  }
+}
+```
+
+This allows Magg to:
+- Know which servers came from which kits
+- Only remove servers when their last kit is unloaded
+- Handle servers that appear in multiple kits
+
+## Creating Your Own Kits
+
+To create a kit:
+
+1. Create a JSON file in `~/.magg/kit.d/` (e.g., `my-tools.json`)
+2. Add kit metadata and server configurations
+3. Use `magg_load_kit` to load it
+
+Example custom kit:
+```json
+{
+  "name": "my-tools",
+  "description": "My personal MCP server collection",
+  "author": "Your Name",
+  "version": "1.0.0",
+  "servers": {
+    "tool1": {
+      "source": "https://github.com/you/tool1",
+      "command": "node",
+      "args": ["index.js"],
+      "enabled": true
+    },
+    "tool2": {
+      "source": "https://github.com/you/tool2",
+      "uri": "http://localhost:8080/mcp",
+      "enabled": false
+    }
+  }
+}
+```
+
+## Best Practices
+
+1. **Kit Naming**: Use descriptive names that indicate the kit's purpose
+2. **Versioning**: Include version numbers for tracking updates
+3. **Documentation**: Provide links to docs and setup instructions
+4. **Server Names**: Use consistent, meaningful server names
+5. **Keywords**: Add relevant keywords for discoverability
+
+## Example Kits
+
+### Web Tools Kit
+Groups web automation and scraping servers:
+- Playwright server for browser automation
+- Puppeteer server as an alternative
+- Web scraping utilities
+
+### Development Kit
+Groups development-related servers:
+- Git operations server
+- GitHub API server
+- Code analysis tools
+
+### Data Kit
+Groups data processing servers:
+- SQLite database server
+- CSV processing server
+- Data transformation tools

docs/proxy.md

@@ -31,8 +31,9 @@ The proxy tool accepts the following parameters:
   - Required for `info` and `call` actions
   - Not allowed for `list` action
 
-- **args** (optional): object
+- **args** (optional): object | string
   - Arguments to pass when using the `call` action
+  - Can be provided as a dict or JSON string (automatically parsed)
   - Only allowed for `call` action
   - Not allowed for `list` and `info` actions
   - For tools: tool-specific arguments
@@ -55,14 +56,22 @@ The proxy tool accepts the following parameters:
   "path": "calculator_add"
 }
 
-// Call a tool
+// Call a tool (with dict args)
 {
   "action": "call",
   "type": "tool", 
   "path": "calculator_add",
   "args": {"a": 5, "b": 3}
 }
 
+// Call a tool (with JSON string args)
+{
+  "action": "call",
+  "type": "tool",
+  "path": "calculator_add", 
+  "args": "{\"a\": 5, \"b\": 3}"
+}
+
 // Read a resource
 {
   "action": "call",

examples/config_reload.py

@@ -11,7 +11,7 @@
 # Add magg to path
 sys.path.insert(0, str(Path(__file__).parent.parent))
 
-from magg.server.server import MaggServer
+from magg.server.server.server import MaggServer
 from magg.server.runner import MaggRunner
 from magg import process