Merge remote-tracking branch 'upstream/dev'

# Conflicts:
#	pyproject.toml
#	src/mcpo/main.py
#	uv.lock

Author: krewi1

.dockerignore

@@ -0,0 +1,72 @@
+########################
+#  Version-control
+########################
+.git
+.gitignore
+.gitattributes
+
+########################
+#  Docker artefacts
+########################
+.dockerignore
+Dockerfile
+docker-compose.yml
+.docker/
+
+########################
+#  Python byte-code / Caches
+########################
+**/__pycache__/
+**/*.py[cod]
+*.so                     # compiled C extensions
+.pytest_cache/
+.mypy_cache/
+.nox/
+.tox/
+
+########################
+#  Virtual-envs & deps
+########################
+.venv/
+venv/
+env/
+*.egg-info/
+*.dist-info/
+build/
+dist/
+pip-wheel-metadata/
+
+########################
+#  Testing & coverage
+########################
+.coverage
+htmlcov/
+nosetests.xml
+coverage.xml
+
+########################
+#  Docs & generated reports
+########################
+docs/_build/
+
+########################
+#  IDE / Editor artefacts
+########################
+.idea/
+.vscode/
+.ropeproject/
+**/*.swp  # Vim swap files
+
+########################
+#  Ops / secrets (keep these out of images!)
+########################
+*.env
+.env*
+*.pem
+*.key
+config.json
+########################
+#  OS junk
+########################
+.DS_Store
+Thumbs.db

CHANGELOG.md

@@ -12,6 +12,18 @@ All notable changes to this project will be documented in this file.
 The format is based on Keep a Changelog,
 and this project adheres to Semantic Versioning.
 
+## [0.0.17] - 2025-07-22
+
+### Added
+
+- 🔄 **Hot Reload Support for Configuration Files**: Added `--hot-reload` flag to watch your config file for changes and dynamically reload MCP servers without restarting the application—enabling seamless development workflows and runtime configuration updates.
+- 🤫 **HTTP Request Filtering for Cleaner Logs**: Added configurable log filtering to reduce noise from frequent HTTP requests, making debugging and monitoring much clearer in production environments.
+
+### Changed
+
+- ⬆️ **Updated MCP Package to v1.12.1**: Upgraded MCP dependency to resolve compatibility issues with Pydantic and improve overall stability and performance.
+- 🔧 **Normalized Streamable HTTP Configuration**: Streamlined configuration syntax for streamable-http servers to align with MCP standards while maintaining backward compatibility.
+
 ## [0.0.16] - 2025-07-02
 
 ### Added

README.md

@@ -49,13 +49,13 @@ mcpo --port 8000 --api-key "top-secret" --server-type "sse" -- http://127.0.0.1:
 You can also provide headers for the SSE connection:
 
 ```bash
-mcpo --port 8000 --api-key "top-secret" --server-type "sse" --headers '{"Authorization": "Bearer token", "X-Custom-Header": "value"}' -- http://127.0.0.1:8001/sse
+mcpo --port 8000 --api-key "top-secret" --server-type "sse" --header '{"Authorization": "Bearer token", "X-Custom-Header": "value"}' -- http://127.0.0.1:8001/sse
 ```
 
 To use a Streamable HTTP-compatible MCP server, specify the server type and endpoint:
 
 ```bash
-mcpo --port 8000 --api-key "top-secret" --server-type "streamable_http" -- http://127.0.0.1:8002/mcp
+mcpo --port 8000 --api-key "top-secret" --server-type "streamable-http" -- http://127.0.0.1:8002/mcp
 ```
 
 You can also run mcpo via Docker with no installation:
@@ -76,14 +76,22 @@ That’s it. Your MCP tool is now available at http://localhost:8000 with a gene
 
 ### 🔄 Using a Config File
 
-You can serve multiple MCP tools via a single config file that follows the [Claude Desktop](https://modelcontextprotocol.io/quickstart/user) format:
+You can serve multiple MCP tools via a single config file that follows the [Claude Desktop](https://modelcontextprotocol.io/quickstart/user) format.
+
+Enable hot-reload mode with `--hot-reload` to automatically watch your config file for changes and reload servers without downtime:
 
 Start via:
 
 ```bash
 mcpo --config /path/to/config.json
 ```
 
+Or with hot-reload enabled:
+
+```bash
+mcpo --config /path/to/config.json --hot-reload
+```
+
 Example config.json:
 
 ```json
@@ -106,7 +114,7 @@ Example config.json:
       }
     },
     "mcp_streamable_http": {
-      "type": "streamable_http",
+      "type": "streamable-http",
       "url": "http://127.0.0.1:8002/mcp"
     } // Streamable HTTP MCP Server
   }
@@ -194,4 +202,4 @@ Not sure where to start? Feel free to open an issue or ask a question—we’re
 
 ---
 
-✨ Let's build the future of interoperable AI tooling together!
+✨ Let's build the future of interoperable AI tooling together!

pyproject.toml

@@ -10,14 +10,15 @@ requires-python = ">=3.11"
 dependencies = [
     "click>=8.1.8",
     "fastapi>=0.115.12",
-    "mcp>=1.8.0",
-    "mcp[cli]>=1.8.0",
+    "mcp>=1.12.1",
+    "mcp[cli]>=1.12.1",
     "passlib[bcrypt]>=1.7.4",
     "pydantic>=2.11.1",
     "pyjwt[crypto]>=2.10.1",
     "python-dotenv>=1.1.0",
     "typer>=0.15.2",
     "uvicorn>=0.34.0",
+    "watchdog>=4.0.0",
 ]
 
 [project.scripts]
@@ -30,6 +31,5 @@ build-backend = "hatchling.build"
 [dependency-groups]
 dev = [
     "pytest>=8.3.5",
-    "pytest-asyncio>=1.1.0",
-    "trio>=0.30.0",
+    "pytest-asyncio>=0.23.0",
 ]

src/mcpo/__init__.py

@@ -66,6 +66,9 @@ def main(
     headers: Annotated[
         Optional[str], typer.Option("--header", "-H", help="Headers in JSON format")
     ] = None,
+    hot_reload: Annotated[
+        Optional[bool], typer.Option("--hot-reload", help="Enable hot reload for config file changes")
+    ] = False,
 ):
     server_command = None
     if not config_path:
@@ -137,6 +140,7 @@ def main(
             ssl_keyfile=ssl_keyfile,
             path_prefix=path_prefix,
             headers=headers,
+            hot_reload=hot_reload,
         )
     )