@@ -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,98 @@ 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 markCancelWaiting : ( ( ) => void ) | undefined
775+ const cancelWaiting = new Promise < void > ( ( resolve ) => {
776+ markCancelWaiting = resolve
777+ } )
778+ vi . mocked ( pWaitFor ) . mockImplementation ( ( condition , options ) =>
779+ realPWaitFor ( async ( ) => {
780+ const done = await condition ( )
781+ if ( ! done ) markCancelWaiting ?.( )
782+ return done
783+ } , options ) ,
784+ )
785+
786+ vi . spyOn ( mockProvider , "createTaskWithHistoryItem" ) . mockImplementation ( ( historyItem ) =>
787+ ClineProvider . prototype . createTaskWithHistoryItem . call ( mockProvider , historyItem , {
788+ startTask : false ,
789+ } ) ,
790+ )
791+
792+ let cancelSettled = false
793+ cancel = mockProvider . cancelTask ( ) . then ( ( ) => {
794+ cancelSettled = true
795+ } )
796+ await Promise . race ( [ cancelWaiting , cancel ] )
797+ expect ( cancelSettled , "cancelTask must wait while the retry stream is live" ) . toBe ( false )
798+
799+ releaseRetryStream ?.( )
800+ await cancel
801+ await expect ( request ) . resolves . toBe ( true )
802+ } finally {
803+ releaseRetryStream ?.( )
804+ await Promise . allSettled ( [ request , cancel ] )
805+ vi . mocked ( pWaitFor ) . mockImplementation ( async ( ) => { } )
806+ }
807+ } )
808+
716809 it ( "finalizes MCP tool call using the request-scoped parser state" , async ( ) => {
717810 const task = new Task ( {
718811 provider : mockProvider ,
0 commit comments