root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(acp): de-flake cancel-mid-prompt fixture race in CI

Browse Source 
The echo-agent fixture's prompt handler awaits a sessionUpdate write before
registering the cancellable hang; the cancel notification is dispatched
concurrently and could land first on loaded CI shards, no-op, and leave the
prompt hanging forever (5s test timeout on shard 2). The fixture now records a
pending cancel so prompt() resolves 'cancelled' immediately regardless of
arrival order. Test-fixture-only change; verified 5x locally.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
gsxdsm
2026-06-03 10:20:50 -07:00
parent fee6cc2609
commit da000b1c24
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/fusion-plugin-acp-runtime/src/__tests__/fixtures/echo-agent.mjs
View File

@@ -135,6 +135,15 @@ class EchoAgent {
// Cancel-mid-prompt test: keep the turn open until cancel() arrives, then
// resolve with the "cancelled" stop reason (mirrors a real agent).
if (process.env.ACP_FIXTURE_HANG_PROMPT === "1") {
// Race-proof: cancel() can be dispatched while this handler is suspended
// on the sessionUpdate write above (JSON-RPC notifications are handled
// concurrently). If the cancel already landed, resolve immediately
// instead of registering a hang nobody will release — this exact race
// made the cancel-mid-prompt test time out on loaded CI shards.
if (this._cancelRequested) {
this._cancelRequested = false;
return { stopReason: "cancelled" };
}
return await new Promise((resolve) => {
this._cancelTurn = () => resolve({ stopReason: "cancelled" });
});
@@ -143,11 +152,15 @@ class EchoAgent {
}
async cancel(_params) {
// Release any in-flight hung turn with a "cancelled" stop reason.
// Release any in-flight hung turn with a "cancelled" stop reason. If the
// prompt handler hasn't reached its hang point yet, record the cancel so
// it resolves immediately when it does (see prompt()).
if (this._cancelTurn) {
const release = this._cancelTurn;
this._cancelTurn = undefined;
release();
} else {
this._cancelRequested = true;
}
}
}