Auto-cleanup orphaned worktrees on app startup#202
Draft
Conversation
Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Add auto-cleanup for orphaned worktrees on session creation
Auto-cleanup orphaned worktrees on app startup
Feb 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Worktrees accumulated silently over time with no automatic cleanup — each consuming up to 12 GB. Users had to manually cross-reference
git worktree listagainst active sessions to clean up stale entries.Changes
RepoManagerFindOrphanedWorktrees(worktrees, activeWorktreeIds)— pure static function; returns tracked worktrees whose IDs are absent from the active set. Used as the identification layer and independently testable.IsSafeToRemoveAsync— classifies an orphan as safe to auto-remove when the directory is missing or the working tree is clean (git status --porcelainempty) and the remote tracking branch is gone (git branch -vvshowsgonefor the current branch).PruneOrphanedWorktreesAsync(activeWorktreeIds, ct)— iterates orphans, removes safe ones via existingRemoveWorktreeAsync(which handlesgit worktree remove --force+ fallback prune). Per-worktree errors are caught individually so one failure doesn't abort the rest.CopilotServicePruneOrphanedWorktreesAsync(ct)(private) — collects active worktree IDs fromOrganization.SessionsandOrganization.Groups, then delegates to_repoManager.PruneOrphanedWorktreesAsync.InitializeAsyncas fire-and-forget afterReconcileOrganization(), consistent with howFetchAvailableModelsAsyncis launched — startup is not blocked.Tests
Five new cases in
RepoManagerTestscoverFindOrphanedWorktrees: normal orphan detection, all-active (no orphans), null IDs treated as inactive, empty worktree list, and empty active set.Warning
Firewall rules blocked me from connecting to one or more addresses (expand for details)
I tried to connect to the following addresses, but was blocked by firewall rules:
l7avsblobprodcus319.vsblob.vsassets.io/usr/bin/dotnet dotnet restore --no-dependencies /home/REDACTED/work/PolyPilot/.codeql-scratch/dbs/csharp/working/622A4908CDBE24FF535A100F8AC55E4F/missingpackages_workingdir --packages /home/REDACTED/work/PolyPilot/.codeql-scratch/dbs/csharp/working/missingpackages /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal --configfile /home/REDACTED/work/PolyPilot/.codeql-scratch/dbs/csharp/working/nugetconfig/nuget.config --force(dns block)If you need me to access, download, or install something from one of these locations, you can either:
Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.