fix(server): storage cleanup no longer reports idle threads on a branchless checkout as busy - #29027

Approvability

Verdict: Approved at 3713b62

Macroscope's review found this PR approvable — Branchless worktrees now report that they have no branch rather than appearing busy. They remain retained, with deletion eligibility and cleanup safeguards unchanged.

^{You can add or adjust custom eligibility rules. Learn more.}

No actionable comments were generated in the recent review.

Merge Risk: Minimal · up to 098f6

This only changes the reason shown for a retained folder. It does not change which folders are kept or removed. The change is low risk and ready to merge.

Pre-merge checks: 4

Check name	Status	Explanation
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.
Title check		The title names the main change: storage cleanup no longer reports idle threads on a branchless checkout as busy. The changeset splits the combined busy/idle check in storageCleanup.ts so a branchless…
Description check		The description follows the repository template in substance. It has Problem, Change, Scope, and Verification sections, and each one is filled in with specific content. The Problem section states the …

Full details: Title check

Explanation

The title names the main change: storage cleanup no longer reports idle threads on a branchless checkout as busy. The changeset splits the combined busy/idle check in storageCleanup.ts so a branchless idle thread gets the 'Thread has no branch' reason instead of the busy reason. The title is specific, follows the conventional commit style, and matches the changed behavior.

Full details: Description check

Explanation

The description follows the repository template in substance. It has Problem, Change, Scope, and Verification sections, and each one is filled in with specific content. The Problem section states the false busy reason for idle branchless threads and the trigger (a scheduled task on a specific checkout). The Change section explains the split of the combined check. Scope gives a bug-fix rationale and links issue #26406. Verification gives reproduction steps, test results, platform checks on Linux, macOS and Windows, and a note on what was not checked (mobile). The template asks for a conventional commit title; the PR title is given in the objectives as a conventional-style title, so that element is satisfied. The description is long, but the required information is present. Minor gaps: the agent-model line is present at the end, as the template requests. The Scope section notes the bug-fix status and links the issue. Overall the description is mostly complete.

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: main
• File: .coderabbit.config.ts
• Commit: 5df5b44
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Advanced
• Run ID: 872733f5-761f-4a0e-a428-ff053b90db47

Commits

Reviewing files that changed from the base of the PR and between cda2486 and 098f6d6.

Files selected for processing: 2

• apps/server/src/storageCleanup.test.ts
• apps/server/src/storageCleanup.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.

Verified in a real dev environment

verified as-is at 3713b62ca3d45014f99b22034a31776fa5a94db3 on this linux vm. no source changes or pushes.

used repo playwright with /usr/bin/google-chrome against real vp run dev servers, one at a time. created the scratch thread and a project pointing at a real git repo through the web app. all verification turns used codex gpt-6.1-sol, without replay, fixtures or database edits.

on github/main (cbd3e149a130f1d99d2d067c77b9889d64e28755), completed a scratch turn, enabled "delete worktrees with deleted threads" in settings > worktrees, and clicked "delete now" in maintenance. the finished thread's folder incorrectly reported the busy reason. restarted on the exact pr head with the same isolated data directory and repeated cleanup. it reported "Thread has no branch". both runs kept the same folder: 0 removed, 1 kept.

a follow-up codex turn in the retained scratch thread completed with "scratch still usable after cleanup." repeated cleanup still kept it. also created a normal branched worktree through the app and ran a real codex turn with timeout 90 sleep 60. cleanup while it was working retained it with the busy reason. after that turn completed, cleanup reported "Has commits beyond the default branch" instead. both folders still existed.

short runtime transcript from the web client's real cleanup requests:

main, completed scratch turn -> 0 removed, 1 kept
  Thread is running or has pending work
pr, same completed scratch turn -> 0 removed, 1 kept
  Thread has no branch
pr, running branched worktree -> 0 removed, 2 kept
  scratch: Thread has no branch
  worktree: Thread is running or has pending work
pr, completed worktree turn -> 0 removed, 2 kept
  worktree: Has commits beyond the default branch
blacksmith: vp test run apps/server/src/storageCleanup.test.ts
  1 test file passed; 151 tests passed

all 30 reported ci checks were successful at this head. inspected the uploaded screenshots and watched the separate short interaction recording through the uploaded video player.

Not verified

native electron desktop on linux, macos or windows, native ios/android clients, other providers, remote/relay/tunnel connections, and shared-folder subagent combinations were not exercised. this pass used the local web client and codex path. mobile has no storage-cleanup screen. no claim is made about scratch-folder deletion policy; this pr only changes the retention reason.

@maria-rcks Since your verification at 3713b62ca3, the only change is 25af34b5bf, which moves the no-branch check in storageCleanup.ts after the running-or-pending check, so a branchless thread whose worktree group is busy reports "Thread is running or has pending work" as on main, while the idle branchless case you ran still reports "Thread has no branch". The cleanup test table gains a running branchless row, and CI passes on this head.

I merged main f419698aea into this branch, so the head moves from 25af34b5bf to cda248604c.
The merge had no conflicts and changes nothing else.

The run verified at 3713b62ca3 covered a Scratch folder, which main now handles itself, so it does not cover this change.
I merged main 5df5b44309 into this branch, so the head moves from cda248604c to 098f6d62f2; storageCleanup.ts conflicted with #36369, and I kept its Scratch handling.
The fix now covers only threads with no branch whose folder is outside the Scratch folder.