@@ -13,9 +13,12 @@ import type { PreparedTurnAttachments } from "../lib/attachmentUpload";
1313
1414const harness = vi . hoisted ( ( ) => ( {
1515 canOperate : true ,
16- threadProjection : null as unknown as import ( "effect/reactivity" ) . Atom . Writable < {
17- readonly projection : { readonly messages : ReadonlyArray < { readonly id : string } > } ;
18- } | null > ,
16+ threadState : null as unknown as import ( "effect/reactivity" ) . Atom . Writable < {
17+ readonly data : import ( "effect/Option" ) . Option < {
18+ readonly messages : ReadonlyArray < { readonly id : string } > ;
19+ } > ;
20+ readonly sequence : number;
21+ } > ,
1922 manager : null as unknown as ReturnType <
2023 typeof import ( "./thread-outbox-manager" ) . createThreadOutboxManager
2124 > ,
@@ -92,12 +95,14 @@ vi.mock("./git", () => ({ gitEnvironment: {} }));
9295
9396vi . mock ( "./threads" , async ( ) => {
9497 const { Atom } = await import ( "effect/reactivity" ) ;
95- harness . threadProjection = Atom . make < {
96- readonly projection : { readonly messages : ReadonlyArray < { readonly id : string } > } ;
97- } | null > ( null ) . pipe ( Atom . keepAlive ) ;
98+ const Option = await import ( "effect/Option" ) ;
99+ harness . threadState = Atom . make ( {
100+ data : Option . none < { readonly messages : ReadonlyArray < { readonly id : string } > } > ( ) ,
101+ sequence : 0 ,
102+ } ) . pipe ( Atom . keepAlive ) ;
98103 return {
99104 threadEnvironment : { } ,
100- environmentThreadDetails : { threadAtom : ( ) => harness . threadProjection } ,
105+ environmentThreadDetails : { stateAtom : ( ) => harness . threadState } ,
101106 } ;
102107} ) ;
103108
@@ -138,6 +143,7 @@ vi.mock("./thread-outbox", async () => {
138143 } ;
139144} ) ;
140145
146+ import * as Option from "effect/Option" ;
141147import { appAtomRegistry } from "./atom-registry" ;
142148import { pendingThreadCreationOutcomesAtom } from "./pending-thread-creation" ;
143149import { clearThreadComposerError , threadComposerErrorsAtom } from "./thread-composer-error" ;
@@ -204,7 +210,7 @@ function remainingMessages(): ReadonlyArray<QueuedThreadMessage> {
204210
205211beforeEach ( ( ) => {
206212 appAtomRegistry . set ( acknowledgedThreadMessagesAtom , [ ] ) ;
207- appAtomRegistry . set ( harness . threadProjection , null ) ;
213+ appAtomRegistry . set ( harness . threadState , { data : Option . none ( ) , sequence : 0 } ) ;
208214 harness . canOperate = true ;
209215 harness . draftFile . setDocument ( { schemaVersion : 1 , drafts : { } } ) ;
210216} ) ;
@@ -330,26 +336,32 @@ describe("thread outbox attachment preparation", () => {
330336} ) ;
331337
332338describe ( "thread outbox drain delivery cleanup" , ( ) => {
333- it ( "drops echoed acknowledged rows at the next delivery without subscribing to the thread" , async ( ) => {
339+ it ( "drops caught-up acknowledged rows at the next delivery without subscribing to the thread" , async ( ) => {
334340 const first = queuedMessage ( { messageId : "awaiting-echo" , text : "Delivered" } ) ;
335341 const second = queuedMessage ( { messageId : "next-delivery" , text : "Also delivered" } ) ;
336342 await harness . manager . enqueue ( first ) ;
337343 await harness . manager . enqueue ( second ) ;
338344
339345 await expect (
340- completeQueuedMessageDelivery ( first , harness . manager . revisionOf ( first . messageId ) ) ,
346+ completeQueuedMessageDelivery ( first , harness . manager . revisionOf ( first . messageId ) , 7 ) ,
341347 ) . resolves . toBe ( "removed" ) ;
342- expect ( appAtomRegistry . get ( acknowledgedThreadMessagesAtom ) ) . toEqual ( [ first ] ) ;
343-
344- appAtomRegistry . set ( harness . threadProjection , {
345- projection : { messages : [ { id : "unrelated" } , { id : first . messageId } ] } ,
348+ expect ( appAtomRegistry . get ( acknowledgedThreadMessagesAtom ) ) . toEqual ( [
349+ { ...first , sequence : 7 } ,
350+ ] ) ;
351+
352+ // The thread applied the message, but its bounded window does not hold it.
353+ appAtomRegistry . set ( harness . threadState , {
354+ data : Option . some ( { messages : [ { id : "unrelated" } ] } ) ,
355+ sequence : 7 ,
346356 } ) ;
347- expect ( appAtomRegistry . get ( acknowledgedThreadMessagesAtom ) ) . toEqual ( [ first ] ) ;
357+ expect ( appAtomRegistry . get ( acknowledgedThreadMessagesAtom ) ) . toHaveLength ( 1 ) ;
348358
349359 await expect (
350- completeQueuedMessageDelivery ( second , harness . manager . revisionOf ( second . messageId ) ) ,
360+ completeQueuedMessageDelivery ( second , harness . manager . revisionOf ( second . messageId ) , 9 ) ,
351361 ) . resolves . toBe ( "removed" ) ;
352- expect ( appAtomRegistry . get ( acknowledgedThreadMessagesAtom ) ) . toEqual ( [ second ] ) ;
362+ expect ( appAtomRegistry . get ( acknowledgedThreadMessagesAtom ) ) . toEqual ( [
363+ { ...second , sequence : 9 } ,
364+ ] ) ;
353365 } ) ;
354366
355367 it ( "removes an acknowledged outbox item even when the sign-out archive write fails" , async ( ) => {
@@ -359,7 +371,11 @@ describe("thread outbox drain delivery cleanup", () => {
359371 harness . draftFile . setWriteError ( new Error ( "Draft storage unavailable" ) ) ;
360372
361373 await expect (
362- completeQueuedMessageDelivery ( message , harness . manager . revisionOf ( message . messageId ) ) ,
374+ completeQueuedMessageDelivery (
375+ message ,
376+ harness . manager . revisionOf ( message . messageId ) ,
377+ undefined ,
378+ ) ,
363379 ) . resolves . toBe ( "removed" ) ;
364380 expect ( remainingMessages ( ) ) . toEqual ( [ ] ) ;
365381
@@ -390,9 +406,9 @@ describe("thread outbox drain delivery cleanup", () => {
390406 ) . toEqual ( [ message ] ) ;
391407
392408 if ( cleared ) await harness . manager . clearEnvironment ( message . environmentId ) ;
393- await expect ( completeQueuedMessageDelivery ( message , deliveryRevision ) ) . resolves . toBe (
394- cleared ? "edited" : "removed" ,
395- ) ;
409+ await expect (
410+ completeQueuedMessageDelivery ( message , deliveryRevision , undefined ) ,
411+ ) . resolves . toBe ( cleared ? "edited" : "removed" ) ;
396412
397413 appAtomRegistry . set ( composerDrafts . composerCloudDraftsAtom , {
398414 accountId : null ,
@@ -412,7 +428,9 @@ describe("thread outbox drain delivery cleanup", () => {
412428 await harness . manager . update ( edited ) ;
413429 await composerDrafts . archiveCloudComposerDrafts ( "account-a" , new Set ( [ message . environmentId ] ) ) ;
414430 await harness . manager . clearEnvironment ( message . environmentId ) ;
415- await expect ( completeQueuedMessageDelivery ( message , deliveryRevision ) ) . resolves . toBe ( "edited" ) ;
431+ await expect ( completeQueuedMessageDelivery ( message , deliveryRevision , undefined ) ) . resolves . toBe (
432+ "edited" ,
433+ ) ;
416434 await composerDrafts . restoreCloudComposerDrafts ( "account-a" ) ;
417435 expect ( remainingMessages ( ) ) . toEqual ( [ edited ] ) ;
418436 } ) ;
@@ -447,7 +465,9 @@ describe("thread outbox drain delivery cleanup", () => {
447465 const edited = { ...message , text : "edited while the turn delivered" } ;
448466 await harness . manager . update ( edited ) ;
449467
450- await expect ( completeQueuedMessageDelivery ( message , deliveryRevision ) ) . resolves . toBe ( "edited" ) ;
468+ await expect ( completeQueuedMessageDelivery ( message , deliveryRevision , undefined ) ) . resolves . toBe (
469+ "edited" ,
470+ ) ;
451471
452472 expect ( remainingMessages ( ) ) . toEqual ( [ edited ] ) ;
453473 expect ( harness . removePersistedFile ) . not . toHaveBeenCalled ( ) ;
@@ -458,7 +478,9 @@ describe("thread outbox drain delivery cleanup", () => {
458478 await harness . manager . enqueue ( message ) ;
459479 const deliveryRevision = harness . manager . revisionOf ( message . messageId ) ;
460480
461- await expect ( completeQueuedMessageDelivery ( message , deliveryRevision ) ) . resolves . toBe ( "removed" ) ;
481+ await expect ( completeQueuedMessageDelivery ( message , deliveryRevision , undefined ) ) . resolves . toBe (
482+ "removed" ,
483+ ) ;
462484
463485 expect ( remainingMessages ( ) ) . toEqual ( [ ] ) ;
464486 expect ( appAtomRegistry . get ( acknowledgedThreadMessagesAtom ) ) . toEqual ( [ message ] ) ;
@@ -479,7 +501,7 @@ describe("thread outbox drain delivery cleanup", () => {
479501 await harness . manager . enqueue ( message ) ;
480502 const deliveryRevision = harness . manager . revisionOf ( message . messageId ) ;
481503
482- const cleanup = completeQueuedMessageDelivery ( message , deliveryRevision ) ;
504+ const cleanup = completeQueuedMessageDelivery ( message , deliveryRevision , undefined ) ;
483505 await removeStarted . promise ;
484506 appAtomRegistry . set ( editingQueuedMessageIdsAtom , { [ message . messageId ] : true } ) ;
485507 removeBarrier . resolve ( ) ;
0 commit comments