@@ -373,6 +373,7 @@ const cleanupFixture = (
373373 ) ) as unknown as SqlClient . SqlClient ) ,
374374 Effect . provideService ( GitManager . GitManager , {
375375 invalidateStatus : ( ) => Effect . void ,
376+ branchPullRequest : ( ) => Effect . succeed ( null ) ,
376377 } as unknown as GitManager . GitManager [ "Service" ] ) ,
377378 Effect . provideService ( TerminalManager . TerminalManager , {
378379 subscribeMetadata : ( ) => Effect . succeed ( ( ) => { } ) ,
@@ -1866,6 +1867,68 @@ describe("settled worktree rechecks", () => {
18661867 ) ;
18671868} ) ;
18681869
1870+ describe ( "worktree cleanup that requires landed work" , ( ) => {
1871+ const triggers = {
1872+ settled : {
1873+ settings : { worktreeSettledAfterDays : 0 } ,
1874+ thread : { settledAt : at ( 0 ) } ,
1875+ removed : "Settled for 0 days" ,
1876+ } ,
1877+ inactive : {
1878+ settings : { worktreeAfterDays : 8 } ,
1879+ thread : { } ,
1880+ removed : "Inactive for 30 days" ,
1881+ } ,
1882+ deleted : {
1883+ settings : { worktreeOnDelete : true } ,
1884+ thread : { deletedAt : at ( - DAY_MS ) } ,
1885+ removed : "Thread was deleted" ,
1886+ } ,
1887+ } as const ;
1888+
1889+ it . effect . each ( Object . keys ( triggers ) as ( keyof typeof triggers ) [ ] ) (
1890+ "keeps unlanded commits for the %s trigger until the head reaches the default branch" ,
1891+ ( trigger ) =>
1892+ Effect . gen ( function * ( ) {
1893+ yield * TestClock . setTime ( NOW_MS ) ;
1894+ const { settings, thread : overrides , removed } = triggers [ trigger ] ;
1895+ const fixture = yield * cleanupFixture ( {
1896+ ...DEFAULT_SERVER_SETTINGS . storageCleanup ,
1897+ worktreeAfterDays : null ,
1898+ worktreeOnDelete : false ,
1899+ worktreeSettledAfterDays : null ,
1900+ worktreeRequireIntegrated : true ,
1901+ ...settings ,
1902+ } ) ;
1903+ const { command, fs, repo, worktree } = fixture ;
1904+ const remote = yield * fs . makeTempDirectoryScoped ( { prefix : "cleanup-remote-" } ) ;
1905+ yield * command ( remote , [ "init" , "--bare" , "-b" , "main" ] ) ;
1906+ yield * command ( repo , [ "remote" , "add" , "origin" , remote ] ) ;
1907+ yield * command ( repo , [ "push" , "origin" , "main" ] ) ;
1908+ yield * fs . writeFileString ( `${ worktree } /tracked.txt` , "unlanded work\n" ) ;
1909+ yield * command ( worktree , [ "commit" , "-am" , "unlanded work" ] ) ;
1910+ const thread = shell ( { branch : "feature" , worktreePath : worktree , ...overrides } ) ;
1911+ if ( trigger === "deleted" ) {
1912+ fixture . setDeletedThreads ( [ thread ] ) ;
1913+ fixture . setThreads ( [ ] ) ;
1914+ } else fixture . setThreads ( [ thread ] ) ;
1915+
1916+ expect ( ( yield * fixture . service . runNow ) . entries [ 0 ] ) . toMatchObject ( {
1917+ outcome : "kept" ,
1918+ reason : "Has commits that are not on the default branch" ,
1919+ } ) ;
1920+ expect ( yield * fs . readFileString ( `${ worktree } /tracked.txt` ) ) . toBe ( "unlanded work\n" ) ;
1921+
1922+ yield * command ( repo , [ "push" , "origin" , "feature:main" ] ) ;
1923+ expect ( ( yield * fixture . service . runNow ) . entries [ 0 ] ) . toMatchObject ( {
1924+ outcome : "removed" ,
1925+ reason : removed ,
1926+ } ) ;
1927+ expect ( yield * fs . exists ( worktree ) ) . toBe ( false ) ;
1928+ } ) . pipe ( Effect . provide ( cleanupTestLayer ) , Effect . scoped ) ,
1929+ ) ;
1930+ } ) ;
1931+
18691932it . live ( "keeps saved usage data when removing a settled checkout" , ( ) =>
18701933 runCleanupTest (
18711934 Effect . gen ( function * ( ) {
0 commit comments