MetaList 0.3.7__tar.gz → 0.3.8__tar.gz

{metalist-0.3.7/metalist.egg-info → metalist-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metalist
-Version: 0.3.7
+Version: 0.3.8
 Summary: A minimalist single-user note-taking app with SSR, fast in-memory tree operations, and efficient sync.
 Project-URL: Homepage, https://github.com/evolvingstuff/metalist
 Project-URL: Repository, https://github.com/evolvingstuff/metalist

{metalist-0.3.7 → metalist-0.3.8}/app/services/namespace_switcher.py

@@ -334,10 +334,33 @@ def open_or_launch_all_namespaces(
     if not isinstance(raw_namespaces, list):
         raise RuntimeError("Namespace catalog missing namespaces")
 
+    profiles = _resolve_conflict_free_profiles_for_all_namespaces(
+        raw_namespaces=raw_namespaces,
+    )
+    saved_profiles = _load_saved_profiles_by_namespace()
+    for profile in profiles:
+        saved_profile = saved_profiles.get(profile.namespace)
+        if saved_profile is None:
+            raise RuntimeError(f"Namespace {profile.namespace} launch profile disappeared")
+        if saved_profile == profile:
+            continue
+        save_namespace_launch_profile(
+            namespace=profile.namespace,
+            port=profile.port,
+            https_port=profile.https_port,
+            mcp_port=profile.mcp_port,
+        )
+        print(
+            f"[startup] WARNING: adjusted namespace {profile.namespace} ports to resolve "
+            f"a saved conflict: HTTP {saved_profile.port} -> {profile.port}, "
+            f"HTTPS {saved_profile.https_port} -> {profile.https_port}, "
+            f"MCP {saved_profile.mcp_port} -> {profile.mcp_port}.",
+            file=sys.stderr,
+            flush=True,
+        )
+
     results: list[NamespaceOpenResult] = []
-    for entry in raw_namespaces:
-        _assert_catalog_entry_has_launch_profile(entry=entry)
-        profile = _catalog_default_profile(entry=entry)
+    for profile in profiles:
         result = open_or_launch_namespace(
             environ=environ,
             current_namespace=None,
@@ -365,6 +388,74 @@ def open_or_launch_all_namespaces(
     return results
 
 
+def _resolve_conflict_free_profiles_for_all_namespaces(
+    *,
+    raw_namespaces: Sequence[object],
+) -> list[NamespaceLaunchProfile]:
+    occupied_ports: set[int] = set()
+    profiles: list[NamespaceLaunchProfile] = []
+    for entry in raw_namespaces:
+        _assert_catalog_entry_has_launch_profile(entry=entry)
+        saved_profile = _catalog_default_profile(entry=entry)
+        profile = _repair_profile_port_conflicts(
+            profile=saved_profile,
+            occupied_ports=occupied_ports,
+        )
+        profiles.append(profile)
+        for _, port in _profile_service_ports(profile=profile):
+            occupied_ports.add(port)
+    return profiles
+
+
+def _repair_profile_port_conflicts(
+    *,
+    profile: NamespaceLaunchProfile,
+    occupied_ports: set[int],
+) -> NamespaceLaunchProfile:
+    working_ports = set(occupied_ports)
+    http_port = _keep_or_replace_port(
+        preferred_port=profile.port,
+        replacement_start=server_runtime._DEFAULT_HTTP_PORT,
+        occupied_ports=working_ports,
+    )
+    working_ports.add(http_port)
+
+    https_port = profile.https_port
+    if https_port is not None:
+        https_port = _keep_or_replace_port(
+            preferred_port=https_port,
+            replacement_start=server_runtime._DEFAULT_HTTPS_PORT,
+            occupied_ports=working_ports,
+        )
+        working_ports.add(https_port)
+
+    mcp_port = _keep_or_replace_port(
+        preferred_port=profile.mcp_port,
+        replacement_start=server_runtime._DEFAULT_MCP_AGENT_WEB_PORT,
+        occupied_ports=working_ports,
+    )
+    return NamespaceLaunchProfile(
+        namespace=profile.namespace,
+        port=http_port,
+        https_port=https_port,
+        mcp_port=mcp_port,
+    )
+
+
+def _keep_or_replace_port(
+    *,
+    preferred_port: int,
+    replacement_start: int,
+    occupied_ports: set[int],
+) -> int:
+    if preferred_port not in occupied_ports:
+        return preferred_port
+    return _next_free_port(
+        start_port=replacement_start,
+        occupied_ports=occupied_ports,
+    )
+
+
 def save_namespace_port_profiles(
     *,
     environ: Mapping[str, str],

{metalist-0.3.7 → metalist-0.3.8}/app/version.py

@@ -1,3 +1,3 @@
 """Single authoritative MetaList application version."""
 
-__version__ = "0.3.7"
+__version__ = "0.3.8"

{metalist-0.3.7 → metalist-0.3.8}/main.py

@@ -155,8 +155,6 @@ def _should_bootstrap_all_namespaces_without_cli_parse(
 ) -> bool:
     if len(argv) != 0:
         return False
-    if not _is_source_main_entrypoint():
-        return False
     if "TEST_MODE" in original_environ and original_environ["TEST_MODE"] == "1":
         return False
     return not any(name in original_environ for name in _EXPLICIT_NAMESPACE_LAUNCH_ENV_NAMES)
@@ -777,8 +775,7 @@ def main(argv: list[str]) -> None:
 
 
 def cli() -> None:
-    _bootstrap_default_namespace_if_empty(environ=os.environ)
-    main([])
+    main(sys.argv[1:])
 
 
 def run_namespace_server(argv: list[str]) -> None:

{metalist-0.3.7 → metalist-0.3.8/metalist.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metalist
-Version: 0.3.7
+Version: 0.3.8
 Summary: A minimalist single-user note-taking app with SSR, fast in-memory tree operations, and efficient sync.
 Project-URL: Homepage, https://github.com/evolvingstuff/metalist
 Project-URL: Repository, https://github.com/evolvingstuff/metalist