@@ -86,6 +86,7 @@ vi.mock("delay", () => ({
8686} ) )
8787
8888import delay from "delay"
89+ import pWaitFor from "p-wait-for"
8990
9091vi . mock ( "uuid" , async ( importOriginal ) => {
9192 const actual = await importOriginal < typeof import ( "uuid" ) > ( )
@@ -713,6 +714,77 @@ 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+ try {
759+ await mockProvider . addClineToStack ( task )
760+ const request = task . recursivelyMakeClineRequests ( [ { type : "text" , text : "abort flag reset test" } ] )
761+ await Promise . race ( [
762+ retryStreamPaused ,
763+ request . then ( ( ) => {
764+ throw new Error ( "request settled before the retry stream paused" )
765+ } ) ,
766+ ] )
767+
768+ const firstApiReq = task . clineMessages . find ( ( message ) => message . say === "api_req_started" )
769+ expect ( JSON . parse ( firstApiReq ?. text ?? "{}" ) ) . toMatchObject ( { cancelReason : "streaming_failed" } )
770+ expect ( attemptApiRequestSpy ) . toHaveBeenCalledTimes ( 2 )
771+
772+ let cancelSettled = false
773+ const cancel = mockProvider . cancelTask ( ) . then ( ( ) => {
774+ cancelSettled = true
775+ } )
776+ await new Promise ( ( resolve ) => setTimeout ( resolve , 200 ) )
777+ expect ( cancelSettled , "cancelTask must wait while the retry stream is live" ) . toBe ( false )
778+
779+ releaseRetryStream ?.( )
780+ await cancel
781+ await request
782+ } finally {
783+ releaseRetryStream ?.( )
784+ vi . mocked ( pWaitFor ) . mockImplementation ( async ( ) => { } )
785+ }
786+ } )
787+
716788 it ( "finalizes MCP tool call using the request-scoped parser state" , async ( ) => {
717789 const task = new Task ( {
718790 provider : mockProvider ,
0 commit comments