Deleting a thread left its Git checkpoint refs behind, which cluttered Git tools and kept old snapshot data reachable. Deletion now queues cleanup after checkpoint writes, removes only that thread's old and current refs, and handles removed worktrees through the project repo. Archived threads keep their restore history.
Addresses https://github.com/pingdotgg/t3code/discussions/13263#discussioncomment-18596278.
Related bug report: https://github.com/pingdotgg/t3code/issues/24083.
Verified with failing regression tests before the fix, real Git tests for packed refs, shared worktrees and lock failures, a capture-order test, and vp run check:changed.
Refs from threads deleted before this change need manual cleanup. Git's normal maintenance reclaims the unused data.
Built with GPT-6.1 Sol high/priority in the Codex harness, with Astra high design and review.
Added 1 commit
Verdict: Needs Human Approval
Macroscope's review found this PR requires human approval — This PR adds checkpoint cleanup to thread deletion across worktrees and project repositories, including new outbox sequencing and atomic Git ref deletion. The behavior is well-tested but cross-cutting and destructive on an existing production path, warranting human review.
You can add or adjust custom eligibility rules. Learn more.
No actionable comments were generated in the recent review.
0c596514-9dbb-4a0f-afa4-9089d2d2a488Reviewing files that changed from the base of the PR and between c5332bf14dfb335c9eb08966624d65328e82641a and 541e43bc8d376267aeb36982fe0576b44957145d.
apps/server/src/checkpointing/CheckpointStore.test.tsapps/server/src/checkpointing/CheckpointStore.tsapps/server/src/checkpointing/Utils.tsapps/server/src/guest/GuestShareService.test.tsapps/server/src/orchestration-v2/CheckpointCaptureService.test.tsapps/server/src/orchestration-v2/CheckpointCaptureService.tsapps/server/src/orchestration-v2/CheckpointService.tsapps/server/src/orchestration-v2/EffectOutbox.tsapps/server/src/orchestration-v2/EffectWorker.tsapps/server/src/orchestration-v2/ResourceCleanupService.test.tsapps/server/src/orchestration-v2/ResourceCleanupService.tsapps/server/src/orchestration-v2/RunFinalizationQueue.test.tsapps/server/src/orchestration-v2/ThreadDeletion.test.tsapps/server/src/orchestration-v2/ThreadDeletion.tsapps/server/src/orchestration-v2/runtimeLayer.test.tsapps/server/src/orchestration-v2/runtimeLayer.tsapps/server/src/project/ProjectService.deletion.test.tsapps/server/src/vcs/GitVcsDriver.tsapps/server/src/vcs/VcsDriver.tsIncluded review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.
Thread deletion now queues checkpoint-ref cleanup. The cleanup service removes matching refs from relevant Git repositories. Git validates and deletes explicit refs and prefix matches atomically. Checkpoint capture now returns early for deleted threads.
Changes: Checkpoint Cleanup
| Layer / File(s) | Summary |
|---|---|
Checkpoint ref deletion apps/server/src/checkpointing/*, apps/server/src/orchestration-v2/CheckpointService.ts, apps/server/src/vcs/* | The deletion input accepts ref prefixes. Thread and scope prefix helpers provide ref paths. Git validates refs and prefixes, expands matching refs, and deletes the collected refs in one transaction. Tests cover exact and prefix deletion, repeated calls, locked refs, invalid inputs, and preservation of unrelated refs. |
Deleted thread cleanup apps/server/src/orchestration-v2/ResourceCleanupService.ts, apps/server/src/orchestration-v2/ResourceCleanupService.test.ts, apps/server/src/orchestration-v2/runtimeLayer.ts, apps/server/src/orchestration-v2/runtimeLayer.test.ts | ResourceCleanupService skips cleanup for threads that are not deleted. For deleted threads, it checks relevant directories and removes matching refs from existing repositories. The service dependencies and tests are updated. |
Deletion effect and capture handling apps/server/src/orchestration-v2/{EffectOutbox.ts,EffectWorker.ts,ThreadDeletion.ts,ThreadDeletion.test.ts,RunFinalizationQueue.test.ts,CheckpointCaptureService.ts,CheckpointCaptureService.test.ts}, apps/server/src/project/ProjectService.deletion.test.ts, apps/server/src/guest/GuestShareService.test.ts | Thread deletion plans a replay-safe checkpoint.cleanup effect, and the effect worker calls the cleanup service. Tests cover effect ordering and project deletion. Checkpoint capture returns early for deleted threads, with test coverage for deleted and rolled-back runs. |
Priority: External image Low
Estimated code review effort: 3 (Moderate) | ~25 minutes
Change: Bug fix
| 1 | sequenceDiagram |
| 2 | participant ThreadDeletion |
| 3 | participant EffectOutbox |
| 4 | participant EffectWorker |
| 5 | participant ResourceCleanupService |
| 6 | participant GitVcsDriver |
| 7 | ThreadDeletion->>EffectOutbox: enqueue checkpoint.cleanup |
| 8 | EffectOutbox->>EffectWorker: provide cleanup effect |
| 9 | EffectWorker->>ResourceCleanupService: cleanupCheckpointRefs(threadId) |
| 10 | ResourceCleanupService->>GitVcsDriver: deleteCheckpointRefs(prefixes) |
Possibly related issues
Suggested labels: bugfix, size:L
Suggested reviewers: yash-singh1, maria-rcks, juliusmarminge
541e4Thread deletion can proceed with checkpoint-ref cleanup; no issue identified here prevents merging after normal checks.
Failed Failed checks: 1 warning
| Check name | Status | Explanation | Resolution |
|---|---|---|---|
| Description check | Warning | The description explains the problem and change, links the related discussion and bug report, and lists focused verification. It does not provide the explicit maintainer approval required by the Scope… | Add the maintainer’s explicit approval of the change’s direction and scope, including the approval comment. Also state the observed results of the verification checks. |
| Check name | Status | Explanation |
|---|---|---|
| Title check | Passed | The title clearly and concisely describes the main change: removing checkpoint refs when threads are deleted. |
| Linked Issues check | Passed | Check skipped because no linked issues were found for this pull request. |
| Out of Scope Changes check | Passed | Check skipped because no linked issues were found for this pull request. |
Explanation
The description explains the problem and change, links the related discussion and bug report, and lists focused verification. It does not provide the explicit maintainer approval required by the Scope and approval section.
Resolution
Add the maintainer’s explicit approval of the change’s direction and scope, including the approval comment. Also state the observed results of the verification checks.
Comment @coderabbitai help to get the list of available commands.
Taking over this one
Thanks @Bil0000 for identifying the checkpoint-ref leak and establishing the reproduction, scoped deletion, and archived-history requirements. Rebuilt this as #25182: a durable cleanup payload, bounded Git ref deletion, and cleanup that retries after lock contention and restart without blocking other resource cleanup. I compared the original diff against the replacement; legacy and current refs, removed-worktree fallback, capture ordering, and project deletion are covered. The original test collection was replaced with focused behavioral regressions and isolated before/after server proof. Closing this in favor of the credited replacement.
