@@ -28,6 +28,7 @@ import { deriveComposerSendState } from "../ChatView.logic";
2828import { ComposerPrimaryActions } from "./ComposerPrimaryActions" ;
2929import { AppAtomRegistryProvider , appAtomRegistry } from "../../rpc/atomRegistry" ;
3030import { useQueuedRunEdit } from "./useQueuedRunEdit" ;
31+ import { readAttachmentUpload , useAttachmentUploadStore } from "../../lib/attachmentUploadQueue" ;
3132
3233interface RunStatus {
3334 readonly id : RunId ;
@@ -150,6 +151,7 @@ function view(
150151
151152function setup ( ) {
152153 mocks . editQueuedRun . mockReset ( ) ;
154+ useAttachmentUploadStore . setState ( { uploadsByImageId : { } } ) ;
153155 useComposerDraftStore . setState ( { draftsByThreadKey : { } , draftThreadsByThreadKey : { } } ) ;
154156 setRuns ( THREAD_A , "queued" ) ;
155157 setRuns ( THREAD_B , "queued" ) ;
@@ -406,6 +408,82 @@ describe("useQueuedRunEdit", () => {
406408 expect ( promptOf ( THREAD_A ) ) . toBe ( "" ) ;
407409 } ) ;
408410
411+ it . each ( [
412+ { transition : "cancel" , result : "Success" } ,
413+ { transition : "cancel" , result : "Failure" } ,
414+ { transition : "keep" , result : "Failure" } ,
415+ { transition : "recover" , result : "Failure" } ,
416+ { transition : "replace" , result : "Success" } ,
417+ { transition : "replace" , result : "Failure" } ,
418+ ] as const ) (
419+ "settles saved attachments after $transition and $result" ,
420+ async ( { transition, result } ) => {
421+ const { hook } = setup ( ) ;
422+ let finishSave ! : ( result : { readonly _tag : "Success" | "Failure" } ) => void ;
423+ let started ! : ( ) => void ;
424+ const saving = new Promise < { readonly _tag : "Success" | "Failure" } > ( ( resolve ) => {
425+ finishSave = resolve ;
426+ } ) ;
427+ const requested = new Promise < void > ( ( resolve ) => {
428+ started = resolve ;
429+ } ) ;
430+ mocks . editQueuedRun . mockImplementation ( ( ) => {
431+ started ( ) ;
432+ return saving ;
433+ } ) ;
434+ await using _screen = await render ( view ( THREAD_A , "queued" , hook ) ) ;
435+ await beginChangedEdit ( hook ) ;
436+ const image = {
437+ type : "image" as const ,
438+ id : "saved-image" ,
439+ name : "image.png" ,
440+ mimeType : "image/png" ,
441+ sizeBytes : 5 ,
442+ file : new File ( [ "image" ] , "image.png" , { type : "image/png" } ) ,
443+ previewUrl : "blob:saved-image" ,
444+ } ;
445+ using revoke = vi . spyOn ( URL , "revokeObjectURL" ) . mockImplementation ( ( ) => { } ) ;
446+ await act ( ( ) =>
447+ useComposerDraftStore . getState ( ) . addImage ( requireHook ( hook ) . draftTarget , image ) ,
448+ ) ;
449+ useAttachmentUploadStore . setState ( {
450+ uploadsByImageId : {
451+ [ image . id ] : { status : "ready" , environmentId : ENV , attachmentId : "saved-upload" } ,
452+ } ,
453+ } ) ;
454+ const target = requireHook ( hook ) . draftTarget ;
455+ const saved = requireHook ( hook ) . saveEdit (
456+ { ...savedContent ( "changed" ) , images : [ image ] } ,
457+ ( ) => { } ,
458+ ) ;
459+ await act ( ( ) => requested ) ;
460+ expect ( requireHook ( hook ) . isSaving ) . toBe ( true ) ;
461+ if ( transition === "cancel" ) await act ( ( ) => requireHook ( hook ) . cancelEdit ( ) ) ;
462+ if ( transition === "recover" ) await act ( ( ) => setRuns ( THREAD_A , "running" ) ) ;
463+ if ( transition === "replace" ) {
464+ await beginChangedEdit ( hook ) ;
465+ await act ( ( ) =>
466+ useComposerDraftStore . getState ( ) . addImage ( requireHook ( hook ) . draftTarget , image ) ,
467+ ) ;
468+ }
469+ expect ( readAttachmentUpload ( image . id ) ) . toBeDefined ( ) ;
470+ expect ( revoke ) . not . toHaveBeenCalled ( ) ;
471+ finishSave ( { _tag : result } ) ;
472+ await act ( ( ) => saved ) ;
473+ if ( transition === "cancel" ) {
474+ expect ( readAttachmentUpload ( image . id ) ) . toBeUndefined ( ) ;
475+ expect ( revoke ) . toHaveBeenCalledWith ( image . previewUrl ) ;
476+ expect ( useComposerDraftStore . getState ( ) . getComposerDraft ( target ) ) . toBeNull ( ) ;
477+ } else {
478+ expect ( readAttachmentUpload ( image . id ) ) . toBeDefined ( ) ;
479+ expect ( revoke ) . not . toHaveBeenCalled ( ) ;
480+ const owner = transition === "recover" ? THREAD_A : target ;
481+ expect ( useComposerDraftStore . getState ( ) . getComposerDraft ( owner ) ?. images ) . toEqual ( [ image ] ) ;
482+ }
483+ useAttachmentUploadStore . setState ( { uploadsByImageId : { } } ) ;
484+ } ,
485+ ) ;
486+
409487 it ( "leaves a newer edit alone when a save from before navigation finishes" , async ( ) => {
410488 const { hook } = setup ( ) ;
411489 let finishSave : ( result : { readonly _tag : "Success" } ) => void = ( ) => { } ;
0 commit comments