Auto-cleanup orphaned worktrees on session creation or app startup

[PureWeen]

Problem

Worktrees accumulate silently over time and are never automatically cleaned up. Each worktree can consume 1-12 GB of disk space. After several sessions, users can end up with many orphaned worktrees from completed/abandoned work (branches deleted from remote, sessions no longer active, etc.).

Today, cleanup requires the user to manually run git worktree list, cross-reference against active sessions, and git worktree remove each stale one.

Proposed Solution

Add automatic worktree cleanup logic, triggered on app startup or new session creation:

1. List all worktrees on disk under ~/.polypilot/worktrees/
2. Cross-reference against active sessions (check _sessions dictionary and Organization.Sessions)
3. Identify orphaned worktrees — those with no active session pointing to them
4. Classify orphans by risk level:
   • Safe to auto-remove: Clean (no dirty files) + remote branch gone ([gone] tracking status)
   • Prompt before removing: Has uncommitted changes or untracked files
   • Keep: Has active session or running processes
5. Auto-remove safe orphans (or at minimum, surface them to the user with an option to clean up)
6. Run git worktree prune after cleanup to remove stale git refs

Additional Context

RepoManager already has RemoveWorktreeAsync — this work is primarily about adding the discovery/reconciliation logic and hooking it into the session lifecycle.

Key files:

• PolyPilot/Services/RepoManager.cs — worktree creation/removal
• PolyPilot/Services/CopilotService.cs — session creation (CreateSessionAsync)

[github-actions]

✅ Agent Fix completed successfully!

[github-actions]

Pull request created: #782

Generated by Agent Fix

[github-actions]

Auto-cleanup orphaned worktrees — PR submitted

What changed

Added automatic worktree cleanup that runs as fire-and-forget on app startup (in RestoreSessionsInBackgroundAsync):

1. FindOrphanedWorktrees (RepoManager) — pure static function identifies worktrees not referenced by any active session or group
2. IsSafeToRemoveAsync (RepoManager) — classifies orphans: safe when directory is missing, OR working tree is clean + remote branch is [gone]
3. PruneOrphanedWorktreesAsync (RepoManager) — orchestrates safe removal with per-worktree error isolation + git worktree prune
4. PruneOrphanedWorktreesAsync (CopilotService) — collects active IDs from Organization.Sessions, Groups.CreatedWorktreeIds, and in-memory _sessions

Safety guards (from 3-model adversarial self-review)

• Only runs after successful session restore (prevents false orphans from incomplete state)
• Skipped in remote mode (worktree paths are server-side)
• Empty/null Branch returns not safe (prevents matching all branches)
• OperationCanceledException properly re-thrown (clean cancellation)
• -- separator before branch name in git command

Test results

• ✅ 3585 unit tests passed (9 new: 6 for FindOrphanedWorktrees + 3 for IsSafeToRemoveAsync)
• ✅ Integration tests build successfully (2 new: startup verification)
• ✅ verify-build and polypilot-integration (smoke) dispatched

Self-review (3-model: Opus 4.6 + Sonnet 4.6 + GPT-5.3-Codex)

• 2/3 consensus: guard pruning behind restore success ✅ fixed
• 3/3 consensus: add behavioral tests for IsSafeToRemoveAsync ✅ fixed
• 1/3 findings (discarded per consensus rules): unpushed commit check, shallow snapshot of CreatedWorktreeIds, external worktree guard

Warning

⚠️ Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• 192.0.2.1

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "192.0.2.1"

See Network Configuration for more information.

Generated by Agent Fix for issue #201 · ● 45.6M · ◷