* fix(relay): authorize send_message targets and surface egress declines
P5 of the relay egress-authorization workstream. The relay path
authenticated the SENDER but never authorized the DESTINATION, and the
gateway compounded it from both ends.
(a) send_message could silently name an arbitrary relay target. Its
`target` parameter is free-form ('platform:chat_id'), so a model could
name ANY chat id and the gateway would emit an outbound frame for it.
gateway/relay/egress.py adds an attestation floor: a relay-routed
destination must have a provenance this gateway can show -- the
operator's home channel, the channel directory, or its own gateway
session origins. Anything else is refused HERE, with a visible tool
error naming the target, before a frame is written. Non-relay platforms
and platforms served by a live native adapter in this process are
untouched (same precedence resolve_delivery_transport applies).
(b) Connector declines were swallowed into apparent successes. The
connector's egress floor answers an unauthorized destination with a
DEFINITE failure whose text is deliberately uniform (F-005). Several
relay lanes degrade a *transport drop* by design and were degrading an
*authorization refusal* the same way:
- _send_media returned None, sending the caller into
BasePlatformAdapter's text fallback -- a DIFFERENT op re-addressed at
the very chat the connector had just refused.
- _send_prompt returned None, so exec-approval / slash-confirm /
clarify reported "relay prompt op unavailable" (a wrong reason) and
ran their numbered-text fallbacks into the refused chat.
- task_card_stop discarded the error entirely.
- typing / delete / react / thread ops degraded silently at debug.
is_egress_decline() classifies THAT a decline happened (never why --
the uniform text is not parsed for reasons) and requires a definite,
non-ambiguous failure, so a lost-ack retry is still a transport
outcome. Lanes with an error-carrying contract now report the decline
verbatim; cosmetic bool/None lanes still degrade but log it at WARNING.
Advisory progress drops that legitimately degrade are unchanged: the
task_card send lane, the draft ambiguous/except branches, and every
transport-exception path keep their existing fail-open behaviour.
Tests: 21 mutations of the production source, all KILLED.
* fix(relay): authorize the RESOLVED target; declines must not fall back
Review round 1 (independently confirmed by a second reviewer) found three
blockers. Two are fixed here; the third (B-2, Telegram @username) is a policy
decision left open deliberately.
B-1 — THE FIX CAUSED THE OUTAGE IT PREVENTED (tools/send_message_tool.py)
The P5(a) guard ran ABOVE Slack user->DM resolution, so it authorized the
internal pseudo-id `_parse_target_ref` emits (`user_name:ben`, `user:U...`).
Provenances only ever hold RESOLVED conversation ids, so a fully attested DM
was compared as a handle against a set of `D...` ids and refused:
base slack:@ben SENT head(before) slack:@ben REFUSED
Every Slack DM by handle was broken. Moved the guard below resolution; it now
authorizes the destination that is actually sent to, and the refusal names the
resolved id. Position is load-bearing, so it is commented as such and pinned:
reverting the move turns exactly the four new cases red.
B-3 — A DECLINE IS NOT A LANE FAILURE (gateway/run.py)
`_approval_send_outcome` had only sent/failed/ambiguous, so a connector
decline collapsed into `failed` — which is the cue to run the plain-text
fallback into the chat the connector had just refused. The adapter fix in the
previous commit improved the error STRING while user-visible behaviour stayed
identical to base; the commit message overstated it. Fixed properly:
- new `declined` verdict, recognised via the shared `is_egress_decline`
contract (not string sniffing at the call site)
- exec-approval returns without the text fallback
- slash-confirm suppresses the text reply AND clears the registration, so a
card that never rendered cannot capture the user's next message
`send_clarify` was already correct (returns early inside the adapter).
MUTATIONS (production source; both directions)
classifier never returns 'declined' -> KILLED (4 cases)
ALL failures classified as 'declined' -> KILLED (2 cases)
guard moved back above Slack resolution -> KILLED (4 cases)
decline CODE changed (review M05) -> KILLED
marker match made case-sensitive (M10) -> KILLED
M05 was a tautology: the test asserted the imported constant against itself,
so changing the constant could not fail it. The wire contract is now pinned as
a literal, because the connector stamps that exact string and a one-sided
change is a silent cross-repo break.
REGRESSION CHECK: the 12 failures + 1 collection error in this test selection
are PRE-EXISTING cross-test contamination — the identical set fails at
7cf86188ac. Verified by diffing the failing sets: no new failures, 363 -> 374
passed.
NOT FIXED (deliberate): B-2, Telegram `@username`. The Bot API resolves handles
at send time, so there is no id to compare and no canonicalization exists yet.
That is a policy decision, not a code move.
* fix(relay): fail CLOSED on guard faults; classify the structured decline
Third independent review. Two more blockers, both reproduced before fixing.
1. THE GUARD ITSELF FAILED OPEN (tools/send_message_tool.py:158)
`_authorize_relay_target` wrapped BOTH the import and the call in one
`except Exception: return None` — and None means AUTHORIZED at every call site.
So any runtime bug inside the guard silently switched the entire P5(a) boundary
off. Reproduced: with the guard raising, an unattested target sent.
The docstring already stated the correct intent ("must not fail closed on its
own IMPORT error") and the code did something broader. The two failures are not
the same: a missing gateway package means there is no relay egress to
authorize; a fault inside the guard means authorization did not happen. The
import is tolerated, the call is not — a guard that cannot answer refuses.
2. THE STRUCTURED DECLINE WAS THROWN AWAY (gateway/run.py)
The adapter preserves the connector's dict in `SendResult.raw_response`. My
previous commit rebuilt a dict from the error STRING, which loses two
contracts:
* a decline carrying `code: egress_declined` and NO text renders as
"relay egress declined" — no marker colon — so it classified as `failed`,
which is exactly the cue to run the fallback into the refused chat;
* `ambiguous: True` (lost ack) was flattened into a DEFINITE failure,
re-sending a card that may already be on the user's screen. That is the
duplicate-card bug the ambiguous verdict exists to prevent, reintroduced
by the fix meant to harden the same path.
Both call sites now classify `raw_response` when present, ambiguity first, and
fall back to the wire sentence only for connectors that send no structured
response.
I had fixed the text-marker path and tested only the text-marker path. Worth
naming: the review's probe was a shape my tests never produced.
MUTATIONS (production source)
guard fault returns None (fail open again) -> KILLED
classifier ignores raw_response -> KILLED (3 cases)
ambiguous treated as a definite failure -> KILLED (2 cases)
40 focused tests pass. Regression check vs be321faf27: identical 13-item
failing set (pre-existing cross-test contamination), no new failures.
STILL OPEN: B-2 / finding 3, Telegram `@username`. The reviewer is right that
this is a REGRESSION of an existing contract (#53573 added Bot API username
support), not merely an unspecified input, since relay provenance stores the
numeric chat id. Fixing it means resolving the handle before authorization, or
explicitly revoking the contract. That is a policy decision, not a code move,
and it is Ben's call.
* test(relay): pin M21 and M25, the survivors whose comments called them load-bearing
Round-2 review reported six unpinned survivors from round 1. Two guard real
behaviour and are now covered; the other four are cosmetic-lane warnings and
fail-open branches I am leaving documented rather than pretending to close.
M25 — thread-qualified session ids. `_session_ids` adds BOTH "chat:thread" and
the bare chat, because the connector authorizes the CHAT. Without the split a
gateway whose session origin is `-100999:77` cannot send to `-100999`, the chat
it is demonstrably already talking in. KILLED.
M21 — the generic `relay` plane must union every fronted platform, since a
relay session is filed under its LOGICAL platform. KILLED.
MY FIRST M21 TEST WAS THE DEFECT IT WAS TESTING FOR. I patched `_relay_fronted`
— the very function the mutation empties — so emptying it changed nothing the
test could see, and the mutation SURVIVED against a green test. Rewritten to
drive the real `relay_fronted_platforms()` through its env source
(`GATEWAY_RELAY_PLATFORMS`), which is how production learns it.
That is the same "the test verifies my stand-in" failure I have spent this
workstream removing from the connector harnesses, reproduced here in three
lines of Python. The tell was identical: a mutation that survives a test
written specifically to kill it.
334 tests pass.
NOT PINNED, deliberately: M03 (success-guard on a malformed dict), M24
(empty-target allowance — the one fail-open branch, reachable only when the
bare-platform path already resolved a home channel), M35/M36 (decline WARNINGs
on cosmetic lanes). All four are observability or defence-in-depth rather than
authorization, and the review agrees they are non-blocking.
* fix(relay): defer Telegram @username authorization to the connector (B-2)
Closes the last blocker. Two reviewers independently called this a REGRESSION
of the public-channel username support added in #53573, not an unspecified
input, and they were right: provenance stores RESOLVED numeric chat ids, so
comparing `@channel` against them could only ever refuse.
WHY THE GATEWAY CANNOT ANSWER IT. The guard fires only when there is no live
native adapter — i.e. relay-fronted deployments — and on exactly those the
CONNECTOR holds the bot token, not this process. There is no local way to turn
a handle into the numeric id. Refusing here is not "fail closed", it is "fail
always".
WHY DEFERRING IS SAFE. The destination is still authorized one layer out: the
connector's Telegram egress floor (gg#238, merged 743a7c2) classifies and
refuses unauthorized destinations after ITS resolution — the layer that closed
the reported vulnerability in the first place. Handles go from two guards to
one, the authoritative one, not to zero.
The carve-out is deliberately narrow and its EDGES are pinned, because the
failure mode of an exemption is silent widening:
telegram `@handle` -> deferred (the regression case)
telegram numeric id -> still guarded
matrix `@user:server` -> still guarded (telegram-only)
bare name, no `@` -> still guarded
attested handle -> normal path, attestation still consulted
MUTATIONS
carve-out widened to all platforms -> KILLED
carve-out widened to every target -> KILLED
carve-out removed (regression back) -> KILLED
carve-out checked BEFORE attestation -> KILLED
THE ORDERING MUTANT SURVIVED MY FIRST TEST. Both orderings return None, so
asserting the verdict could not tell them apart — the test asserted the claim
instead of the mechanism. Rewritten to observe that attestation is actually
consulted. Same defect class as the M21 test earlier in this branch: a
mutation surviving a test written specifically to kill it means the test is
measuring the wrong thing.
341 tests pass.
FOLLOW-UP (option 2, Ben's call, deliberately NOT done here): resolve the
handle before authorizing so BOTH layers apply. That needs a resolution
round-trip through the connector — new wire surface — so it belongs in its own
phase rather than bolted onto this one. Recorded in the code comment at the
carve-out, not just here.
* fix(relay): close two fail-open boundaries; test the code-only decline for real
Both blockers from review, each REPRODUCED before fixing.
1. STRUCTURED DECLINE HAD NO GUARD. Deleting `raw_response=result` from both
`_send_prompt` return branches left all 34 tests green — a surviving,
non-equivalent security mutant. The `code` field is the documented
PREFERRED signal precisely because a connector may send no prose, and a
caller rebuilding `{"success": False, "error": ...}` cannot see it.
Cause: every existing case declines with marker TEXT. The evidence for the
code-only path was a hand-built SimpleNamespace in a different file — a
stand-in for the adapter, so it verified my fixture instead of production.
Fixed with a CodeOnlyDecliningConnector driving the real
`send_exec_approval` -> `_send_prompt`, feeding the REAL SendResult to the
REAL `_approval_send_outcome`, plus the same shape on the media lane.
drop raw_response SURVIVED (34 passed) -> KILLED
2. TWO FAIL-OPEN BOUNDARIES, both "absence" and "fault" sharing a return.
`_relay_fronted` swallowed EVERY exception and returned an empty set, which
`relay_routed_platform` reads as "not relay-routed" — skipping the guard.
Probe, with a positive control in the same run:
positive_control_denied = True
discovery_fault_denied = False <- unattested target AUTHORIZED
`_authorize_relay_target` caught every exception during IMPORT as "no
gateway package". A module that exists and fails to initialize is a fault,
not an absence, and returning None there means authorized.
Now: ImportError alone is absence; anything else raises RelayRouteUnknown
and `authorize_relay_target` converts it to a REFUSAL STRING (not a raised
exception — every caller treats the return value as the verdict, so raising
would trade a fail-open for a crash).
Kept the converse under test so "fail closed" does not silently become
"refuse everything in CLI/cron", which is the outage the broad except
existed to prevent.
discovery fault -> empty set KILLED
RelayRouteUnknown -> authorized KILLED
import fault -> authorized KILLED
397 passed (was 392, +5 new cases), zero failures.
* fix(relay): close all seven review-round-3 blockers
Every finding reproduced before fixing; every fix mutation-checked after.
CONTENT LEAKS (the decline was laundered into a different op, same chat)
#1 A declined DRAFT SEAL replayed as a plain send. On stream-is-the-message
platforms the turn-final becomes draft(final=True); `_seal_open_draft`
dropped the structured body, so `_absorb_into_open_draft` read a REFUSAL as
a lane failure and fell through. Probe, Slack descriptor:
before: draft(partial) -> draft(final,SECRET) -> send(SECRET)
after: draft(partial) -> draft(final,SECRET)
My first probe of this used a discord descriptor and showed no seal at all —
the leak is real, my probe was wrong (streams only arm for Slack).
#6 Task-card PROGRESS had the same defect one lane over: a bare failed
SendResult reads as "card lane unavailable", and TurnRunner then sends the
task text to the same chat. Both card methods now carry raw_response and
the caller suppresses the fallback on a decline.
AUTHORIZATION BYPASSES
#2 `except ImportError` was NOT the fix I claimed last round. ImportError also
covers a broken dependency inside an INSTALLED gateway; review probed
`ImportError.name = "gateway.relay.dependency"` and got an authorized
verdict. Now only a name identifying the gateway relay module itself is
absence. An ImportError with NO name stays absence — refusing on a fault we
cannot attribute would trade an unidentifiable bug for a real CLI/cron
outage, and an existing test caught exactly that when I first got it wrong.
#3 `relay_routed_platform` lowercases the requested platform; `_relay_fronted`
returned configured names verbatim. A platform configured as "Discord"
missed the membership test, looked native, and skipped the guard:
'discord' => refused 'Discord' => ALLOWED 'DISCORD' => ALLOWED
An attestation bypass on a string comparison.
UNDELIVERABLE PROMPTS THAT HUNG
#4 `_clarify_send_disposition` handled `failed` and `ambiguous` but not
`declined`, so a REFUSED clarify card fell through to wait_for_response and
blocked until clarify_timeout — indefinitely when configured non-positive.
A decline is more definitive than a failure, not less.
#5 The exec-approval decline branch returned quietly, which suppressed the text
fallback (right) but left the CENTRAL approval entry pending (wrong) — the
dangerous command stayed blocked until the approval timeout. My comment
claimed the registration was torn down; only RelayAdapter's private map was.
It now raises `_ExecApprovalDeclined`, which propagates to
`_await_gateway_decision`'s existing notify-failure path (drops the entry,
unblocks the tool). A dedicated type, re-raised past the local
`except Exception` that would otherwise have restored the leak.
#7 THE GAP THAT LET ALL OF THIS SHIP. Both caller-level suppressions were
unfalsifiable: deleting either branch left 36/38 tests green. The suites
drove `_approval_send_outcome` and `RelayAdapter` but never the real
TurnRunner / busy-session callers, so nothing observed whether a text send
FOLLOWED a decline — which is the whole property.
tests/gateway/test_decline_fallback_suppression.py drives both real callers
and records every send. Each decline case is paired with an ordinary-FAILURE
control, because without one a caller that never falls back would also pass.
MUTATIONS (all on production source, anchors count-checked, restored after)
#1 seal decline -> plain send KILLED
#1b seal drops raw_response KILLED
#2 nested ImportError -> authorized KILLED
#3 fronted set not normalized KILLED
#4 clarify declined branch removed KILLED
#5 approval decline returns not raises KILLED
#6 task_card drops raw_response KILLED
#7 slash-confirm suppression removed KILLED
#7's two were the reviewer's SURVIVORS (36/38 passing); both now die.
425 passed, zero failures.
* fix(relay): close the three round-4 blockers
Round 4 confirmed six of seven round-3 fixes and found three more. Each
reproduced before fixing, each mutation-checked after.
1. A NAMELESS ImportError still authorized. Last round I admitted it as
"absence" to protect the CLI/cron path. That reasoning was WRONG and the
interpreter says so:
import gateway.relay.nope -> ModuleNotFoundError, name="gateway.relay.nope"
import totally_absent_pkg -> ModuleNotFoundError, name="totally_absent_pkg"
Genuine absence is ALWAYS ModuleNotFoundError with `.name` set, so the
CLI/cron path never produces a bare ImportError and nothing legitimate was
being protected. A plain or nameless ImportError comes from an import hook
or a module that failed while initializing — an unattributable FAULT.
Now: absence is ModuleNotFoundError naming gateway / gateway.relay /
gateway.relay.egress; everything else refuses. Two existing tests raised a
bare ImportError to simulate absence and were corrected to the real shape.
2. SESSION ATTESTATION INVENTED IDS. `_session_ids` split every id on the first
colon to recover "chat" from "chat:thread". Matrix ids contain a colon
natively, so `!room:server.org` attested a bare `!room` — the guard
vouching for a destination on its own fabrication. The split now applies
only to platforms whose ids genuinely carry a `:thread` suffix (allow-list;
unknown platforms are treated as un-splittable, which can only refuse more).
Kept a Slack control: dropping the split entirely would refuse legitimate
thread replies, which is the outage the split exists to prevent.
3. THE TASK-CARD FIX WAS UNFALSIFIABLE — my own round-3 mistake, and the same
one round 3 caught me making. I added the production branch AND a test, but
the test stopped at RelayAdapter: it proved `raw_response` is carried and
never called `TurnRunner._task_card_publish`, which owns the property.
Deleting the real branch left 30 tests green. Now driven through the real
caller, with an ordinary-failure control.
The lesson generalises: proving the DATA reaches the boundary is not proving
the CALLER acts on it. Every one of these decline fixes has two halves and
the second half is where the security lives.
Also closed the round-4 non-blocking finding: `gateway/relay/egress.py` has its
OWN import boundary, and the existing test intercepted the earlier import in
tools/send_message_tool.py, so it was never exercised. Mutating that classifier
to treat every ImportError as absence now dies.
MUTATIONS (production source, anchors count-checked, restored after)
R4-1 nameless ImportError -> authorized KILLED
R4-2 session split unconditional KILLED
R4-3 task-card caller branch removed KILLED (was SURVIVED)
egress classifier: any ImportError = absence KILLED
Also probed and found NOT a leak: a refused OPENING draft frame disarms the
stream and the turn-final goes out via `send`. That send is itself guarded and
the connector refuses it too, so no content is delivered — unlike the seal case
(round 3, #1) where the seal was the only check on that path.
452 passed, zero failures.
* fix(relay): recover the thread parent from thread_id, not a colon split
Round 4 blocker 2 was closed with an allow-list of platforms whose ids have no
native colon. Reviewing my own fix while round 5 ran, the allow-list is the
wrong mechanism: it NARROWS a guess instead of removing it, and it still gets
Matrix wrong the moment a Matrix session is thread-qualified
(`!room:server.org:$thr` -> split yields `!room`).
The structured field was there all along. `_session_entry_id` composes the id
as f"{chat_id}:{thread_id}" and the entry still carries `thread_id`
separately, so the parent is knowable EXACTLY: strip the known suffix, or add
nothing. No platform list, no guessing, correct for ids that contain colons.
Mutations:
back to splitting on the first colon KILLED
thread parent never recovered (over-refuse) KILLED
Both directions matter: the first invents attestations, the second refuses
legitimate thread replies.
One existing test (M25) asserted the right PROPERTY with a fixture that omitted
`thread_id` — a shape real entries never have. Fixture corrected, assertions
untouched.
453 passed.
* fix(relay): close the four round-5 blockers
Each reproduced before fixing, each mutation-checked after.
R5-1 A DISABLED NATIVE ADAPTER BYPASSED AUTHORIZATION. `_has_live_native_adapter`
treated any entry in the adapter map as native; `resolve_delivery_transport`
ignores a native adapter whose config is disabled and routes over Relay.
Two independent routing classifiers, disagreeing:
guard says native: True delivery routes relay: True
So the guard skipped authorization for a send that went over the relay.
The guard now applies the router's enabled-state rule; probed both
configurations and they agree.
R5-2 THREAD IDS WERE NEVER AUTHORIZED. The parser splits chat_id and thread_id;
only chat_id reached the guard. On Discord the thread IS the destination —
`POST /channels/{thread_id}/messages` — so an attested parent channel
authorized an arbitrary caller-supplied thread. `authorize_relay_target`
now takes thread_id and requires its own attestation (bare id or the
`chat:thread` form a session origin produces); both call sites forward it.
R5-3 A DECLINED **INITIAL** DRAFT WAS RETRIED AS A PLAIN SEND. Round 3 fixed the
declined SEAL; the declined OPEN was a different path. `send_draft`
returned a bare failure, so the stream consumer read "draft transport
unusable", disabled drafts and fell through to `_first_send`. Measured
through the real adapter and real StreamTransportMixin:
before: ops ['draft', 'send'] after: ops ['draft']
send_draft now carries raw_response; a decline is terminal for the run and
the guard sits in `_first_send`, where every fallback path converges.
R5-4 MY ROUND-4 TASK-CARD FIX SUPPRESSED EXACTLY ONE UPDATE. It set
`native_failed`, which the entry gate already uses for an ordinary broken
lane, so the next progress event skipped the decline branch and went
straight to the text fallback:
after first publish: [] after second: ['send']
Terminal declines are now a separate `egress_declined` state checked at the
entry gate. A refusal does not expire after one tick.
MUTATIONS
R5-1 disabled native counts as native KILLED
R5-2 thread_id not authorized KILLED
R5-2b tool does not forward thread_id KILLED (was SURVIVED)
R5-3 initial-draft decline not terminal KILLED
R5-3b _first_send guard removed KILLED
R5-4 declined state not persistent KILLED
R5-2b is the same gap that produced findings 3 and 4 of the last two rounds, a
third time: every test called `authorize_relay_target` directly, so dropping the
argument from the TOOL WRAPPER changed nothing. Testing the callee never proves
the caller uses it — now pinned explicitly.
Each fix ships with an ordinary-failure control, because every one of these
makes the guard refuse MORE, and over-refusal is now the larger risk.
474 passed, zero failures.
* refactor(relay): declare the terminal-decline state where it lives
Both terminal-decline flags were set dynamically. They worked (neither class is
frozen or slotted) but an undeclared attribute hides the state from anyone
reading the class, and this one is security-relevant.
_TaskCardState.egress_declined — declared dataclass field
StreamConsumer._egress_declined — initialised in __init__
Lifetime verified while checking whether a refusal can leak ACROSS turns and
mute a healthy destination: it cannot. _TaskCardState is constructed per
progress-drain (run_turn_runner.py:420) and the consumer's flags per run
(stream_consumer.py:163), so both are fresh each turn.
Also verified the guard's blast radius after adding thread authorization: the
ONLY callers of authorize_relay_target are the two model-facing send_message
call sites. Gateway-internal sends — notably the handoff path, which creates a
thread and immediately posts to it with no session provenance yet — go through
transport.adapter directly and are unaffected. That was the most plausible
over-refusal, and it does not reach this guard.
461 passed.
* fix(relay): close the four round-6 blockers — the edit lane
R6-1 MY OWN R5-1 FIX REINTRODUCED THE BYPASS IT CLOSED. I wrote
`except Exception: return True` around the config lookup, so a config read
fault declared the platform native while the ROUTER, reading the real
config, sends over the relay:
guard_has_live_native True guard_verdict None router relay
Routing we cannot determine is UNKNOWN. It now raises RelayRouteUnknown,
which the outer handler must re-raise rather than flatten to False, and
`authorize_relay_target` turns into a refusal. This is the second time a
convenience `except` in this function created a bypass; there is now no
permissive return left in it.
R6-2/3/4 THE NINTH LANE: `edit`. ONE dropped field, THREE leaks.
`RelayAdapter.edit_message` discarded the connector response, and three
independent callers read a bare edit failure as "editing is unavailable"
and re-send the content as a NEW message to the same chat:
stream edit fallback ['edit', 'edit', 'send'] the unseen tail
queued reconciliation ['edit', 'send'] the WHOLE response
task-card fallback ['edit', 'send'] the task text again
Fixed at the source (edit_message carries raw_response) plus each caller:
`_on_edit_failure` — the single funnel for stream edit failures — makes a
decline terminal for the run, `_send_fallback_final` refuses to deliver a
continuation after one, the queued reconciler returns instead of sending,
and the task-card fallback sets the same terminal state R5-4 introduced.
R5-4 fixed the native task-card op and I did not check its sibling
fallback path. The pattern across rounds 3-6 is consistent: the fix goes
where the decline is OBSERVED, and the leak lives wherever someone else
later decides to retry.
MUTATIONS
R6-1 config fault -> assume native KILLED
R6-1b RelayRouteUnknown swallowed as False KILLED
R6-2 edit drops raw_response KILLED
R6-2b edit-failure decline not terminal KILLED
R6-3 queued reconcile falls back on decline KILLED
R6-4 task-card fallback edit decline KILLED
Each with an ordinary-failure control: a genuinely un-editable message must
still be delivered, and a broken card lane must still reach the user.
481 passed, zero failures.
* fix(relay): add a terminal-decline latch at the adapter choke point
THE STRUCTURAL FIX, not a twelfth local check.
Rounds 3-6 of review found ONE defect in eleven lanes: the connector refuses an
op, and some caller downstream reads that as 'this lane is unavailable' and
retries the same content through a DIFFERENT op against the SAME chat. Media,
prompt, draft-open, draft-seal, native task card, task-card fallback edit,
slash-confirm, exec-approval, clarify, stream edit, queued reconciliation.
Each was closed by adding a check at one more call site. That approach cannot
converge: gateway/ has ~60 outbound call sites, every one of them a place a
future change can reintroduce this, and four consecutive review rounds each
found another. The reviewer's own count of lanes is the argument against the
per-site design.
Every relay frame from every one of those callers passes through
_transport.send_outbound. One latch there covers them all: once the connector
refuses a chat, this adapter stops emitting CONTENT frames for that chat.
Proven to subsume the local checks: with the stream-edit per-site check
DISABLED, the leak probe still reports blocked=true — the frame never reaches
the wire. The local checks stay as defence in depth and for their better error
messages, but they are no longer the only thing standing between a decline and
a re-addressed send.
Scope is deliberately narrow, and each limit is mutation-pinned:
per CHAT - a refusal must not mute other conversations
CONTENT ops - typing/delete carry nothing; latching them would leave a
stuck typing indicator for no security gain
self-healing - cleared when the connector accepts that chat again, so a
transient policy change does not need a restart
Mutations:
latch never set KILLED
latch never consulted KILLED
latch is global, not per-chat KILLED
latch never clears KILLED
485 passed.
* fix(relay): one route source; the latch already covered round 7's lanes
Round 7 reviewed 573e41e294 — one commit BEFORE the terminal-decline latch —
and independently reached the same conclusion I had: 'The per-call-site
approach is structurally wrong. Use one turn-scoped choke point.' That is the
latch in 6dbc004594.
Its four 'still broken' lanes (tool-progress edit, progress-overflow edit,
long-running heartbeat edit, stale streamed-final reconciliation) all share the
shape edit_message->declined->adapter.send(same chat, same content), and NONE
has a local check. Probed all four against the latch:
tool_progress ops ['edit'] blocked
progress_overflow ops ['edit'] blocked
heartbeat ops ['edit'] blocked
stale_final ops ['edit'] blocked
That is the argument for the choke point, measured: lanes nobody patched are
safe anyway. Pinned by a parametrized test named for those four lanes.
R7-1 IS A REAL BYPASS THE LATCH DOES NOT COVER, and it is fixed here. The guard
rebuilt routing from GATEWAY_RELAY_PLATFORMS while resolve_delivery_transport
asks the CONNECTED adapter (fronts_platform, from the handshake identity set).
Different snapshots: with env discovery stale or momentarily empty, the guard
said 'native' and the router sent over the relay, skipping authorization.
before: guard_relay_routed False / delivery relay
after: guard_relay_routed True / delivery relay / unattested target refused
The guard now asks the live adapter first and falls back to config only when
there is no runner (CLI/cron) — pinned in both directions.
R7-5 (non-blocking, and a fair hit): my stream-fallback test asserted
_egress_declined and never drove _send_fallback_final, so removing that early
return SURVIVED. The test now calls the real fallback and asserts the wire is
untouched; the mutation dies.
Mutations:
R7-1 guard ignores the live adapter KILLED (was SURVIVED)
R7-5 fallback early return removed KILLED (was SURVIVED)
latch not consulted KILLED
491 passed.
* fix(relay): close three holes found by attacking my own latch
Round 8's brief told the reviewer to attack the latch. I did the same in
parallel and found three real holes in it before the review returned.
1. send_for_platform BYPASSED THE LATCH ENTIRELY. It builds and posts its frame
directly rather than through _outbound — and it is the delivery resolver's
OWN entry point, so it is the single most important caller.
before: ops ['edit', 'send'] after: ops ['edit']
gateway/AGENTS.md states the rule I had just broken: 'Seal-interception
exists at BOTH egress doors (send() and send_for_platform()); a new egress
door needs the same two checks.' The latch is a third such check and I had
wired it to one door.
2. A COSMETIC SUCCESS CLEARED THE LATCH. Clearing on ANY success meant a
typing indicator — routinely allowed for a chat whose content is refused —
re-opened the door for the very next send:
ops ['edit', 'typing', 'send']
Only a CONTENT op the connector accepted may clear it now.
3. A THREAD INSIDE A REFUSED CHAT WAS NOT COVERED. A thread lives inside its
parent, so the same content reached the same conversation one level down:
ops ['edit', 'send']
The latch key now strips the thread suffix.
Also normalised int/str chat ids (callers pass both; a type mismatch would
silently unlatch).
MUTATIONS
send_for_platform not latched KILLED
cosmetic success clears the latch KILLED
thread suffix not stripped KILLED
draft-seal retry not latched SURVIVED — EQUIVALENT, proven:
is unreachable while latched (a declined edit before the seal
produces ZERO seal frames, measured). Kept as defence in depth because it
posts directly, and documented at the site rather than covered by a
test that could not fail.
One self-inflicted bug on the way: a blanket replace put 1Password CLI brings 1Password to your terminal.
Turn on the 1Password app integration and sign in to get started. Run
'op signin --help' to learn more.
For more help, read our documentation:
https://www.1password.dev/cli
1Password CLI is built using open-source software. View our credits and
licenses:
https://downloads.1password.com/op/credits/stable/credits.html
Usage: op [command] [flags]
Management Commands:
account Manage your locally configured 1Password accounts
connect Manage Connect server instances and tokens in your 1Password account
document Perform CRUD operations on Document items in your vaults
events-api Manage Events API integrations in your 1Password account
group Manage the groups in your 1Password account
item Perform CRUD operations on the 1Password items in your vaults
plugin Manage the shell plugins you use to authenticate third-party CLIs
service-account Manage service accounts
user Manage users within this 1Password account
vault Manage permissions and perform CRUD operations on your 1Password vaults
Commands:
completion Generate shell completion information
inject Inject secrets into a config file
read Read a secret reference
run Pass secrets as environment variables to a process
signin Sign in to a 1Password account
signout Sign out of a 1Password account
update Check for and download updates.
whoami Get information about a signed-in account
Global Flags:
--account account Select the account to execute the command by account shorthand, sign-in address, account ID, or user ID. For a list
of available accounts, run 'op account list'. Can be set as the OP_ACCOUNT environment variable.
--cache Store and use cached information. Caching is enabled by default on UNIX-like systems. Caching is not available on
Windows. Options: true, false. Can also be set with the OP_CACHE environment variable. (default true)
--config directory Use this configuration directory.
--debug Enable debug mode. Can also be enabled by setting the OP_DEBUG environment variable to true.
--encoding type Use this character encoding type. Default: UTF-8. Supported: SHIFT_JIS, gbk.
--format string Use this output format. Can be 'human-readable' or 'json'. Can be set as the OP_FORMAT environment variable.
(default "human-readable")
-h, --help Get help for op.
--iso-timestamps Format timestamps according to ISO 8601 / RFC 3339. Can be set as the OP_ISO_TIMESTAMPS environment variable.
--no-color Print output without color.
--session token Authenticate with this session token. 1Password CLI outputs session tokens for successful 'op signin' commands when
1Password app integration is not enabled.
-v, --version version for op
Run 'op [command] --help' for more information on the command. into
send_for_platform, which has no such variable. Two existing unfurl tests caught
it — NameError at adapter.py:1407.
504 passed.
* fix(relay): Telegram handle exemption + a turn boundary for the latch
Round 8 blockers. Two of its four were already closed by 93750e351a (it
reviewed the commit before it); these two are real and both are mine.
B1 — THE TELEGRAM @HANDLE EXEMPTION COVERED A NATIVE SEND.
_is_unresolved_handle exempts telegram @handles from attestation because
"the connector resolves and authorizes it". That justification is FALSE
whenever the gateway holds its own token: _send_to_platform calls
_send_telegram(pconfig.token, ...) directly and no connector is involved.
So an unattested @handle went out under the gateway's own credential
while the numeric control was correctly refused.
The exemption now requires that no native credential exists. A probe
fault WITHDRAWS the exemption (falls back to the ordinary attestation
check) rather than granting it.
Shipped with the converse control: relay-only config still exempts
@handles, and numeric targets stay guarded in both modes.
B4 — THE LATCH HAD NO BOUNDARY, SO IT WAS AN OUTAGE MECHANISM.
My own regression, and worse than reported. Removing "clear on cosmetic
success" (correctly) removed the ONLY way the latch could ever clear: a
content op can never reach the connector to succeed, because the latch
blocks it locally first. A refusal at 09:00 muted that chat forever.
A new inbound message for a chat is the generation marker — the natural
teardown point. Suppression still holds for the whole turn.
same_turn_blocked: true next_turn_delivered: true
MUTATIONS (all killed)
handle exemption ignores native credential
native-credential fault GRANTS the exemption
no turn boundary (latch never clears)
teardown clears ALL chats not just this one
teardown ignores the chat
The last two SURVIVED first: I tested _clear_declined_for_turn directly
and never proved _on_inbound calls it — the caller-level gap that has now
produced four blockers on this branch. Added a test driving the real
inbound entry point.
One self-inflicted bug, caught by my own fault test: the probe imported
load_config, which does not exist (it is load_gateway_config), so it
always threw and returned the fault default. The test that pinned fault
behaviour is what exposed it.
510 passed.
* fix(relay): correct latch identity and boundary; one config snapshot
Round 9, four blockers, all reproduced.
B1+B4 — THE TEARDOWN WAS AT THE WRONG PLACE, twice over.
It sat on the adapter's raw _on_inbound, which runs BEFORE profile
routing, the ignored-channel guard, plugin hooks and user authorization.
An unauthorized or dropped event could therefore clear a refusal
belonging to an active turn, and stale content then went out as a
different op. The same placement missed Discord interaction passthrough,
which builds its own MessageEvent and calls handle_message directly, so
slash commands and modal submits stayed muted after an earlier decline.
Both are one mistake: I picked a lane instead of a boundary. Teardown now
runs immediately after _hm_admit_event, the single admission gate every
entry path shares.
dropped event -> latch survives, stale send blocked
admitted event -> latch clears
B2 — THE LATCH KEY SPLIT ON ':', WHICH IS A MISTAKE I ALREADY FIXED ONCE.
_latch_key did str(chat_id).split(":", 1)[0], so !room:tenant-a and
!room:tenant-b both keyed !room: a decline in one Matrix room muted
another, and inbound from one cleared the other's refusal. egress.py
::_session_ids stopped doing exactly this in round 4 and I reintroduced
it three rounds later.
Parent identity is never recoverable from identifier TEXT. Thread
coverage is now structural: _thread_parent looks the relationship up in
the recorded auto-thread map.
B3 — AUTHORIZATION AND DISPATCH USED DIFFERENT CONFIG SNAPSHOTS.
_handle_send retains one pconfig; the guard independently reloaded
config. Across a transition the authorization snapshot could see a
connector-only setup (exemption granted) while dispatch still held the
native token and sent the unattested @handle itself. The guard now takes
native_token from the SAME snapshot dispatch will use. A caller that
omits it does not silently look like "no token".
NB-1/2/3 also closed: real-object snapshot tests, an exception shield
that faces a real exception, and send_follow_up no longer discards the
connector's verdict (that discard is exactly how the edit lane laundered
declines).
MUTATIONS (all killed)
latch key splits on colon again
thread parent lookup disabled
dispatch token ignored by guard
tool drops the snapshot token
admission teardown removed
teardown moved BEFORE admission
exception shield removed
follow_up drops raw_response
"admission teardown removed" SURVIVED first: I had tested the helper, not
_handle_message. Added a test driving production _handle_message with
admission stubbed both ways. Fifth caller-level gap on this branch.
One self-inflicted bug caught before commit: I passed pconfig.token in
_handle_react, which has no pconfig — a NameError on every reaction.
516 passed.
* docs(relay): pin the latch's thread coverage limit as a deliberate trade
_thread_parent only sees connector auto-threads, and that map is capped at
256 entries, so a user-created or evicted thread does not inherit its
parent's latch. Documented at the site and asserted by a test, because the
alternative - deriving parents from identifier text - is exactly what muted
unrelated Matrix rooms in round 9.
The primary control is unaffected: authorize_relay_target takes thread_id as
part of the destination and attests it on every send (6 thread tests).
* refactor(relay): one SendResult decline classifier for all 8 gateway lanes
The extraction found a DEFECT, not just repetition.
Eight gateway lanes each hand-rolled the unwrapping of a decline from a
SendResult, and they did not agree. Six checked only raw_response. Two
also checked the error text. A connector that answers with the uniform
decline SENTENCE and no structured code - the documented contract for
older connectors, per _approval_send_outcome - was therefore classified
as an ordinary failure by those six lanes, so each treated a refusal as
"editing unavailable" and retried through another op.
Measured:
text-only decline six-site check False two-site check True
structured decline six-site check True two-site check True
No content leaked, because the adapter latch classifies the transport
dict directly and catches both shapes (verified: text-only decline still
latches C1 and keeps SECRET off the wire). The cost was wrong verdicts
and futile retries, not disclosure.
declined_send(result) in gateway/relay/egress.py now owns this. It checks
raw_response when structured, else the error text, and preserves the
ambiguous exclusion - an ambiguous result is a transport outcome, so it
must never read as a refusal.
run.py keeps its own shape deliberately: that lane has three verdicts
(ambiguous / declined / failed), so it checks ambiguous first and then
delegates the boolean.
MUTATIONS (all killed)
helper drops the text-only branch
helper drops the structured branch
ambiguous no longer excluded
draft lane decline check removed
edit-failure lane decline check removed
prompt verdict lane check removed
slash-confirm lane check removed
draft lane goes terminal on ANY failure (over-refusal direction)
"draft lane decline check removed" SURVIVED first: _send_draft_frame had
no test driving an unsuccessful send_draft at all. Added one, with an
ordinary-failure control so the fix cannot silently become "one flaky
frame mutes the chat". A non-unique anchor also masked the edit-failure
lane on the first pass - the trap my own skill warns about.
This closes the duplication that caused four of nine rounds of blockers:
a new lane now calls one classifier instead of copying three lines.
519 passed.
* fix(relay): latch identity, new-turn boundary, seal arming, ambiguity
Round 10, four blockers, each reproduced before fixing. Two are my own
regressions from the previous two rounds.
B1 - ADMISSION IS NOT A NEW-TURN BOUNDARY.
Round 9 moved teardown to just after _hm_admit_event. That is only an
ADMISSION gate: an authorized message can be steered into a running
session, answer a pending prompt, run a busy slash command, or be refused
by the pause/drain gates - all without starting a turn. Each of those
cleared the ACTIVE turn's refusal, and a later fallback from that turn
reached the wire (probe: latch emptied, wire ops ['edit', 'send']).
Teardown now runs after _claim_active_session_slot, the first point the
runner OWNS a new turn. The new test drives production _handle_message
through all four non-turn lanes plus the real new-turn path.
B2 - LATCH IDENTITY OMITTED THE LOGICAL PLATFORM.
One relay adapter fronts several platforms, so native ids collide. A
Discord refusal for chat 42 was cleared by clear_egress_latch("telegram",
"42") - the method took a platform and ignored it - and the Discord
fallback then reached the connector. Keyed by normalized platform plus
exact chat id; thread-parent expansion keeps the platform component.
B3 - THE DIRECT DRAFT-SEAL PATH DID NOT ARM THE LATCH.
_seal_open_draft posts through _attempt directly rather than _outbound,
so a definite decline logged and returned but never latched. The
immediate plain-send fallback was suppressed by the caller's own check;
later same-turn sends were not (wire ['draft', 'draft', 'send'], the
third frame carrying refused content).
B4 - MY OWN REFACTOR MADE AMBIGUOUS RESULTS TERMINAL.
send_draft's ambiguous projection discarded raw_response, so
declined_send fell through to the error-text branch - and an ambiguous
result whose text carries the decline marker ("... egress declined: ack
lost") read as a DEFINITE refusal and terminated the run. Ambiguous means
the frame may well have been delivered: a transport outcome, never an
authorization one.
Fixed on both layers: the projection carries the body (and the seal's
ambiguous return is now explicit too), and declined_send's text-only
branch - which cannot see the ambiguous flag - treats ack-lost text as
transport ambiguity. Audited every SendResult projection in adapter.py
for the same shape.
MUTATIONS (all killed)
latch key drops the platform
clear_egress_latch ignores platform
draft seal does not arm the latch
ambiguous projection drops raw body
declined_send infers decline from ack-lost text
teardown back at admission
523 passed.
* refactor(relay): split the terminal-decline latch out of the guard PR
The latch moves to feat/p5-egress-decline-latch (pushed at 3cf45736d7,
which retains the full history) for redesign. This PR keeps the
authorization guard and the per-site decline checks.
WHY. Across eleven review rounds the two halves behaved very differently.
The guard is a PURE FUNCTION of the destination - its blockers were all
"you asked the wrong question" (case sensitivity, nested ImportError,
missing thread_id, config snapshot skew), each a one-line correction that
then stayed fixed. Rounds 7-10 found nothing new in it.
The latch is MUTABLE STATE WITH A LIFETIME living on RelayAdapter - an
object registered once per process that holds the WebSocket and has no
concept of a turn. Nine of its blockers reduce to three questions the
adapter cannot answer: when does it end, who arms it, what is it keyed
on. Every answer so far has been a proxy (a successful op, an inbound
message, an admitted event, a claimed session slot) and every proxy was
wrong in a lane found later.
The per-site checks hold identical information on `st` - a PER-TURN
object - and have produced zero blockers, because the state dies with the
turn and nobody has to decide when it ends.
The no-relaunder property does NOT depend on the latch. Measured on the
real consumer path with the latch absent: a declined draft frame sets
_egress_declined and puts nothing on the wire.
Removal verified structurally rather than by eye: an AST diff of every
symbol between HEAD and this tree reports only latch symbols gone,
nothing added. That check caught two over-deletions my strip made -
_on_inbound (consumed by a "next def" boundary) and _SEEN_INBOUND_MAX
(a class constant inside the removed span). Both restored; 19 failures
went to 0.
ALSO: RESTORED A TEST I WRONGLY REPORTED AS PASSING.
test_tool_guard_forwards_thread_id never made it into the repo - `git log
-S` finds it in no commit - though round 5 recorded its mutant as killed.
Dropping thread_id from the guard call therefore survived the entire
tests/tools suite (146 passed). Written properly this time, driving the
real _handle_send far enough to reach the guard. It now KILLS that
mutant.
MUTATIONS on this tree
guard fault authorizes instead of refusing KILLED
thread_id dropped from the guard call KILLED (was SURVIVED)
handle exemption ignores native credential KILLED
draft lane decline check removed KILLED
prompt verdict lane check removed KILLED
slash-confirm lane check removed KILLED
503 passed.
* test(relay): close the phantom-coverage gaps the guard audit found
The thread_id test that was reported as killing a round-5 mutant turned
out never to have been committed. That is a reason to distrust the other
claimed kills, so I re-ran every guard mutation against the COMMITTED
tree instead of trusting the earlier reports.
Result: 9 of 11 killed, and the two "SKIPPED" ones had non-unique
anchors hiding SIX separate sites. Mutating those individually found
three real survivors.
CASE NORMALISATION (round 3, finding 3) WAS HALF-COVERED.
test_relay_fronted_matching_is_case_insensitive varies the CONFIGURED
name but always requests lowercase "discord", so it pins _relay_fronted's
normalisation and nothing else. The REQUESTED name's `.lower()` was
covered by nothing at all. Probe with it removed:
relay_routed("Discord") -> False
authorize("Discord", unattested) -> AUTHORIZED
which is exactly the bypass round 3 reported, alive again and untested.
Two further sites were untested in the OVER-REFUSAL direction: the
attested store is keyed lowercase, so a mixed-case request missed its own
attested set and refused legitimate traffic. attested_relay_targets' own
normalisation was invisible to every existing test because they all
monkeypatch that function away; it is now asserted against the real
function with only its leaf sources stubbed.
Three tests added. All six case sites now die when mutated.
I also re-did the three fail-closed RelayRouteUnknown mutations properly.
The first pass swapped whole lines and produced IndentationErrors, so
"KILLED" there proved nothing but a syntax error. Neutralising each raise
at correct indentation: all three genuinely KILLED.
FINAL AUDIT ON THIS TREE — 17 mutations, zero survivors
guard: thread_id dropped at the call site
guard: react path unguarded
guard: handle exemption ignores native credential
guard: 3x fail-closed raise neutralised
guard: 6x case-normalisation site
classifier: ambiguous treated as a decline
classifier: text-only decline branch removed
lane: draft / stream-edit / prompt / slash-confirm checks removed
511 passed.
* test(relay): make the stream-edit test fail for the right reason
Review of 45835a282d raised one blocking issue and three non-blocking
ones. All four are addressed; none was a production defect.
BLOCKING — the stream-edit test failed on the double, not on a leak.
test_declined_stream_edit_does_not_send_the_unseen_tail implemented only
the GUARDED path in its consumer double. Removing either guard therefore
raised AttributeError inside the fake before any send could be observed:
guard 1 removed -> AttributeError: no attribute '_is_flood_error'
guard 2 removed -> AttributeError: no attribute '_clean_for_display'
Red, but for the wrong reason — the test could not have caught the leak
it is named for. My own docstring claimed it drove the fallback and
checked the wire; it did neither.
The double now implements everything the UNGUARDED path reaches
(_is_flood_error, _flood_strikes, _current_edit_interval, _last_edit_time,
_notify_new_message, _try_strip_cursor, _clean_for_display,
_fallback_prefix, _metadata_for_send). Both mutations now fail on real
assertions:
guard 1 removed -> assert consumer._egress_declined is True
guard 2 removed -> AssertionError: the unseen tail reached the wire:
['send']
NON-BLOCKING 1 — a docstring claimed more than the test exercises.
test_requested_platform_name_is_also_normalised described a mixed-case
send_message(target="Discord:999") bypass. That entry point cannot reach
it: _resolve_tool_target lowercases the platform at
tools/send_message_tool.py:47 before the guard runs. The test still pins
a real contract — the helpers must not assume a lowercased argument, for
the gateway lanes and any future non-normalising caller — so the claim is
narrowed to that rather than the test removed.
NON-BLOCKING 2 — the module docstring said "every lane drives the REAL
RelayAdapter". The stream tests drive mixin doubles by design, because
the behaviour under test belongs to the adapter's CALLER. Docstring now
distinguishes the two kinds.
NON-BLOCKING 3 — latch-deletion residue in gateway/relay/adapter.py:418:
return None
return latched if surface_declines else None
The second line was unreachable and referenced a name deleted with the
latch. Removed, along with the 20-line comment block describing the latch
as "the structural fix" — that mechanism now lives on
feat/p5-egress-decline-latch, not here.
The reviewer independently confirmed the large deletion: an AST census
between 3cf45736d7 and f57a2298fa reports only latch symbols removed and
nothing added.
511 passed.
* docs(relay): correct three claims that outran the code
Review of 41ce3cc765 found no new production defect but three overstated
claims, one of them in my own commit message.
1. THE LATCH COMMENTARY WAS STILL THERE. My previous commit message said
it removed "the 20-line comment block describing the latch as the
structural fix". It removed only the unreachable statement. Twenty
lines at adapter.py:361-380 still described a per-chat latch, a choke
point and its scope rules - none of which exist on this branch. In a
refusal-sensitive module that reads as coverage this branch does not
have. Now removed for real.
This is the same defect class as the tests: a claim that outran what
the code does. I made it while fixing that class.
2. THE STREAM-TEST DOCSTRING OVERSTATED BOTH MUTANTS. It said the
mutation "now fails on the assertion that a send reached the wire" -
true of one guard, not both. Verified separately:
remove the _on_edit_failure check -> dies on _egress_declined,
never reaches the fallback
remove the fallback early return -> dies on the wire: ['send']
Both are valid behavioural failures, which is what the blocker asked
for; they are different observables and the docstring now says so.
3. Duplicate `from types import SimpleNamespace` from an earlier scripted
insert; imports reordered.
112 tests pass in the four focused files.
* fix(relay): close two authorization defects found in review
Both were reproduced before fixing and both mutants are pinned.
1. A LIVE relay adapter whose fronts_platform() raised degraded into the
config fallback. `_live_relay_fronted` returned None for every failure,
and None means "no live adapter, use the config snapshot" — so a faulting
adapter plus an empty/stale snapshot made the guard conclude "not
relay-routed" and authorize an unattested destination, while
resolve_delivery_transport asks that same adapter and still routes over
the relay. Measured: relay_routed=False, verdict None for chat 999.
Absence and fault now have separate return values: None only when there
is no runner or no relay adapter; a live adapter that cannot answer
raises RelayRouteUnknown. This is the third instance of this bug class in
this file, and the first two were also mine.
2. An attested chat whose id equalled the requested THREAD id vouched for
that thread. The `thread in attested` arm proved nothing about parentage.
Measured: attested {"-100A", "7"} authorized (-100A, thread 7).
Only the bound `parent:thread` form is accepted now. Nothing legitimate
needed the bare arm — _session_entry_id records a threaded origin as
f"{chat_id}:{thread_id}", and a thread addressed as its own channel
arrives as chat_id and passes the parent check.
The existing test blessed the bare form via parametrize, so it PINNED the
defect. Corrected, plus negative controls for the sibling-chat and
other-parent cases and a positive control proving genuine absence still
takes the config path (otherwise fix 1 would break native-only deploys).
Merged origin/main (was 22 behind). 428 passed via scripts/run_tests.sh;
full 10-row mutation ledger re-killed on the merged tree, none dying on an
exception rather than an assertion.
* fix(relay): only a missing adapter is absence; everything else is a fault
Reviewer BLOCKER, reproduced before fixing. Two more paths where a PRESENT
relay adapter still degraded into the config snapshot:
1. `fronts_platform` may be a property or descriptor, so the ATTRIBUTE
LOOKUP can raise — and the lookup sat inside the absence handler. Probed
with a raising property plus an empty snapshot: live=None, routed=False,
verdict=None, i.e. an unattested target authorized. The previous test made
an already-retrieved METHOD raise, so it could not reach this.
2. A present adapter with no usable `fronts_platform` returned None for the
same reason. An adapter that cannot say what it fronts is broken, not
absent, so it now raises too.
Also found by my own spot-check while the review ran: the nested imports of
`gateway.config` / `gateway.run` inside the live probe shared the broad
handler, so a broken installation degraded to the snapshot as well. Probed
with a healthy-adapter positive control in the same run — healthy refused
the unattested target, faulted authorized it. `_relay_fronted` one function
below already drew this exact distinction for its own import.
The boundary is now: `relay is None` is the ONLY absence. Everything about a
present adapter — attribute access, callability, the call itself, and the
imports needed to reach it — is a fault and raises RelayRouteUnknown.
This is the fourth variant of absence-vs-fault in this file and all four
were mine. The lesson is in the code as a comment rather than in a commit
message nobody re-reads.
Four controls keep genuine absence benign: no runner, no relay adapter in
the runner, a real ModuleNotFoundError naming the gateway package, and the
configured-attested-target-still-sends case.
434 passed via scripts/run_tests.sh; 9-row mutation ledger re-killed
including both new guards, none dying on an exception.
* fix(relay): invert the live probe to fail closed by default
Reviewer BLOCKER round 2, reproduced: reading the adapter registry can also
raise. A runner whose `adapters.get()` raised gave relay_present=True,
live=None, routed=False, verdict=None — unattested discord:999 authorized.
That was the FIFTH boundary in one function with the same defect: the call,
the attribute lookup, a non-callable attribute, the nested imports, and now
the registry lookup. Each round I patched the reported boundary and the
defect moved one statement up. The cause was the shape, not the statements:
the function asked "did something go wrong?" and answered None, and None
MEANS "no live adapter, use the config snapshot" — so every statement was a
new chance to fail open, and every new statement would have been too.
Inverted rather than patched a sixth time. Each `return None` now sits
behind an explicit narrow check that cannot itself be the fault (no runner,
no adapters, no relay key, gateway package genuinely absent), and one outer
handler turns anything else into RelayRouteUnknown. A statement added inside
this function is now fail-CLOSED by default.
Verified all six fault shapes raise (call, attribute, missing method,
registry .get, .adapters property, runner ref) and all five absence shapes
stay benign, plus a liveness control where the config snapshot disagrees
with a healthy adapter and the adapter still wins.
Four new tests, including the two absence controls that keep native-only and
CLI deployments working. 438 passed via scripts/run_tests.sh. Mutation
ledger: 8 killed. One survivor recorded as a proven equivalent mutant —
widening `if not registry` to `or {}` is behaviourally identical because
`{}.get()` returns None, i.e. the same absence; it is a readability guard.
965 lines
51 KiB
Python
965 lines
51 KiB
Python
"""Gateway streaming consumer — bridges sync agent callbacks to async platform delivery.
|
|
|
|
on_delta() queues deltas from the agent's worker thread; the async run() task buffers,
|
|
rate-limits and progressively edits one platform message (send, then editMessageText;
|
|
draft/native transports are optional per adapter).
|
|
Credit: jobless0x (#774, #1312), OutThisLife (#798), clicksingh (#697).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import concurrent.futures
|
|
import contextlib
|
|
import inspect
|
|
import logging
|
|
import queue
|
|
import secrets
|
|
import threading
|
|
import time
|
|
import uuid
|
|
from dataclasses import dataclass
|
|
from typing import Any, Callable, Optional
|
|
|
|
from gateway.platforms.base import BasePlatformAdapter as _BasePlatformAdapter
|
|
from gateway.platforms.base import _custom_unit_to_cp
|
|
from gateway.config import (
|
|
DEFAULT_STREAMING_EDIT_INTERVAL as _DEFAULT_STREAMING_EDIT_INTERVAL,
|
|
DEFAULT_STREAMING_BUFFER_THRESHOLD as _DEFAULT_STREAMING_BUFFER_THRESHOLD,
|
|
DEFAULT_STREAMING_CURSOR as _DEFAULT_STREAMING_CURSOR)
|
|
from gateway.response_filters import (
|
|
is_intentional_silence_response as _is_intentional_silence_response,
|
|
is_partial_silence_marker as _is_partial_silence_marker)
|
|
from gateway.stream_consumer_fences import ensure_closed_code_fences
|
|
from gateway.stream_consumer_transport import StreamTransportMixin
|
|
from gateway.stream_consumer_fallback import StreamFallbackMixin
|
|
from gateway.stream_consumer_think import StreamThinkFilterMixin
|
|
|
|
logger = logging.getLogger("gateway.stream_consumer")
|
|
|
|
# Queue sentinels (see _drain_queue()). Bare: _DONE, _NEW_SEGMENT (finalize, start a
|
|
# fresh message), _REOPEN_SEED (EAGER native re-seed after a clarify answer — WeCom
|
|
# typing is driven by the seed frame; lazy re-seed measured 48s of dead air). Tuples:
|
|
# (_COMMENTARY, text); (_TOOL_PROGRESS, line) native-bubble overlay; (_FINAL_TEXT, text)
|
|
# authoritative final_response incl. post-stream augmentation, queued just before _DONE;
|
|
# (_FLUSH, threading.Event) barrier; (_APPROVAL_BOUNDARY, future, cancelled_flag).
|
|
_DONE = object()
|
|
_NEW_SEGMENT = object()
|
|
_COMMENTARY = object()
|
|
_TOOL_PROGRESS = object()
|
|
_FINAL_TEXT = object()
|
|
_FLUSH = object()
|
|
_APPROVAL_BOUNDARY = object()
|
|
_REOPEN_SEED = object()
|
|
_FUTURE_TYPES = (asyncio.Future, concurrent.futures.Future)
|
|
|
|
# Boundary finalize text when nothing has accumulated yet (overridable per boundary).
|
|
_DEFAULT_BOUNDARY_PLACEHOLDER = "⏸ 等待审批中..."
|
|
|
|
|
|
@dataclass
|
|
class StreamConsumerConfig:
|
|
"""Runtime config for a single stream consumer instance."""
|
|
edit_interval: float = _DEFAULT_STREAMING_EDIT_INTERVAL
|
|
buffer_threshold: int = _DEFAULT_STREAMING_BUFFER_THRESHOLD
|
|
cursor: str = _DEFAULT_STREAMING_CURSOR
|
|
buffer_only: bool = False
|
|
# >0: final goes out as a fresh message once the preview has been visible this
|
|
# long (timestamp reflects completion); 0 = always edit in place.
|
|
# This makes the platform's visible timestamp reflect completion time instead of first-token time for
|
|
# long-running responses (e.g. reasoning models that stream slowly). Ported from
|
|
# openclaw/openclaw#72038. The gateway enables this selectively per-platform.
|
|
fresh_final_after_seconds: float = 0.0
|
|
# "auto"/"draft": native drafts when adapter+chat support it, else "edit"
|
|
# (progressive editMessageText). "off" is handled by the gateway.
|
|
transport: str = "edit"
|
|
chat_type: str = "" # originating chat type; gates platform-specific drafts
|
|
|
|
|
|
@dataclass
|
|
class _Tick:
|
|
"""Everything one drain of the queue decided."""
|
|
got_done: bool = False
|
|
got_segment_break: bool = False
|
|
got_flush: bool = False
|
|
flush_event: Any = None
|
|
got_reopen_seed: bool = False
|
|
approval_boundary: Optional[tuple] = None # (future, cancelled_flag)
|
|
commentary_text: Optional[str] = None
|
|
# Set by _push_update for _finalize_turn / _end_segment.
|
|
update_visible: bool = False
|
|
draft_final_fresh_send: bool = False
|
|
|
|
@property
|
|
def is_interim(self) -> bool:
|
|
"""Mid-stream tick: not finalizing, not a segment break, no commentary."""
|
|
return not self.got_done and not self.got_segment_break and self.commentary_text is None
|
|
|
|
|
|
class GatewayStreamConsumer(StreamTransportMixin, StreamFallbackMixin, StreamThinkFilterMixin):
|
|
"""Async consumer that progressively edits a platform message with streamed tokens.
|
|
Usage: ``agent.stream_delta_callback = consumer.on_delta``; ``create_task(consumer.run())``;
|
|
after the agent finishes ``consumer.finish()`` then ``await task`` for the final edit."""
|
|
|
|
_MAX_FLOOD_STRIKES = 3 # consecutive flood failures before edits are disabled
|
|
|
|
# Class-wide monotonic draft-id counter (Telegram animates a draft only when the
|
|
# same non-zero draft_id is reused). RANDOM seed: draft_id keys the relay
|
|
# connector's sealed-stream tombstones, which outlive this process — a replayed id
|
|
# is answered out of the OLD tombstone and dropped. 49 bits stays inside JS 2^53.
|
|
_draft_id_counter: int = secrets.randbits(49)
|
|
|
|
def __init__(
|
|
self,
|
|
adapter: Any,
|
|
chat_id: str,
|
|
config: Optional[StreamConsumerConfig] = None,
|
|
metadata: Optional[dict] = None,
|
|
on_new_message: Optional[callable] = None,
|
|
on_before_finalize: Optional[Callable[[], Any]] = None,
|
|
initial_reply_to_id: Optional[str] = None,
|
|
run_still_current: Optional[Callable[[], bool]] = None):
|
|
self.adapter = adapter
|
|
self.chat_id = chat_id
|
|
self.cfg = config or StreamConsumerConfig()
|
|
self.metadata = metadata
|
|
# Hooks (exceptions swallowed): on_new_message per fresh content bubble (next
|
|
# tool-progress bubble goes BELOW it); on_before_finalize once (pause typing).
|
|
self._on_new_message = on_new_message
|
|
self._on_before_finalize = on_before_finalize
|
|
self._initial_reply_to_id = initial_reply_to_id
|
|
self._turn_id = str(uuid.uuid4()) # keys send_stream_frame() per concurrent consumer
|
|
# Returns False after /new or /stop; run() then abandons the stream.
|
|
self._run_still_current = run_still_current or (lambda: True)
|
|
# Only platforms needing an explicit finalize call (DingTalk AI Cards) force a
|
|
# redundant final edit; ``is True`` keeps MagicMock adapters out.
|
|
self._adapter_requires_finalize = getattr(adapter, "REQUIRES_EDIT_FINALIZE", False) is True
|
|
# Telegram bounds edit retries at 5s; a fallback must not wait longer.
|
|
self._max_fallback_flood_retry_seconds = 5.0
|
|
|
|
self._queue: queue.Queue = queue.Queue()
|
|
# Every real preview id on screen this response (fresh-final deletes them all);
|
|
# the per-segment set holds only the active segment so failure recovery never
|
|
# deletes an earlier finalized preamble/commentary.
|
|
# Wall-clock timestamp (time.monotonic) when ``_message_id`` was first assigned from a successful
|
|
# first-send. Used by the fresh-final logic to detect long-lived previews whose edit timestamps
|
|
# would be stale by completion time. Ported from openclaw/openclaw#72038.
|
|
self._preview_message_ids: "set[str]" = set()
|
|
self._already_sent = False
|
|
self._edit_supported = True # False once progressive edits stop working
|
|
self._last_edit_time = 0.0
|
|
self._last_edit_overflowed = False # last _send_or_edit split into continuations
|
|
self._flood_strikes = 0
|
|
self._current_edit_interval = self.cfg.edit_interval # adaptive backoff
|
|
self._delivered_commentary_texts: list[str] = []
|
|
self._delivered_segment_texts: list[str] = [] # finalized text per past segment
|
|
self._in_think_block = False # think-tag filter state (mirrors CLI _stream_delta)
|
|
self._think_buffer = ""
|
|
self._before_finalize_notified = False
|
|
self._reset_message_state()
|
|
|
|
# Transports, resolved in run(). Draft: animated frames via adapter.send_draft;
|
|
# the final still uses first-send; the first failure disables drafts. Native
|
|
# (WeCom msgtype "stream"): the ONLY channel — any failure falls back to edit/send.
|
|
self._use_draft_streaming = False
|
|
self._draft_id: Optional[int] = None
|
|
self._draft_failures = 0
|
|
# TERMINAL authorization refusal for THIS RUN (see _send_draft_frame).
|
|
# Per-run state, constructed fresh each turn, so a refusal can never
|
|
# mute a healthy destination on a later turn.
|
|
self._egress_declined = False
|
|
self._use_native_streaming = False
|
|
self._native_stream_opened = False # seed sent: bubble open, zero content
|
|
self._native_last_pushed_len = 0 # throttle under WeCom's 30 frames/min
|
|
# Boundary state from close_for_approval_prompt() (boundaries are processed
|
|
# serially). reopen=True (clarify) keeps native enabled so post-prompt output
|
|
# re-opens a fresh stream; approval degrades to send().
|
|
self._boundary_placeholder = _DEFAULT_BOUNDARY_PLACEHOLDER
|
|
self._boundary_reason = "Approval"
|
|
self._boundary_reopen = False
|
|
# Reopen requested but nothing re-seeded: got_done must not open a stream just
|
|
# to emit a lone "✅"; an EAGER re-seed opened a bubble that got_done MUST close.
|
|
self._awaiting_reopen_after_boundary = False
|
|
self._reopen_seeded_eagerly = False
|
|
|
|
def _reset_message_state(self) -> None:
|
|
"""Per-message (segment) state: fresh at construction and after each segment break."""
|
|
self._message_id: Optional[str] = None
|
|
self._message_created_ts: Optional[float] = None # fresh-final age
|
|
# ``_stream_ledger`` mirrors ``_accumulated`` but is NOT truncated when
|
|
# overflow splits seal head chunks (reconcilable turn-final payload).
|
|
self._accumulated = self._stream_ledger = ""
|
|
self._last_sent_text = "" # skip redundant edits
|
|
self._fallback_final_send = False
|
|
self._fallback_prefix = ""
|
|
# Fallback sends only the missing tail after a partial overflow delivery.
|
|
self._fallback_preserve_partial_messages = False
|
|
self._segment_preview_message_ids: "set[str]" = set()
|
|
# Tool-progress overlay (native only): shown in the bubble until text arrives.
|
|
self._tool_progress_lines: list[str] = []
|
|
self._tool_progress_active: bool = False
|
|
self._clear_turn_final_flags()
|
|
|
|
def _clear_turn_final_flags(self) -> None:
|
|
"""Reset every turn-final delivery flag to "nothing delivered yet".
|
|
``_delivered_final_text`` is the cleaned turn-final payload the gateway compares to
|
|
the completed final_response before trusting the flags (a successful finalize edit
|
|
may carry a stale preview); None = legacy trust. A payload-less
|
|
``_turn_split_delivery`` must NOT inherit legacy trust; ``_delivery_ambiguous`` (a
|
|
full-final send timed out but MAY have landed) is the only case that does."""
|
|
# #29346: a tool/segment boundary means what we delivered was an interim preamble, not the final
|
|
# answer — clear the flags so a premature setter can't fool the gateway. Safe: got_done returns
|
|
# before any reset, and run.py reads these only after the consumer task exits.
|
|
self._final_response_sent = False
|
|
self._final_content_delivered = False # content landed even if the cosmetic edit failed
|
|
self._delivered_final_text: Optional[str] = None
|
|
self._turn_split_delivery = False
|
|
# True when a full-final send timed out in a way that MAY have reached the platform
|
|
# (``_send_empty_fallback_final`` → "ambiguous"). The only case where a payload-less delivery flag
|
|
# keeps legacy trust in ``delivered_final_matches`` (#95382 tightening) — re-sending there risks a
|
|
# duplicate rather than recovering a loss.
|
|
self._delivery_ambiguous = False
|
|
|
|
def _stream_is_message(self) -> bool:
|
|
"""Whether THIS chat's transport treats the stream as the message: per-chat probe
|
|
first (a relay adapter's class attribute only reflects its primary identity), else
|
|
the legacy attribute; both on the CLASS (MagicMock-safe)."""
|
|
probe = getattr(type(self.adapter), "stream_is_message_for_chat", None)
|
|
if not callable(probe):
|
|
return getattr(self.adapter, "draft_stream_is_message", False) is True
|
|
try:
|
|
return probe(self.adapter, str(self.chat_id)) is True
|
|
except Exception:
|
|
return False
|
|
|
|
@property
|
|
def accepts_tool_progress(self) -> bool:
|
|
"""True only when native streaming is active (gates in-stream tool progress)."""
|
|
return self._use_native_streaming
|
|
|
|
def on_tool_progress(self, line: str) -> None:
|
|
"""Thread-safe: overlay a tool-progress line in the native bubble until the next delta."""
|
|
if line:
|
|
self._queue.put((_TOOL_PROGRESS, line))
|
|
|
|
def _compose_frame_content(self) -> str:
|
|
"""Native frame content: text, with any tool-progress lines below a rule."""
|
|
progress = "\n".join(self._tool_progress_lines)
|
|
return "\n\n---\n".join(p for p in (self._accumulated, progress) if p)
|
|
|
|
def _metadata_for_send(self, *, final: bool = False, expect_edits: bool = False) -> dict | None:
|
|
"""Per-send metadata. ``final`` → notify=True (Mattermost treats notify-worthy sends
|
|
as final when a broken thread root may fall back flat); ``expect_edits`` keeps
|
|
editable previews on Telegram's legacy send path."""
|
|
meta = dict(self.metadata) if self.metadata else {}
|
|
if self._initial_reply_to_id:
|
|
meta["reply_to_message_id"] = self._initial_reply_to_id
|
|
if expect_edits:
|
|
meta["expect_edits"] = True
|
|
if final:
|
|
meta["notify"] = True
|
|
return meta or None
|
|
|
|
# Read-only views for the gateway (flag semantics: see _clear_turn_final_flags).
|
|
already_sent = property(lambda self: self._already_sent)
|
|
final_response_sent = property(lambda self: self._final_response_sent)
|
|
message_id = property(lambda self: self._message_id)
|
|
final_content_delivered = property(lambda self: self._final_content_delivered)
|
|
|
|
async def _notify_before_finalize(self) -> None:
|
|
"""Run the pre-finalize hook exactly once, swallowing hook errors."""
|
|
if self._before_finalize_notified:
|
|
return
|
|
self._before_finalize_notified = True
|
|
if self._on_before_finalize is not None:
|
|
with contextlib.suppress(Exception):
|
|
result = self._on_before_finalize()
|
|
if inspect.isawaitable(result):
|
|
await result
|
|
|
|
def _append_accumulated(self, text: str) -> None:
|
|
"""Append to the live buffer and the split-stable stream ledger."""
|
|
if not text:
|
|
return
|
|
if self._tool_progress_lines: # real text overwrites the overlay
|
|
self._tool_progress_lines.clear()
|
|
self._tool_progress_active = False
|
|
self._accumulated += text
|
|
self._stream_ledger += text
|
|
|
|
def _mark_skip_redundant_finalize(self) -> None:
|
|
"""Mark the turn final as delivered by a prior mid-stream edit. Records what was
|
|
ACKED on the wire, not ``_accumulated``: a throttled stream's last ack may be an
|
|
older cursor-suffixed preview, which must not suppress the corrective send."""
|
|
acked = self._last_sent_text or self._accumulated
|
|
if self.cfg.cursor and acked.endswith(self.cfg.cursor):
|
|
acked = acked[: -len(self.cfg.cursor)]
|
|
self._mark_final_delivered(record=acked)
|
|
|
|
def _mark_final_delivered(self, record: Optional[str] = None) -> None:
|
|
"""Set both turn-final flags; ``record`` also records the delivered payload."""
|
|
self._final_response_sent = True
|
|
# Only claim final delivery if the sealed chunks and final tail actually landed. ``_already_sent``
|
|
# may be True from prior progress/fallback state (#10748).
|
|
# The final clean-up edit failed, but the complete answer is already visible from the last streaming
|
|
# frame (usually with only the cursor still stuck on screen). Mark the content delivered so the
|
|
# gateway suppresses its normal full final send; otherwise users see the same long answer twice when
|
|
# Telegram/Discord rate-limit this cosmetic final edit (#36965, #25349).
|
|
self._final_content_delivered = True
|
|
if record is not None:
|
|
self._record_turn_final_payload(record)
|
|
|
|
def _display_payload(self, text: str) -> str:
|
|
"""Normalize like ``_send_or_edit`` output: directive strip + fence close + strip."""
|
|
return ensure_closed_code_fences(self._clean_for_display(text or "")).strip()
|
|
|
|
def _record_turn_final_payload(self, text: str) -> None:
|
|
"""Record what the user actually saw as this turn's final answer. On a split ``text``
|
|
is only the trailing chunk, so the un-truncated ``_stream_ledger`` is recorded — else
|
|
the gateway sees a mismatch and re-sends an answer the user already received."""
|
|
if self._turn_split_delivery and self._stream_ledger:
|
|
text = self._stream_ledger
|
|
self._delivered_final_text = self._display_payload(text)
|
|
|
|
def delivered_final_matches(self, final_text: str) -> Optional[bool]:
|
|
"""Tri-state reconcile of the recorded turn-final payload against ``final_text`` (a
|
|
*successful* finalize edit can still carry a stale preview, so call success alone
|
|
must not confirm delivery). True: recorded payload (or an earlier segment /
|
|
commentary) matches. False: payload differs, or payload-less split. None: nothing
|
|
recorded on a legacy/ambiguous path (caller trusts flags)."""
|
|
target = self._display_payload(final_text)
|
|
if not target:
|
|
return None
|
|
if self._delivered_final_text is not None:
|
|
# A segment break / commentary may have delivered it under another record.
|
|
return (self._delivered_final_text.strip() == target
|
|
or self.has_delivered_text(final_text))
|
|
if self._turn_split_delivery:
|
|
return False
|
|
# No recorded payload: judge against the FINAL content, not the flag.
|
|
# ``_already_sent`` gates the match: draft frames set ``_last_sent_text`` but
|
|
# deliberately not ``_already_sent``.
|
|
# #95382 / #98552 class fix: a delivery flag with NO recorded payload must still be judged against
|
|
# the FINAL content, not trusted blindly. Every internal flag-setting site records a payload; a
|
|
# record-less consumer whose visible/streamed text does not contain the completed response has
|
|
# demonstrably NOT delivered it (first-edit prefix, mid-stream truncation) — the flag alone must not
|
|
# suppress the corrective send. ``_already_sent`` gates the visible-text match: draft frames set
|
|
# ``_last_sent_text`` for dedupe but are ephemeral (they deliberately do not set ``_already_sent``),
|
|
# so draft-only visibility must not count as durable delivery.
|
|
if self._already_sent and self.has_delivered_text(final_text):
|
|
return True
|
|
# Only a timed-out full-final send that MAY have landed keeps legacy trust.
|
|
return None if self._delivery_ambiguous else False
|
|
|
|
def has_delivered_text(self, text: str) -> bool:
|
|
"""Return True if *text* was already delivered as visible chat content."""
|
|
target = self._clean_for_display(text or "").strip()
|
|
seen = (self._visible_prefix(), *self._delivered_commentary_texts,
|
|
*self._delivered_segment_texts)
|
|
return bool(target) and any(sent.strip() == target for sent in seen)
|
|
|
|
def on_segment_break(self) -> None:
|
|
"""Finalize the current stream segment and start a fresh message."""
|
|
self._queue.put(_NEW_SEGMENT)
|
|
|
|
def close_for_approval_prompt(
|
|
self, placeholder: str | None = None, reason: str = "Approval", reopen: bool = False,
|
|
) -> asyncio.Future:
|
|
"""Queue an interaction boundary (approval / clarify prompt) from sync context.
|
|
run() finalizes the current native stream (``placeholder`` when empty), then per
|
|
``reopen``: False (approval; unbounded waits) degrades to one send() at got_done;
|
|
True (clarify) keeps native enabled so post-prompt output re-opens a fresh stream.
|
|
Returns (Future, cancelled_flag); the Future resolves True once processed
|
|
(cancelled_flag is legacy, no longer read). Without native streaming returns a
|
|
bare, already-resolved Future."""
|
|
loop = None
|
|
with contextlib.suppress(RuntimeError):
|
|
loop = asyncio.get_running_loop()
|
|
boundary_future = loop.create_future() if loop else concurrent.futures.Future()
|
|
if not self._use_native_streaming:
|
|
boundary_future.set_result(True)
|
|
return boundary_future
|
|
# Instance attributes are race-free: boundaries are processed one at a time.
|
|
self._boundary_placeholder = placeholder or _DEFAULT_BOUNDARY_PLACEHOLDER
|
|
self._boundary_reason = reason or "Approval"
|
|
self._boundary_reopen = bool(reopen)
|
|
cancelled_flag = {"cancelled": False}
|
|
self._queue.put((_APPROVAL_BOUNDARY, boundary_future, cancelled_flag))
|
|
return boundary_future, cancelled_flag
|
|
|
|
def on_commentary(self, text: str) -> None:
|
|
"""Queue a completed interim assistant commentary message."""
|
|
if text:
|
|
self._queue.put((_COMMENTARY, text))
|
|
|
|
def flush_pending_sync(self, timeout: float = 5.0) -> bool:
|
|
"""Block the agent worker thread until everything queued so far is delivered:
|
|
``(_FLUSH, Event)`` barrier — run() drains earlier items (FIFO), finalizes the
|
|
segment, sets the event. False on timeout (consumer task may not be running)."""
|
|
evt = threading.Event()
|
|
try:
|
|
self._queue.put((_FLUSH, evt))
|
|
except Exception:
|
|
return False
|
|
return evt.wait(timeout=max(0.0, float(timeout)))
|
|
|
|
def _reopen_seed_pending(self) -> bool:
|
|
"""Native stream, reopen requested after a boundary, nothing open yet."""
|
|
return (self._use_native_streaming and self._awaiting_reopen_after_boundary
|
|
and not self._native_stream_opened)
|
|
|
|
def request_reopen_seed(self) -> None:
|
|
"""Thread-safe: request an EAGER native re-seed after a clarify answer. No-op unless
|
|
reopen-pending, so a stray call can't open a spurious bubble mid-stream or on approval."""
|
|
if self._reopen_seed_pending():
|
|
self._queue.put(_REOPEN_SEED)
|
|
|
|
def _notify_new_message(self) -> None:
|
|
"""Fire the on_new_message callback, swallowing any errors."""
|
|
try:
|
|
if self._on_new_message is not None:
|
|
self._on_new_message()
|
|
except Exception:
|
|
logger.debug("on_new_message callback error", exc_info=True)
|
|
|
|
@staticmethod
|
|
def _signal_flush(flush_event) -> None:
|
|
"""Wake a thread blocked in flush_pending_sync(), swallowing errors. Every loop path
|
|
that consumed a ``_FLUSH`` barrier (incl. early ``continue``) must call this; a
|
|
missed set stalls the caller for the full timeout."""
|
|
if flush_event is not None:
|
|
with contextlib.suppress(Exception):
|
|
flush_event.set()
|
|
|
|
def _reset_segment_state(self, *, preserve_no_edit: bool = False) -> None:
|
|
if preserve_no_edit and self._message_id == "__no_edit__":
|
|
return
|
|
# Retain the segment's visible text so has_delivered_text still matches.
|
|
finalized = self._clean_for_display(self._last_sent_text).strip()
|
|
if finalized:
|
|
self._delivered_segment_texts.append(finalized)
|
|
# Also clears the final flags: what we delivered was an interim preamble. Safe:
|
|
# got_done returns before any reset; run.py reads flags after the task exits.
|
|
self._reset_message_state()
|
|
# Telegram-shaped drafts: bump draft_id so the next segment animates as a fresh
|
|
# preview below the tool-progress bubbles. Stream-is-the-message adapters keep
|
|
# ONE stream per turn — a bump there left one frozen message per segment.
|
|
if self._use_draft_streaming and not self._stream_is_message():
|
|
self._bump_draft_id()
|
|
|
|
def _bump_draft_id(self) -> None:
|
|
type(self)._draft_id_counter += 1
|
|
self._draft_id = type(self)._draft_id_counter
|
|
|
|
async def _handle_approval_boundary(self, boundary_future, cancelled_flag=None) -> None:
|
|
"""Serially process an interaction boundary dequeued by run(). The stream is never
|
|
kept open across a prompt: the WeCom finalize ack only confirms server receipt, and
|
|
after a long idle gap the client may stop tracking the stream."""
|
|
_reason = self._boundary_reason or "Approval"
|
|
try:
|
|
boundary_ok = True
|
|
if self._native_stream_opened:
|
|
boundary_ok = await self._finalize_boundary_stream(_reason)
|
|
if self._boundary_reopen:
|
|
# Clarify: keep native enabled (NOT buffer_only); the closed stream
|
|
# makes the next post-prompt delta re-open via the lazy re-seed. The
|
|
# gap to the "Re-opened native stream" INFO is the typing latency.
|
|
self._close_native_state()
|
|
self._awaiting_reopen_after_boundary = True
|
|
else:
|
|
# Approval: post-approval output goes via one send() at got_done.
|
|
self._degrade_native_to_buffered_send()
|
|
self._reset_segment_state()
|
|
if self._boundary_reopen:
|
|
logger.info("[latency] Clarify boundary finalized, awaiting first "
|
|
"post-answer delta to re-seed (chat=%s, turn=%s)",
|
|
self.chat_id, self._turn_id)
|
|
except Exception as e:
|
|
logger.warning("%s boundary processing failed: %s", _reason, e)
|
|
boundary_ok = False
|
|
finally:
|
|
with contextlib.suppress(Exception):
|
|
if isinstance(boundary_future, _FUTURE_TYPES) and not boundary_future.done():
|
|
boundary_future.set_result(boundary_ok)
|
|
|
|
async def _finalize_boundary_stream(self, _reason: str) -> bool:
|
|
"""Close the open native stream at a boundary; send() the pre-prompt text if that
|
|
fails. False only when both finalize and the fallback send failed."""
|
|
finalize_text = self._accumulated or self._boundary_placeholder
|
|
try:
|
|
if await self._send_frame(finalize_text, finalize=True):
|
|
logger.debug("%s boundary: finalized stream (chat=%s, turn=%s)",
|
|
_reason, self.chat_id, self._turn_id)
|
|
return True
|
|
except Exception as e:
|
|
logger.warning("%s boundary: finalize failed: %s", _reason, e)
|
|
# Typing bubble may still show partial content; deliver via send().
|
|
logger.warning("%s boundary: finalize not confirmed, "
|
|
"falling back to send() for pre-prompt text (chat=%s)",
|
|
_reason, self.chat_id)
|
|
try:
|
|
if getattr(await self.adapter.send(self.chat_id, finalize_text), "success", False):
|
|
return True
|
|
except Exception as send_err:
|
|
logger.warning("%s boundary: fallback send also failed: %s", _reason, send_err)
|
|
logger.error("%s boundary: both finalize and fallback send failed "
|
|
"(chat=%s) — pre-prompt text may not have been delivered",
|
|
_reason, self.chat_id)
|
|
return False
|
|
|
|
def on_delta(self, text: str) -> None:
|
|
"""Thread-safe callback from the agent's worker thread. ``None`` signals a tool
|
|
boundary: the current message is finalized and subsequent text goes out as a new
|
|
message below any tool-progress messages."""
|
|
if text:
|
|
self._queue.put(text)
|
|
elif text is None:
|
|
self.on_segment_break()
|
|
|
|
def finish(self, final_text: Optional[str] = None) -> None:
|
|
"""Signal stream completion. ``final_text`` is the AUTHORITATIVE completed
|
|
final_response (incl. post-stream augmentation the accumulator never saw); the drain
|
|
loop adopts it as the finalize payload. Interrupt/error paths call ``finish()`` bare."""
|
|
if final_text is not None:
|
|
self._queue.put((_FINAL_TEXT, final_text))
|
|
self._queue.put(_DONE)
|
|
|
|
async def run(self) -> None:
|
|
"""Async task that drains the queue and edits the platform message."""
|
|
self._len_fn, self._safe_limit = self._resolve_length_budget()
|
|
await self._start_transports()
|
|
try:
|
|
while True:
|
|
# Session reset (/new, /stop): abandon rather than deliver stale deltas.
|
|
if not self._run_still_current():
|
|
await self._abandon_native_stream()
|
|
return
|
|
tick = self._drain_queue()
|
|
|
|
# Boundary produces its own finalize and resets state, so it must
|
|
# run before got_done/segment_break processing.
|
|
if tick.approval_boundary is not None:
|
|
await self._handle_approval_boundary(*tick.approval_boundary)
|
|
continue
|
|
if tick.got_reopen_seed:
|
|
await self._eager_reopen_seed()
|
|
continue
|
|
|
|
if tick.got_done:
|
|
self._flush_think_buffer()
|
|
# A bare intentional-silence marker (NO_REPLY / [SILENT]): the
|
|
# gateway's whole-response filter runs too late for a streamed
|
|
# preview, so retract it here instead of finalizing.
|
|
if _is_intentional_silence_response(self._clean_for_display(self._accumulated)):
|
|
await self._suppress_silence_marker()
|
|
return
|
|
|
|
if self._should_edit(tick) and (
|
|
self._accumulated or (self._use_native_streaming and self._tool_progress_active)
|
|
):
|
|
# Overflow split. Native streaming bypasses this: the adapter
|
|
# truncates against the stream protocol's own limit.
|
|
if not self._use_native_streaming and self._first_send_overflows():
|
|
if await self._split_first_send(tick):
|
|
return
|
|
continue
|
|
await self._seal_overflow_heads()
|
|
await self._push_update(tick)
|
|
|
|
if tick.got_done:
|
|
await self._finalize_turn(tick)
|
|
return
|
|
|
|
if tick.commentary_text is not None:
|
|
await self._deliver_commentary(tick.commentary_text)
|
|
if tick.got_segment_break:
|
|
await self._end_segment(tick)
|
|
|
|
# Done last so the waiter unblocks only once everything queued
|
|
# before the barrier is on screen.
|
|
if tick.got_flush:
|
|
self._signal_flush(tick.flush_event)
|
|
|
|
await asyncio.sleep(0.05) # Small yield to not busy-loop
|
|
|
|
except asyncio.CancelledError:
|
|
await self._on_cancelled()
|
|
except Exception as e:
|
|
logger.error("Stream consumer error: %s", e)
|
|
finally:
|
|
self._wake_flush_waiters()
|
|
|
|
# ── run() collaborators ─────────────────────────────────────────────
|
|
|
|
def _resolve_length_budget(self) -> "tuple[Callable[[str], int], int]":
|
|
"""Per-chat length function (relay adapters differ per chat, e.g. utf16) + budget.
|
|
isinstance gate: MagicMock auto-attributes aren't callables; test doubles use len."""
|
|
len_fn = (self.adapter.message_len_fn_for_chat(self.chat_id)
|
|
if isinstance(self.adapter, _BasePlatformAdapter) else len)
|
|
return len_fn, max(500, self._raw_message_limit() - len_fn(self.cfg.cursor) - 100)
|
|
|
|
async def _start_transports(self) -> None:
|
|
"""Resolve native/draft transport; native wins (adapters declaring it can't edit).
|
|
The empty seed frame shows "typing" before the first token; on failure → edit path."""
|
|
self._use_native_streaming = self._resolve_native_streaming()
|
|
if self._use_native_streaming:
|
|
logger.debug("Stream consumer using native-stream transport (chat=%s)", self.chat_id)
|
|
if await self._try_seed_frame("Native streaming seed frame raised; disabling native",
|
|
exc_info=True):
|
|
self._native_stream_opened = True
|
|
self._use_draft_streaming = False
|
|
return
|
|
self._use_native_streaming = False
|
|
self._use_draft_streaming = self._resolve_draft_streaming()
|
|
# Native draft streaming: bump the draft_id so the next text segment animates as a fresh preview
|
|
# below the tool-progress bubbles, not over the prior segment's already-finalized draft. This is how
|
|
# we avoid the "inter-tool-call text leak" failure mode openclaw documented in their issue #32535 —
|
|
# each text block becomes its own visible message via the finalize, then a new draft animates for
|
|
# the next one.
|
|
if self._use_draft_streaming:
|
|
self._bump_draft_id()
|
|
logger.debug("Stream consumer using native-draft transport (chat=%s draft_id=%s)",
|
|
self.chat_id, self._draft_id)
|
|
|
|
def _drain_queue(self) -> "_Tick":
|
|
"""Drain everything queued so far into one tick. Control sentinels stop the drain
|
|
(they take effect this tick); _FINAL_TEXT / _TOOL_PROGRESS / text deltas fold into
|
|
state so simultaneous items batch."""
|
|
tick = _Tick()
|
|
while True:
|
|
try:
|
|
item = self._queue.get_nowait()
|
|
except queue.Empty:
|
|
return tick
|
|
if item is _DONE:
|
|
tick.got_done = True
|
|
return tick
|
|
if item is _NEW_SEGMENT:
|
|
tick.got_segment_break = True
|
|
return tick
|
|
if item is _REOPEN_SEED:
|
|
tick.got_reopen_seed = True
|
|
return tick
|
|
kind = item[0] if isinstance(item, tuple) and item else None
|
|
if kind is _FINAL_TEXT:
|
|
self._adopt_final_text(item[1])
|
|
elif kind is _TOOL_PROGRESS: # keep draining to batch simultaneous lines
|
|
if self._use_native_streaming:
|
|
self._tool_progress_lines.append(item[1])
|
|
self._tool_progress_active = True
|
|
elif kind is _APPROVAL_BOUNDARY:
|
|
tick.approval_boundary = (item[1], item[2])
|
|
return tick
|
|
elif kind is _COMMENTARY:
|
|
tick.commentary_text = item[1]
|
|
return tick
|
|
elif kind is _FLUSH:
|
|
# Barrier: finalize like a tool boundary, signal at the end of the tick.
|
|
tick.got_flush = tick.got_segment_break = True
|
|
tick.flush_event = item[1]
|
|
return tick
|
|
else:
|
|
self._filter_and_accumulate(item)
|
|
|
|
def _adopt_final_text(self, final_raw: str) -> None:
|
|
"""Adopt the authoritative final (see finish()) as the finalize content — only if this
|
|
consumer streamed something (a no-stream turn keeps the gateway's final-send
|
|
ownership). Split delivery: wholesale adoption would repeat sealed heads, refusing
|
|
makes the gateway resend the ENTIRE body — so append only the suffix when the final
|
|
strictly prefix-extends the ledger."""
|
|
if not (self._accumulated or self._message_id or self._last_sent_text):
|
|
return
|
|
if not self._turn_split_delivery:
|
|
final_payload = self._clean_for_display(final_raw)
|
|
if final_payload and final_payload != self._clean_for_display(self._accumulated):
|
|
self._accumulated = final_raw
|
|
self._stream_ledger = final_raw
|
|
return
|
|
ledger = self._stream_ledger
|
|
if ledger and final_raw.startswith(ledger) and len(final_raw) > len(ledger):
|
|
self._accumulated += final_raw[len(ledger):]
|
|
self._stream_ledger = final_raw
|
|
|
|
async def _eager_reopen_seed(self) -> None:
|
|
"""Eager re-seed after a clarify answer (gate re-checked: state may have advanced).
|
|
Trade-off: WeCom's ~6-minute stream limit (errcode 846608, from the FIRST frame)
|
|
now starts at the reply instant; on expiry we degrade to send()."""
|
|
if not self._reopen_seed_pending():
|
|
return
|
|
if await self._try_seed_frame("Eager reopen seed raised, disabling native: %s"):
|
|
self._native_stream_opened = True
|
|
self._native_last_pushed_len = 0
|
|
self._awaiting_reopen_after_boundary = False
|
|
self._reopen_seeded_eagerly = True
|
|
logger.info("[latency] Eager re-seed after clarify answer "
|
|
"(typing bubble reopened immediately, turn=%s)", self._turn_id)
|
|
else:
|
|
# Degrade to a single buffered send(), like the approval path.
|
|
self._degrade_native_to_buffered_send()
|
|
|
|
def _should_edit(self, tick: "_Tick") -> bool:
|
|
"""Decide whether this tick flushes an edit/frame."""
|
|
if not tick.is_interim:
|
|
return True
|
|
if self.cfg.buffer_only:
|
|
return False
|
|
if self._use_native_streaming:
|
|
# No platform edit-rate limit: push every delta immediately.
|
|
should_edit = bool(self._accumulated) or self._tool_progress_active
|
|
else:
|
|
elapsed = time.monotonic() - self._last_edit_time
|
|
# buffer_threshold is a codepoint debounce heuristic, not a
|
|
# platform-limit check (_len_fn is for overflow).
|
|
should_edit = bool((elapsed >= self._current_edit_interval and self._accumulated)
|
|
or len(self._accumulated) >= self.cfg.buffer_threshold)
|
|
# Defer mid-stream edits while the buffer could still resolve to a silence
|
|
# marker ("NO"→"NO_REPLY"); got_done always resolves the buffer.
|
|
return should_edit and not _is_partial_silence_marker(
|
|
self._clean_for_display(self._accumulated))
|
|
|
|
async def _split_first_send(self, tick: "_Tick") -> bool:
|
|
"""No message to edit yet and the buffer overflows: seal only the head chunks; the
|
|
tail stays in _accumulated as the active preview later deltas edit in place.
|
|
True when the turn finished here (the run loop returns)."""
|
|
chunks = self._truncate_for_stream(self._accumulated, self._safe_limit, self._len_fn)
|
|
if len(chunks) <= 1:
|
|
# Malformed/legacy adapter result must still be splittable.
|
|
chunks = self._split_text_chunks(self._accumulated, self._safe_limit, self._len_fn)
|
|
reply_to = self._initial_reply_to_id
|
|
heads_delivered = len(chunks) > 1
|
|
for chunk in chunks[:-1]:
|
|
new_id = await self._send_new_chunk(chunk, reply_to, final=tick.got_done)
|
|
if new_id is None or new_id == reply_to:
|
|
heads_delivered = False # keep the full text intact for the gateway fallback
|
|
break
|
|
reply_to = new_id
|
|
|
|
if heads_delivered:
|
|
self._accumulated = chunks[-1]
|
|
# Flag BEFORE the tail send: fresh-final replaces every tracked preview
|
|
# with one message, which is only valid while the active message holds
|
|
# the whole answer — deleting sealed heads drops delivered text.
|
|
self._turn_split_delivery = True
|
|
# Heads are sealed (or a later head failed): never edit a sealed message with
|
|
# the unsplit payload — the tail is sent fresh, or the fallback path retries.
|
|
self._message_id = None
|
|
self._message_created_ts = None
|
|
self._last_sent_text = ""
|
|
self._last_edit_time = time.monotonic()
|
|
if tick.got_done:
|
|
tail_delivered = (not self._accumulated
|
|
or await self._send_or_edit(self._accumulated, finalize=True))
|
|
# ``_already_sent`` may be True from prior state — only heads + tail count.
|
|
self._final_response_sent = heads_delivered and tail_delivered
|
|
if self._final_response_sent:
|
|
self._turn_split_delivery = True
|
|
self._mark_final_delivered(record=self._accumulated)
|
|
return True
|
|
if tick.got_segment_break:
|
|
self._fallback_final_send = False
|
|
self._fallback_prefix = ""
|
|
if not self._accumulated:
|
|
return False
|
|
# Early `continue` skips the bottom-of-loop flush signal.
|
|
if tick.got_flush:
|
|
self._signal_flush(tick.flush_event)
|
|
return False
|
|
|
|
def _overflows(self) -> bool:
|
|
return self._len_fn(self._accumulated) > self._safe_limit
|
|
|
|
def _first_send_overflows(self) -> bool:
|
|
return self._message_id is None and self._overflows()
|
|
|
|
async def _seal_overflow_heads(self) -> None:
|
|
"""Existing message overflowing: seal it with the head, start a new message for the rest."""
|
|
while self._overflows() and self._message_id is not None and self._edit_supported:
|
|
cp_budget = _custom_unit_to_cp(self._accumulated, self._safe_limit, self._len_fn)
|
|
split_at = self._accumulated.rfind("\n", 0, cp_budget)
|
|
if split_at < cp_budget // 2:
|
|
split_at = cp_budget
|
|
chunk = self._accumulated[:split_at]
|
|
# finalize=True: the sealed chunk is never edited again, so it needs its
|
|
# rich-text pass now. is_turn_final=False: a split head is not the
|
|
# answer, so fresh-final must not mark the turn delivered on it.
|
|
ok = await self._send_or_edit(chunk, finalize=True, is_turn_final=False)
|
|
if self._fallback_final_send or not ok:
|
|
break # keep the full text intact for the fallback final send
|
|
self._accumulated = self._accumulated[split_at:].lstrip("\n")
|
|
self._message_id = None
|
|
self._last_sent_text = ""
|
|
self._turn_split_delivery = True
|
|
|
|
async def _push_update(self, tick: "_Tick") -> None:
|
|
"""Send/edit this tick's visible text (cursor-suffixed unless finalizing)."""
|
|
display_text = self._accumulated
|
|
if tick.is_interim:
|
|
if self._use_native_streaming:
|
|
display_text = self._compose_frame_content()
|
|
if display_text and self.cfg.cursor:
|
|
display_text += self.cfg.cursor
|
|
else:
|
|
display_text += self.cfg.cursor
|
|
|
|
# A got_done FRESH send via the draft transport already carries finalize=True,
|
|
# unlike an EDIT, which REQUIRES_EDIT_FINALIZE adapters still need a pass for.
|
|
tick.draft_final_fresh_send = (tick.got_done and self._use_draft_streaming
|
|
and self._message_id is None)
|
|
# Segment break finalizes so platforms needing explicit closure (DingTalk AI
|
|
# Cards) don't leave the segment stuck loading; it closes a preamble, not the
|
|
# answer.
|
|
tick.update_visible = await self._send_or_edit(
|
|
display_text, finalize=tick.got_done or tick.got_segment_break,
|
|
is_turn_final=tick.got_done)
|
|
self._last_edit_time = time.monotonic()
|
|
# Lines stay in _tool_progress_lines for the next compose.
|
|
self._tool_progress_active = False
|
|
|
|
async def _finalize_turn(self, tick: "_Tick") -> None:
|
|
"""got_done: final edit without cursor, or one continuation send if edits failed."""
|
|
if self._accumulated or self._message_id is not None or self._already_sent:
|
|
await self._notify_before_finalize()
|
|
if self._reopen_seed_pending() and not self._accumulated:
|
|
# Lazy reopen, no post-prompt content: nothing is open on screen, so
|
|
# don't re-seed just to emit a lone "✅".
|
|
logger.debug("Clarify reopen boundary with no post-prompt content "
|
|
"— skipping lone-placeholder finalize (turn=%s)", self._turn_id)
|
|
elif (self._reopen_seeded_eagerly and self._native_stream_opened
|
|
and not self._accumulated and not tick.update_visible):
|
|
# Eager seed, no content: the typing bubble IS on screen and would hang
|
|
# forever — close it with an empty finalize. Delivery flags untouched.
|
|
await self._close_empty_native_bubble("Eager-seed empty finalize failed: %s")
|
|
logger.debug("Eager reopen seed but no post-answer content — "
|
|
"closed empty typing bubble (turn=%s)", self._turn_id)
|
|
elif self._use_native_streaming:
|
|
# Native streams MUST close with finish=true even when empty (tool-only
|
|
# turns) — placeholder if needed.
|
|
if not tick.update_visible:
|
|
await self._finalize_edit(self._accumulated or "✅", record=False)
|
|
else:
|
|
self._mark_final_delivered()
|
|
elif self._accumulated:
|
|
await self._finalize_edit_path(tick)
|
|
|
|
async def _finalize_edit_path(self, tick: "_Tick") -> None:
|
|
"""Edit-transport finalize (the non-native got_done branches, in priority order)."""
|
|
if self._fallback_final_send:
|
|
await self._send_fallback_final(self._accumulated)
|
|
elif self._final_response_sent:
|
|
# Fresh-final already delivered; a second finalize would duplicate.
|
|
self._mark_final_delivered(record=self._accumulated)
|
|
elif tick.update_visible and (not self._adapter_requires_finalize
|
|
or self._last_edit_overflowed or tick.draft_final_fresh_send):
|
|
# The update already delivered the final. A second finalize would re-edit
|
|
# it (Telegram: editMessageText after sendRichMessage falls back to the
|
|
# legacy formatter) or overflow-split again, duplicating chunks.
|
|
self._mark_skip_redundant_finalize()
|
|
elif self._message_id:
|
|
# No visible update this tick, or the adapter needs explicit finalize=True.
|
|
# The edit may exhaust flood strikes → fallback mode: send the unsent tail.
|
|
if not await self._finalize_edit(self._accumulated) and self._fallback_final_send:
|
|
await self._send_fallback_final(self._accumulated)
|
|
elif not self._already_sent:
|
|
# Retry after the finalize tick failed. finalize=True keeps stream-is-the-
|
|
# message adapters out of the draft-frame branch, whose dedupe against the
|
|
# last UNSEALED frame would report success with no transport call.
|
|
await self._finalize_edit(self._accumulated)
|
|
|
|
async def _finalize_edit(self, text: str, *, record: bool = True) -> bool:
|
|
"""finalize=True send_or_edit; on success mark the turn delivered (+ record payload)."""
|
|
self._final_response_sent = await self._send_or_edit(text, finalize=True)
|
|
if self._final_response_sent:
|
|
self._mark_final_delivered(record=text if record else None)
|
|
return self._final_response_sent
|
|
|
|
def _cumulative_transport(self) -> bool:
|
|
"""Stream-is-the-message drafts and WeCom native: one append-only stream per turn."""
|
|
stream_draft = self._stream_is_message() and self._use_draft_streaming
|
|
return stream_draft or self._use_native_streaming
|
|
|
|
async def _deliver_commentary(self, commentary_text: str) -> None:
|
|
"""Post commentary as its own message. Cumulative transports keep the stream going —
|
|
resetting _accumulated would break the append-only invariant / lose text."""
|
|
cumulative = self._cumulative_transport()
|
|
if not cumulative:
|
|
self._reset_segment_state()
|
|
await self._send_commentary(commentary_text)
|
|
self._last_edit_time = time.monotonic()
|
|
if not cumulative:
|
|
self._reset_segment_state()
|
|
|
|
async def _end_segment(self, tick: "_Tick") -> None:
|
|
"""Tool boundary: edit-based transports reset so the next chunk is a fresh message.
|
|
Cumulative transports must NOT reset — clearing _accumulated makes the next frame a
|
|
non-prefix snapshot and the connector re-appends the whole answer. preserve_no_edit:
|
|
"__no_edit__" (platform never returned a real id — Signal, github_comment webhook)
|
|
must keep its sentinel or every tool boundary posts a new message; the
|
|
continuation goes out once via _send_fallback_final."""
|
|
if self._cumulative_transport():
|
|
return
|
|
# If the segment-break edit didn't land (flood control / fallback mode),
|
|
# _accumulated holds unseen pre-boundary text — flush it before the reset.
|
|
if (self._accumulated and not tick.update_visible and self._message_id
|
|
and self._message_id != "__no_edit__"):
|
|
await self._flush_segment_tail_on_edit_failure()
|
|
self._reset_segment_state(preserve_no_edit=True)
|
|
|
|
async def _on_cancelled(self) -> None:
|
|
"""Best-effort final edit on task cancel: finalize=True so REQUIRES_EDIT_FINALIZE
|
|
platforms apply formatting; is_turn_final=False because this handler owns the flags.
|
|
Only a successful edit confirms delivery — a partial send may be just "Let me
|
|
search…", not the answer."""
|
|
best_effort_ok = False
|
|
if self._accumulated and self._message_id:
|
|
with contextlib.suppress(Exception):
|
|
best_effort_ok = bool(await self._send_or_edit(
|
|
self._accumulated, finalize=True, is_turn_final=False))
|
|
elif self._message_id is None:
|
|
# Draft path keeps _message_id=None; seal in place (else the stream stays
|
|
# visibly live and the adapter keeps armed interception state).
|
|
await self._abandon_native_stream()
|
|
if best_effort_ok and not self._final_response_sent:
|
|
self._mark_final_delivered(record=self._accumulated)
|
|
|
|
def _wake_flush_waiters(self) -> None:
|
|
"""Wake still-queued _FLUSH waiters so a consumer dying mid-flush
|
|
doesn't stall flush_pending_sync() for its full timeout."""
|
|
with contextlib.suppress(Exception):
|
|
while True:
|
|
item = self._queue.get_nowait()
|
|
if isinstance(item, tuple) and len(item) == 2 and item[0] is _FLUSH:
|
|
self._signal_flush(item[1])
|
|
|
|
@staticmethod
|
|
# Strip MEDIA:<path> tags before display. Uses the shared anchored MEDIA_TAG_CLEANUP_RE from
|
|
# gateway/platforms/base.py — only tags whose path ends in a deliverable extension are removed, so an
|
|
# unknown-extension path stays visible instead of being silently dropped (issue #34517). Streaming and
|
|
# non-streaming paths share the same regex, so a tag is treated identically whichever path delivered the
|
|
# text.
|
|
def _clean_for_display(text: str) -> str:
|
|
"""Hide MEDIA:<path> / [[audio_as_voice]] directives; media is delivered post-stream."""
|
|
return _BasePlatformAdapter.strip_media_directives_for_display(text)
|
|
|
|
|
|
# ---- BEGIN PLUGIN-COMPAT (revert-scheduled; see COMPAT_MANIFEST.md) ----
|
|
# Names external plugins imported from this module before the Sep 2026 decomposition.
|
|
# Internal code MUST NOT use these (scripts/check_compat_pointers.py fails CI if it does).
|
|
# The whole block is removed by reverting the commit that added it.
|
|
|
|
|
|
_PLUGIN_COMPAT_LAZY = {
|
|
'MEDIA_TAG_CLEANUP_RE': ('gateway.platforms.base', 'MEDIA_TAG_CLEANUP_RE'),
|
|
'escape_code_fences_for_display': ('gateway.stream_consumer_fences', 'escape_code_fences_for_display'),
|
|
}
|
|
|
|
|
|
def __getattr__(name): # PEP 562 — lazy so no import cycles
|
|
target = _PLUGIN_COMPAT_LAZY.get(name)
|
|
if target is None:
|
|
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
|
|
import importlib
|
|
from hermes_cli.plugin_compat import warn_once
|
|
warn_once(__name__, name, *target)
|
|
return getattr(importlib.import_module(target[0]), target[1])
|
|
# ---- END PLUGIN-COMPAT ----
|