[juliusmarminge]

ProviderTurnStartService decided whether to rebuild a thread's managed worktree with fileSystem.exists(worktreePath), so a folder left behind without its .git link (e.g. only node_modules after a failed removal) skipped recovery and the provider ran outside any checkout, where git reached the enclosing repository. Turn start now checks exists(/.git), and recreateMissingWorktree first deletes the leftover folder (recursive, force) before pruneWorktrees/createWorktree, because git refuses to add a worktree into a non-empty directory. This stays limited to managed worktree paths (the existing isManagedWorktreePath guard). Storage cleanup's worktreePathReason now treats a NotFound from stat(/.git) as missing (Effect.catchReason PlatformError/NotFound, the pattern used elsewhere in the server), so such folders are kept as 'not a linked worktree' instead of failing every sweep. The only test change: the fake FileSystem in the 'recreates a missing worktree only at the managed location' table now has a no-op remove. No new regex or parser.

Fixes #24390

Reproduction on main

On origin/main 1a1f9ac, ran the dev server on a fresh database (T3CODE_DEV_SEED=0 vp run dev). Created a scratch git repo, added it with t3 project add, and started a worktree thread with t3 thread start --provider devReplay --model showcase --worktree main --branch feature/leftover --wait. Deleted the worktree's .git file and tracked files, left an empty node_modules/ folder, and ran git worktree prune in the main repo. Sent a second turn with t3 thread send --wait: it completed, no 'provider turn start recreating missing worktree' was logged, the folder still held only node_modules, and git worktree list showed no worktree for it. Inside that folder, git commands went up to the repository around it, so the thread's branch was changed to that repository's branch. Control: after deleting the folder entirely, the next turn logged 'recreating missing worktree' and restored a checkout. Two tests fail on main: the real-git recovery test in ProviderTurnStartService.test.ts with a new 'leftover' case (the provider opens in a folder that is not a checkout: not_a_repository), and a new storageCleanup.test.ts case where a thread's worktree has lost its .git (the sweep reports outcome 'failed' with 'NotFound: FileSystem.stat …/.git' instead of 'kept').

Evidence

Being captured: before and after in the real app. This section is filled in before the pull request can merge.

Tests

Ran from apps/server: vp test run src/orchestration-v2/ProviderTurnStartService.test.ts src/storageCleanup.test.ts: 242/242 pass. With only the fix reverted, 2 fail: the repro 'leftover' recovery case and 'keeps a thread's worktree folder that lost its .git link'. vp run typecheck (apps/server) passes. vp run check:changed: lint, knip and tests (3 files, 244) pass; format failed until I ran vp fmt; typecheck failed only on suggestions in scripts/evals, which it checked because the diff against the newer origin/main includes unrelated files. Pre-commit hook fmt/lint/knip passed.

Not in this change

• Turn start still treats an exists() error (e.g. permission denied) as 'present' and skips recovery; I kept that behaviour.

AI-assisted; verified with the tests and tools listed above.

[macroscopeapp]

🔴 Critical orchestration-v2/ProviderTurnStartService.ts:222

When a managed worktree has lost only its .git entry, the next turn recursively deletes the entire worktreePath, permanently removing any remaining modified, untracked, or ignored files. The .git check detects the missing checkout metadata, while isManagedWorktreePath verifies only the path location; preserve the directory by moving it aside before recreation, or refuse recovery when its contents are not safe to discard.

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file @apps/server/src/orchestration-v2/ProviderTurnStartService.ts around line 222:

When a managed worktree has lost only its `.git` entry, the next turn recursively deletes the entire `worktreePath`, permanently removing any remaining modified, untracked, or ignored files. The `.git` check detects the missing checkout metadata, while `isManagedWorktreePath` verifies only the path location; preserve the directory by moving it aside before recreation, or refuse recovery when its contents are not safe to discard.

[macroscopeapp]

Approvability

Verdict: Needs Human Approval

Macroscope's review found this PR requires human approval — Recovery now deletes and recreates managed worktree directories when their .git entry is missing. Remaining user files can be permanently lost, so the preservation policy needs resolution before this automatic recovery is safe.

Needs human approval because:

• 1 blocking correctness issue found at or above your repo's Minimum Blocking Severity

^{Adjust the Minimum Blocking Severity for this repo — including turning it Off — in Settings. You can add or adjust custom eligibility rules. Learn more.}

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Codex	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Codex	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	21.5 KiB	21.5 KiB	0 B (0.0%)	24.4 KiB	✅
Codex	Live turn messages	1	1	0 (0.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Claude	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Claude	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.9 KiB	21.9 KiB	0 B (0.0%)	24.4 KiB	✅
Claude	Live turn messages	1	1	0 (0.0%)	8	✅

Baseline: 4e0b528 · PR result: 2ae1676 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 108.5 KiB
• Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[coderabbitai]

No actionable comments were generated in the recent review.

Walkthrough

Managed-worktree recovery now checks for a .git link and removes leftover contents before recreating a worktree. Storage cleanup treats a missing .git entry as not a linked worktree and keeps the folder.

Changes: Managed worktree recovery and cleanup

Layer / File(s)	Summary
Detect and recreate incomplete worktrees apps/server/src/orchestration-v2/ProviderTurnStartService.ts, apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts	Recovery checks for <worktreePath>/.git and removes the target path before pruning worktrees and recreating the branch. Tests cover leftover node_modules contents and the recovery scenario.
Handle missing worktree links during cleanup apps/server/src/storageCleanup.ts, apps/server/src/storageCleanup.test.ts	A missing .git entry is treated as not a linked worktree. The test verifies cleanup keeps the folder and its node_modules contents.

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix · Severity of issue fixed: Medium

Possibly related issues

• pingdotgg/t3code#31136 reports the same missing .git stat error that this change handles during storage cleanup.

Possibly related PRs

• pingdotgg/t3code#24156: Changes the same managed-worktree recovery path by delegating it to makeRestoreMissingWorktree.
• pingdotgg/t3code#18359: Adds a recreation helper for missing managed worktrees and changes the related tests.
• pingdotgg/t3code#30773: Adds setup-script execution to the same worktree recreation flow.

Suggested labels: bugfix

Suggested reviewers: t3dotgg, stienswout, macroscopeapp

Merge Risk: Minimal · up to 2ae16

This change lets the app recover a managed worktree whose folder is left behind without its .git link, and lets storage cleanup keep such a folder instead of failing. No actionable merge-blocking risk was found.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title names the main change: recreating a worktree folder that lost its checkout link. It matches the changeset, which checks for /.git and force-removes the leftover folder before recre…
Description check		The description covers the problem, the change, scope, and verification. It links issue #24390 and explains the reproduction on main, the test results, and the reverted-fix checks. It also lists a kno…
Linked Issues check		[#24390] Objective 1: turn start must recover a managed worktree path that exists without a valid checkout. The diff changes ProviderTurnStartService.ts so the existence check uses path.join(worktreeP…
Out of Scope Changes check		All changed hunks map to the objectives of #24390. The ProviderTurnStartService.ts changes cover the .git existence check and the forced folder removal inside recreateMissingWorktree. Both sit behind …

Full details: Title check

Explanation

The title names the main change: recreating a worktree folder that lost its checkout link. It matches the changeset, which checks for <worktree>/.git and force-removes the leftover folder before recreating the worktree. The title follows the conventional commit form in the repository template and is 68 characters long.

Full details: Description check

Explanation

The description covers the problem, the change, scope, and verification. It links issue #24390 and explains the reproduction on main, the test results, and the reverted-fix checks. It also lists a known exclusion. The Evidence section is a placeholder that says before and after captures are pending, and the template asks for before and after screenshots only for UI changes. This change is server-side, so the gap is minor. The Scope section links the issue, which satisfies the template's requirement.

Full details: Linked Issues check

Explanation

[#24390] Objective 1: turn start must recover a managed worktree path that exists without a valid checkout. The diff changes ProviderTurnStartService.ts so the existence check uses path.join(worktreePath, ".git") instead of worktreePath. A folder with only node_modules now takes the missing-worktree path. The isManagedWorktreePath guard still gates recreation. Objective 2: recreateMissingWorktree now runs fileSystem.remove(worktreePath, { recursive: true, force: true }) before pruneWorktrees and createWorktree, which clears the leftover folder so git worktree add can succeed. Objective 3: storageCleanup.ts catches PlatformError/NotFound from stat(<worktree>/.git) and returns 'not a linked worktree', so the sweep keeps the folder instead of failing. The change does not add the optional 'not registered in git worktree list' check from the issue's suggested direction. The objectives only require the missing .git link case, so this is not a gap. Tests were reported by the author (new leftover recovery case and storage cleanup case, failing without the fix). I did not re-run them. The author's real-app evidence section is pending, but it is not a coding requirement.

Full details: Out of Scope Changes check

Explanation

All changed hunks map to the objectives of #24390. The ProviderTurnStartService.ts changes cover the .git existence check and the forced folder removal inside recreateMissingWorktree. Both sit behind the existing managed-path guard. The storageCleanup.ts change covers the NotFound handling for the .git stat. The test changes add a no-op remove to the fake FileSystem, a leftover recovery case, and a storage cleanup case for a missing .git. These support the implementation. No unrelated file changes appear in the reviewed whole-PR diff for these two files. The author notes that the diff against the newer origin/main includes unrelated files in scripts/evals. That reflects the base branch state and is not a change introduced by this PR's code.

Finishing Touches

Generate unit tests (beta)

• Commit to this branch
• Create a new PR

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

Usage-based review receipt

• Mode: Continue automatically
• Reviewed files: 4
• Charged: $1.00
• View usage details

Note

This review was completed with usage-based billing: files reviewed beyond your plan's included limits are billed at $0.25/file. View usage-based billing.

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: factory/issue-24390
• File: .coderabbit.config.ts
• Commit: 2ae1676
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: f2e5b52b-c825-4c05-afca-f7426a8249af

Commits

Reviewing files that changed from the base of the PR and between 4e0b528 and 2ae1676.

Files selected for processing: 4

• apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
• apps/server/src/orchestration-v2/ProviderTurnStartService.ts
• apps/server/src/storageCleanup.test.ts
• apps/server/src/storageCleanup.ts

Limit details: You’ve used all 10 included reviews currently available.