MetaList 0.3.9__tar.gz → 0.3.10__tar.gz

{metalist-0.3.9/metalist.egg-info → metalist-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metalist
-Version: 0.3.9
+Version: 0.3.10
 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.9 → metalist-0.3.10}/app/services/namespace_switcher.py

@@ -45,6 +45,8 @@ _PROCESS_WAIT_POLL_INTERVAL_SECONDS = 0.25
 _TERMINATE_GRACE_SECONDS = 5.0
 _KILL_GRACE_SECONDS = 5.0
 _PROBE_TAB_ID = "namespace-switcher-probe"
+_LAUNCH_LOG_TAIL_BYTES = 16 * 1024
+ORCHESTRATED_CHILD_ENV_NAME = "METALIST_ORCHESTRATED_CHILD"
 
 
 @dataclass(frozen=True)
@@ -75,6 +77,12 @@ class NamespaceOpenResult:
     message: str
 
 
+@dataclass(frozen=True)
+class NamespaceLaunchProcess:
+    process: subprocess.Popen[bytes]
+    log_path: Path
+
+
 @dataclass(frozen=True)
 class NamespaceDeleteResult:
     deleted_namespace: str
@@ -301,7 +309,7 @@ def open_or_launch_namespace(
         chosen_profile=chosen_profile,
         allowed_listener_pids=frozenset(),
     )
-    _launch_namespace_process(
+    launched_process = _launch_namespace_process(
         environ=environ,
         chosen_profile=chosen_profile,
     )
@@ -309,6 +317,7 @@ def open_or_launch_namespace(
         environ=environ,
         namespace=normalized_namespace,
         port=chosen_profile.port,
+        launched_process=launched_process,
     )
     launched_url = _build_browser_url(environ=environ, port=chosen_profile.port)
     assert launched_url is not None
@@ -1517,7 +1526,7 @@ def _launch_namespace_process(
     *,
     environ: Mapping[str, str],
     chosen_profile: NamespaceLaunchProfile,
-) -> None:
+) -> NamespaceLaunchProcess:
     child_environ = dict(environ)
     for name in (
         "METALIST_NAMESPACE",
@@ -1527,6 +1536,7 @@ def _launch_namespace_process(
     ):
         if name in child_environ:
             del child_environ[name]
+    child_environ[ORCHESTRATED_CHILD_ENV_NAME] = "1"
     command = _resolve_main_launch_command(environ=child_environ)
     command.extend(
         [
@@ -1546,7 +1556,7 @@ def _launch_namespace_process(
     recycle_direct_append_log_file(path=log_path)
     log_handle = open(log_path, "ab")
     try:
-        subprocess.Popen(
+        process = subprocess.Popen(
             command,
             env=child_environ,
             stdout=log_handle,
@@ -1555,6 +1565,7 @@ def _launch_namespace_process(
         )
     finally:
         log_handle.close()
+    return NamespaceLaunchProcess(process=process, log_path=log_path)
 
 
 def _stop_processes_listening_on_port(*, port: int) -> None:
@@ -1584,7 +1595,7 @@ def _restart_running_namespace_process(
         allowed_listener_pids=allowed_listener_pids,
     )
     _stop_processes_listening_on_port(port=running_port)
-    _launch_namespace_process(
+    launched_process = _launch_namespace_process(
         environ=environ,
         chosen_profile=chosen_profile,
     )
@@ -1592,20 +1603,44 @@ def _restart_running_namespace_process(
         environ=environ,
         namespace=namespace,
         port=chosen_profile.port,
+        launched_process=launched_process,
     )
 
 
+def _read_namespace_launch_log_tail(*, log_path: Path) -> str:
+    read_capture = CapturedExceptionContext(OSError)
+    log_bytes: bytes | None = None
+    with read_capture:
+        log_bytes = log_path.read_bytes()
+    if read_capture.captured_exception is not None:
+        return f"<unable to read child log: {read_capture.captured_exception}>"
+    if log_bytes is None:
+        raise RuntimeError("Namespace child log read produced no bytes")
+    tail = log_bytes[-_LAUNCH_LOG_TAIL_BYTES:].decode("utf-8", errors="replace").strip()
+    if tail == "":
+        return "<child log is empty>"
+    return tail
+
+
 def _wait_for_namespace_ready(
     *,
     environ: Mapping[str, str],
     namespace: str,
     port: int,
+    launched_process: NamespaceLaunchProcess,
 ) -> None:
     main_server_config = resolve_main_server_config(environ=environ)
     connect_host = resolve_backend_connect_host(host=main_server_config.host)
     api_prefix = resolve_api_prefix(environ=environ)
     deadline = time.monotonic() + _LAUNCH_READY_TIMEOUT_SECONDS
     while time.monotonic() < deadline:
+        exit_code = launched_process.process.poll()
+        if exit_code is not None:
+            log_tail = _read_namespace_launch_log_tail(log_path=launched_process.log_path)
+            raise RuntimeError(
+                f"Namespace {namespace} process exited with code {exit_code}. "
+                f"Child log: {launched_process.log_path}\n{log_tail}"
+            )
         status_payload = _probe_namespace_status(
             host=connect_host,
             port=port,
@@ -1614,7 +1649,11 @@ def _wait_for_namespace_ready(
         if status_payload is not None and status_payload.get("namespace") == namespace:
             return
         time.sleep(_READY_POLL_INTERVAL_SECONDS)
-    raise RuntimeError(f"Timed out waiting for namespace {namespace} on port {port}")
+    log_tail = _read_namespace_launch_log_tail(log_path=launched_process.log_path)
+    raise RuntimeError(
+        f"Timed out waiting for namespace {namespace} on port {port}. "
+        f"Child log: {launched_process.log_path}\n{log_tail}"
+    )
 
 
 def _probe_namespace_status(

{metalist-0.3.9 → metalist-0.3.10}/app/version.py

@@ -1,3 +1,3 @@
 """Single authoritative MetaList application version."""
 
-__version__ = "0.3.9"
+__version__ = "0.3.10"

{metalist-0.3.9 → metalist-0.3.10}/main.py

@@ -33,6 +33,7 @@ from app.startup_sanity import assert_startup_sanity
 from app.services.exception_capture import CapturedExceptionContext
 from app.services.namespace_switcher import build_namespace_catalog
 from app.services.namespace_switcher import NamespaceOpenResult
+from app.services.namespace_switcher import ORCHESTRATED_CHILD_ENV_NAME
 from app.services.namespace_switcher import open_or_launch_all_namespaces
 from app.services.self_update import schedule_self_update
 from app.services.windows_process_control import find_listening_pids_for_port as find_windows_listening_pids_for_port
@@ -777,6 +778,13 @@ def main(argv: list[str]) -> None:
 
 def cli() -> None:
     argv = sys.argv[1:]
+    if ORCHESTRATED_CHILD_ENV_NAME in os.environ:
+        orchestrated_child = os.environ[ORCHESTRATED_CHILD_ENV_NAME]
+        if orchestrated_child != "1":
+            raise RuntimeError(f"{ORCHESTRATED_CHILD_ENV_NAME} must be '1' when set")
+        del os.environ[ORCHESTRATED_CHILD_ENV_NAME]
+        run_orchestrated_namespace_server(argv)
+        return
     if len(argv) != 0 and argv[0] == "update":
         if argv != ["update"]:
             raise RuntimeError("Usage: metalist update")
@@ -803,6 +811,12 @@ def run_namespace_server(argv: list[str]) -> None:
     _run_namespace_server_for_current_env(argv=argv)
 
 
+def run_orchestrated_namespace_server(argv: list[str]) -> None:
+    logging.getLogger("uvicorn.access").addFilter(FilterCheckUpdates())
+    apply_main_cli_args_to_environ(argv=argv, environ=os.environ)
+    _run_namespace_server_for_current_env(argv=argv)
+
+
 def _run_namespace_server_for_current_env(*, argv: list[str]) -> None:
     database_runtime_config = resolve_database_runtime_config(
         environ=os.environ,

{metalist-0.3.9 → metalist-0.3.10/metalist.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metalist
-Version: 0.3.9
+Version: 0.3.10
 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