[juliusmarminge]

Problem

Storage cleanup reports a thread as failed on every pass when its stored worktree path sits below something that is now a regular file. fs.exists maps only ENOENT to false. access() on a path under a file fails with ENOTDIR, which Effect maps to BadResource, so the error propagates and the entry becomes BadResource: FileSystem.access (<path>). The reporter had 467 of these stale legacy paths filling the report. A missing path (ENOENT) is already skipped quietly.

Reproduced on main 30eb7e7 with the real server (bin.ts serve on a fresh base dir, worktreeAfterDays: 30). One thread's stored worktreePath was <base>/legacy-root/stored-workspace, where legacy-root is a file, and a control thread's was <base>/missing-root/stored-workspace. server.runStorageCleanup returned failed: 1 for the ENOTDIR thread and nothing for the ENOENT one, for both archived and unarchived threads.

Change

The worktree pass's first existence check now treats a PlatformError whose cause.code is ENOTDIR as "does not exist". It reuses the catchIf errno pattern this file already uses for EINVAL. Nothing can exist below a regular file, so the candidate is skipped like a missing path. Every other error, including other BadResource causes and EACCES, still fails as before. No thread data or history is changed.

Scope and approval

Fixes #26585

Verification

• New test storage cleanup reports and local file policies > skips a stored worktree path whose parent is a regular file in apps/server/src/storageCleanup.test.ts.
  • On the test-only commit it fails with outcome: "failed", reason: "BadResource: FileSystem.access (…/legacy-root/stored-workspace)".
  • With the fix, all 123 tests in the file pass.
• vp run check:changed passes: format, lint, knip, typecheck and tests.
• Runtime transcript from the real server, before (main 30eb7e7) and after (fix 4f47da5), with archived and unarchived threads. The stored paths are read back from the server before each cleanup run.
  • Before: failed: 1 with the BadResource entry, plus a server-log warning showing code: 'ENOTDIR'.
  • After: failed: 0, no entries, no warning.
  • The ENOENT control thread is skipped on both sides.
  • Files: transcript-26585-v2.txt, driver repro-26585-v2.ts (synthetic data only).
• No UI change, so there are no captures. The only visible effect is that the stale rows disappear from the cleanup report.
• Not checked: running it on macOS (the reporter's platform). macOS reports the same ENOTDIR errno, and the mapping is in shared Node code.

Model and harness: Claude Opus 5.5 (lead, test, fix, review B) and GPT-6.1 Sol (review A), run through Claude Code and Codex in T3 Code.

🤖 Generated with Claude Code

[macroscopeapp]

Approvability

Verdict: Approved at d7cfd98

Macroscope's review found this PR approvable — Storage cleanup now skips stale worktree paths beneath regular files instead of treating ENOTDIR as an existence-check failure. Cleanup policies and safeguards for existing worktrees remain unchanged.

No code changes detected at d66f0d1. Prior analysis still applies.

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

[coderabbitai]

No actionable comments were generated in the recent review.

Walkthrough

cleanWorktrees treats ENOTDIR from a worktree existence check as an absent path. A regression test verifies that a stored path beneath a regular file produces no report entries and zero outcome counts.

Changes: Worktree cleanup

Layer / File(s)	Summary
Handle inaccessible stored paths apps/server/src/storageCleanup.ts, apps/server/src/storageCleanup.test.ts	cleanWorktrees skips a path when its existence check returns ENOTDIR; other errors continue through existing error handling. The regression test checks for no report entries and zero removed, kept, or failed worktrees.

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

Change: Bug fix · Severity of issue fixed: Medium

Possibly related issues

Suggested reviewers: t3dotgg

Merge Risk: Minimal · up to d66f0

Stale worktree paths beneath regular files are intended to be skipped. No merge-blocking risk is identified.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title is concise, uses the repository’s conventional format, and clearly identifies the storage cleanup fix for stale worktree paths under a regular file.
Description check		The description includes all required sections and provides clear problem details, implementation scope, focused test results, runtime verification, and an explicit note about untested macOS execution…
Linked Issues check		Issue #26585 requires a safe, history-preserving classification for stored worktree paths that return ENOTDIR. The cleanup pass now converts only an ENOTDIR cause from fs.exists into false, so…
Out of Scope Changes check		The changes are limited to the worktree existence check in apps/server/src/storageCleanup.ts and a regression test in apps/server/src/storageCleanup.test.ts. Both changes directly implement issue …

Full details: Description check

Explanation

The description includes all required sections and provides clear problem details, implementation scope, focused test results, runtime verification, and an explicit note about untested macOS execution.

Full details: Linked Issues check

Explanation

Issue #26585 requires a safe, history-preserving classification for stored worktree paths that return ENOTDIR. The cleanup pass now converts only an ENOTDIR cause from fs.exists into false, so it skips the candidate. Other errors still propagate. The regression test uses a regular parent file and verifies zero report entries and zero failures. The change does not delete or modify thread data or history, and it applies before archived or unarchived worktree processing.

Full details: Out of Scope Changes check

Explanation

The changes are limited to the worktree existence check in apps/server/src/storageCleanup.ts and a regression test in apps/server/src/storageCleanup.test.ts. Both changes directly implement issue #26585. No unrelated UI, data migration, deletion, or history change is present.

Finishing Touches

Generate docstrings

• Commit to this branch
• Create a new PR

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: 2
• Charged: $0.50
• 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: fix/issue-26585
• File: .coderabbit.config.ts
• Commit: d66f0d1
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: 36c9218b-b421-4d33-8778-9adb238ceb8d

Commits

Reviewing files that changed from the base of the PR and between d7cfd98 and d66f0d1.

Files selected for processing: 2

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

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

[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: c90b678 · PR result: d66f0d1 · 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.

[juliusmarminge]

The automated pipeline stopped on this pull request and will not merge it:

someone else pushed to fix/issue-26585 (head is now d7cfd98); the pipeline does not build on commits it did not review

It stays open for a person to finish or close.

[juliusmarminge]

Evidence

Create retained and archived conversations with stored worktree paths beneath a disposable root. Stop the app, replace that root with a regular file, restart, enable inactive-worktree cleanup, then select Settings → Maintenance → Delete now and expand Last run.

Both captures use Chromium at 1280×800 with the light theme and fresh synthetic data. Displayed fixture paths are redacted; report counts, errors, titles, and server behavior are unchanged.

Before	After
c90b67859a	d66f0d1b63
Before recording	After recording

Reproduction driver and seed scripts · Preservation results

Base reports both stale candidates as BadResource failures. Head omits both and emits no storage-cleanup failure warning. Both conversations and the parent file survive on both sides.

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

Not shown:

• Overall warning-free startup is not achieved: the separate automatic-thread-settlement subsystem still emits an ENOTDIR-related warning on head. The cleanup operation itself emitted no storage-cleanup failure warning.