bazaar-compute-node 0.2.1rc1__tar.gz → 0.2.1rc3__tar.gz

{bazaar_compute_node-0.2.1rc1 → bazaar_compute_node-0.2.1rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bazaar-compute-node
-Version: 0.2.1rc1
+Version: 0.2.1rc3
 Summary: Runtime-agnostic computer node daemon for agents and channels.
 License-Expression: AGPL-3.0-only
 License-File: LICENSE
@@ -13,6 +13,14 @@ Requires-Dist: packaging>=25.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: protobug==1.0.0
 Requires-Dist: tzdata>=2024.1 ; sys_platform == 'win32'
+Requires-Dist: starlette>=1.6.0
+Requires-Dist: uvicorn>=0.53.0
+Requires-Dist: uvloop>=0.22.1 ; sys_platform != 'win32'
+Requires-Dist: httptools>=0.8.0
+Requires-Dist: python-multipart>=0.0.32
+Requires-Dist: yarl>=1.18
+Requires-Dist: markdown-it-py>=4.2.0
+Requires-Dist: pygments>=2.20.0
 Requires-Python: >=3.14
 Project-URL: Repository, https://github.com/yuchanns/bazaar-compute-node
 Description-Content-Type: text/markdown
@@ -51,14 +59,17 @@ bcn --version
 uv tool upgrade bazaar-compute-node
 
 # Add an Agent / 添加智能体
-# allowed_sender_ids holds the Telegram user ids allowed to open a private chat
-# allowed_sender_ids 是允许与其私聊的 Telegram 用户 id
+# allowed_chats lists the chats let in by name: Telegram chat ids (a private
+# chat's id is the other side's user id). Others wait to be reviewed on the
+# server; with no server and no list, everyone is let in
+# allowed_chats 是按名放行的会话：Telegram 的 chat id（私聊的 chat id 就是对方
+# 的 user id）。其余的等服务端审核；没接服务端也没写名单时，谁来都放行
 bcn agent add \
   --name Tifa \
   --channel telegram \
   --runtime codex \
   --set channel.token_env=BCN_TELEGRAM_TIFA_TOKEN \
-  --set channel.allowed_sender_ids=[123456789]
+  --set channel.allowed_chats=["123456789"]
 
 # Configure the runtime environment / 配置运行时环境
 # Example file content / 示例文件内容:

{bazaar_compute_node-0.2.1rc1 → bazaar_compute_node-0.2.1rc3}/README.md

@@ -32,14 +32,17 @@ bcn --version
 uv tool upgrade bazaar-compute-node
 
 # Add an Agent / 添加智能体
-# allowed_sender_ids holds the Telegram user ids allowed to open a private chat
-# allowed_sender_ids 是允许与其私聊的 Telegram 用户 id
+# allowed_chats lists the chats let in by name: Telegram chat ids (a private
+# chat's id is the other side's user id). Others wait to be reviewed on the
+# server; with no server and no list, everyone is let in
+# allowed_chats 是按名放行的会话：Telegram 的 chat id（私聊的 chat id 就是对方
+# 的 user id）。其余的等服务端审核；没接服务端也没写名单时，谁来都放行
 bcn agent add \
   --name Tifa \
   --channel telegram \
   --runtime codex \
   --set channel.token_env=BCN_TELEGRAM_TIFA_TOKEN \
-  --set channel.allowed_sender_ids=[123456789]
+  --set channel.allowed_chats=["123456789"]
 
 # Configure the runtime environment / 配置运行时环境
 # Example file content / 示例文件内容:

{bazaar_compute_node-0.2.1rc1 → bazaar_compute_node-0.2.1rc3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc1"
+version = "0.2.1rc3"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"
@@ -16,6 +16,14 @@ dependencies = [
     "pydantic>=2.0.0",
     "protobug==1.0.0",
     "tzdata>=2024.1; sys_platform == 'win32'",
+    "starlette>=1.6.0",
+    "uvicorn>=0.53.0",
+    "uvloop>=0.22.1 ; sys_platform != 'win32'",
+    "httptools>=0.8.0",
+    "python-multipart>=0.0.32",
+    "yarl>=1.18",
+    "markdown-it-py>=4.2.0",
+    "pygments>=2.20.0",
 ]
 
 [project.urls]
@@ -23,10 +31,11 @@ Repository = "https://github.com/yuchanns/bazaar-compute-node"
 
 [project.scripts]
 bcn = "bazaar_compute_node.cli:main"
+bcs = "bazaar_compute_server.cli:main"
 
 [project.entry-points."bazaar_compute_node.runtimes"]
-codex = "bazaar_compute_node.contrib.codex.plugin:create_runtime"
-claudecode = "bazaar_compute_node.contrib.claude.plugin:create_runtime"
+codex = "bazaar_compute_node.contrib.codex.plugin:builder"
+claudecode = "bazaar_compute_node.contrib.claude.plugin:builder"
 
 [project.entry-points."bazaar_compute_node.channels"]
 wecom = "bazaar_compute_node.contrib.wecom.plugin:builder"
@@ -36,8 +45,15 @@ lark = "bazaar_compute_node.contrib.lark.plugin:builder"
 [project.entry-points."bazaar_compute_node.storages"]
 sqlite = "bazaar_compute_node.contrib.sqlite.plugin:create_storage"
 
+[project.entry-points."bazaar_compute_server.storages"]
+sqlite = "bazaar_compute_server.contrib.sqlite.plugin:create_storage"
+
 [project.entry-points."bazaar_compute_node.audits"]
 logging = "bazaar_compute_node.contrib.logging.plugin:create_audit"
+server = "bazaar_compute_node.contrib.server.plugin:create_audit"
+
+[project.entry-points."bazaar_compute_node.controls"]
+server = "bazaar_compute_node.contrib.server.plugin:create_control"
 
 [dependency-groups]
 dev = [
@@ -52,8 +68,14 @@ dev = [
 path = "tests/support"
 editable = true
 
+[tool.uv.build-backend]
+module-name = [
+    "bazaar_compute_node",
+    "bazaar_compute_server",
+]
+
 [tool.pytest.ini_options]
-addopts = "-m 'not e2e'"
+addopts = "-m 'not e2e' -p no:anyio"
 markers = ["e2e: requires a real external provider"]
 
 [build-system]

{bazaar_compute_node-0.2.1rc1 → bazaar_compute_node-0.2.1rc3}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "bazaar-compute-node"
-version = "0.2.1rc1"
+version = "0.2.1rc3"
 description = "Runtime-agnostic computer node daemon for agents and channels."
 readme = "README.md"
 license = "AGPL-3.0-only"
@@ -16,6 +16,14 @@ dependencies = [
     "pydantic>=2.0.0",
     "protobug==1.0.0",
     "tzdata>=2024.1; sys_platform == 'win32'",
+    "starlette>=1.6.0",
+    "uvicorn>=0.53.0",
+    "uvloop>=0.22.1 ; sys_platform != 'win32'",
+    "httptools>=0.8.0",
+    "python-multipart>=0.0.32",
+    "yarl>=1.18",
+    "markdown-it-py>=4.2.0",
+    "pygments>=2.20.0",
 ]
 
 [project.urls]
@@ -23,10 +31,11 @@ Repository = "https://github.com/yuchanns/bazaar-compute-node"
 
 [project.scripts]
 bcn = "bazaar_compute_node.cli:main"
+bcs = "bazaar_compute_server.cli:main"
 
 [project.entry-points."bazaar_compute_node.runtimes"]
-codex = "bazaar_compute_node.contrib.codex.plugin:create_runtime"
-claudecode = "bazaar_compute_node.contrib.claude.plugin:create_runtime"
+codex = "bazaar_compute_node.contrib.codex.plugin:builder"
+claudecode = "bazaar_compute_node.contrib.claude.plugin:builder"
 
 [project.entry-points."bazaar_compute_node.channels"]
 wecom = "bazaar_compute_node.contrib.wecom.plugin:builder"
@@ -36,8 +45,15 @@ lark = "bazaar_compute_node.contrib.lark.plugin:builder"
 [project.entry-points."bazaar_compute_node.storages"]
 sqlite = "bazaar_compute_node.contrib.sqlite.plugin:create_storage"
 
+[project.entry-points."bazaar_compute_server.storages"]
+sqlite = "bazaar_compute_server.contrib.sqlite.plugin:create_storage"
+
 [project.entry-points."bazaar_compute_node.audits"]
 logging = "bazaar_compute_node.contrib.logging.plugin:create_audit"
+server = "bazaar_compute_node.contrib.server.plugin:create_audit"
+
+[project.entry-points."bazaar_compute_node.controls"]
+server = "bazaar_compute_node.contrib.server.plugin:create_control"
 
 [dependency-groups]
 dev = [
@@ -52,7 +68,9 @@ dev = [
 bcn-test-support = { path = "tests/support", editable = true }
 
 [tool.pytest.ini_options]
-addopts = "-m 'not e2e'"
+# 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"
 markers = [
     "e2e: requires a real external provider",
 ]
@@ -60,3 +78,6 @@ markers = [
 [build-system]
 requires = ["uv_build>=0.12.2,<0.13.0"]
 build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-name = ["bazaar_compute_node", "bazaar_compute_server"]

{bazaar_compute_node-0.2.1rc1 → bazaar_compute_node-0.2.1rc3}/src/bazaar_compute_node/app/agent.py

@@ -13,6 +13,7 @@ from functools import partial
 from pathlib import Path
 
 from ..core.actor import Actor, Actors, Agent, Thread
+from ..core.agent import State
 from ..core.audit import AuditRecorder
 from ..core.channel import Channel, ChannelContext, Channels, IChannel
 from ..core.concurrency import IThreadConcurrency, ThreadLockRegistry
@@ -22,14 +23,13 @@ from ..core.models import (
     Message,
     RuntimeSession,
 )
-from ..core.observability import IAudit
 from ..core.orchestration import AgentOrchestrator
-from ..core.orchestration.reminder_command import ReminderCommandService
 from ..core.paths import resolve_workspace_dir
+from ..core.review import ReviewPolicy
 from ..core.runtime import IRuntime, RuntimeCommandContext
 from ..core.storage import IStorageScope
 from ..core.timerwheel import TimerWheel
-from ..core.utils.clock import now_ms
+from ..core.utils.command import PLATFORM_ENVIRONMENT
 from ..i18n import Translator
 from .attachments import AttachmentMaterializer
 from .command import CommandDispatchError
@@ -42,19 +42,6 @@ from .wrapper import install_bcc_wrapper, remove_bcc_wrapper
 CommandRecord = tuple[str, tuple[str, ...]]
 
 _ENVIRONMENT_NAME = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
-_PLATFORM_ENVIRONMENT = {
-    "HOME",
-    "LANG",
-    "LC_ALL",
-    "PATH",
-    "TMPDIR",
-    "TEMP",
-    "TMP",
-    "SystemRoot",
-    "ComSpec",
-    "PATHEXT",
-    "USERPROFILE",
-}
 
 
 @dataclass(frozen=True, slots=True)
@@ -75,7 +62,7 @@ class AgentApplication:
         configuration: AgentConfiguration,
         factories: AgentAdapterFactories,
         storage: IStorageScope,
-        audit: IAudit,
+        audit: AuditRecorder,
         timer_wheel: TimerWheel,
         reminder_concurrency: IThreadConcurrency,
         reminder_poke: Callable[[], None],
@@ -84,12 +71,12 @@ class AgentApplication:
         translator: Translator,
         upgrade_service: UpgradeService | None,
         upgrade_notice: Callable[[], tuple[str, str] | None] = lambda: None,
+        reviewed: bool = False,
     ) -> None:
         self.configuration = configuration
         self.agent_id = configuration.id
         self.name = configuration.name
         self.storage = storage
-        self.audit = audit
         self.timer_wheel = timer_wheel
         self.timeout_budget = timeout_budget
         self.translator = translator
@@ -98,38 +85,30 @@ class AgentApplication:
         self.command_log: list[CommandRecord] = []
         self._session_capabilities: dict[str, _SessionCapabilityBinding] = {}
         self._concurrency = ThreadLockRegistry()
-        self._started = False
-        self._stopping = False
         self._runtime_configurations = configuration.runtimes
         self._logger = logging.getLogger("bazaar_compute_node.application.agent")
         self._attachment_materializer = AttachmentMaterializer(
             self.workspace_path,
             self._referenced_attachment_paths,
         )
-        self._audit_recorder = AuditRecorder(
-            sink=audit,
-            timeout_budget=timeout_budget,
-            clock=now_ms,
-        )
-        self.channel: IChannel = Channels(
-            tuple(
-                Channel(
-                    self.agent_id,
-                    factories.channels[channel_configuration.kind].build(
-                        ChannelContext(
-                            agent_id=self.agent_id,
-                            attachments=self._attachment_materializer,
-                            options=dict(channel_configuration.options),
-                            workspace=self.workspace_path,
-                            translator=self.translator,
-                            timer_wheel=self.timer_wheel,
-                            audit=self._audit_recorder,
-                        )
-                    ),
-                )
-                for channel_configuration in configuration.channels
+        channels = tuple(
+            Channel(
+                self.agent_id,
+                factories.channels[channel_configuration.kind].build(
+                    ChannelContext(
+                        agent_id=self.agent_id,
+                        attachments=self._attachment_materializer,
+                        options=dict(channel_configuration.options),
+                        workspace=self.workspace_path,
+                        translator=self.translator,
+                        timer_wheel=self.timer_wheel,
+                        audit=audit,
+                    )
+                ),
             )
+            for channel_configuration in configuration.channels
         )
+        self.channel: IChannel = Channels(channels)
         runtime_contexts: list[RuntimeCommandContext] = []
         runtimes: list[IRuntime] = []
         for index, runtime_configuration in enumerate(configuration.runtimes):
@@ -147,6 +126,7 @@ class AgentApplication:
                 # the context belongs to one instance, so the index it builds
                 # the child environment for is fixed here
                 environment_for_session=partial(self._runtime_environment, index),
+                environment_for_probe=partial(self._probe_environment, index),
                 agent_id=self.agent_id,
                 agent_name=self.name,
                 bot_names=self._bot_names,
@@ -172,13 +152,13 @@ class AgentApplication:
             raise ValueError("agent idle timeout exceeds the timer horizon")
         self._runtime_contexts = tuple(runtime_contexts)
         self.runtimes: tuple[IRuntime, ...] = tuple(runtimes)
-        self._actors = Actors(agent_id=self.agent_id, mode=configuration.mode)
+        self.actors = Actors(agent_id=self.agent_id, mode=configuration.mode)
         self.orchestrator = AgentOrchestrator(
-            actors=self._actors,
+            actors=self.actors,
             channel=self.channel,
             runtimes=self.runtimes,
             storage=self.storage,
-            audit=self._audit_recorder,
+            audit=audit,
             timeout_budget=self.timeout_budget,
             timer_wheel=self.timer_wheel,
             runtime_idle_timeout_ms=(
@@ -191,32 +171,44 @@ class AgentApplication:
             error_feedback_detail=self._redact_session_secrets,
             upgrade_notice=upgrade_notice,
             concurrency=self._concurrency,
-        )
-        self.reminder_service = ReminderCommandService(
-            storage=self.storage,
-            concurrency=reminder_concurrency,
-            poke=reminder_poke,
+            review=ReviewPolicy(
+                tuple(
+                    (channel, channel_configuration.allowed_chats)
+                    for channel, channel_configuration in zip(
+                        channels, configuration.channels, strict=True
+                    )
+                ),
+                reviewed,
+            ),
+            reminder_concurrency=reminder_concurrency,
+            reminder_poke=reminder_poke,
         )
         self.command_dispatcher = CommandDispatcher(
             self.orchestrator.command_service,
-            actors=self._actors,
-            reminder_service=self.reminder_service,
+            actors=self.actors,
             session_binding_validator=self._validate_actor_binding,
             upgrade_service=upgrade_service,
         )
 
+    @property
+    def state(self) -> State:
+        """Where the agent is: not up yet, done for, or - once up - at rest,
+        since the actors' own states are theirs to tell."""
+
+        return self.orchestrator.agent.lifecycle
+
     @property
     def started(self) -> bool:
-        return self._started
+        return self.orchestrator.agent.up
 
     def workspace_path(self) -> Path:
         return resolve_workspace_dir(self.agent_id)
 
     async def start(self) -> None:
-        if self._started:
+        if self.started:
             return
-        if self._stopping:
-            raise RuntimeError("Agent application is stopping")
+        if self.state is State.TERMINATED:
+            raise RuntimeError("Agent application is terminated")
         workspace = self.workspace_path()
         await asyncio.to_thread(
             workspace.mkdir,
@@ -231,7 +223,7 @@ class AgentApplication:
                 install_bcc_wrapper,
                 workspace / ".bcn" / "bin",
                 agent_id=self.agent_id,
-                mode=self._actors.mode,
+                mode=self.actors.mode,
             )
             await self._attachment_materializer.reconcile()
             await self._backfill_channel_identity()
@@ -241,7 +233,6 @@ class AgentApplication:
         except BaseException:
             await self._cleanup_partial_start()
             raise
-        self._started = True
         self.command_dispatcher.start_accepting()
 
     async def _backfill_channel_identity(self) -> None:
@@ -278,10 +269,11 @@ class AgentApplication:
         return tuple(names)
 
     async def stop(self) -> None:
-        if self._stopping:
+        if self.state is State.TERMINATED:
             return
-        self._stopping = True
-        self._started = False
+        # the turn is taken before anything is awaited: whoever looks in the
+        # meantime sees an agent that is done for, not one to be changed
+        self.orchestrator.agent.terminated()
         self.command_dispatcher.stop_accepting()
         errors: list[BaseException] = []
         try:
@@ -301,6 +293,11 @@ class AgentApplication:
         except BaseException as error:  # noqa: BLE001
             errors.append(error)
         self._session_capabilities.clear()
+        # the one who stopped it being cancelled is not an error of the stop:
+        # the cleanup is done, and the cancellation goes on up
+        for error in errors:
+            if isinstance(error, asyncio.CancelledError):
+                raise error
         if errors:
             raise RuntimeError(
                 "; ".join(type(error).__name__ for error in errors)
@@ -313,7 +310,7 @@ class AgentApplication:
         return await self.command_dispatcher(request)
 
     async def publish_inbox_wake(self, message: Message[InboundAttachment]) -> None:
-        if not self._started:
+        if not self.started:
             raise RuntimeError("Agent application is not started")
         await self.orchestrator.publish_inbox_wake(message)
 
@@ -321,7 +318,7 @@ class AgentApplication:
         return {
             "agent_id": self.agent_id,
             "name": self.name,
-            "status": "started" if self.started else "stopped",
+            "status": "started" if self.started else self.state.value,
             "channels": tuple(member.name for member in self.channel.members),
             "runtimes": tuple(runtime.name for runtime in self.runtimes),
             "channel_health": dict(self.channel.health),
@@ -409,6 +406,9 @@ class AgentApplication:
             runtime_index=runtime_index,
         )
 
+    def _probe_environment(self, runtime_index: int) -> dict[str, str]:
+        return self._configured_environment(runtime_index)
+
     def _build_command_environment(
         self,
         actor_id: str,
@@ -440,7 +440,28 @@ class AgentApplication:
                 token_values=tuple(token_values),
             )
             self._session_capabilities[actor_id] = binding
-        allowed = set(_PLATFORM_ENVIRONMENT)
+        environment = self._configured_environment(runtime_index)
+        environment["PATH"] = os.pathsep.join(
+            (str(wrapper_path.parent), environment.get("PATH", os.defpath))
+        )
+        environment.update(
+            {
+                "BCN_AGENT_ID": self.agent_id,
+                "BCN_ENDPOINT": self._endpoint(),
+                "BCN_ACTOR_ID": actor_id,
+                "BCN_RUNTIME_SESSION_ID": runtime_session_id,
+                "BCN_COMMAND_CAPABILITY": binding.capability,
+            }
+        )
+        return environment
+
+    def _configured_environment(self, runtime_index: int) -> dict[str, str]:
+        """What a runtime's process starts with: the platform's own
+        variables it needs, and those its configuration binds, each under
+        the name it asked for."""
+
+        environment_bindings = self._runtime_configurations[runtime_index].env
+        allowed = set(PLATFORM_ENVIRONMENT)
         for name in self.runtimes[runtime_index].environment_variable_names():
             if not _ENVIRONMENT_NAME.fullmatch(name):
                 raise ValueError(f"runtime environment name is invalid: {name}")
@@ -467,22 +488,10 @@ class AgentApplication:
             if source_name not in environment_bindings:
                 environment.pop(source_name, None)
         environment.update(bound)
-        environment["PATH"] = os.pathsep.join(
-            (str(wrapper_path.parent), environment.get("PATH", os.defpath))
-        )
-        environment.update(
-            {
-                "BCN_AGENT_ID": self.agent_id,
-                "BCN_ENDPOINT": self._endpoint(),
-                "BCN_ACTOR_ID": actor_id,
-                "BCN_RUNTIME_SESSION_ID": runtime_session_id,
-                "BCN_COMMAND_CAPABILITY": binding.capability,
-            }
-        )
         return environment
 
     def _redact_session_secrets(self, thread_id: str, text: str) -> str:
-        binding = self._session_capabilities.get(self._actors.for_thread(thread_id).id)
+        binding = self._session_capabilities.get(self.actors.for_thread(thread_id).id)
         if binding is None:
             return text
         for token in binding.token_values:
@@ -506,7 +515,7 @@ class AgentApplication:
             raise RuntimeError("bcc wrapper is not installed")
         self.command_log.append((thread_id, tuple(arguments)))
         runtime_session = self.orchestrator.runtime_session(
-            self._actors.for_thread(thread_id)
+            self.actors.for_thread(thread_id)
         )
         if runtime_session is None:
             raise RuntimeError("runtime session is not live")

{bazaar_compute_node-0.2.1rc1 → bazaar_compute_node-0.2.1rc3}/src/bazaar_compute_node/app/agent_management.py

@@ -16,9 +16,9 @@ from .config import (
     ConfigurationError,
     NodeConfiguration,
     RuntimeConfiguration,
-    _write_configuration,
     load_node_configuration,
     resolve_config_path,
+    write_configuration,
 )
 from .usage import Usage
 
@@ -136,7 +136,7 @@ def _add_agent(
             configuration,
             agents=(*configuration.agents, agent),
         )
-        _write_configuration(config_path, updated)
+        write_configuration(config_path, updated)
     except ConfigurationError as error:
         parser.error(str(error))
     print(
@@ -169,7 +169,7 @@ def _remove_agent(
         agents=tuple(agent for agent in configuration.agents if agent.id != removed.id),
     )
     try:
-        _write_configuration(config_path, updated)
+        write_configuration(config_path, updated)
     except ConfigurationError as error:
         parser.error(str(error))
     print(f"Agent removed id={removed.id} name={removed.name}", flush=True)