@@ -7,6 +7,9 @@ const composerDraftFileMocks = vi.hoisted(() => {
77 let writeError : Error | null = null ;
88 let releaseRead : ( ( ) => void ) | null = null ;
99 let readBarrier = Promise . resolve ( ) ;
10+ let nextWriteBarrier : Promise < void > | null = null ;
11+ let onWrite : ( ( ) => void ) | null = null ;
12+ const writes : string [ ] = [ ] ;
1013
1114 return {
1215 blockRead ( ) {
@@ -27,6 +30,18 @@ const composerDraftFileMocks = vi.hoisted(() => {
2730 setWriteError ( error : Error | null ) {
2831 writeError = error ;
2932 } ,
33+ setNextWriteBarrier ( barrier : Promise < void > | null ) {
34+ nextWriteBarrier = barrier ;
35+ } ,
36+ setOnWrite ( callback : ( ( ) => void ) | null ) {
37+ onWrite = callback ;
38+ } ,
39+ getWrites ( ) : ReadonlyArray < string > {
40+ return writes ;
41+ } ,
42+ resetWrites ( ) {
43+ writes . length = 0 ;
44+ } ,
3045 Directory : class {
3146 create ( ) { }
3247 } ,
@@ -47,7 +62,18 @@ const composerDraftFileMocks = vi.hoisted(() => {
4762 if ( writeError ) {
4863 throw writeError ;
4964 }
65+ if ( nextWriteBarrier ) {
66+ const barrier = nextWriteBarrier ;
67+ nextWriteBarrier = null ;
68+ return barrier . then ( ( ) => {
69+ document = value ;
70+ writes . push ( value ) ;
71+ onWrite ?.( ) ;
72+ } ) ;
73+ }
5074 document = value ;
75+ writes . push ( value ) ;
76+ onWrite ?.( ) ;
5177 }
5278 } ,
5379 } ;
@@ -62,6 +88,7 @@ vi.mock("expo-file-system", () => ({
6288import { appAtomRegistry } from "./atom-registry" ;
6389import {
6490 clearComposerDraftContentState ,
91+ clearComposerDraftsEnvironment ,
6592 ComposerDraftPersistenceError ,
6693 composerDraftsAtom ,
6794 copyComposerDraftContentIfEmpty ,
@@ -74,8 +101,10 @@ import {
74101 getComposerDraftSnapshot ,
75102 mergeComposerDraftContentState ,
76103 removeComposerDraftsForEnvironment ,
104+ resetComposerDraftsLoadState ,
77105 restoreComposerDraftSnapshotState ,
78106 setComposerDraftText ,
107+ setStickyComposerModelSelection ,
79108 stickyComposerModelSelectionAtom ,
80109} from "./use-composer-drafts" ;
81110
@@ -86,6 +115,12 @@ const DRAFT: ComposerDraft = {
86115
87116afterEach ( ( ) => {
88117 vi . useRealTimers ( ) ;
118+ resetComposerDraftsLoadState ( ) ;
119+ composerDraftFileMocks . setDocument ( "" ) ;
120+ composerDraftFileMocks . setWriteError ( null ) ;
121+ composerDraftFileMocks . setNextWriteBarrier ( null ) ;
122+ composerDraftFileMocks . setOnWrite ( null ) ;
123+ composerDraftFileMocks . resetWrites ( ) ;
89124 appAtomRegistry . set ( composerDraftsAtom , { } ) ;
90125 appAtomRegistry . set ( stickyComposerModelSelectionAtom , null ) ;
91126} ) ;
@@ -159,6 +194,44 @@ describe("mobile composer drafts", () => {
159194 ) . toThrow ( ) ;
160195 } ) ;
161196
197+ it ( "keeps share-import receipts on otherwise contentless new-task drafts" , ( ) => {
198+ const receiptDraft : ComposerDraft = {
199+ text : "" ,
200+ attachments : [ ] ,
201+ importedShareIds : [ "share-1" ] ,
202+ } ;
203+ // The stale-model strip must not touch receipt-bearing drafts, and the
204+ // empty filter must keep them — or the same share would re-import after
205+ // restart.
206+ expect (
207+ decodePersistedComposerState ( {
208+ schemaVersion : 1 ,
209+ drafts : {
210+ "new-task:environment-1:project-1" : {
211+ ...receiptDraft ,
212+ modelSelection : {
213+ instanceId : "codex" ,
214+ model : "gpt-5.4" ,
215+ } ,
216+ } ,
217+ } ,
218+ } ) . drafts ,
219+ ) . toEqual ( {
220+ "new-task:environment-1:project-1" : {
221+ text : "" ,
222+ attachments : [ ] ,
223+ importedShareIds : [ "share-1" ] ,
224+ } ,
225+ } ) ;
226+
227+ expect (
228+ decodePersistedComposerState ( {
229+ schemaVersion : 1 ,
230+ drafts : { "new-task:environment-1:project-1" : receiptDraft } ,
231+ } ) . drafts ,
232+ ) . toEqual ( { "new-task:environment-1:project-1" : receiptDraft } ) ;
233+ } ) ;
234+
162235 it ( "hydrates the global sticky model selection" , ( ) => {
163236 expect (
164237 decodePersistedComposerState ( {
@@ -177,44 +250,33 @@ describe("mobile composer drafts", () => {
177250
178251 it ( "waits for hydration before persisting the latest composer state" , async ( ) => {
179252 vi . useFakeTimers ( ) ;
180- let resolveRead ! : ( contents : string ) => void ;
181- let markReadStarted ! : ( ) => void ;
182- let markWriteStarted ! : ( ) => void ;
183- const readStarted = new Promise < void > ( ( resolve ) => {
184- markReadStarted = resolve ;
185- } ) ;
186- const writeStarted = new Promise < void > ( ( resolve ) => {
187- markWriteStarted = resolve ;
188- } ) ;
189- composerFile . read = new Promise < string > ( ( resolve ) => {
190- resolveRead = resolve ;
253+ composerDraftFileMocks . setDocument ( {
254+ schemaVersion : 1 ,
255+ drafts : {
256+ "environment-1:thread-1" : DRAFT ,
257+ } ,
258+ stickyModelSelection : {
259+ instanceId : "codex" ,
260+ model : "gpt-5.6-sol" ,
261+ } ,
191262 } ) ;
192- composerFile . onReadStart = markReadStarted ;
193- composerFile . onWrite = markWriteStarted ;
194- composerFile . writes = [ ] ;
263+ composerDraftFileMocks . blockRead ( ) ;
264+ composerDraftFileMocks . resetWrites ( ) ;
195265
196266 ensureComposerDraftsLoaded ( ) ;
197- await readStarted ;
267+ await Promise . resolve ( ) ;
268+ // The read is blocked, hydration is pending.
198269 setComposerDraftText ( "new-task:environment-1:project-1" , "New prompt" ) ;
199270 await vi . advanceTimersByTimeAsync ( 200 ) ;
200271
201- expect ( composerFile . writes ) . toEqual ( [ ] ) ;
272+ // Write should still be deferred — hydration has not resolved.
273+ expect ( composerDraftFileMocks . getWrites ( ) ) . toHaveLength ( 0 ) ;
202274
203- resolveRead (
204- JSON . stringify ( {
205- schemaVersion : 1 ,
206- drafts : {
207- "environment-1:thread-1" : DRAFT ,
208- } ,
209- stickyModelSelection : {
210- instanceId : "codex" ,
211- model : "gpt-5.6-sol" ,
212- } ,
213- } ) ,
214- ) ;
215- await writeStarted ;
275+ composerDraftFileMocks . releaseRead ( ) ;
276+ // Let the loadPromise settle and chain into the deferred persist.
277+ await vi . runAllTimersAsync ( ) ;
216278
217- expect ( JSON . parse ( composerFile . writes [ 0 ] ! ) ) . toEqual ( {
279+ expect ( JSON . parse ( composerDraftFileMocks . getWrites ( ) [ 0 ] ! ) ) . toEqual ( {
218280 schemaVersion : 1 ,
219281 drafts : {
220282 "environment-1:thread-1" : DRAFT ,
@@ -230,6 +292,97 @@ describe("mobile composer drafts", () => {
230292 } ) ;
231293 } ) ;
232294
295+ it ( "flush waits for pending hydration instead of clobbering disk" , async ( ) => {
296+ vi . useFakeTimers ( ) ;
297+ composerDraftFileMocks . setDocument ( {
298+ schemaVersion : 1 ,
299+ drafts : {
300+ "environment-1:thread-1" : DRAFT ,
301+ } ,
302+ stickyModelSelection : {
303+ instanceId : "codex" ,
304+ model : "gpt-5.6-sol" ,
305+ } ,
306+ } ) ;
307+ composerDraftFileMocks . blockRead ( ) ;
308+ composerDraftFileMocks . resetWrites ( ) ;
309+
310+ ensureComposerDraftsLoaded ( ) ;
311+ await Promise . resolve ( ) ;
312+ // An edit lands before hydration finishes; its debounced write is gated
313+ // behind the blocked read.
314+ setComposerDraftText ( "new-task:environment-1:project-1" , "New prompt" ) ;
315+
316+ const flush = flushComposerDrafts ( ) ;
317+ await vi . advanceTimersByTimeAsync ( 200 ) ;
318+ // The flush must not have written the pre-hydration snapshot over disk.
319+ expect ( composerDraftFileMocks . getWrites ( ) ) . toHaveLength ( 0 ) ;
320+
321+ composerDraftFileMocks . releaseRead ( ) ;
322+ await flush ;
323+
324+ const written = JSON . parse ( composerDraftFileMocks . getDocument ( ) ) ;
325+ expect ( written . drafts [ "environment-1:thread-1" ] ) . toEqual ( DRAFT ) ;
326+ expect ( written . drafts [ "new-task:environment-1:project-1" ] ) . toEqual ( {
327+ text : "New prompt" ,
328+ attachments : [ ] ,
329+ } ) ;
330+ expect ( written . stickyModelSelection ) . toEqual ( {
331+ instanceId : "codex" ,
332+ model : "gpt-5.6-sol" ,
333+ } ) ;
334+ } ) ;
335+
336+ it ( "serializes environment cleanup after an older queued write" , async ( ) => {
337+ vi . useFakeTimers ( ) ;
338+ composerDraftFileMocks . setDocument ( JSON . stringify ( { schemaVersion : 1 , drafts : { } } ) ) ;
339+ composerDraftFileMocks . resetWrites ( ) ;
340+ let releaseFirstWrite ! : ( ) => void ;
341+ const firstWriteBarrier = new Promise < void > ( ( resolve ) => {
342+ releaseFirstWrite = resolve ;
343+ } ) ;
344+ composerDraftFileMocks . setNextWriteBarrier ( firstWriteBarrier ) ;
345+ let writeCount = 0 ;
346+ const bothWritesCommitted = new Promise < void > ( ( resolve ) => {
347+ composerDraftFileMocks . setOnWrite ( ( ) => {
348+ writeCount += 1 ;
349+ if ( writeCount === 2 ) {
350+ resolve ( ) ;
351+ }
352+ } ) ;
353+ } ) ;
354+
355+ appAtomRegistry . set ( composerDraftsAtom , {
356+ "environment-1:thread-1" : DRAFT ,
357+ "environment-2:thread-2" : { text : "keep" , attachments : [ ] } ,
358+ } ) ;
359+ setStickyComposerModelSelection ( {
360+ instanceId : ProviderInstanceId . make ( "codex" ) ,
361+ model : "gpt-5.6-sol" ,
362+ } ) ;
363+ await vi . advanceTimersByTimeAsync ( 200 ) ;
364+
365+ const clear = clearComposerDraftsEnvironment ( EnvironmentId . make ( "environment-1" ) ) ;
366+ await Promise . resolve ( ) ;
367+ // Cleanup write is queued behind the still-blocked debounced write.
368+ expect ( composerDraftFileMocks . getWrites ( ) ) . toHaveLength ( 0 ) ;
369+
370+ releaseFirstWrite ( ) ;
371+ await clear ;
372+ await bothWritesCommitted ;
373+
374+ expect ( JSON . parse ( composerDraftFileMocks . getDocument ( ) ) ) . toEqual ( {
375+ schemaVersion : 1 ,
376+ drafts : {
377+ "environment-2:thread-2" : { text : "keep" , attachments : [ ] } ,
378+ } ,
379+ stickyModelSelection : {
380+ instanceId : "codex" ,
381+ model : "gpt-5.6-sol" ,
382+ } ,
383+ } ) ;
384+ } ) ;
385+
233386 it ( "clears sent content without clearing the selected model or workspace" , ( ) => {
234387 const draftKey = "environment-1:thread-1" ;
235388 const draft : ComposerDraft = {
0 commit comments