Skip to content

SDK fixes for 1.2.1: drain cursor, gap resolution, in-flight dedup, served gate question fixtures (folds #9, #10, #11) - #12

Merged
sanctrl merged 9 commits into
mainfrom
fix/sdk-engine-and-fixtures
Nov 8, 2026
Merged

sanctrl merged 9 commits into
mainfrom
fix/sdk-engine-and-fixtures

Conversation

@sanctrl

@sanctrl sanctrl commented Nov 8, 2026

Copy link
Copy Markdown
Contributor

One PR instead of three: merges the reviewed heads of #9 (ca99a5a, conformance fixtures carry the served gate question), #10 (bf24ad3, an already-handled repeat below the anchor is acked; the cursor never covers a row no handler finished) and #11 (5e7b5f0, a copy still being handled is never dispatched again or waited on; disconnect() stops intake before flushing; gap resolution and flush never clear a parked frame unseen; a gap fill during disconnect acks nothing). No code beyond those heads; the merges were conflict-free. Each was independently reviewed and approved (#11 after two rework rounds). Conformance files are byte-identical to agentchatme/agentchat-typescript main (1.2.1).

Local (3.9): ruff, mypy, pytest 360 passed. CI runs 3 OSes × 3.9/3.11/3.13.

After merge: a release PR for 1.2.1, then tag → pypi approval.

tray.sample.json carries the server's gate question as of
agentchat-platform/agentchat#152, and gate-prompt.expected.txt is its
rendering. Two lines changed on the server: defer states the server-owned
ladder (15 min, 24 h, stop) instead of "say when to look again", and the
verdict line records reply after the answer is sent instead of "the send
is the verdict" (a send marks nothing read).

The tool-less triage preamble is unchanged: it already tells the model not
to call agentchat_decide and that the host records the verdicts.

Byte-identical to agentchat-typescript's conformance/v1.
…gine conformance scenarios

Default mode dropped a live message.new below the conversation's seq anchor
without an ack, even when this session had already dispatched that message
id. The delivery-ack protocol acknowledges every dedup hit (the earlier
dispatch is the proof), and the TypeScript SDK does. It is now acked again,
still without re-dispatch. A below-anchor frame no handler has seen is
unchanged: dropped unacked, the server re-offers it.

Adds conformance/v1/engine-scenarios.json, run in both modes by a new
harness (identical bytes ship in the TypeScript SDK): drain gap + close
during an earlier handler or inside the gap window, a raising handler during
a drain, and an already-handled repeat below the live anchor as a frame and
as a drain row. Also pins the drain-cursor rule for a socket drop during an
earlier handler with a regression test.
…handler

Shared scenario (identical bytes in agentchat-typescript): page [g1, g3, h1],
h1's handler held, the socket drops, h1 released; the default-mode cursor
stops at g1. This drain awaits each handler while routing, so the drop lands
during a LATER row's handler and clears the parked g3 before the cursor is
computed. Copying a cursor that stops only while a row is still buffered
into _drain_row_ackable now fails this scenario and the reworked unit test
(the earlier-handler shape did not catch it).

CHANGELOG: say where the SDKs still differ on a below-anchor frame no
handler has seen.
…irst copy is running

After a reconnect the server pushes its stored backlog on the socket and the
REST drain brings the same rows. The dedup cache is filled only once a
handler succeeds, so with a slow handler the second copy was dispatched
again (e.g. an in-order copy whose cursor advances only after the first
copy's handler returned). _deliver_message_new now keeps a future per
message id in flight; a copy that finds one is not dispatched and takes the
outcome (shielded; a cancelled first copy counts as not handled). A copy
waits only where it waited on its own handler call before; a live repeat
below the anchor, which used to be dropped, never holds up the receive loop
and is acked once the first copy finished. Off with dedup_cache_size=0.

Also closes two races between concurrent copies: the per-conversation
cursor never moves backwards (_advance_past), and _cleanup_if_idle removes
only the state it was handed, never a newer connection's.

Shared scenarios repeat-while-handler-runs-in-order / -below-anchor
(identical bytes in agentchat-typescript).
…ver, never cleared unseen

_resolve_gap and _flush_parked_frames snapshotted the buffer, awaited each
handler, then cleared it. The receive loop keeps running during those
awaits, so a frame that parked meanwhile was cleared without dispatch:
under ack_on_receipt (acked at receipt) it was never handled; in the
default mode it waited unacked for the next reconnect. A concurrent
in-order arrival could also pop entries the snapshot still expected
(KeyError in the gap task) or hand them over twice.

Both now pop each frame before handing it over, lowest seq first, and keep
going until nothing is parked (the flush across every conversation, since
disconnect() flushes before it closes the socket). The cursor advances past
each frame after its handler, never backwards.

Shared scenario frame-arrives-while-a-lapsed-gap-is-handled, with a new op
gap_window_lapses (identical bytes in agentchat-typescript).
…aps resolve on a snapshot

Review of #11. An in-flight repeat no longer waits for the first copy
anywhere: _adopt_in_flight records the outcome and returns. A live repeat
is acked when the first copy finished cleanly, never if it failed; a drain
row's cursor reads the outcome when computed and stops if the first copy is
not done (the next drain covers it as a dedup hit), so a slow or hung live
handler no longer holds up later drain rows, and a handler that awaits
disconnect() while a repeat of its own message arrives no longer
deadlocks. Adoption is per connection generation: a re-offer on a later
connection is dispatched afresh even if the first copy still runs.

_resolve_gap and the shutdown flush work on the frames parked when they
start; each frame leaves the buffer and the cursor moves past it before its
handler is awaited, so in-order arrivals go to the receive loop, a frame
behind a new hole gets its own gap window and report, and nothing is
cleared unseen (a state being resolved is never dropped as idle).
disconnect() stops taking frames in before it flushes, so it returns
promptly while frames keep arriving; a frame acked at receipt is never
dropped by the flush.
…opted in-order repeat moves the cursor on

A gap fill whose fetch returned while disconnect() was flushing acked its
rows at receipt (ack_on_receipt), and the shutdown then cancelled the gap
task, possibly mid-handover: acked rows never handled. Once disconnect() has
begun, the fill now returns before acking (a gap fill marks nothing on the
server, which keeps the rows).

A live repeat that adopted a drain row still running its handler left the
cursor where it was, so the next live frame parked and opened a spurious gap
(a REST gap fill and a report 2 s later, though nothing was missing). The
in-order branch now moves the cursor on for an adopted copy exactly as for
a dispatch.

Docs: handlers in one conversation can overlap (they start in seq order),
as in the TypeScript SDK.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant