@@ -12,6 +12,9 @@ const fixture = vi.hoisted(() => ({
1212 sessions : new Map < string , string > ( ) ,
1313 failClose : false ,
1414 sideChatShell : null as { latestRun : { runId : string } | null } | null ,
15+ threadRemoved : false ,
16+ failDelete : false ,
17+ shellStatus : "live" ,
1518 clearedDrafts : [ ] as ScopedThreadRef [ ] ,
1619} ) ) ;
1720vi . mock ( "../lib/terminalCloseConfirm" , ( ) => ( {
@@ -34,6 +37,7 @@ vi.mock("../state/entities", () => ({
3437 useQuietThreadShell : ( ) => null ,
3538 useProject : ( ) => null ,
3639 readThreadShell : ( ) => fixture . sideChatShell ,
40+ waitForThreadRemoval : async ( ) => fixture . threadRemoved ,
3741} ) ) ;
3842vi . mock ( "../state/terminalSessions" , ( ) => ( { useKnownTerminalSessions : ( ) => null } ) ) ;
3943vi . mock ( "../composerDraftStore" , async ( ) => {
@@ -56,6 +60,7 @@ vi.mock("../state/use-atom-command", () => ({
5660 } ) => {
5761 const key = `${ request . environmentId } /${ request . input . threadId } /${ request . input . terminalId } ` ;
5862 if ( label === "terminal close" && fixture . failClose ) return { _tag : "Failure" } ;
63+ if ( label === "side chat delete" && fixture . failDelete ) return { _tag : "Failure" } ;
5964 if ( label === "terminal close" || label === "terminal write" ) fixture . sessions . delete ( key ) ;
6065 return { _tag : "Success" } ;
6166 } ,
@@ -65,7 +70,9 @@ vi.mock("../state/terminal", () => ({ terminalEnvironment: { open: {}, close: {}
6570vi . mock ( "../state/preview" , ( ) => ( { previewEnvironment : { close : { } } } ) ) ;
6671vi . mock ( "../state/threads" , ( ) => ( { threadEnvironment : { delete : { } } } ) ) ;
6772vi . mock ( "../state/shell" , ( ) => ( { environmentShell : { stateValueAtom : ( ) => null } } ) ) ;
68- vi . mock ( "../rpc/atomRegistry" , ( ) => ( { appAtomRegistry : { get : ( ) => ( { status : "live" } ) } } ) ) ;
73+ vi . mock ( "../rpc/atomRegistry" , ( ) => ( {
74+ appAtomRegistry : { get : ( ) => ( { status : fixture . shellStatus } ) } ,
75+ } ) ) ;
6976vi . mock ( "@t3tools/client-runtime/state/runtime" , ( ) => ( {
7077 isAtomCommandInterrupted : ( ) => false ,
7178} ) ) ;
@@ -75,6 +82,9 @@ function setup() {
7582 fixture . sessions = new Map ( ) ;
7683 fixture . failClose = false ;
7784 fixture . sideChatShell = null ;
85+ fixture . threadRemoved = false ;
86+ fixture . failDelete = false ;
87+ fixture . shellStatus = "live" ;
7888 fixture . clearedDrafts = [ ] ;
7989 useRightPanelStore . setState ( { byThreadKey : { } } ) ;
8090 useTerminalUiStateStore . setState ( { terminalUiStateByThreadKey : { } } ) ;
@@ -145,14 +155,20 @@ it.each(["cancel", "revoked"])(
145155 } ,
146156) ;
147157
158+ // The local shell lags the server, so a run-less shell never proves the side chat was deleted.
148159it . each ( [
149- { latestRun : null , cleared : true } ,
150- { latestRun : { runId : "run-1" } , cleared : false } ,
160+ { name : "the thread leaves the live shell" , threadRemoved : true , cleared : true } ,
161+ { name : "the server keeps the thread" , threadRemoved : false , cleared : false } ,
162+ { name : "the delete fails" , threadRemoved : true , failDelete : true , cleared : false } ,
163+ { name : "the shell is not live" , threadRemoved : true , shellStatus : "loading" , cleared : false } ,
151164] ) (
152- "clears a closed side chat's draft only when it never ran, cleared=$cleared " ,
153- async ( { latestRun , cleared } ) => {
165+ "clears a closed side chat's draft only after deletion: $name " ,
166+ async ( { threadRemoved , failDelete = false , shellStatus = "live" , cleared } ) => {
154167 const { original } = setup ( ) ;
155- fixture . sideChatShell = { latestRun } ;
168+ fixture . sideChatShell = { latestRun : null } ;
169+ fixture . threadRemoved = threadRemoved ;
170+ fixture . failDelete = failDelete ;
171+ fixture . shellStatus = shellStatus ;
156172 const sideChatId = ThreadId . make ( "side-chat-a" ) ;
157173 useRightPanelStore . getState ( ) . openSideChat ( original , sideChatId ) ;
158174 const surface = selectThreadRightPanelState (
@@ -168,6 +184,7 @@ it.each([
168184 }
169185 await using screen = await render ( < SideChatHarness /> ) ;
170186 await screen . getByRole ( "button" ) . click ( ) ;
187+ await act ( async ( ) => { } ) ;
171188 expect ( fixture . clearedDrafts ) . toEqual (
172189 cleared ? [ { environmentId : original . environmentId , threadId : sideChatId } ] : [ ] ,
173190 ) ;
0 commit comments