Skip to content

fix(gateway): synchronize gateway and adapter pending message queues … #4491

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

Closed
devorun wants to merge 1 commit into from
Closed

fix(gateway): synchronize gateway and adapter pending message queues … #4491

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
23 changes: 19 additions & 4 deletions gateway/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6037,19 +6037,34 @@ async def monitor_for_interrupt():
# Use session_key (not source.chat_id) to match adapter's storage keys.
pending = None
if result and adapter and session_key:
# Fetch accumulated string messages from the gateway queue
gateway_pending_text = self._pending_messages.pop(session_key, None)

if result.get("interrupted"):
# Interrupted — consume the interrupt message
pending_event = adapter.get_pending_message(session_key)
if pending_event:

if pending_event and pending_event.text:
pending = pending_event.text
# Merge both queues if both have pending content
if gateway_pending_text:
pending = f"{gateway_pending_text}\n{pending}"
elif gateway_pending_text:
pending = gateway_pending_text
elif result.get("interrupt_message"):
pending = result.get("interrupt_message")
else:
# Normal completion — check for /queue'd messages that were
# stored without triggering an interrupt.
# Normal completion — check for /queue'd messages
pending_event = adapter.get_pending_message(session_key)
if pending_event:

if pending_event and pending_event.text:
pending = pending_event.text
if gateway_pending_text:
pending = f"{gateway_pending_text}\n{pending}"
elif gateway_pending_text:
pending = gateway_pending_text

if pending:
logger.debug("Processing queued message after agent completion: '%s...'", pending[:40])

if pending:
Expand Down
Loading