open-edison 0.1.42__py3-none-any.whl → 0.1.43__py3-none-any.whl

{open_edison-0.1.42.dist-info → open_edison-0.1.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-edison
-Version: 0.1.42
+Version: 0.1.43
 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.42.dist-info → open_edison-0.1.43.dist-info}/RECORD

@@ -1,18 +1,21 @@
 src/__init__.py,sha256=bEYMwBiuW9jzF07iWhas4Vb30EcpnqfpNfz_Q6yO1jU,209
 src/__main__.py,sha256=kQsaVyzRa_ESC57JpKDSQJAHExuXme0rM5beJsYxFeA,161
-src/cli.py,sha256=P38IWER41S5oAfbd_7p89hBpnjClsNHpmE5pSsJc6uU,9733
+src/cli.py,sha256=fqX-HuRDePRasexpnURQ_pVYeycJuWxllMcwfqDxMQw,8490
 src/config.py,sha256=RSsAYzl8cj6eaDN1RORMcfKKWBcp4bKTQp2BdhAL9mg,10258
 src/config.pyi,sha256=FgehEGli8ZXSjGlANBgMGv5497q4XskQciOc1fUcxqM,2033
 src/events.py,sha256=aFQrVXDIZwt55Dz6OtyoXu2yi9evqo-8jZzo3CR2Tto,4965
-src/oauth_manager.py,sha256=qcQa5BDRZr4bjqiXNflCnrXOh9mo9JVjvP2Caseg2Uc,9943
+src/oauth_manager.py,sha256=W9QSo0vfGDQ_i-QWCngkv7YLSL3Rk5jfPmqjU1J2rnU,9911
 src/permissions.py,sha256=NGAnlG_z59HEiVA-k3cYvwmmiuHzxuNb5Tbd5umbL00,10483
 src/server.py,sha256=cnO5bgxT-lrfuwk9AIvB_HBV8SWOtFClfGUn5_zFWyo,45652
 src/single_user_mcp.py,sha256=rJrlqHcIubGkos_24ux5rb3OoKYDzvagCHghhfDeXTI,18535
 src/telemetry.py,sha256=-RZPIjpI53zbsKmp-63REeZ1JirWHV5WvpSRa2nqZEk,11321
-src/frontend_dist/index.html,sha256=rNNHhYAvyDujYAnwut4zIQfkSKEwES491uH4fEOjkIw,259
+src/frontend_dist/index.html,sha256=s95FMkH8VLisvawLH7bZxbLzRUFvMhHkH6ZMzpVBngs,673
+src/frontend_dist/sw.js,sha256=rihX1es-vWwjmtnXyaksJjs2dio6MVAOTAWwQPeJUYw,2164
+src/frontend_dist/assets/index-BUUcUfTt.js,sha256=awoyPI6u0v6ao2iarZdSkrSDUvyU8aNkMLqHMvgVgyY,257666
+src/frontend_dist/assets/index-o6_8mdM8.css,sha256=nwmX_6q55mB9463XN2JM8BdeihjkALpQK83Fc3_iGvE,15936
 src/mcp_importer/__init__.py,sha256=Mk59pVr7OMGfYGWeSYk8-URfhIcrs3SPLYS7fmJbMII,275
 src/mcp_importer/__main__.py,sha256=0jVfxKzyr6koVu1ghhWseah5ilKIoGovE6zkEZ-u-Og,515
-src/mcp_importer/api.py,sha256=kYhmVHBUekTXPv3xNdt8rJNH1mbWXvs2cTZZGOkVhAk,3383
+src/mcp_importer/api.py,sha256=47tur0xgl1NBI1Vnh3cpScEmDS64bKMYcWjZDuqx7HQ,6644
 src/mcp_importer/cli.py,sha256=Pe0GLWm1nMd1VuNXOSkxIrFZuGNFc9dNvfBsvf-bdBI,3487
 src/mcp_importer/export_cli.py,sha256=daEadB6nL8P4OpEGFx0GshuN1a091L7BhiitpV1bPqA,6294
 src/mcp_importer/exporters.py,sha256=fSgl6seduoXFp7YnKH26UEaC1sFBnd4whSut7CJLBQs,11348
@@ -21,13 +24,12 @@ src/mcp_importer/importers.py,sha256=zGN8lT7qQJ95jDTd-ck09j_w5PSvH-uj33TILoHfHbs
 src/mcp_importer/merge.py,sha256=KIGT7UgbAm07-LdyoUXEJ7ABSIiPTFlj_qjz669yFxg,1569
 src/mcp_importer/parsers.py,sha256=JRE7y_Gg-QmlAARvZdrI9CmUyy-ODvDPbS695pb3Aw8,4856
 src/mcp_importer/paths.py,sha256=4L-cPr7KCM9X9gAUP7Da6ictLNrPWuQ_IM419zqY-2I,2700
-src/mcp_importer/quick_cli.py,sha256=24-R77-AuKsbeag0SyADba4Vf9oYHkaOBnRXK2sZt_4,1911
+src/mcp_importer/quick_cli.py,sha256=4mJe10q_lZCYLm75QBt1rYy2j8mGEsRZoAqA0agjfSM,1834
 src/mcp_importer/types.py,sha256=h03TbAnJbap6OWWd0dT0QcFWNvSaiVFWH9V9PD6x4s0,138
 src/middleware/data_access_tracker.py,sha256=bArBffWgYmvxOx9z_pgXQhogvnWQcc1m6WvEblDD4gw,15039
 src/middleware/session_tracking.py,sha256=5W1VH9HNqIZeX0HNxDEm41U4GY6SqKSXtApDEeZK2qo,23084
-frontend_dist/index.html,sha256=rNNHhYAvyDujYAnwut4zIQfkSKEwES491uH4fEOjkIw,259
-open_edison-0.1.42.dist-info/METADATA,sha256=ycCiWJGiiCWyiam8Du-w4YqfUbrIhBPL4mu8HYcd8l4,13152
-open_edison-0.1.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-open_edison-0.1.42.dist-info/entry_points.txt,sha256=YiGNm9x2I00hgT10HDyB4gxC1LcaV_mu8bXFjolu0Yw,171
-open_edison-0.1.42.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-open_edison-0.1.42.dist-info/RECORD,,
+open_edison-0.1.43.dist-info/METADATA,sha256=OO5PDNk7pByRgIShryHaCtp2_7ua9XOwC8eBVdU-b5o,13188
+open_edison-0.1.43.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+open_edison-0.1.43.dist-info/entry_points.txt,sha256=YiGNm9x2I00hgT10HDyB4gxC1LcaV_mu8bXFjolu0Yw,171
+open_edison-0.1.43.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+open_edison-0.1.43.dist-info/RECORD,,

src/cli.py

@@ -8,15 +8,15 @@ import argparse
 import asyncio
 import os
 import subprocess as _subprocess
-import sys
 from contextlib import suppress
 from pathlib import Path
-from typing import Any, NoReturn, cast
+from typing import Any, NoReturn
 
 from loguru import logger as _log  # type: ignore[reportMissingImports]
 
-from .config import Config, get_config_dir, get_config_json_path
-from .server import OpenEdisonProxy
+from src.config import Config, get_config_dir, get_config_json_path
+from src.mcp_importer.cli import run_cli
+from src.server import OpenEdisonProxy
 
 log: Any = _log
 
@@ -45,7 +45,7 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     # import-mcp: import MCP servers from other tools into config.json
     sp_import = subparsers.add_parser(
         "import-mcp",
-        help="Import MCP servers from other tools (Cursor, Windsurf, Cline, Claude Desktop, etc.)",
+        help="Import MCP servers from other tools (Cursor, VS Code, Claude Code)",
         description=(
             "Import MCP server configurations from other tools into Open Edison config.json.\n"
             "Use --source to choose the tool and optional flags to control merging."
@@ -55,16 +55,10 @@ def _parse_args(argv: list[str] | None = None) -> argparse.Namespace:
         "--source",
         choices=[
             "cursor",
-            "windsurf",
-            "cline",
-            "claude-desktop",
             "vscode",
             "claude-code",
-            "gemini-cli",
-            "codex",
-            "interactive",
         ],
-        default="interactive",
+        default="cursor",
         help="Source application to import from",
     )
     sp_import.add_argument(
@@ -226,35 +220,8 @@ def main(argv: list[str] | None = None) -> NoReturn:  # noqa: C901
         raise SystemExit(exit_code)
 
     if getattr(args, "command", None) == "import-mcp":
-        # Defer-import importer package (lives under repository scripts/)
-        importer_pkg = Path(__file__).parent.parent / "scripts" / "mcp_importer"
-        try:
-            if str(importer_pkg) not in sys.path:
-                sys.path.insert(0, str(importer_pkg))
-            from mcp_importer.cli import run_cli  # type: ignore
-        except Exception as imp_exc:  # noqa: BLE001
-            log.error(
-                "Failed to load MCP importer package from {}: {}",
-                importer_pkg,
-                imp_exc,
-            )
-            raise SystemExit(1) from imp_exc
-
-        importer_argv: list[str] = []
-        if args.source:
-            importer_argv += ["--source", str(args.source)]
-        if getattr(args, "config_dir", None):
-            importer_argv += [
-                "--config-dir",
-                str(Path(args.config_dir).expanduser().resolve()),
-            ]
-        if args.merge:
-            importer_argv += ["--merge", str(args.merge)]
-        if bool(getattr(args, "dry_run", False)):
-            importer_argv += ["--dry-run"]
-
-        rc_val: int = int(cast(Any, run_cli)(importer_argv))
-        raise SystemExit(rc_val)
+        result_code = run_cli(argv)
+        raise SystemExit(result_code)
 
     # default: run server (top-level flags)
     try: