bazaar-compute-node 0.2.1rc13__tar.gz → 0.2.1rc14__tar.gz

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bazaar-compute-node
-Version: 0.2.1rc13
+Version: 0.2.1rc14
 Summary: Runtime-agnostic computer node daemon for agents and channels.
 License-Expression: AGPL-3.0-only
 License-File: LICENSE

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc13"
+version = "0.2.1rc14"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"
@@ -78,8 +78,11 @@ module-name = [
 ]
 
 [tool.pytest.ini_options]
-addopts = "-m 'not e2e' -p no:anyio"
-markers = ["e2e: requires a real external provider"]
+addopts = "-m 'not e2e and not system' -p no:anyio"
+markers = [
+    "e2e: requires a real external provider",
+    "system: runs real native system services in an isolated environment",
+]
 
 [build-system]
 requires = ["uv_build>=0.12.2,<0.13.0"]

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc13"
+version = "0.2.1rc14"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"
@@ -73,9 +73,10 @@ bcn-test-support = { path = "tests/support", editable = true }
 [tool.pytest.ini_options]
 # anyio arrives with starlette and brings a pytest plugin that fights
 # pytest-asyncio over the event loop; the suite runs on pytest-asyncio alone
-addopts = "-m 'not e2e' -p no:anyio"
+addopts = "-m 'not e2e and not system' -p no:anyio"
 markers = [
     "e2e: requires a real external provider",
+    "system: runs real native system services in an isolated environment",
 ]
 
 [build-system]

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/src/bazaar_compute_node/app/server_management.py

@@ -13,10 +13,9 @@ from .config import (
     NodeConfiguration,
     _replace_file,
     load_node_configuration,
-    resolve_config_path,
     write_configuration,
 )
-from .system_service import default_env_file, installed_env_file
+from .system_service import default_env_file, installed_env_file, resolve_service_paths
 from .usage import Usage
 
 TOKEN_ENV = "BCN_SERVER_TOKEN"
@@ -31,7 +30,7 @@ def run_server_command(args: argparse.Namespace, parser: Usage) -> int:
         or args.foreground
     ):
         parser.error("bcn server commands only accept the node-level --config option")
-    config_path = (args.config or resolve_config_path()).expanduser()
+    config_path, _ = resolve_service_paths(args.config)
     try:
         configuration = load_node_configuration(config_path)
     except ConfigurationError as error:
@@ -61,7 +60,7 @@ def _connect(
         parser.error("--token must not contain quotes or line breaks")
     # a registered service already said which file it reads; before any
     # registration the default is ours to set, and the install must match it
-    registered = installed_env_file()
+    registered = installed_env_file(registered=True)
     env_file = (args.env_file or registered or default_env_file()).expanduser()
     options = MappingProxyType({"url": url, "token_env": TOKEN_ENV})
     updated = replace(

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/src/bazaar_compute_node/app/system_service.py

@@ -88,12 +88,13 @@ def _build_context(
             "bcn system-service commands only accept the node-level --config option"
         )
     executable = _resolve_executable() if require_executable else None
-    config_path = (args.config or resolve_config_path()).expanduser().resolve()
+    config_path, data_dir = resolve_service_paths(
+        args.config, registered=not require_executable
+    )
     # the service reads the same file `bcn server connect` writes to unless
     # told another; none of the platforms minds the file not existing yet
     env_file = (getattr(args, "env_file", None) or default_env_file()).expanduser()
     env_file = env_file.resolve()
-    data_dir = resolve_data_dir()
     return SystemServiceContext(
         executable=executable,
         config_path=config_path,
@@ -104,6 +105,61 @@ def _build_context(
     )
 
 
+def resolve_service_paths(
+    config: Path | None = None, *, registered: bool = True
+) -> tuple[Path, Path]:
+    """Read the node paths selected by an installed service, without account lookup."""
+
+    config_path = (config or resolve_config_path()).expanduser().resolve()
+    data_dir = resolve_data_dir()
+    if registered:
+        system = platform.system()
+        if system == "Linux":
+            unit_path = _systemd_unit_path()
+            if _is_managed(unit_path):
+                values = dict(
+                    line.split("=", 1)
+                    for line in unit_path.read_text(encoding="utf-8").splitlines()
+                    if "=" in line
+                )
+                data_dir = Path(values["WorkingDirectory"].replace("%%", "%"))
+                if config is None:
+                    command = shlex.split(values["ExecStart"])
+                    config_path = Path(
+                        command[command.index("--config") + 1].replace("%%", "%")
+                    )
+        elif system == "Darwin":
+            plist_path, _ = _launchd_paths()
+            if _is_managed(plist_path):
+                with plist_path.open("rb") as stream:
+                    values = plistlib.load(stream)
+                data_dir = Path(values["WorkingDirectory"])
+                if config is None:
+                    config_path = Path(values["EnvironmentVariables"]["BCN_CONFIG"])
+        elif system == "Windows":
+            directory = _windows_service_data_dir()
+            if directory is not None:
+                data_dir = directory
+                if config is None:
+                    _, script_path, _ = _windows_paths(data_dir)
+                    if not _is_managed(script_path):
+                        raise RuntimeError(
+                            "registered system service wrapper is missing or unmanaged"
+                        )
+                    for line in script_path.read_text(encoding="utf-8").splitlines():
+                        if line.startswith("$configPath = '"):
+                            value = line.removeprefix("$configPath = '").removesuffix(
+                                "'"
+                            )
+                            config_path = Path(value.replace("''", "'"))
+                            break
+                    else:
+                        raise RuntimeError(
+                            "registered system service wrapper has no config path"
+                        )
+    return config_path, data_dir
+
+
 def _resolve_current_user() -> str:
     try:
         return getpass.getuser()
@@ -123,8 +179,11 @@ def _require_executable(context: SystemServiceContext) -> Path:
     return context.executable
 
 
-def _systemd_quote(path: Path) -> str:
-    return shlex.quote(str(path))
+def _systemd_quote(path: Path | str, *, quote: bool = True) -> str:
+    value = str(path).replace("%", "%%")
+    return (
+        '"' + value.replace("\\", "\\\\").replace('"', '\\"') + '"' if quote else value
+    )
 
 
 def _powershell_literal(path: Path | str | None) -> str:
@@ -138,8 +197,9 @@ def _render_systemd_unit(context: SystemServiceContext) -> str:
             "managed_marker": MANAGED_MARKER,
             "executable": _systemd_quote(_require_executable(context)),
             "config_path": _systemd_quote(context.config_path),
-            "data_dir": _systemd_quote(context.data_dir),
-            "environment_file": _systemd_quote(context.env_file),
+            "data_dir": _systemd_quote(context.data_dir, quote=False),
+            "home_environment": _systemd_quote(f"BCN_HOME={context.data_dir.parent}"),
+            "environment_file": _systemd_quote(context.env_file, quote=False),
         }
     )
 
@@ -158,6 +218,7 @@ def _render_launchd_plist(
             "managed_marker": MANAGED_MARKER,
             "wrapper_path": str(wrapper_path),
             "data_dir": str(context.data_dir),
+            "home_dir": str(context.data_dir.parent),
             "config_path": str(context.config_path),
             "environment_file": str(context.env_file),
             "executable": str(_require_executable(context)),
@@ -172,6 +233,7 @@ def _render_windows_wrapper(context: SystemServiceContext) -> str:
             "managed_marker": MANAGED_MARKER,
             "executable": _powershell_literal(_require_executable(context)),
             "config_path": _powershell_literal(context.config_path),
+            "home_dir": _powershell_literal(context.data_dir.parent),
             "environment_script": _powershell_literal(context.env_file),
             "log_path": _powershell_literal(context.log_path),
         }
@@ -387,7 +449,31 @@ def default_env_file() -> Path:
     return Path.home() / ".config" / "bcn" / name
 
 
-def installed_env_file() -> Path | None:
+def _windows_service_data_dir() -> Path | None:
+    task_path = _powershell_literal("\\")
+    task_name = _powershell_literal(WINDOWS_TASK_NAME.lstrip("\\"))
+    query_script = "\n".join(
+        (
+            "$ErrorActionPreference = 'Stop'",
+            f"$task = Get-ScheduledTask -TaskPath {task_path} -TaskName {task_name}",
+            f"if ($task.Description -eq {_powershell_literal(MANAGED_MARKER)}) {{",
+            "    $task.Actions.WorkingDirectory",
+            "}",
+            "",
+        )
+    )
+    queried = _run_native_command(
+        ["powershell.exe", "-NoProfile", "-NonInteractive", "-Command", query_script],
+        check=False,
+    )
+    return (
+        Path(queried.stdout.strip())
+        if queried.returncode == 0 and queried.stdout.strip()
+        else None
+    )
+
+
+def installed_env_file(*, registered: bool = False) -> Path | None:
     """The environment file the registered service was told to read, if any;
     a service file at our path that is not ours says nothing."""
 
@@ -399,7 +485,7 @@ def installed_env_file() -> Path | None:
         for line in unit_path.read_text(encoding="utf-8").splitlines():
             if line.startswith("EnvironmentFile="):
                 value = line.removeprefix("EnvironmentFile=").removeprefix("-")
-                return Path(shlex.split(value)[0]) if value else None
+                return Path(value.replace("%%", "%")) if value else None
         return None
     if system == "Darwin":
         plist_path, _ = _launchd_paths()
@@ -413,7 +499,12 @@ def installed_env_file() -> Path | None:
             )
         return Path(value) if isinstance(value, str) and value else None
     if system == "Windows":
-        _, script_path, _ = _windows_paths(resolve_data_dir())
+        data_dir = (
+            _windows_service_data_dir() or resolve_data_dir()
+            if registered
+            else resolve_data_dir()
+        )
+        _, script_path, _ = _windows_paths(data_dir)
         if not _is_managed(script_path):
             return None
         for line in script_path.read_text(encoding="utf-8").splitlines():
@@ -900,5 +991,6 @@ __all__ = [
     "SystemServiceContext",
     "default_env_file",
     "installed_env_file",
+    "resolve_service_paths",
     "run_system_service_command",
 ]

bazaar_compute_node-0.2.1rc14/src/bazaar_compute_node/core/paths.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+import os
+from pathlib import Path
+
+
+def resolve_data_dir() -> Path:
+    """Resolve .bcn under BCN_HOME or the user's home."""
+
+    path = Path(os.environ.get("BCN_HOME") or Path.home())
+    return path.expanduser().resolve() / ".bcn"
+
+
+def resolve_workspace_dir(agent_id: str) -> Path:
+    """Resolve the persistent workspace owned by one configured Agent."""
+
+    if not isinstance(agent_id, str) or not agent_id:
+        raise ValueError("agent_id must be a non-empty string")
+    return resolve_data_dir() / "workspaces" / agent_id

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/src/bazaar_compute_node/core/utils/children.py

@@ -69,6 +69,9 @@ def _signal_group(pid: int, number: signal.Signals) -> None:
         os.killpg(pid, number)
     except ProcessLookupError:
         pass
+    except PermissionError:
+        if sys.platform != "darwin" or _group_has_live_members(pid):
+            raise
 
 
 def _group_alive(pid: int) -> bool:
@@ -76,9 +79,25 @@ def _group_alive(pid: int) -> bool:
         os.killpg(pid, 0)
     except ProcessLookupError:
         return False
+    except PermissionError:
+        if sys.platform != "darwin" or _group_has_live_members(pid):
+            raise
+        return False
     return True
 
 
+def _group_has_live_members(pid: int) -> bool:
+    # Darwin also returns EPERM for a group containing only zombies. Check
+    # the kernel's process list before treating a permission error as exit.
+    result = subprocess.run(
+        ["ps", "-axo", "pgid=,stat="], capture_output=True, text=True, check=True
+    )
+    return any(
+        int(group) == pid and not state.startswith("Z")
+        for group, state in (line.split() for line in result.stdout.splitlines())
+    )
+
+
 async def _end_tree(pid: int) -> None:
     process = await asyncio.create_subprocess_exec(
         "taskkill",

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/src/bazaar_compute_node/resources/system_service/launchd.plist

@@ -14,6 +14,8 @@
     <string>{{ data_dir | e }}</string>
     <key>EnvironmentVariables</key>
     <dict>
+        <key>BCN_HOME</key>
+        <string>{{ home_dir | e }}</string>
         <key>BCN_CONFIG</key>
         <string>{{ config_path | e }}</string>
         <key>BCN_ENV_FILE</key>

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/src/bazaar_compute_node/resources/system_service/launchd.sh

@@ -2,10 +2,12 @@
 # {{ managed_marker }}
 set -eu
 
+directory=$BCN_HOME
 if [ -n "${BCN_ENV_FILE:-}" ] && [ -f "$BCN_ENV_FILE" ]; then
     set -a
     . "$BCN_ENV_FILE"
     set +a
 fi
 
+export BCN_HOME="$directory"
 exec "$BCN_EXECUTABLE" run --config "$BCN_CONFIG"

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/src/bazaar_compute_node/resources/system_service/systemd.service

@@ -4,8 +4,9 @@ Description=Bazaar Compute Node
 
 [Service]
 Type=simple
-ExecStart={{ executable }} run --config {{ config_path }}
+ExecStart=:env {{ home_environment }} {{ executable }} run --config {{ config_path }}
 WorkingDirectory={{ data_dir }}
+Environment={{ home_environment }}
 {% if environment_file %}EnvironmentFile=-{{ environment_file }}
 {% endif %}Restart=on-failure
 RestartSec=5

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc14}/src/bazaar_compute_node/resources/system_service/windows.ps1

@@ -89,6 +89,8 @@ if ($environmentScript -and (Test-Path -LiteralPath $environmentScript)) {
     }
 }
 
+$env:BCN_HOME = {{ home_dir }}
+
 try {
     $exitCode = [BcnNoWindowProcess]::Run($executable, $configPath, $logPath)
 } catch {

bazaar_compute_node-0.2.1rc13/src/bazaar_compute_node/core/paths.py

@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-import os
-from pathlib import Path
-
-DATA_NAME_ENV = "BCN_DATA_NAME"
-DEFAULT_DATA_NAME = ".bcn"
-
-
-def resolve_data_name() -> str:
-    """Resolve the persistent node data name."""
-
-    name = os.environ.get(DATA_NAME_ENV, DEFAULT_DATA_NAME)
-    if not name or name in {".", ".."} or "/" in name or "\\" in name:
-        raise ValueError(f"{DATA_NAME_ENV} must be a single path component")
-    return name
-
-
-def resolve_data_dir() -> Path:
-    """Resolve the persistent node data directory under the user's home."""
-
-    return Path.home() / resolve_data_name()
-
-
-def resolve_workspace_dir(agent_id: str) -> Path:
-    """Resolve the persistent workspace owned by one configured Agent."""
-
-    if not isinstance(agent_id, str) or not agent_id:
-        raise ValueError("agent_id must be a non-empty string")
-    return resolve_data_dir() / "workspaces" / agent_id