open-edison 0.1.39__tar.gz → 0.1.40__tar.gz

{open_edison-0.1.39 → open_edison-0.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-edison
-Version: 0.1.39
+Version: 0.1.40
 Summary: Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy.
 Author-email: Hugo Berg <hugo@edison.watch>
 License-File: LICENSE
@@ -76,7 +76,7 @@ Optionally, import your existing MCP configs from Cursor, VS Code, or Claude Cod
 
 ```bash
 # From source (no install) — quick one-liner (add --dry-run to preview)
-uv run python -m mcp_importer.quick_cli --yes
+uv run python -m src.mcp_importer.quick_cli --yes
 ```
 
 <details>
@@ -139,29 +139,29 @@ OPEN_EDISON_CONFIG_DIR=~/edison-config open-edison run
 
     ```bash
     # From source (no install)
-    uv run python -m mcp_importer.quick_cli --yes
+    uv run python -m src.mcp_importer.quick_cli --yes
     ```
 
   - Preview what will be imported (no writes):
 
     ```bash
-    uv run python -m mcp_importer --source cursor --dry-run
+    uv run python -m src.mcp_importer --source cursor --dry-run
     ```
 
   - Import servers into Open Edison `config.json` (merge policy defaults to `skip`):
 
     ```bash
-    uv run python -m mcp_importer --source cursor
-    uv run python -m mcp_importer --source vscode
-    uv run python -m mcp_importer --source claude-code
+    uv run python -m src.mcp_importer --source cursor
+    uv run python -m src.mcp_importer --source vscode
+    uv run python -m src.mcp_importer --source claude-code
     ```
 
   - Point your editor to Open Edison (backup original config and replace with a single Open Edison server):
 
     ```bash
-    uv run python -m mcp_importer export --target cursor --yes
-    uv run python -m mcp_importer export --target vscode --yes
-    uv run python -m mcp_importer export --target claude-code --yes
+    uv run python -m src.mcp_importer export --target cursor --yes
+    uv run python -m src.mcp_importer export --target vscode --yes
+    uv run python -m src.mcp_importer export --target claude-code --yes
     ```
 
 </details>

{open_edison-0.1.39 → open_edison-0.1.40}/README.md

@@ -52,7 +52,7 @@ Optionally, import your existing MCP configs from Cursor, VS Code, or Claude Cod
 
 ```bash
 # From source (no install) — quick one-liner (add --dry-run to preview)
-uv run python -m mcp_importer.quick_cli --yes
+uv run python -m src.mcp_importer.quick_cli --yes
 ```
 
 <details>
@@ -115,29 +115,29 @@ OPEN_EDISON_CONFIG_DIR=~/edison-config open-edison run
 
     ```bash
     # From source (no install)
-    uv run python -m mcp_importer.quick_cli --yes
+    uv run python -m src.mcp_importer.quick_cli --yes
     ```
 
   - Preview what will be imported (no writes):
 
     ```bash
-    uv run python -m mcp_importer --source cursor --dry-run
+    uv run python -m src.mcp_importer --source cursor --dry-run
     ```
 
   - Import servers into Open Edison `config.json` (merge policy defaults to `skip`):
 
     ```bash
-    uv run python -m mcp_importer --source cursor
-    uv run python -m mcp_importer --source vscode
-    uv run python -m mcp_importer --source claude-code
+    uv run python -m src.mcp_importer --source cursor
+    uv run python -m src.mcp_importer --source vscode
+    uv run python -m src.mcp_importer --source claude-code
     ```
 
   - Point your editor to Open Edison (backup original config and replace with a single Open Edison server):
 
     ```bash
-    uv run python -m mcp_importer export --target cursor --yes
-    uv run python -m mcp_importer export --target vscode --yes
-    uv run python -m mcp_importer export --target claude-code --yes
+    uv run python -m src.mcp_importer export --target cursor --yes
+    uv run python -m src.mcp_importer export --target vscode --yes
+    uv run python -m src.mcp_importer export --target claude-code --yes
     ```
 
 </details>

{open_edison-0.1.39 → open_edison-0.1.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-edison"
-version = "0.1.39"
+version = "0.1.40"
 description = "Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy."
 readme = "README.md"
 authors = [
@@ -28,8 +28,8 @@ requires-python = ">= 3.12"
 [project.scripts]
 open-edison = "src.cli:main"
 open_edison = "src.cli:main"
-mcp-importer = "mcp_importer.__main__:main"
-mcp-importer-quick = "mcp_importer.quick_cli:main"
+mcp-importer = "src.mcp_importer.__main__:main"
+mcp-importer-quick = "src.mcp_importer.quick_cli:main"
 
 [build-system]
 requires = ["hatchling"]
@@ -54,10 +54,7 @@ dev-dependencies = [
 allow-direct-references = true
 
 [tool.hatch.build.targets.wheel]
-packages = ["src", "src/mcp_importer"]
-exclude = [
-  "src/mcp_importer/**",
-]
+packages = ["src"]
 include = [
   "README.md",
   "LICENSE",
@@ -66,8 +63,8 @@ include = [
   "resource_permissions.json",
   "prompt_permissions.json",
   "docs/**",
-  "src/frontend_dist/**",
 ]
+force-include = { "src/frontend_dist" = "frontend_dist" }
 
 [tool.hatch.build.targets.wheel.hooks.custom]
 path = "hatch_build.py"

{open_edison-0.1.39 → open_edison-0.1.40}/src/mcp_importer/__init__.py

@@ -1,6 +1,6 @@
 """MCP importer package for Open Edison scripts.
 
-Import submodules explicitly as needed, e.g. `from mcp_importer import cli`.
+Import submodules explicitly as needed, e.g. `from src.mcp_importer import cli`.
 """
 
 # pyright: reportUnsupportedDunderAll=false

{open_edison-0.1.39 → open_edison-0.1.40}/src/mcp_importer/__main__.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import sys
 
-from mcp_importer.cli import run_cli as import_run_cli
-from mcp_importer.export_cli import run_cli as export_run_cli
+from src.mcp_importer.cli import run_cli as import_run_cli
+from src.mcp_importer.export_cli import run_cli as export_run_cli
 
 
 def main() -> int:

{open_edison-0.1.39 → open_edison-0.1.40}/src/mcp_importer/api.py

@@ -3,18 +3,35 @@ import asyncio
 from collections.abc import Awaitable
 from enum import Enum
 from pathlib import Path
-from typing import Any
+from typing import Any, Protocol, cast, runtime_checkable
 
 from fastmcp import FastMCP
 
-import mcp_importer.paths as _paths
-from mcp_importer.exporters import export_to_claude_code, export_to_cursor, export_to_vscode
-from mcp_importer.importers import import_from_claude_code, import_from_cursor, import_from_vscode
-from mcp_importer.merge import MergePolicy, merge_servers
 from src.config import Config, MCPServerConfig, get_config_json_path
+from src.mcp_importer import paths as _paths
+from src.mcp_importer.exporters import (
+    ExportResult,
+    export_to_claude_code,
+    export_to_cursor,
+    export_to_vscode,
+)
+from src.mcp_importer.importers import (
+    import_from_claude_code,
+    import_from_cursor,
+    import_from_vscode,
+)
+from src.mcp_importer.merge import MergePolicy, merge_servers
 from src.oauth_manager import OAuthStatus, get_oauth_manager
 
 
+@runtime_checkable
+class _MCPClientLike(Protocol):
+    async def list_tools(self) -> Any: ...
+    async def list_resources(self) -> Any: ...
+    async def list_prompts(self) -> Any: ...
+    def shutdown(self) -> Awaitable[Any] | Any: ...
+
+
 class CLIENT(str, Enum):
     CURSOR = "cursor"
     VSCODE = "vscode"
@@ -79,12 +96,17 @@ def export_edison_to(
     dry_run: bool = False,
     force: bool = False,
     create_if_missing: bool = False,
-) -> Any:
+) -> ExportResult:
     if dry_run:
         print(
             f"[dry-run] Would export Open Edison to '{client}' (backup and replace editor MCP config)"
         )
-        return None
+        return ExportResult(
+            target_path=Path(""),
+            backup_path=None,
+            wrote_changes=False,
+            dry_run=True,
+        )
     match client:
         case CLIENT.CURSOR:
             return export_to_cursor(
@@ -115,7 +137,7 @@ def export_edison_to(
             )
 
 
-def verify_mcp_server(server: MCPServerConfig) -> bool:
+def verify_mcp_server(server: MCPServerConfig) -> bool:  # noqa
     """Minimal validation: try listing tools/resources/prompts via FastMCP within a timeout."""
 
     async def _verify_async() -> bool:
@@ -136,7 +158,7 @@ def verify_mcp_server(server: MCPServerConfig) -> bool:
         proxy: FastMCP[Any] | None = None
         try:
             proxy = FastMCP.as_proxy(backend=backend_cfg, name=f"open-edison-verify-{server.name}")
-            s: Any = proxy
+            s: _MCPClientLike = cast(_MCPClientLike, proxy)
             await asyncio.wait_for(
                 asyncio.gather(
                     s.list_tools(),
@@ -160,7 +182,7 @@ def verify_mcp_server(server: MCPServerConfig) -> bool:
     return asyncio.run(_verify_async())
 
 
-def server_needs_oauth(server: MCPServerConfig) -> bool:
+def server_needs_oauth(server: MCPServerConfig) -> bool:  # noqa
     """Return True if the remote server currently needs OAuth; False otherwise."""
 
     async def _needs_oauth_async() -> bool:

{open_edison-0.1.39 → open_edison-0.1.40}/src/mcp_importer/quick_cli.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import argparse
 from collections.abc import Iterable
 
-from mcp_importer.api import (
+from src.mcp_importer.api import (
     CLIENT,
     detect_clients,
     export_edison_to,