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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc14"
+version = "0.2.1rc15"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"

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

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc14"
+version = "0.2.1rc15"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"

{bazaar_compute_node-0.2.1rc14 → 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.1rc14 → 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.1rc14 → 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
@@ -97,6 +99,7 @@ def _build_context(
     env_file = env_file.resolve()
     return SystemServiceContext(
         executable=executable,
+        python=Path(vars(sys)["_base_executable"]).resolve(),
         config_path=config_path,
         data_dir=data_dir,
         env_file=env_file,
@@ -196,6 +199,8 @@ 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, quote=False),
             "home_environment": _systemd_quote(f"BCN_HOME={context.data_dir.parent}"),
@@ -222,6 +227,8 @@ def _render_launchd_plist(
             "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")
@@ -232,6 +239,8 @@ 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),
@@ -375,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"])
@@ -387,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,
@@ -406,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(
@@ -441,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."""
@@ -568,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 }",
             "",
@@ -721,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:

{bazaar_compute_node-0.2.1rc14 → 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.1rc14 → 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.1rc14 → 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.1rc14 → 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.1rc14 → 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.1rc14 → bazaar_compute_node-0.2.1rc15}/src/bazaar_compute_node/resources/system_service/launchd.plist

@@ -22,6 +22,10 @@
         <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.1rc14 → bazaar_compute_node-0.2.1rc15}/src/bazaar_compute_node/resources/system_service/launchd.sh

@@ -10,4 +10,4 @@ if [ -n "${BCN_ENV_FILE:-}" ] && [ -f "$BCN_ENV_FILE" ]; then
 fi
 
 export BCN_HOME="$directory"
-exec "$BCN_EXECUTABLE" run --config "$BCN_CONFIG"
+exec "$BCN_PYTHON" "$BCN_SUPERVISOR" --executable "$BCN_EXECUTABLE" --config "$BCN_CONFIG"

bazaar_compute_node-0.2.1rc15/src/bazaar_compute_node/resources/system_service/supervisor.py

@@ -0,0 +1,58 @@
+# Managed by bazaar-compute-node.
+"""Keep the service's running entry point separate from its installed entry point."""
+
+from __future__ import annotations
+
+import argparse
+import os
+import shutil
+import signal
+import subprocess
+import time
+from pathlib import Path
+from types import FrameType
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--executable", type=Path, required=True)
+    parser.add_argument("--config", type=Path, required=True)
+    args = parser.parse_args()
+    running = Path(__file__).with_name(
+        "bcn.running.exe" if os.name == "nt" else "bcn.running"
+    )
+    stopping = False
+    process: subprocess.Popen[bytes] | None = None
+
+    def stop(number: int, frame: FrameType | None) -> None:
+        nonlocal stopping
+        del number, frame
+        stopping = True
+        if process is not None and process.poll() is None:
+            process.terminate()
+
+    signal.signal(signal.SIGINT, stop)
+    signal.signal(signal.SIGTERM, stop)
+    while not stopping:
+        try:
+            shutil.copy2(args.executable, running)
+            if stopping:
+                break
+            process = subprocess.Popen(
+                [str(running), "run", "--config", str(args.config)],
+                stdin=subprocess.DEVNULL,
+                creationflags=subprocess.CREATE_NO_WINDOW if os.name == "nt" else 0,
+            )
+            print(f"system service supervisor started pid={process.pid}", flush=True)
+            if stopping:
+                process.terminate()
+            code = process.wait()
+            print(f"system service supervisor child exited code={code}", flush=True)
+        except OSError as error:
+            print(f"system service supervisor launch failed: {error}", flush=True)
+        if not stopping:
+            time.sleep(1)
+
+
+if __name__ == "__main__":
+    main()

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

@@ -4,7 +4,7 @@ Description=Bazaar Compute Node
 
 [Service]
 Type=simple
-ExecStart=:env {{ home_environment }} {{ executable }} run --config {{ config_path }}
+ExecStart=:env {{ home_environment }} {{ python }} {{ supervisor_path }} --executable {{ executable }} --config {{ config_path }}
 WorkingDirectory={{ data_dir }}
 Environment={{ home_environment }}
 {% if environment_file %}EnvironmentFile=-{{ environment_file }}

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

@@ -2,6 +2,8 @@
 $ErrorActionPreference = 'Stop'
 
 $executable = {{ executable }}
+$python = {{ python }}
+$supervisorPath = {{ supervisor_path }}
 $configPath = {{ config_path }}
 $environmentScript = {{ environment_script }}
 $logPath = {{ log_path }}
@@ -15,11 +17,11 @@ using System.Threading.Tasks;
 
 public static class BcnNoWindowProcess
 {
-    public static int Run(string executable, string configPath, string logPath)
+    public static int Run(string python, string supervisorPath, string executable, string configPath, string logPath)
     {
         ProcessStartInfo startInfo = new ProcessStartInfo();
-        startInfo.FileName = executable;
-        startInfo.Arguments = "run --config \"" + configPath + "\"";
+        startInfo.FileName = python;
+        startInfo.Arguments = "\"" + supervisorPath + "\" --executable \"" + executable + "\" --config \"" + configPath + "\"";
         startInfo.UseShellExecute = false;
         startInfo.CreateNoWindow = true;
         startInfo.RedirectStandardInput = true;
@@ -92,7 +94,7 @@ if ($environmentScript -and (Test-Path -LiteralPath $environmentScript)) {
 $env:BCN_HOME = {{ home_dir }}
 
 try {
-    $exitCode = [BcnNoWindowProcess]::Run($executable, $configPath, $logPath)
+    $exitCode = [BcnNoWindowProcess]::Run($python, $supervisorPath, $executable, $configPath, $logPath)
 } catch {
     $_ | Out-String | Add-Content -LiteralPath $logPath -Encoding utf8
     exit 1

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

@@ -1,9 +0,0 @@
-"""The exit code a node uses to ask its host to start it again."""
-
-from __future__ import annotations
-
-# systemd restarts on a non-zero exit, launchd on any exit, and the Windows
-# launcher looks for exactly this one before it swaps and starts bcn again
-RESTART_EXIT_CODE = 75
-
-__all__ = ["RESTART_EXIT_CODE"]