Release v0.10.0

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

Author: sitbon

.env.example

@@ -13,8 +13,6 @@
 
 # Logging
 # MAGG_LOG_LEVEL=WARNING
-# MAGG_DEBUG=0
-# MAGG_QUIET=0
 
 # Other options
 # MAGG_CONFIG_PATH=./magg/config.json

.github/workflows/docker-publish.yml

@@ -194,8 +194,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - target: pre
-            suffix: "-pre"
+          # - target: pre
+          #   suffix: "-pre"
           - target: pro
             suffix: ""
 
@@ -223,7 +223,7 @@ jobs:
             type=ref,event=pr,suffix=${{ matrix.suffix }}
             type=semver,pattern=v{{major}}.{{minor}}.{{patch}},pattern={{major}}.{{minor}}.{{patch}},suffix=${{ matrix.suffix }}
             type=semver,pattern=v{{major}}.{{minor}}.{{patch}},pattern={{major}}.{{minor}},suffix=${{ matrix.suffix }}
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' && matrix.target == 'pro' }}
+            # type=raw,value=current,enable=${{ github.ref == 'refs/heads/main' && matrix.target == 'pro' }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6

compose.yaml

@@ -11,8 +11,6 @@ services:
       MAGG_PRIVATE_KEY: ${MAGG_PRIVATE_KEY:-}
       MAGG_LOG_LEVEL: ${MAGG_LOG_LEVEL:-}
       MAGG_CONFIG_PATH: ${MAGG_CONFIG_PATH:-}
-      MAGG_QUIET: ${MAGG_QUIET:-}
-      MAGG_DEBUG: ${MAGG_DEBUG:-}
       MAGG_SELF_PREFIX: ${MAGG_SELF_PREFIX:-}
       MAGG_AUTO_RELOAD: ${MAGG_AUTO_RELOAD:-false}
       MAGG_RELOAD_POLL_INTERVAL: ${MAGG_RELOAD_POLL_INTERVAL:-}

dockerfile

@@ -17,11 +17,6 @@ WORKDIR ${HOME}
 
 FROM base AS venv
 
-ARG USER
-ARG HOME
-ARG PACKAGE
-ARG UID
-ARG MAGG_READ_ONLY=false
 ARG PYTHON_VERSION
 
 ENV PYTHONDONTWRITEBYTECODE=1 \
@@ -30,9 +25,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     UV_LINK_MODE=copy \
     PATH="${HOME}/.venv/bin:${PATH}" \
     VIRTUAL_ENV="${HOME}/.venv" \
-    PS1="(${PACKAGE}) \h:\w\$ " \
-    MAGG_CONFIG_PATH="${HOME}/.magg/config.json" \
-    MAGG_READ_ONLY="${MAGG_READ_ONLY}"
+    PS1="(${PACKAGE}) \h:\w\$ "
 
 # Activating the venv through bash the "normal" way:
 # ENV BASH_ENV="${HOME}/.bashrc"  # enables .bashrc to be sourced in non-interactive shells e.g. `bash -c`
@@ -42,12 +35,23 @@ RUN curl -LsSf https://astral.sh/uv/install.sh | sh
 
 ADD --chown=${USER}:${USER} .python-version ./
 
-# Override Python version if provided as build arg
 RUN if [ -n "${PYTHON_VERSION}" ]; then \
         echo "${PYTHON_VERSION}" > .python-version; \
     fi
 
-# Install the project's dependencies using the lockfile and settings
+FROM venv AS proj
+
+LABEL org.opencontainers.image.source=https://github.com/sitbon/magg \
+      org.opencontainers.image.description="Magg - The Model Context Protocol (MCP) Aggregator (Project)" \
+      org.opencontainers.image.licenses=AGPLv3 \
+      org.opencontainers.image.authors="Phillip Sitbon <phillip.sitbon@gmail.com>"
+
+ARG MAGG_CONFIG_PATH="${HOME}/.magg/config.json"
+ARG MAGG_READ_ONLY=false
+
+ENV MAGG_CONFIG_PATH="${MAGG_CONFIG_PATH}" \
+    MAGG_READ_ONLY="${MAGG_READ_ONLY}"
+
 RUN --mount=type=cache,uid=${UID},gid=${UID},target=${HOME}/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
@@ -60,8 +64,6 @@ RUN if [ "${PYTHON_VERSION}" = "3.12" ]; then \
             'ln -sf "$(basename "$1")" "$(dirname "$1")/$(echo "$(basename "$1")" | sed "s/-musl\.so$/-gnu.so/")"' _ {} \; ; \
     fi
 
-# Then, add the rest of the project source code and install it
-# Installing separately from its dependencies allows optimal layer caching
 ADD --chown=${USER}:${USER} pyproject.toml uv.lock readme.md license.md ./
 ADD --chown=${USER}:${USER} ${PACKAGE}/ ./${PACKAGE}/
 
@@ -77,18 +79,13 @@ ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["magg", "serve", "--http", "--host", "0.0.0.0", "--port", "8000"]
 
 
-FROM venv AS pre
+FROM proj AS pre
 
 LABEL org.opencontainers.image.source=https://github.com/sitbon/magg \
       org.opencontainers.image.description="Magg - The Model Context Protocol (MCP) Aggregator (Staging)" \
       org.opencontainers.image.licenses=AGPLv3 \
       org.opencontainers.image.authors="Phillip Sitbon <phillip.sitbon@gmail.com>"
 
-ARG USER
-ARG HOME
-ARG PACKAGE
-ARG MAGG_READ_ONLY
-
 ENV MAGG_LOG_LEVEL=INFO
 
 USER root
@@ -117,31 +114,47 @@ ENV MAGG_LOG_LEVEL=WARNING
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD ["magg", "status"]
 
-FROM venv AS dev
+FROM proj AS dev
 
 LABEL org.opencontainers.image.source=https://github.com/sitbon/magg \
       org.opencontainers.image.description="Magg - The Model Context Protocol (MCP) Aggregator (Development)" \
       org.opencontainers.image.licenses=AGPLv3 \
       org.opencontainers.image.authors="Phillip Sitbon <phillip.sitbon@gmail.com>"
 
-ARG USER
-ARG HOME
-ARG PACKAGE
-
 ENV MAGG_LOG_LEVEL=DEBUG
 
-# Reinstall dependencies with dev packages
+ADD --chown=${USER}:${USER} test/ ./test/
+
 RUN --mount=type=cache,uid=1000,gid=1000,target=${HOME}/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
     uv sync --locked --dev
 
-#USER root
-#RUN apk add --no-cache nano
-#USER ${USER}
+FROM dev AS pkg
+
+LABEL org.opencontainers.image.source=https://github.com/sitbon/magg \
+      org.opencontainers.image.description="Magg - The Model Context Protocol (MCP) Aggregator (Packaging)" \
+      org.opencontainers.image.licenses=AGPLv3 \
+      org.opencontainers.image.authors="Phillip Sitbon <phillip.sitbon@gmail.com>"
+
+RUN --mount=type=cache,uid=${UID},gid=${UID},target=${HOME}/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    uv build
+
+FROM venv AS user
+
+LABEL org.opencontainers.image.source=https://github.com/sitbon/magg \
+      org.opencontainers.image.description="Magg - The Model Context Protocol (MCP) Aggregator (User Environment)" \
+      org.opencontainers.image.licenses=AGPLv3 \
+      org.opencontainers.image.authors="Phillip Sitbon <phillip.sitbon@gmail.com>"
+
+ENV PS1="(user) \h:\w\$ "
+
+COPY --from=pkg ${HOME}/dist/ ${HOME}/dist/
+
+RUN uv init --no-workspace --no-package --no-readme --no-description --name user && \
+    uv sync && \
+    uv add "magg[dev] @ $(ls -t1 dist/*.whl | head -n 1)"
 
-## Keep code writable in dev
-#USER root
-#RUN chown -R ${USER}:${USER} ${HOME}/${PACKAGE} && \
-#    chmod -R u+rwX ${HOME}/${PACKAGE}
-#USER ${USER}
+CMD ["bash"]

docs/index.md

@@ -728,6 +728,37 @@ When configuration changes are detected, Magg:
 - `MAGG_PREFIX_SEP` (default: `_`) - Separator between prefix and tool name
 - `MAGG_SELF_PREFIX` (default: `magg`) - Prefix for Magg's own tools
 
+### Environment Variable Inheritance
+
+By default, stdio-based MCP servers run with isolated environments. While the recommended approach is to configure environment variables in the server configuration (see Advanced Configuration), you can also pass environment variables at runtime to all stdio subprocesses:
+
+**Pass current environment to servers:**
+```bash
+magg serve --env-pass
+```
+
+**Set specific environment variables:**
+```bash
+magg serve --env-set API_KEY mykey --env-set LANG en_US.UTF-8
+```
+
+**Combined usage:**
+```bash
+# Pass current env and add specific variables
+magg serve --env-pass --env-set DEBUG true
+```
+
+This is useful for:
+- Passing API keys and authentication tokens to servers
+- Sharing PATH and system configuration
+- Development environments where servers need local tools
+- CI/CD pipelines with environment-based configuration
+
+**Note:** 
+- Environment inheritance only affects stdio-based servers. HTTP/URI servers do not receive inherited environment variables.
+- The preferred method is to set environment variables in the server configuration's `env` field for better reproducibility.
+- The `mbro` CLI tool also supports these same `--env-pass` and `--env-set` flags when connecting to servers.
+
 ### Usage Examples
 
 **Automatic reload (default):**
@@ -996,16 +1027,16 @@ export MAGG_SELF_PREFIX=""
 You can change the separator between prefix and tool name:
 
 ```bash
-# Default underscore separator: calc_add, magg_list_servers
+# Default underscore separator: calc_add, magg_server_list
 export MAGG_PREFIX_SEP="_"
 
-# Dash separator: calc-add, magg-list-servers  
+# Dash separator: calc-add, magg-server-list  
 export MAGG_PREFIX_SEP="-"
 
-# Dot separator: calc.add, magg.list.servers
+# Dot separator: calc.add, magg.server.list
 export MAGG_PREFIX_SEP="."
 
-# No separator: calcadd, magglistservers
+# No separator: calcadd, maggserverlist
 export MAGG_PREFIX_SEP=""
 ```
 

docs/mbro.md

@@ -296,7 +296,7 @@ mbro> call magg_server_enable <TAB>
 └─────────────────────────────────────────────────────┘
 ```
 
-#### 🔍 Enhanced Tab Completion
+#### 🔍 Tab Completion
 Tab completion provides rich parameter information:
 - **Parameter names with types**: `server=` | `string` | `required` | `Name of server to enable`
 - **Type-aware value suggestions**: Enum values, boolean `true/false`, examples
@@ -312,7 +312,7 @@ Error: Tool 'wether' not found.
 Did you mean: weather, whether_tool?
 ```
 
-#### ⚡ Enhanced Search
+#### ⚡ Search
 - Multi-word search support: `search file manager`
 - Searches across names, descriptions, and URIs
 - More flexible matching algorithms
@@ -559,35 +559,51 @@ mbro:magg> call weather_current location=London
 }
 ```
 
-### Example 4: Using Natural Language (Enhanced Mode)
+### Example 3.1: Using Magg in Hybrid Mode
 
 ```bash
+# mbro can host Magg in hybrid mode and connect via stdio
 $ mbro
-MBRO - MCP Browser
-Type 'help' for available commands or 'quit' to exit.
-Enhanced mode: Ctrl+M for multiline JSON, natural language supported
+mbro> connect magg "magg serve --hybrid --port 8080"
+Connected to 'magg' (Tools: 11, Resources: 5, Prompts: 2)
 
-mbro> connect to calculator at npx -y @modelcontextprotocol/server-calculator
-Connected to 'calculator' (Tools: 4, Resources: 0, Prompts: 0)
+# Now Magg is:
+# - Connected to mbro via stdio
+# - Also accessible via HTTP at http://localhost:8080
 
-mbro:calculator> what tools are available?
-Available tools:
-  - add: Add two numbers
-  - subtract: Subtract two numbers
-  - multiply: Multiply two numbers
-  - divide: Divide two numbers
+# In another terminal, different mbro instances can connect via HTTP
+$ mbro
+mbro> connect magg-remote http://localhost:8080
+Connected to 'magg-remote' (Tools: 11, Resources: 5, Prompts: 2)
 
-mbro:calculator> call add with a=25 and b=17
-42
+# Both connections can use Magg simultaneously
+mbro:magg> call calc_add a=5 b=3
+8
 
-mbro:calculator> search for mult
-Search results for 'mult':
+mbro:magg-remote> call calc_multiply a=5 b=3
+15
+```
 
-Tools (1):
-  - multiply: Multiply two numbers
+### Example 4: Script Automation
+
+```bash
+# Create a script file for common tasks
+$ cat > weather_check.mbro << 'EOF'
+# Weather check script
+connect weather npx -y @modelcontextprotocol/server-weather
+call get_forecast location="San Francisco" days=3
+disconnect
+quit
+EOF
 
-mbro:calculator> call multiply a=6 b=7
-42
+# Execute the script
+$ mbro -x weather_check.mbro
+
+# Or execute non-interactively
+$ mbro -X weather_check.mbro
+
+# Chain multiple scripts
+$ mbro -x setup.mbro -x weather_check.mbro -x cleanup.mbro
 ```
 
 ## Output Modes
@@ -636,6 +652,9 @@ echo $result | jq
 
 # One-liner with proper escaping
 mbro --json connect calc npx -y @modelcontextprotocol/server-calculator \; call add a=5 b=3 | jq
+
+# Quiet mode - suppress informational messages
+mbro -q connect calc npx -y @modelcontextprotocol/server-calculator \; call add a=5 b=3
 ```
 
 ## Tips and Tricks
@@ -649,11 +668,14 @@ mbro --json connect calc npx -y @modelcontextprotocol/server-calculator \; call
 
 ### Command Line Options 
    - `commands` - Commands to execute (positional arguments)
+   - `--version` / `-V` - Show version information
    - `--json` / `-j` - Output only JSON (machine-readable)
    - `--no-rich` - Disable Rich formatting
    - `--indent N` - Set JSON indent level (0 for compact, default: 2)
    - `--verbose` / `-v` - Enable verbose output (can be used multiple times)
-   - `--no-enhanced` - Disable enhanced features (shell-style args, multiline, etc.)
+   - `--quiet` / `-q` - Suppress informational messages
+   - `--env-pass` / `-e` - Pass environment to stdio MCP servers
+   - `--env-set KEY VALUE` / `-E KEY VALUE` - Set environment variable for stdio MCP servers (can be used multiple times)
    - `--repl` - Drop into REPL mode on startup
    - `-n` / `--no-interactive` - Don't drop into interactive mode after commands
    - `-x SCRIPT` / `--execute-script SCRIPT` - Execute .mbro script file (can be used multiple times)

examples/authentication.py

@@ -8,6 +8,7 @@
 """
 import argparse
 import asyncio
+import logging
 import os
 import sys
 from typing import Any
@@ -19,7 +20,6 @@
 
 async def bearer_auth(args: argparse.Namespace) -> None:
     """Test bearer token authentication with configurable options."""
-    # Get JWT from environment or command line
     jwt = args.token
     if not jwt:
         jwt = os.environ.get(args.env_var)
@@ -175,7 +175,6 @@ async def main():
     args = parser.parse_args()
 
     if args.debug:
-        import logging
         logging.basicConfig(level=logging.DEBUG)
 
     # Check if subcommand was provided

magg/auth.py

@@ -37,7 +37,6 @@ def load_keys(self) -> None:
         if not self.enabled:
             raise RuntimeError("Authentication is not enabled")
 
-        # Already loaded
         if self._private_key and self._public_key:
             return