bazaar-compute-node 0.2.1rc14__tar.gz → 0.2.2__tar.gz

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

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

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

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

@@ -21,12 +21,10 @@ class AttachmentMaterializer:
         referenced_paths: Callable[[], Awaitable[set[str]]],
         *,
         max_file_bytes: int = 25 * 1024 * 1024,
-        max_workspace_bytes: int = 1024 * 1024 * 1024,
     ) -> None:
         self._workspace = workspace
         self._referenced_paths = referenced_paths
         self._max_file_bytes = max_file_bytes
-        self._max_workspace_bytes = max_workspace_bytes
         self._lock = asyncio.Lock()
 
     async def reconcile(self) -> None:
@@ -66,11 +64,9 @@ class AttachmentMaterializer:
         source: bytes | AsyncIterable[bytes],
         temporary: Path,
         destination: Path,
-        root: Path,
     ) -> int:
         """Write an attachment aside, then move it into place once it is whole."""
 
-        current_size = await asyncio.to_thread(self._stored_size, root)
         descriptor: int | None = None
         try:
             descriptor = await asyncio.to_thread(
@@ -80,7 +76,7 @@ class AttachmentMaterializer:
                 0o600,
             )
             try:
-                size = await self._write(descriptor, source, current_size)
+                size = await self._write(descriptor, source)
                 await asyncio.to_thread(os.fsync, descriptor)
                 stored = await asyncio.to_thread(os.fstat, descriptor)
                 if stored.st_size != size:
@@ -107,12 +103,12 @@ class AttachmentMaterializer:
         self,
         descriptor: int,
         source: bytes | AsyncIterable[bytes],
-        current_size: int,
     ) -> int:
         """Write the source through, refusing it the moment it goes over a limit."""
 
         if isinstance(source, bytes):
-            self._check_room(len(source), current_size)
+            if len(source) > self._max_file_bytes:
+                raise ValueError("attachment exceeds the per-file size limit")
             await asyncio.to_thread(_write_all, descriptor, source)
             return len(source)
         size = 0
@@ -120,16 +116,11 @@ class AttachmentMaterializer:
             if not isinstance(chunk, bytes):
                 raise TypeError("attachment stream must yield bytes")
             size += len(chunk)
-            self._check_room(size, current_size)
+            if size > self._max_file_bytes:
+                raise ValueError("attachment exceeds the per-file size limit")
             await asyncio.to_thread(_write_all, descriptor, chunk)
         return size
 
-    def _check_room(self, size: int, current_size: int) -> None:
-        if size > self._max_file_bytes:
-            raise ValueError("attachment exceeds the per-file size limit")
-        if current_size + size > self._max_workspace_bytes:
-            raise ValueError("attachment workspace quota exceeded")
-
     async def materialize(
         self,
         source: bytes | AsyncIterable[bytes],
@@ -153,7 +144,7 @@ class AttachmentMaterializer:
             await asyncio.to_thread(
                 staging.mkdir, parents=True, exist_ok=True, mode=0o700
             )
-            size = await self._stage(source, temporary, destination, root)
+            size = await self._stage(source, temporary, destination)
         return InboundAttachment(
             attachment_id=attachment_id,
             name=Path(name).name,
@@ -181,17 +172,6 @@ class AttachmentMaterializer:
             error=error,
         )
 
-    @staticmethod
-    def _stored_size(root: Path) -> int:
-        if not root.exists():
-            return 0
-        return sum(
-            path.stat().st_size
-            for pattern in ("*/content", "*/content.*")
-            for path in root.glob(pattern)
-            if path.is_file() and not path.is_symlink()
-        )
-
 
 def _write_all(descriptor: int, payload: bytes) -> None:
     view = memoryview(payload)

{bazaar_compute_node-0.2.1rc14 → bazaar_compute_node-0.2.2}/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.2}/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.2}/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.2}/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.2}/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.2}/src/bazaar_compute_node/contrib/lark/channel.py

@@ -437,6 +437,7 @@ class LarkChannel(IChannel):
 
         quoted: Message | None = None
         if parent_id is not None:
+            metadata["provider_reply_to_message_id"] = parent_id
             quoted, failure = await self._quoted_message(
                 parent_id,
                 chat_id=fields.chat_id,
@@ -462,7 +463,6 @@ class LarkChannel(IChannel):
             mentions_agent=target_kind is ChannelTargetKind.GROUP,
             notifies_runtime=True,
             received_at_ms=received_at_ms,
-            reply_to_message_id=quoted.message_id if quoted is not None else None,
             provider_payload_metadata=metadata,
         )
         await self._queue_inbound(
@@ -485,7 +485,6 @@ class LarkChannel(IChannel):
         mentions_agent: bool,
         notifies_runtime: bool,
         received_at_ms: int,
-        reply_to_message_id: str | None = None,
         provider_payload_metadata: Mapping[str, object] | None = None,
     ) -> Message:
         provider_message_id = _provider_text(message.get("message_id"))
@@ -546,7 +545,6 @@ class LarkChannel(IChannel):
             notifies_runtime=notifies_runtime,
             attachments=attachments,
             provider_time_ms=_provider_time_ms(message.get("create_time")),
-            reply_to_message_id=reply_to_message_id,
             metadata=metadata,
         )
 

{bazaar_compute_node-0.2.1rc14 → bazaar_compute_node-0.2.2}/src/bazaar_compute_node/contrib/telegram/channel.py

@@ -779,9 +779,9 @@ class TelegramChannel(IChannel):
         reply = message.get("reply_to_message")
 
         received_at_ms = time_ns() // 1_000_000
-        reply_to_message_id: str | None = None
+        reference: str | None = None
         if isinstance(reply, Mapping):
-            reply_to_message_id = await self._queue_reply_backfill(
+            reference = await self._queue_reply_backfill(
                 reply,
                 update_id=update_id,
                 identity=identity,
@@ -818,8 +818,8 @@ class TelegramChannel(IChannel):
                 notifies_runtime=activation.notifies_runtime,
                 attachments=update.content.attachments,
                 provider_time_ms=update.provider_time_s * 1_000,
-                reply_to_message_id=reply_to_message_id,
                 metadata={
+                    "provider_reply_to_message_id": reference,
                     "telegram_update_id": update_id,
                     "telegram_chat_id": update.chat_id,
                     "telegram_message_thread_id": update.topic_id,
@@ -866,20 +866,20 @@ class TelegramChannel(IChannel):
         bot_username = self._bot_username or ""
         if bot_id is None:
             raise RuntimeError("Telegram bot identity is not initialized")
-        # what the bot itself said is on record as sent; quoted back, it is
-        # not heard a second time as if someone else had said it
         quoted_sender = reply.get("from")
-        if isinstance(quoted_sender, Mapping) and quoted_sender.get("id") == bot_id:
-            return None
         content = await self._content(
             reply,
             bot_id=bot_id,
             bot_username=bot_username,
         )
         if content is None:
-            return None
+            return str(provider_message_id)
 
-        sender = self._sender(reply)
+        sender = (
+            None
+            if isinstance(quoted_sender, Mapping) and quoted_sender.get("id") == bot_id
+            else self._sender(reply)
+        )
         provider_time_s = reply.get("date")
         provider_time_ms: int | None = None
         historical: bool | None = None
@@ -892,12 +892,11 @@ class TelegramChannel(IChannel):
             historical = provider_time_s < self._started_at_s
 
         channel_session_id = identity.channel_session_id
-        message_id = identity.message_id(provider_message_id)
         await self._inbound.put(
             Message(
                 direction=MessageDirection.INBOUND,
                 seq=0,
-                message_id=message_id,
+                message_id=identity.message_id(provider_message_id),
                 thread_id=identity.session_id,
                 channel_session_id=channel_session_id,
                 channel="telegram",
@@ -935,7 +934,7 @@ class TelegramChannel(IChannel):
         )
         self._messages_queued += 1
         self._quoted_messages_queued += 1
-        return message_id
+        return str(provider_message_id)
 
     async def _content(
         self,