Fix worktree removal timing out on large install trees

[jakeleventhal]

Summary

Solves #3593

• Forced worktree removal was hitting a 15s git worktree remove timeout on multi-GB trees with setup artifacts like node_modules.
• Delete the working tree via the filesystem first (5m budget), then let git clean up registration metadata with a longer timeout.
• Update the worktree remove integration test to exercise the force path used by thread deletion.

Test plan

• Delete a thread that owns a worktree with installed deps and choose “Delete the worktree too”
• Confirm the toast no longer reports Git command timed out / worktree removal failure
• Confirm the worktree directory is gone under ~/.t3/worktrees/... and git worktree list no longer lists it
• vp test in apps/server for src/vcs/GitVcsDriverCore.test.ts

Made with Cursor

Note

Fix removeWorktree timing out on large install trees by pre-deleting directories with retry

• When force=true, removeWorktree now pre-deletes the worktree directory before running git worktree remove, avoiding git's own slow recursive delete on large trees.
• Directory deletion only proceeds if the target is a registered linked worktree (verified via git worktree list --porcelain), preventing accidental deletion of unregistered paths.
• Transient filesystem errors (Busy, WouldBlock, Unknown) are retried on a spaced schedule (100ms intervals, up to 50 attempts); persistent failures surface as GitCommandError.
• A 5-minute timeout guards the entire directory-delete phase; the subsequent git worktree remove runs with a 60-second timeout.
• Behavioral Change: removeWorktree(force=true) now performs two filesystem/git operations instead of one, and timeout or delete failures surface as structured GitCommandError rather than a hung process.

^{Macroscope summarized 6c52ef2.}

[chatgpt-codex-connector]

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: c3ff8123-3722-4456-a4bf-b1a67764eeb8

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[macroscopeapp]

Approvability

Verdict: Needs human review

This bug fix introduces substantial new filesystem manipulation logic (~80 lines) for pre-deleting worktree directories with retry handling and safety validation. While the intent is clear and tests are comprehensive, the complexity of the new behavior warrants human review.

^{You can customize Macroscope's approvability policy. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit f4844dc. Configure here.}