spawn-cli 0.1.13__tar.gz → 0.1.14__tar.gz

{spawn_cli-0.1.13/src/spawn_cli.egg-info → spawn_cli-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spawn-cli
-Version: 0.1.13
+Version: 0.1.14
 Summary: A minimal installable Python CLI package.
 License: MIT
 Classifier: License :: OSI Approved :: MIT License

{spawn_cli-0.1.13 → spawn_cli-0.1.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spawn-cli"
-version = "0.1.13"
+version = "0.1.14"
 description = "A minimal installable Python CLI package."
 readme = "README.md"
 requires-python = ">=3.10"

{spawn_cli-0.1.13 → spawn_cli-0.1.14}/src/spawn_cli/cli.py

@@ -210,7 +210,7 @@ def build_parser() -> argparse.ArgumentParser:
         action="store_true",
         help=(
             "Fail on issues that default to warnings "
-            "(missing skill files, bad mcp.json, empty file descriptions)."
+            "(missing skill files, invalid extsrc/mcp/*.json, empty file descriptions)."
         ),
     )
 

{spawn_cli-0.1.13 → spawn_cli-0.1.14}/src/spawn_cli/core/download.py

@@ -21,7 +21,6 @@ from ruamel.yaml import YAML
 from spawn_cli.core import low_level as ll
 from spawn_cli.core.errors import SpawnError, SpawnWarning
 from spawn_cli.core import scripts
-from spawn_cli.io.json_io import load_json
 from spawn_cli.io.paths import ensure_dir, safe_path
 from spawn_cli.io.yaml_io import load_yaml, save_yaml
 from spawn_cli.models.config import ExtensionConfig, ExtensionsMeta, FileMode, SourceYaml
@@ -128,15 +127,7 @@ def _candidate_norm_skill_names(extsrc_dir: Path) -> list[str]:
 
 
 def _candidate_mcp_server_names(extsrc_dir: Path) -> list[str]:
-    path = extsrc_dir / "mcp.json"
-    if not path.is_file():
-        return []
-    data = load_json(path)
-    names: list[str] = []
-    for s in data.get("servers") or []:
-        if isinstance(s, dict) and s.get("name"):
-            names.append(str(s["name"]))
-    return names
+    return ll.extsrc_mcp_server_names_for_staging(extsrc_dir)
 
 
 def _validate_render_identity_for_new_extension(target_root: Path, new_name: str, extsrc_dir: Path) -> None:

{spawn_cli-0.1.13 → spawn_cli-0.1.14}/src/spawn_cli/core/high_level.py

@@ -10,7 +10,7 @@ from spawn_cli.core import low_level as ll
 from spawn_cli.core import scripts
 from spawn_cli.core.errors import SpawnError, SpawnWarning
 from spawn_cli.ide.registry import IdeCapabilities, get as ide_get
-from spawn_cli.io.json_io import load_json
+from spawn_cli.io.json_io import save_json
 from spawn_cli.io.paths import ensure_dir, safe_path
 from spawn_cli.io.yaml_io import load_yaml, save_yaml
 from spawn_cli.models.config import ExtensionConfig, ReadFlag
@@ -417,6 +417,16 @@ def extension_healthcheck(target_root: Path, extension: str) -> bool:
     return scripts.run_healthcheck_scripts(target_root, extension)
 
 
+def _ensure_empty_mcp_platform_files(extsrc: Path) -> None:
+    mdir = extsrc / "mcp"
+    ensure_dir(mdir)
+    empty: dict = {"servers": []}
+    for stem in ("windows", "linux", "macos"):
+        p = mdir / f"{stem}.json"
+        if not p.is_file():
+            save_json(p, empty)
+
+
 def extension_init(path: Path, name: str) -> None:
     extsrc = path / "extsrc"
     cfg_path = extsrc / "config.yaml"
@@ -429,6 +439,7 @@ def extension_init(path: Path, name: str) -> None:
     ensure_dir(extsrc / "skills")
     ensure_dir(extsrc / "files")
     ensure_dir(extsrc / "setup")
+    _ensure_empty_mcp_platform_files(extsrc)
     template = {
         "name": name,
         "schema": 1,
@@ -475,15 +486,49 @@ def extension_check(path: Path, strict: bool = False) -> list[str]:
                 if strict:
                     raise SpawnError(msg)
                 warnings_out.append(msg)
-    mcp_path = extsrc / "mcp.json"
-    if mcp_path.is_file():
-        try:
-            load_json(mcp_path)
-        except Exception as e:
-            msg = f"mcp.json not parseable: {e}"
+    root_mcp = extsrc / "mcp.json"
+    if root_mcp.is_file():
+        msg = (
+            "obsolete extsrc/mcp.json is not used; remove it and use "
+            "extsrc/mcp/windows.json, linux.json, and macos.json only"
+        )
+        if strict:
+            raise SpawnError(msg)
+        warnings_out.append(msg)
+    mcp_dir = extsrc / "mcp"
+    if not mcp_dir.is_dir():
+        msg = "missing extsrc/mcp/ directory (expected windows.json, linux.json, macos.json)"
+        if strict:
+            raise SpawnError(msg)
+        warnings_out.append(msg)
+    else:
+        paths = ll.extension_mcp_platform_json_paths(extsrc)
+        if not all(p.is_file() for p in paths):
+            missing = [p.name for p in paths if not p.is_file()]
+            msg = f"incomplete extsrc/mcp layout (missing {', '.join(missing)})"
             if strict:
-                raise SpawnError(msg) from e
+                raise SpawnError(msg)
             warnings_out.append(msg)
+        else:
+            name_sets: list[frozenset[str]] = []
+            for p in paths:
+                try:
+                    nm = ll.normalized_mcp_from_mcp_json_path(p, cfg.name or "extension")
+                except Exception as e:
+                    if strict:
+                        raise SpawnError(f"MCP file invalid ({p}): {e}") from e
+                    warnings_out.append(f"MCP file invalid ({p}): {e}")
+                    name_sets = []
+                    break
+                name_sets.append(frozenset(s.name for s in nm.servers))
+            if name_sets and len(set(name_sets)) != 1:
+                msg = (
+                    "MCP server names must match across mcp/windows.json, "
+                    "linux.json, and macos.json"
+                )
+                if strict:
+                    raise SpawnError(msg)
+                warnings_out.append(msg)
     if cfg.setup:
         for _phase, rel in (
             ("before-install", cfg.setup.before_install),
@@ -555,6 +600,7 @@ def extension_from_rules(source: str, output_path: Path, name: str, branch: str
         )
         ensure_dir(extsrc / "skills")
         ensure_dir(extsrc / "setup")
+        _ensure_empty_mcp_platform_files(extsrc)
     finally:
         shutil.rmtree(tmp, ignore_errors=True)
 

{spawn_cli-0.1.13 → spawn_cli-0.1.14}/src/spawn_cli/core/low_level.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import re
 import shutil
+import sys
 import time
 import uuid
 import warnings
@@ -22,6 +23,8 @@ from spawn_cli.models.config import CoreConfig, ExtensionConfig, FileMode, IdeLi
 from spawn_cli.models.mcp import McpCapabilities, McpEnvVar, McpServer, McpTransport, NormalizedMcp
 from spawn_cli.models.skill import SkillFileRef, SkillMetadata, SkillRawInfo
 
+MCP_PLATFORM_STEMS: tuple[str, ...] = ("windows", "linux", "macos")
+
 CANONICAL_IDE_KEYS: tuple[str, ...] = (
     "cursor",
     "codex",
@@ -658,9 +661,25 @@ def _mcp_capabilities(raw: dict[str, Any]) -> McpCapabilities:
     return McpCapabilities.model_validate(c) if isinstance(c, dict) else McpCapabilities()
 
 
-def list_mcp(target_root: Path, extension: str) -> NormalizedMcp:
-    path = _extend_root(target_root) / extension / "mcp.json"
-    data = load_json(path)
+def mcp_host_platform_stem() -> str:
+    plat = sys.platform
+    if plat == "win32":
+        return "windows"
+    if plat == "darwin":
+        return "macos"
+    if plat.startswith("linux"):
+        return "linux"
+    raise SpawnError(
+        f"unsupported platform for MCP selection: {plat!r} (expected Windows, Linux, or macOS)"
+    )
+
+
+def extension_mcp_platform_json_paths(extension_root: Path) -> tuple[Path, Path, Path]:
+    d = extension_root / "mcp"
+    return tuple(d / f"{s}.json" for s in MCP_PLATFORM_STEMS)
+
+
+def _normalized_mcp_from_loaded(data: dict, path: Path, extension: str) -> NormalizedMcp:
     servers_out: list[McpServer] = []
     for s in data.get("servers") or []:
         if not isinstance(s, dict):
@@ -690,6 +709,49 @@ def list_mcp(target_root: Path, extension: str) -> NormalizedMcp:
     return NormalizedMcp(servers=servers_out)
 
 
+def normalized_mcp_from_mcp_json_path(path: Path, extension: str) -> NormalizedMcp:
+    data = load_json(path)
+    return _normalized_mcp_from_loaded(data, path, extension)
+
+
+def list_mcp(target_root: Path, extension: str) -> NormalizedMcp:
+    ext_root = _extend_root(target_root) / extension
+    mcp_dir = ext_root / "mcp"
+    if not mcp_dir.is_dir():
+        return NormalizedMcp(servers=[])
+    stem = mcp_host_platform_stem()
+    path = mcp_dir / f"{stem}.json"
+    if not path.is_file():
+        raise SpawnError(f"missing MCP platform file for this OS: {path}")
+    return normalized_mcp_from_mcp_json_path(path, extension)
+
+
+def extsrc_mcp_server_names_for_staging(extsrc_dir: Path) -> list[str]:
+    """Return sorted MCP server names from extsrc ``mcp/*.json`` or [] if ``mcp/`` is absent.
+
+    When ``mcp/`` exists, all three platform files must be present and declare the same
+    server ``name`` set.
+    """
+    mcp_dir = extsrc_dir / "mcp"
+    if not mcp_dir.is_dir():
+        return []
+    paths = list(extension_mcp_platform_json_paths(extsrc_dir))
+    if not all(p.is_file() for p in paths):
+        missing = [p.name for p in paths if not p.is_file()]
+        raise SpawnError(
+            f"extsrc/mcp layout incomplete (missing {', '.join(missing)}) under {mcp_dir}"
+        )
+    name_sets: list[frozenset[str]] = []
+    for p in paths:
+        nm = normalized_mcp_from_mcp_json_path(p, "_staging")
+        name_sets.append(frozenset(s.name for s in nm.servers))
+    if len(set(name_sets)) != 1:
+        raise SpawnError(
+            "MCP server names must be identical across mcp/windows.json, linux.json, macos.json"
+        )
+    return sorted(name_sets[0])
+
+
 def get_navigation_metadata(target_root: Path, extension: str) -> dict:
     return {
         "required": [x.model_dump(by_alias=True) for x in get_required_read_global(target_root, extension)],
@@ -1205,14 +1267,18 @@ __all__ = [
     "get_required_read_global_all",
     "get_skill_raw_info",
     "init",
+    "extsrc_mcp_server_names_for_staging",
+    "extension_mcp_platform_json_paths",
     "list_extensions",
     "list_ides",
     "list_mcp",
     "list_skills",
+    "mcp_host_platform_stem",
     "sync_core_config_from_defaults",
     "merge_core_and_extension_agent_ignore",
     "METADATA_TEMP_MAX_AGE_SECONDS",
     "normalize_skill_name",
+    "normalized_mcp_from_mcp_json_path",
     "prune_metadata_temp",
     "push_to_global_gitignore",
     "remove_from_global_gitignore",

{spawn_cli-0.1.13 → spawn_cli-0.1.14/src/spawn_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spawn-cli
-Version: 0.1.13
+Version: 0.1.14
 Summary: A minimal installable Python CLI package.
 License: MIT
 Classifier: License :: OSI Approved :: MIT License