Skip to content

Fix Buzz live fan-out across multiple channels #1015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olegbrok merged 1 commit into from
Aug 7, 2026
Merged

Fix Buzz live fan-out across multiple channels #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/pinky_daemon/agent_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3567,7 +3567,7 @@ def update_buzz_inbound_health(
self,
agent_name: str,
*,
status: str,
status: str | None = None,
last_error: str = "",
connected_at: float | None = None,
liveness_at: float | None = None,
Expand All @@ -3576,15 +3576,16 @@ def update_buzz_inbound_health(
connected = float(connected_at) if connected_at is not None else None
liveness = float(liveness_at) if liveness_at is not None else None
event = float(event_at) if event_at is not None else None
status_value = str(status or "unknown")[:40] if status is not None else None
self._db.execute(
"""UPDATE buzz_inbound_policies
SET status=?, last_error=?,
SET status=COALESCE(?, status), last_error=?,
last_connect_at=COALESCE(MAX(last_connect_at, ?), last_connect_at),
last_liveness_at=COALESCE(MAX(last_liveness_at, ?), last_liveness_at),
last_event_at=COALESCE(MAX(last_event_at, ?), last_event_at)
WHERE agent=?""",
(
str(status or "unknown")[:40],
status_value,
str(last_error or "")[:160],
connected,
liveness,
Expand Down
58 changes: 31 additions & 27 deletions src/pinky_daemon/buzz_inbound.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ async def process_event(
self._registry.mark_buzz_inbound_event_delivered(self.agent_name, event_id)
self._registry.update_buzz_inbound_health(
self.agent_name,
status="connected",
event_at=self._clock(),
)
self.stats["delivered"] += 1
Expand Down Expand Up @@ -499,25 +498,30 @@ async def _run_authenticated_subscription(self, ws, channels: list[str]) -> None
raise BuzzRelayProtocolError("relay_auth_refused")

await self._processor.replay_pending()
main_sub = f"pinky-{self._agent_name}-{secrets.token_hex(8)}"
since = self._registry.get_buzz_subscription_since(self._agent_name)
await self._send_frame(
ws,
[
"REQ",
main_sub,
# The production Buzz relay does not live-fanout events to a
# subscription whose filter carries ``since``. Keep the wire
# subscription open-ended and enforce this exact floor in the
# client before any cache, authorization gate, or durable write.
{"kinds": [9, 20002], "#h": channels},
],
)
main_subscription_since: dict[str, int] = {}
connection_token = secrets.token_hex(8)
for index, channel_id in enumerate(channels):
main_sub = f"pinky-{self._agent_name}-{connection_token}-{index}"
main_subscription_since[main_sub] = since
await self._send_frame(
ws,
[
"REQ",
main_sub,
# The production Buzz relay does not live-fanout events to
# subscriptions carrying ``since`` or multiple ``#h``
# values. Keep each live REQ open-ended and channel-local,
# then enforce the shared floor in the client before any
# cache, authorization gate, or durable write.
{"kinds": [9, 20002], "#h": [channel_id]},
],
)
await self._wait_for_eose(
ws,
subscription_id=main_sub,
subscription_ids=set(main_subscription_since),
timeout=self._liveness_timeout,
subscription_since={main_sub: since},
subscription_since=main_subscription_since,
)
now = time.time()
self._status = "connected"
Expand All @@ -541,8 +545,7 @@ async def _run_authenticated_subscription(self, ws, channels: list[str]) -> None
await self._active_liveness_probe(
ws,
channels,
main_subscription=main_sub,
main_since=since,
main_subscription_since=main_subscription_since,
)
next_heartbeat = loop.time() + self._heartbeat_interval
await self._processor.replay_pending()
Expand All @@ -555,16 +558,15 @@ async def _run_authenticated_subscription(self, ws, channels: list[str]) -> None
await self._handle_frame(
ws,
frame,
subscription_since={main_sub: since},
subscription_since=main_subscription_since,
)

async def _active_liveness_probe(
self,
ws,
channels: list[str],
*,
main_subscription: str,
main_since: int,
main_subscription_since: dict[str, int],
) -> None:
heartbeat_sub = f"pinky-live-{secrets.token_hex(8)}"
heartbeat_since = int(time.time())
Expand All @@ -584,10 +586,10 @@ async def _active_liveness_probe(
try:
await self._wait_for_eose(
ws,
subscription_id=heartbeat_sub,
subscription_ids={heartbeat_sub},
timeout=self._liveness_timeout,
subscription_since={
main_subscription: main_since,
**main_subscription_since,
heartbeat_sub: heartbeat_since,
},
)
Expand All @@ -611,18 +613,20 @@ async def _wait_for_eose(
self,
ws,
*,
subscription_id: str,
subscription_ids: set[str],
timeout: float,
subscription_since: dict[str, int],
) -> None:
pending_eose = set(subscription_ids)
deadline = asyncio.get_running_loop().time() + timeout
while True:
while pending_eose:
remaining = deadline - asyncio.get_running_loop().time()
if remaining <= 0:
raise asyncio.TimeoutError
frame = await self._receive_frame(ws, timeout=remaining)
if len(frame) >= 2 and frame[0] == "EOSE" and frame[1] == subscription_id:
return
if len(frame) >= 2 and frame[0] == "EOSE" and frame[1] in pending_eose:
pending_eose.remove(frame[1])
continue
await self._handle_frame(
ws,
frame,
Expand Down
Loading
Loading