mirror of
https://github.com/getpaseo/paseo.git
synced 2026-11-21 15:55:58 +00:00
fix(acp): settle deferred turn immediately on Stop even if a steer RPC is unanswered
This commit is contained in:
@@ -751,7 +751,7 @@ class AcpRuntime {
|
||||
// An agent may wait for its outstanding permission replies before ending the prompt.
|
||||
if (active) {
|
||||
this.finishTurnPermissions(active.turnId);
|
||||
if (active.deferred && active.wirePromptsInFlight === 0) {
|
||||
if (active.deferred) {
|
||||
this.finishDeferredTurn(active, { type: "cancel" });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4250,7 +4250,11 @@ describe("deferTurnOnRunningTools", () => {
|
||||
instance.respond(request, { stopReason: "end_turn" });
|
||||
return true;
|
||||
}
|
||||
rejectHeldSteer = () => instance.reject(request, "Request aborted");
|
||||
if (promptCount === 4) {
|
||||
rejectHeldSteer = () => instance.reject(request, "Request aborted");
|
||||
return true;
|
||||
}
|
||||
instance.respond(request, { stopReason: "end_turn" });
|
||||
return true;
|
||||
},
|
||||
});
|
||||
@@ -4375,7 +4379,6 @@ describe("deferTurnOnRunningTools", () => {
|
||||
requestId: "stop-race",
|
||||
sessionId: "session-1",
|
||||
});
|
||||
rejectHeldSteer!();
|
||||
await waitForEvent(
|
||||
events,
|
||||
(event) =>
|
||||
@@ -4383,6 +4386,26 @@ describe("deferTurnOnRunningTools", () => {
|
||||
event.turnId === "acp:cancel-race-turn" &&
|
||||
event.state === "canceled",
|
||||
);
|
||||
// Even before the old steer settles (or if it never answers), a new prompt starts cleanly.
|
||||
await connection.send({
|
||||
type: "session.prompt",
|
||||
sessionId: "session-1",
|
||||
prompt: {
|
||||
clientMessageId: "after-unanswered-steer",
|
||||
delivery: "auto",
|
||||
input: { type: "message", content: [{ type: "text", text: "fresh prompt" }] },
|
||||
},
|
||||
});
|
||||
await waitForEvent(
|
||||
events,
|
||||
(event) =>
|
||||
event.type === "session.turn" &&
|
||||
event.turnId === "acp:after-unanswered-steer" &&
|
||||
event.state === "completed",
|
||||
);
|
||||
// Late rejection of the old steer after the new prompt is ignored cleanly.
|
||||
rejectHeldSteer!();
|
||||
await new Promise((resolve) => setTimeout(resolve, 30));
|
||||
} finally {
|
||||
await connection.close();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user