bazaar-compute-node 0.1.39rc4__tar.gz → 0.2.0__tar.gz

{bazaar_compute_node-0.1.39rc4 → bazaar_compute_node-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bazaar-compute-node
-Version: 0.1.39rc4
+Version: 0.2.0
 Summary: Runtime-agnostic computer node daemon for agents and channels.
 License-Expression: AGPL-3.0-only
 License-File: LICENSE
@@ -19,9 +19,9 @@ Description-Content-Type: text/markdown
 
 # Bazaar Compute Node
 
-Collaborate with your Agents in the bazaar across compute nodes, through any interface, with any harness runtime.
+Bring Your Own Agents to the bazaar, and build with your teams in the open.
 
-在集市里与你的 Agent 们合作，透过任意界面与任意 Harness。
+不必独自建造——带上你的智能体，来集市。
 
 <p align="left">
   <a href="https://github.com/yuchanns/bazaar-compute-node/actions"><img
@@ -50,12 +50,15 @@ bcn --version
 # Upgrade / 升级
 uv tool upgrade bazaar-compute-node
 
-# Add an Agent / 添加 Agent
+# Add an Agent / 添加智能体
+# allowed_sender_ids holds the Telegram user ids allowed to open a private chat
+# allowed_sender_ids 是允许与其私聊的 Telegram 用户 id
 bcn agent add \
   --name Tifa \
   --channel telegram \
   --runtime codex \
-  --set channel.token_env=BCN_TELEGRAM_TIFA_TOKEN
+  --set channel.token_env=BCN_TELEGRAM_TIFA_TOKEN \
+  --set channel.allowed_sender_ids=[123456789]
 
 # Configure the runtime environment / 配置运行时环境
 # Example file content / 示例文件内容:
@@ -94,8 +97,8 @@ Windows: Get-Content "$env:USERPROFILE\.bcn\system-service.log" -Wait
 | --- | --- |
 | ✅ | Reminders / 定时器 |
 | ✅ | Attachments / 附件 |
-| ✅ | Multi-Agents / 多 Agent |
-| 🚧 | Teams / 团队协作 |
+| ✅ | Multi-Agents / 多智能体 |
+| ✅ | Teams / 团队协作 |
 
 ### Channels / 渠道
 

{bazaar_compute_node-0.1.39rc4 → bazaar_compute_node-0.2.0}/README.md

@@ -1,8 +1,8 @@
 # Bazaar Compute Node
 
-Collaborate with your Agents in the bazaar across compute nodes, through any interface, with any harness runtime.
+Bring Your Own Agents to the bazaar, and build with your teams in the open.
 
-在集市里与你的 Agent 们合作，透过任意界面与任意 Harness。
+不必独自建造——带上你的智能体，来集市。
 
 <p align="left">
   <a href="https://github.com/yuchanns/bazaar-compute-node/actions"><img
@@ -31,12 +31,15 @@ bcn --version
 # Upgrade / 升级
 uv tool upgrade bazaar-compute-node
 
-# Add an Agent / 添加 Agent
+# Add an Agent / 添加智能体
+# allowed_sender_ids holds the Telegram user ids allowed to open a private chat
+# allowed_sender_ids 是允许与其私聊的 Telegram 用户 id
 bcn agent add \
   --name Tifa \
   --channel telegram \
   --runtime codex \
-  --set channel.token_env=BCN_TELEGRAM_TIFA_TOKEN
+  --set channel.token_env=BCN_TELEGRAM_TIFA_TOKEN \
+  --set channel.allowed_sender_ids=[123456789]
 
 # Configure the runtime environment / 配置运行时环境
 # Example file content / 示例文件内容:
@@ -75,8 +78,8 @@ Windows: Get-Content "$env:USERPROFILE\.bcn\system-service.log" -Wait
 | --- | --- |
 | ✅ | Reminders / 定时器 |
 | ✅ | Attachments / 附件 |
-| ✅ | Multi-Agents / 多 Agent |
-| 🚧 | Teams / 团队协作 |
+| ✅ | Multi-Agents / 多智能体 |
+| ✅ | Teams / 团队协作 |
 
 ### Channels / 渠道
 

{bazaar_compute_node-0.1.39rc4 → bazaar_compute_node-0.2.0}/pyproject.toml

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

{bazaar_compute_node-0.1.39rc4 → bazaar_compute_node-0.2.0}/pyproject.toml.orig

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

{bazaar_compute_node-0.1.39rc4 → bazaar_compute_node-0.2.0}/src/bazaar_compute_node/app/agent.py

@@ -12,8 +12,10 @@ from dataclasses import dataclass
 from functools import partial
 from pathlib import Path
 
+from ..core.actor import Actor, Actors, Agent, Thread
+from ..core.audit import AuditRecorder
 from ..core.channel import Channel, ChannelContext, IChannel
-from ..core.concurrency import ISessionConcurrency, SessionLockRegistry
+from ..core.concurrency import IThreadConcurrency, ThreadLockRegistry
 from ..core.lifecycle import TimeoutBudget
 from ..core.models import (
     InboundAttachment,
@@ -21,12 +23,13 @@ from ..core.models import (
     RuntimeSession,
 )
 from ..core.observability import IAudit
-from ..core.orchestration import SessionOrchestrator
+from ..core.orchestration import AgentOrchestrator
 from ..core.orchestration.reminder_command import ReminderCommandService
 from ..core.paths import resolve_workspace_dir
 from ..core.runtime import IRuntime, RuntimeCommandContext
 from ..core.storage import IStorageScope
 from ..core.timerwheel import TimerWheel
+from ..core.utils.clock import now_ms
 from ..i18n import Translator
 from .attachments import AttachmentMaterializer
 from .command import CommandDispatchError
@@ -57,7 +60,7 @@ _PLATFORM_ENVIRONMENT = {
 @dataclass(frozen=True, slots=True)
 class _SessionCapabilityBinding:
     agent_id: str
-    bcn_session_id: str
+    actor_id: str
     runtime_session_id: str
     capability: str
     token_values: tuple[str, ...]
@@ -74,7 +77,7 @@ class AgentApplication:
         storage: IStorageScope,
         audit: IAudit,
         timer_wheel: TimerWheel,
-        reminder_concurrency: ISessionConcurrency,
+        reminder_concurrency: IThreadConcurrency,
         reminder_poke: Callable[[], None],
         endpoint: Callable[[], str],
         timeout_budget: TimeoutBudget,
@@ -94,7 +97,7 @@ class AgentApplication:
         self._wrapper_path: Path | None = None
         self.command_log: list[CommandRecord] = []
         self._session_capabilities: dict[str, _SessionCapabilityBinding] = {}
-        self._concurrency = SessionLockRegistry()
+        self._concurrency = ThreadLockRegistry()
         self._started = False
         self._stopping = False
         self._runtime_configurations = configuration.runtimes
@@ -103,6 +106,11 @@ class AgentApplication:
             self.workspace_path,
             self._referenced_attachment_paths,
         )
+        self._audit_recorder = AuditRecorder(
+            sink=audit,
+            timeout_budget=timeout_budget,
+            clock=now_ms,
+        )
         provider_channel = factories.channel.build(
             ChannelContext(
                 agent_id=self.agent_id,
@@ -111,6 +119,7 @@ class AgentApplication:
                 workspace=self.workspace_path,
                 translator=self.translator,
                 timer_wheel=self.timer_wheel,
+                audit=self._audit_recorder,
             )
         )
         self.channel: IChannel = Channel(self.agent_id, provider_channel)
@@ -135,6 +144,7 @@ class AgentApplication:
                 agent_name=self.name,
                 bot_name=self._bot_name,
                 runtime_options=runtime_options,
+                mode=configuration.mode,
                 sandbox_mode=runtime_configuration.sandbox_mode,
                 network_access=runtime_configuration.network_access,
                 startup_timeout_seconds=timeout_budget.startup_seconds,
@@ -155,12 +165,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.orchestrator = SessionOrchestrator(
-            agent_id=self.agent_id,
+        self._actors = Actors(agent_id=self.agent_id, mode=configuration.mode)
+        self.orchestrator = AgentOrchestrator(
+            actors=self._actors,
             channel=self.channel,
             runtimes=self.runtimes,
             storage=self.storage,
-            audit=self.audit,
+            audit=self._audit_recorder,
             timeout_budget=self.timeout_budget,
             timer_wheel=self.timer_wheel,
             runtime_idle_timeout_ms=(
@@ -181,9 +192,10 @@ class AgentApplication:
         )
         self.command_dispatcher = CommandDispatcher(
             self.orchestrator.command_service,
+            actors=self._actors,
             reminder_service=self.reminder_service,
             timeout_budget=self.timeout_budget,
-            session_binding_validator=self._validate_session_binding,
+            session_binding_validator=self._validate_actor_binding,
             upgrade_service=upgrade_service,
         )
 
@@ -213,6 +225,7 @@ class AgentApplication:
                 install_bcc_wrapper,
                 workspace / ".bcn" / "bin",
                 agent_id=self.agent_id,
+                mode=self._actors.mode,
             )
             await self._attachment_materializer.reconcile()
             await self.orchestrator.start(
@@ -268,11 +281,6 @@ class AgentApplication:
     ) -> Mapping[str, object]:
         return await self.command_dispatcher(request)
 
-    async def has_session(self, session_id: str) -> bool:
-        if not isinstance(session_id, str) or not session_id:
-            return False
-        return await self.storage.get_bcn_session(session_id) is not None
-
     async def publish_inbox_wake(self, message: Message[InboundAttachment]) -> None:
         if not self._started:
             raise RuntimeError("Agent application is not started")
@@ -312,9 +320,9 @@ class AgentApplication:
     async def _referenced_attachment_paths(self) -> set[str]:
         return set(await self.storage.list_ready_attachment_paths())
 
-    async def _validate_session_binding(
+    async def _validate_actor_binding(
         self,
-        session_id: str,
+        actor: Actor,
         request: Mapping[str, object],
     ) -> None:
         request_agent_id = request.get("agent_id")
@@ -325,22 +333,26 @@ class AgentApplication:
             )
         runtime_session_id = request.get("runtime_session_id")
         session_capability = request.get("session_capability")
-        if await self.storage.get_bcn_session(session_id) is None:
-            raise CommandDispatchError(
-                "SESSION_NOT_FOUND",
-                f"unknown bcn session: {session_id}",
-            )
-        runtime_session = self.orchestrator.runtime_session(session_id)
+        match actor:
+            case Thread(thread_id):
+                if await self.storage.get_thread(thread_id) is None:
+                    raise CommandDispatchError(
+                        "SESSION_NOT_FOUND",
+                        f"unknown thread: {thread_id}",
+                    )
+            case Agent():
+                pass
+        runtime_session = self.orchestrator.runtime_session(actor)
         if runtime_session is None or runtime_session_id != runtime_session.id:
             raise CommandDispatchError(
                 "SESSION_BINDING_FAILED",
                 "runtime session binding is invalid",
             )
-        binding = self._session_capabilities.get(session_id)
+        binding = self._session_capabilities.get(actor.id)
         if (
             binding is None
             or binding.agent_id != self.agent_id
-            or binding.bcn_session_id != session_id
+            or binding.actor_id != actor.id
             or binding.runtime_session_id != runtime_session.id
             or not isinstance(session_capability, str)
             or not hmac.compare_digest(
@@ -357,31 +369,29 @@ class AgentApplication:
         runtime_index: int,
         session: RuntimeSession,
     ) -> Mapping[str, str]:
-        runtime_session = self.orchestrator.runtime_session(session.bcn_session_id)
+        runtime_session = self.orchestrator.runtime_session(session.actor)
         if runtime_session is None or runtime_session.id != session.id:
             raise RuntimeError("runtime session is not the current live binding")
         return self._build_command_environment(
-            session.bcn_session_id,
+            session.actor.id,
             session.id,
             runtime_index=runtime_index,
         )
 
     def _build_command_environment(
         self,
-        session_id: str,
+        actor_id: str,
         runtime_session_id: str,
         *,
         runtime_index: int,
     ) -> dict[str, str]:
-        if not session_id:
-            raise ValueError("session_id must be a non-empty string")
         if not runtime_session_id:
             raise ValueError("runtime_session_id must be a non-empty string")
         wrapper_path = self._wrapper_path
         if wrapper_path is None:
             raise RuntimeError("bcc wrapper is not installed")
         environment_bindings = self._runtime_configurations[runtime_index].env
-        binding = self._session_capabilities.get(session_id)
+        binding = self._session_capabilities.get(actor_id)
         if binding is None or binding.runtime_session_id != runtime_session_id:
             capability = secrets.token_urlsafe(32)
             token_values = [capability]
@@ -393,12 +403,12 @@ class AgentApplication:
                     token_values.append(value)
             binding = _SessionCapabilityBinding(
                 agent_id=self.agent_id,
-                bcn_session_id=session_id,
+                actor_id=actor_id,
                 runtime_session_id=runtime_session_id,
                 capability=capability,
                 token_values=tuple(token_values),
             )
-            self._session_capabilities[session_id] = binding
+            self._session_capabilities[actor_id] = binding
         allowed = set(_PLATFORM_ENVIRONMENT)
         for name in self.runtimes[runtime_index].environment_variable_names():
             if not _ENVIRONMENT_NAME.fullmatch(name):
@@ -433,15 +443,15 @@ class AgentApplication:
             {
                 "BCN_AGENT_ID": self.agent_id,
                 "BCN_ENDPOINT": self._endpoint(),
-                "BCN_SESSION_ID": session_id,
+                "BCN_ACTOR_ID": actor_id,
                 "BCN_RUNTIME_SESSION_ID": runtime_session_id,
                 "BCN_COMMAND_CAPABILITY": binding.capability,
             }
         )
         return environment
 
-    def _redact_session_secrets(self, session_id: str, text: str) -> str:
-        binding = self._session_capabilities.get(session_id)
+    def _redact_session_secrets(self, thread_id: str, text: str) -> str:
+        binding = self._session_capabilities.get(self._actors.for_thread(thread_id).id)
         if binding is None:
             return text
         for token in binding.token_values:
@@ -450,12 +460,12 @@ class AgentApplication:
 
     async def _run_runtime_command(
         self,
-        session_id: str,
+        thread_id: str,
         arguments: Sequence[str],
         body: str | None,
     ) -> None:
-        if not session_id:
-            raise ValueError("session_id must be a non-empty string")
+        if not thread_id:
+            raise ValueError("thread_id must be a non-empty string")
         if not arguments or any(
             not isinstance(argument, str) for argument in arguments
         ):
@@ -463,12 +473,14 @@ class AgentApplication:
         wrapper_path = self._wrapper_path
         if wrapper_path is None:
             raise RuntimeError("bcc wrapper is not installed")
-        self.command_log.append((session_id, tuple(arguments)))
-        runtime_session = self.orchestrator.runtime_session(session_id)
+        self.command_log.append((thread_id, tuple(arguments)))
+        runtime_session = self.orchestrator.runtime_session(
+            self._actors.for_thread(thread_id)
+        )
         if runtime_session is None:
             raise RuntimeError("runtime session is not live")
         environment = self._build_command_environment(
-            session_id,
+            runtime_session.actor.id,
             runtime_session.id,
             runtime_index=runtime_session.runtime_index,
         )

{bazaar_compute_node-0.1.39rc4 → bazaar_compute_node-0.2.0}/src/bazaar_compute_node/app/application.py

@@ -10,7 +10,7 @@ from dataclasses import dataclass
 from pathlib import Path
 
 from .. import __version__
-from ..core.concurrency import SessionLockRegistry
+from ..core.concurrency import ThreadLockRegistry
 from ..core.lifecycle import ITaskFailureSource, TimeoutBudget
 from ..core.models import InboundAttachment, Message
 from ..core.observability import IAudit
@@ -82,7 +82,7 @@ class NodeApplication:
         self.storage: IStorage = shared_factories.storage()
         self.audit: IAudit = shared_factories.audit()
         self.timer_wheel = TimerWheel()
-        self._reminder_concurrency = SessionLockRegistry()
+        self._reminder_concurrency = ThreadLockRegistry()
         self.reminder_scheduler = ReminderScheduler(
             storage=self.storage,
             timer_wheel=self.timer_wheel,
@@ -243,23 +243,17 @@ class NodeApplication:
             await self.version_watcher.stop(
                 timeout=self.timeout_budget.shutdown_seconds,
             )
-        except asyncio.CancelledError:
-            raise
         except Exception as error:  # noqa: BLE001
             errors.append(f"version_watcher.stop:{type(error).__name__}")
         try:
             await self.reminder_scheduler.stop(
                 timeout=self.timeout_budget.shutdown_seconds,
             )
-        except asyncio.CancelledError:
-            raise
         except Exception as error:  # noqa: BLE001
             errors.append(f"reminder_scheduler.stop:{type(error).__name__}")
         for agent_id, agent in tuple(self.agents.items()):
             try:
                 await agent.stop()
-            except asyncio.CancelledError:
-                raise
             except Exception as error:  # noqa: BLE001
                 errors.append(f"agent[{agent_id}].stop:{type(error).__name__}")
                 self._log(
@@ -369,18 +363,16 @@ class NodeApplication:
             self._log(
                 "reminder.wake.agent_unavailable",
                 agent_id=agent_id,
-                owner_session_id=message.session_id,
+                owner_thread_id=message.thread_id,
             )
             return False
         try:
             await agent.publish_inbox_wake(message)
-        except asyncio.CancelledError:
-            raise
         except Exception as error:  # noqa: BLE001
             self._log(
                 "reminder.wake.failed",
                 agent_id=agent_id,
-                owner_session_id=message.session_id,
+                owner_thread_id=message.thread_id,
                 error_type=type(error).__name__,
                 error=format_exception(error),
             )