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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bazaar-compute-node
-Version: 0.2.1rc13
+Version: 0.2.1rc15
 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.1rc15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc13"
+version = "0.2.1rc15"
 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.1rc15}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc13"
+version = "0.2.1rc15"
 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.1rc15}/src/bazaar_compute_node/app/application.py

@@ -20,7 +20,6 @@ from ..core.models import InboundAttachment, Message, RuntimeEventState
 from ..core.observability import AuditContext, IAudit
 from ..core.orchestration import ReminderScheduler
 from ..core.paths import resolve_data_dir, resolve_workspace_dir
-from ..core.restart import RESTART_EXIT_CODE
 from ..core.runtime import RuntimeAvailability, RuntimeDescription, RuntimeModels
 from ..core.storage import IStorage
 from ..core.timerwheel import TimerWheel
@@ -204,17 +203,11 @@ class NodeApplication:
             version=__version__,
             interval_seconds=self.timeout_budget.startup_seconds,
         )
-        self._restart_requested = False
-        # Windows has nothing that brings the node back after it exits, so
-        # there it offers no upgrade command at all
-        self.upgrade_service = (
-            None
-            if os.name == "nt"
-            else UpgradeService(
-                available_version=self.version_watcher.available_version,
-                installed_version=__version__,
-                request_restart=self.request_restart,
-            )
+        self._stopped = asyncio.Event()
+        self.upgrade_service = UpgradeService(
+            available_version=self.version_watcher.available_version,
+            installed_version=__version__,
+            request_stop=self._stopped.set,
         )
         self.command_server = LocalCommandServer(
             self._dispatch,
@@ -226,7 +219,6 @@ class NodeApplication:
         self._started = False
         self._ready = False
         self._accepting = False
-        self._stopped = asyncio.Event()
         self._logger = logging.getLogger("bazaar_compute_node.application")
 
     @property
@@ -865,16 +857,6 @@ class NodeApplication:
         if errors:
             self._log("bcn.stop.errors", errors=errors)
 
-    def request_restart(self) -> None:
-        """Stop, and tell whatever hosts this node to start it again."""
-
-        self._restart_requested = True
-        self._stopped.set()
-
-    @property
-    def exit_code(self) -> int:
-        return RESTART_EXIT_CODE if self._restart_requested else 0
-
     async def wait(self) -> None:
         loop = asyncio.get_running_loop()
         for signum in (signal.SIGINT, signal.SIGTERM):

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc15}/src/bazaar_compute_node/app/resource_dispatch.py

@@ -273,8 +273,6 @@ class CommandDispatcher(_MessageCommandDispatcher):
         if resource == "node":
             upgrade_service = self._upgrade_service
             if upgrade_service is None:
-                # nothing on this platform would bring the node back after an
-                # upgrade exits it, so the Agent is given no upgrade to run
                 raise CommandDispatchError(
                     "UNKNOWN_RESOURCE",
                     f"unsupported command resource: {resource}",

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc15}/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.1rc15}/src/bazaar_compute_node/app/system_service.py

@@ -14,6 +14,7 @@ import sys
 import tempfile
 import time
 from dataclasses import dataclass
+from importlib.resources import files
 from pathlib import Path
 
 from ..core.paths import resolve_data_dir
@@ -43,6 +44,7 @@ class SystemServiceContext:
     """Resolved paths used to render one user-level system service."""
 
     executable: Path | None
+    python: Path
     config_path: Path
     data_dir: Path
     env_file: Path
@@ -88,14 +90,16 @@ 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,
+        python=Path(vars(sys)["_base_executable"]).resolve(),
         config_path=config_path,
         data_dir=data_dir,
         env_file=env_file,
@@ -104,6 +108,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 +182,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:
@@ -137,9 +199,12 @@ def _render_systemd_unit(context: SystemServiceContext) -> str:
         {
             "managed_marker": MANAGED_MARKER,
             "executable": _systemd_quote(_require_executable(context)),
+            "python": _systemd_quote(context.python),
+            "supervisor_path": _systemd_quote(context.data_dir / "supervisor.py"),
             "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,9 +223,12 @@ 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)),
+            "python": str(context.python),
+            "supervisor_path": str(context.data_dir / "supervisor.py"),
             "log_path": str(context.log_path),
         }
     ).encode("utf-8")
@@ -171,7 +239,10 @@ def _render_windows_wrapper(context: SystemServiceContext) -> str:
         {
             "managed_marker": MANAGED_MARKER,
             "executable": _powershell_literal(_require_executable(context)),
+            "python": _powershell_literal(context.python),
+            "supervisor_path": _powershell_literal(context.data_dir / "supervisor.py"),
             "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),
         }
@@ -313,6 +384,7 @@ def _windows_paths(data_dir: Path) -> tuple[Path, Path, Path]:
 
 
 def _install_linux(context: SystemServiceContext) -> None:
+    _install_supervisor(context)
     unit_path = _systemd_unit_path()
     _write_managed_file(unit_path, _render_systemd_unit(context), mode=0o600)
     _run_native_command(["systemctl", "--user", "daemon-reload"])
@@ -325,6 +397,7 @@ def _install_linux(context: SystemServiceContext) -> None:
 
 
 def _install_macos(context: SystemServiceContext) -> None:
+    _install_supervisor(context)
     plist_path, wrapper_path = _launchd_paths()
     _write_managed_file(
         wrapper_path,
@@ -344,6 +417,7 @@ def _install_macos(context: SystemServiceContext) -> None:
 
 
 def _install_windows(context: SystemServiceContext) -> None:
+    _install_supervisor(context)
     xml_path, wrapper_path, launcher_path = _windows_paths(context.data_dir)
     context.data_dir.mkdir(parents=True, exist_ok=True)
     _write_managed_file(
@@ -379,6 +453,16 @@ def _install_windows(context: SystemServiceContext) -> None:
     print(f"Start with: schtasks /Run /TN {WINDOWS_TASK_NAME}", flush=True)
 
 
+def _install_supervisor(context: SystemServiceContext) -> None:
+    _write_managed_file(
+        context.data_dir / "supervisor.py",
+        files("bazaar_compute_node")
+        .joinpath("resources/system_service/supervisor.py")
+        .read_bytes(),
+        mode=0o600,
+    )
+
+
 def default_env_file() -> Path:
     """The environment file a service reads unless told another, in the
     platform's format."""
@@ -387,7 +471,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 +507,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 +521,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():
@@ -477,18 +590,21 @@ def _stop_macos() -> None:
 
 def _managed_windows_process_ids(context: SystemServiceContext) -> tuple[int, ...]:
     config_path = _powershell_literal(context.config_path)
+    supervisor_path = _powershell_literal(context.data_dir / "supervisor.py")
     script = "\n".join(
         (
             "$ErrorActionPreference = 'Stop'",
             "$queryProcessId = $PID",
             f"$configPath = [IO.Path]::GetFullPath({config_path}).ToLowerInvariant()",
+            f"$supervisorPath = [IO.Path]::GetFullPath({supervisor_path}).ToLowerInvariant()",
             "Get-CimInstance -ClassName Win32_Process |",
             "    Where-Object {",
             "        $_.ProcessId -ne $queryProcessId -and",
             "        $_.CommandLine -and",
             "        $_.CommandLine.ToLowerInvariant().Contains($configPath) -and",
-            r"        $_.CommandLine -match '(?i)(^|\s)run(\s|$)' -and",
-            r"        $_.CommandLine -match '(?i)(^|\s)--config(\s|$)'",
+            r"        $_.CommandLine -match '(?i)(^|\s)--config(\s|$)' -and",
+            "        ($_.CommandLine.ToLowerInvariant().Contains($supervisorPath) -or",
+            r"         $_.CommandLine -match '(?i)(^|\s)run(\s|$)')",
             "    } |",
             "    ForEach-Object { $_.ProcessId }",
             "",
@@ -630,6 +746,10 @@ def _uninstall(context: SystemServiceContext) -> None:
         _uninstall_windows(context)
     else:
         raise RuntimeError(f"unsupported host service platform: {system}")
+    _remove_managed_file(context.data_dir / "supervisor.py")
+    (
+        context.data_dir / ("bcn.running.exe" if os.name == "nt" else "bcn.running")
+    ).unlink(missing_ok=True)
 
 
 def _status_linux() -> NativeServiceStatus:
@@ -900,5 +1020,6 @@ __all__ = [
     "SystemServiceContext",
     "default_env_file",
     "installed_env_file",
+    "resolve_service_paths",
     "run_system_service_command",
 ]

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc15}/src/bazaar_compute_node/app/upgrade.py

@@ -70,7 +70,8 @@ def _install(version: str) -> None:
             _uv_executable(),
             "tool",
             "install",
-            "--force",
+            # Reuse the tool environment: --force would remove its running
+            # Python interpreter on Windows, even with a copied entry point.
             # the release was announced by PyPI's own API minutes ago, while uv
             # resolves against a separately cached index that can still predate
             # it and would then report the version as one that does not exist
@@ -90,11 +91,11 @@ class UpgradeService:
         *,
         available_version: Callable[[], str | None],
         installed_version: str,
-        request_restart: Callable[[], None],
+        request_stop: Callable[[], None],
     ) -> None:
         self._available_version = available_version
         self._installed_version = installed_version
-        self._request_restart = request_restart
+        self._request_stop = request_stop
         self._lock = asyncio.Lock()
 
     @property
@@ -134,10 +135,7 @@ class UpgradeService:
                 raise UpgradeError(f"{version!r} is not a release version") from error
             await self.install(version)
             reminder_id = await wake_after(version)
-            # the node cannot restart itself from the inside: on Windows the
-            # stop it would ask for kills the process tree it is asking from.
-            # Exiting is the one thing it can do that its host watches for.
-            self._request_restart()
+            self._request_stop()
             return version, reminder_id
 
     async def install(self, version: str) -> None:

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc15}/src/bazaar_compute_node/cmd/bcc/__init__.py

@@ -36,13 +36,10 @@ for group in (message, thread, reminder):
 if os.environ.get("BCN_AGENT_MODE") == Mode.DANGEROUS_INDIVIDUAL.value:
     bcc.add_command(inbox)
 
-# Windows has nothing that brings the node back after an upgrade exits it, so
-# there the node offers no upgrade and the commands would only ever be refused
-if os.name != "nt":
-    bcc.add_command(node)
-    # `bcc upgrade` reads better than `bcc node upgrade`, so the command line name
-    # and the resource it addresses differ here
-    bcc.add_command(node.commands["upgrade"], "upgrade")
+bcc.add_command(node)
+# `bcc upgrade` reads better than `bcc node upgrade`, so the command line name
+# and the resource it addresses differ here
+bcc.add_command(node.commands["upgrade"], "upgrade")
 
 
 def main(argv: Sequence[str] | None = None) -> int:

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc15}/src/bazaar_compute_node/cmd/bcn/node.py

@@ -175,7 +175,7 @@ async def _run_node(args: argparse.Namespace, parser: Usage) -> int:
         except TimeoutError:
             print("bcn stop timed out; ending runtimes", file=sys.stderr, flush=True)
         await children.end_all()
-    return node.exit_code
+    return 0
 
 
 def build_node_commands(translator: Translator) -> tuple[click.Command, ...]:

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc15}/src/bazaar_compute_node/core/orchestration/turn.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import asyncio
 import logging
-import os
 from collections.abc import Awaitable, Callable, Mapping, Sequence
 from dataclasses import asdict, dataclass, replace
 
@@ -257,9 +256,6 @@ def inbox_notice(
             "rows": [row[2] for row in rows],
             "upgrade_version": upgrade_version,
             "installed_version": installed_version,
-            # Windows has nothing that would bring the node back after an
-            # upgrade exits it, so there the user runs the commands themselves
-            "manual_upgrade": os.name == "nt",
             "closing_bracket_on_own_line": closing_bracket_on_own_line,
         }
     )

bazaar_compute_node-0.2.1rc15/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.1rc15}/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.1rc15}/src/bazaar_compute_node/resources/inbox_notice.tpl

@@ -1,5 +1,5 @@
 [inbox notice:
 Inbox update: {{ total_unread_count }} unread {{ "message" if total_unread_count == 1 else "messages" }} total; {{ rows | length }} changed {{ "target" if rows | length == 1 else "targets" }}{% for row in rows %}
 {{ row.target }}  pending: {{ row.pending_count }} {{ "message" if row.pending_count == 1 else "messages" }} · first msg={{ row.first_id }}{% if row.latest_sender is not none %} · latest sender @{{ row.latest_sender }}{% endif %} · latest msg={{ row.latest_id }}{% for flag in row.flags %} · {{ "you were mentioned" if flag == "mention" else flag }}{% endfor %}{% endfor %}{% if upgrade_version is not none and installed_version is not none %}
-Upgrade available: {{ distribution }} {{ upgrade_version }} (installed {{ installed_version }}). Mention it in passing when you reply and offer to upgrade. {% if manual_upgrade %}Upgrading is theirs to run on this platform: if they want it, give them these three commands in this order, and say the second one needs the node stopped: `bcn system-service stop`, `uv tool install --force --refresh-package {{ distribution }} {{ distribution }}=={{ upgrade_version }}`, `bcn system-service start`.{% else %}If the user agrees, run `bcc node upgrade`.{% endif %} If they do not want it, just carry on.{% endif %}{% if closing_bracket_on_own_line %}
+Upgrade available: {{ distribution }} {{ upgrade_version }} (installed {{ installed_version }}). Mention it in passing when you reply and offer to upgrade. If the user agrees, run `bcc node upgrade`. If they do not want it, just carry on.{% endif %}{% if closing_bracket_on_own_line %}
 {% endif %}]{{ "" -}}

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

@@ -14,12 +14,18 @@
     <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>
         <string>{{ environment_file | e }}</string>
         <key>BCN_EXECUTABLE</key>
         <string>{{ executable | e }}</string>
+        <key>BCN_PYTHON</key>
+        <string>{{ python | e }}</string>
+        <key>BCN_SUPERVISOR</key>
+        <string>{{ supervisor_path | e }}</string>
     </dict>
     <key>RunAtLoad</key>
     <true/>

{bazaar_compute_node-0.2.1rc13 → bazaar_compute_node-0.2.1rc15}/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
 
-exec "$BCN_EXECUTABLE" run --config "$BCN_CONFIG"
+export BCN_HOME="$directory"
+exec "$BCN_PYTHON" "$BCN_SUPERVISOR" --executable "$BCN_EXECUTABLE" --config "$BCN_CONFIG"