Skip to content

Commit 5c04578

Browse files
committed
fix: reset didFinishAbortingStream for each request
1 parent c0a50e5 commit 5c04578

2 files changed

Lines changed: 76 additions & 0 deletions

File tree

‎src/core/task/Task.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3236,6 +3236,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
32363236
this.didRejectTool = false
32373237
this.didAlreadyUseTool = false
32383238
this.assistantMessageSavedToHistory = false
3239+
this.didFinishAbortingStream = false
32393240
this.resetAssistantMessagePersistence()
32403241
// Reset tool failure flag for each new assistant turn - this ensures that tool failures
32413242
// only prevent attempt_completion within the same assistant message, not across turns

‎src/core/task/__tests__/Task.spec.ts‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ vi.mock("delay", () => ({
8686
}))
8787

8888
import delay from "delay"
89+
import pWaitFor from "p-wait-for"
8990

9091
vi.mock("uuid", async (importOriginal) => {
9192
const actual = await importOriginal<typeof import("uuid")>()
@@ -713,6 +714,80 @@ describe("Cline", () => {
713714
])
714715
})
715716

717+
it("clears didFinishAbortingStream on retry so cancelTask waits for the new stream (#1801)", async () => {
718+
const task = new Task({
719+
provider: mockProvider,
720+
apiConfiguration: mockApiConfig,
721+
task: "abort flag reset test",
722+
startTask: false,
723+
})
724+
725+
vi.spyOn(task.diffViewProvider, "reset").mockResolvedValue(undefined)
726+
vi.spyOn(getTaskTestAccess(task), "safeEnsureModelFetched").mockResolvedValue(stubModelInfo)
727+
vi.spyOn(getTaskTestAccess(task), "presentAssistantMessageSafe").mockImplementation(() => {})
728+
729+
const failingStream = async function* (): AsyncGenerator<ApiStreamChunk> {
730+
yield { type: "text", text: "partial" }
731+
throw new Error("simulated mid-stream failure")
732+
}
733+
734+
let releaseRetryStream: (() => void) | undefined
735+
let markRetryStreamPaused: (() => void) | undefined
736+
const retryStreamRelease = new Promise<void>((resolve) => {
737+
releaseRetryStream = resolve
738+
})
739+
const retryStreamPaused = new Promise<void>((resolve) => {
740+
markRetryStreamPaused = resolve
741+
})
742+
const pausedRetryStream = async function* (): AsyncGenerator<ApiStreamChunk> {
743+
yield { type: "text", text: "retry" }
744+
markRetryStreamPaused?.()
745+
await retryStreamRelease
746+
}
747+
748+
const attemptApiRequestSpy = vi
749+
.spyOn(task, "attemptApiRequest")
750+
.mockImplementationOnce(() => failingStream())
751+
.mockImplementationOnce(() => pausedRetryStream())
752+
.mockImplementation(() => {
753+
throw new Error("stop after retry response")
754+
})
755+
756+
const { default: realPWaitFor } = await vi.importActual<typeof import("p-wait-for")>("p-wait-for")
757+
vi.mocked(pWaitFor).mockImplementation(realPWaitFor)
758+
let request: Promise<boolean> | undefined
759+
let cancel: Promise<void> | undefined
760+
try {
761+
await mockProvider.addClineToStack(task)
762+
request = task.recursivelyMakeClineRequests([{ type: "text", text: "abort flag reset test" }])
763+
await Promise.race([
764+
retryStreamPaused,
765+
request.then(() => {
766+
throw new Error("request settled before the retry stream paused")
767+
}),
768+
])
769+
770+
const firstApiReq = task.clineMessages.find((message) => message.say === "api_req_started")
771+
expect(JSON.parse(firstApiReq?.text ?? "{}")).toMatchObject({ cancelReason: "streaming_failed" })
772+
expect(attemptApiRequestSpy).toHaveBeenCalledTimes(2)
773+
774+
let cancelSettled = false
775+
cancel = mockProvider.cancelTask().then(() => {
776+
cancelSettled = true
777+
})
778+
await new Promise((resolve) => setTimeout(resolve, 200))
779+
expect(cancelSettled, "cancelTask must wait while the retry stream is live").toBe(false)
780+
781+
releaseRetryStream?.()
782+
await cancel
783+
await request
784+
} finally {
785+
releaseRetryStream?.()
786+
await Promise.allSettled([request, cancel])
787+
vi.mocked(pWaitFor).mockImplementation(async () => {})
788+
}
789+
})
790+
716791
it("finalizes MCP tool call using the request-scoped parser state", async () => {
717792
const task = new Task({
718793
provider: mockProvider,

0 commit comments

Comments
 (0)