@@ -1762,6 +1762,57 @@ describe("orphan worktree reports", () => {
17621762 ) ,
17631763 ) ;
17641764
1765+ it . live . each ( [
1766+ { home : "an installed" , worktreeHome : false , customFolderOutcome : "removed" } ,
1767+ { home : "a git worktree's dev" , worktreeHome : true , customFolderOutcome : "kept" } ,
1768+ ] as const ) (
1769+ "on $home home, a custom worktrees folder ends $customFolderOutcome" ,
1770+ ( { worktreeHome, customFolderOutcome } ) =>
1771+ runCleanupTest (
1772+ Effect . gen ( function * ( ) {
1773+ const fs = yield * FileSystem . FileSystem ;
1774+ const config = yield * ServerConfig . ServerConfig ;
1775+ const checkout = yield * fs . makeTempDirectoryScoped ( { prefix : "cleanup-dev-checkout-" } ) ;
1776+ yield * fs . writeFileString ( `${ checkout } /.git` , "gitdir: /repo/.git/worktrees/dev\n" ) ;
1777+ const baseDir = worktreeHome ? `${ checkout } /.t3` : config . baseDir ;
1778+ const fixture = yield * cleanupFixture ( ) . pipe (
1779+ Effect . provideService ( ServerConfig . ServerConfig , {
1780+ ...config ,
1781+ baseDir,
1782+ worktreesDir : `${ baseDir } /worktrees` ,
1783+ } ) ,
1784+ ) ;
1785+ const customFolder = yield * fs . realPath (
1786+ yield * fs . makeTempDirectoryScoped ( { prefix : "cleanup-real-worktrees-" } ) ,
1787+ ) ;
1788+ const realWorktree = `${ customFolder } /seeded` ;
1789+ yield * fixture . command ( fixture . repo , [ "worktree" , "add" , "-b" , "seeded" , realWorktree ] ) ;
1790+ fixture . setSettings ( { worktreesDirectory : customFolder } ) ;
1791+ fixture . setThreads ( [
1792+ shell ( { branch : "feature" , worktreePath : fixture . worktree } ) ,
1793+ shell ( {
1794+ id : ThreadId . make ( "seeded" ) ,
1795+ lineage : {
1796+ rootThreadId : ThreadId . make ( "seeded" ) ,
1797+ parentThreadId : null ,
1798+ relationshipToParent : null ,
1799+ } ,
1800+ branch : "seeded" ,
1801+ worktreePath : realWorktree ,
1802+ } ) ,
1803+ ] ) ;
1804+
1805+ const { entries } = yield * fixture . service . runNow ;
1806+
1807+ expect ( entries . find ( ( entry ) => entry . path === realWorktree ) ?. outcome ) . toBe (
1808+ customFolderOutcome ,
1809+ ) ;
1810+ expect ( yield * fs . exists ( realWorktree ) ) . toBe ( customFolderOutcome === "kept" ) ;
1811+ expect ( yield * fs . exists ( fixture . worktree ) ) . toBe ( false ) ;
1812+ } ) ,
1813+ ) ,
1814+ ) ;
1815+
17651816 it . live ( "skips symbolic links at both directory levels and disabled cleanup" , ( ) =>
17661817 runCleanupTest (
17671818 Effect . gen ( function * ( ) {
0 commit comments