[juliusmarminge]

Problem

When storage cleanup (or git worktree remove) deletes a thread's managed worktree, the composer's $ picker lists no project skills for that thread, even though the branch still exists and the next turn recreates the worktree. Reproduced on main 4c3a9d5 in the web dev server with a project that commits .claude/skills/finalize/SKILL.md: a Claude thread in a new worktree lists finalize; after git worktree remove and the 5-minute snapshot TTL, $finalize shows "No skills found". The Claude scan runs against the missing folder, finds no project skills, and returns a finished (non-pending) snapshot, so the client never asks again.

Change

When a workspace snapshot is requested for a folder that does not exist, is a managed worktree path, and belongs to a thread with a branch (the same conditions turn start uses to recreate it), the server scans the owning project's root instead. ProjectService.workspaceScanDirectory resolves that directory, and ProviderRegistry.refreshWorkspaceSnapshot takes it as an internal scanCwd while keeping the snapshot keyed by the requested worktree path, so clients find it without any change. Existing folders, unmanaged paths, branchless threads and lookup failures behave as before. No wire contract, persisted state, or worktree recreation at scan time. The fallback sits above the drivers, so it applies to every provider with workspace scans, and to the whole workspace snapshot: project slash commands (.claude/commands/*.md) come back along with skills.

Scope and approval

Fixes #32459

Verification

Tests

• apps/server/src/ws.test.ts › "a missing thread worktree gets its project's skills in the cwd snapshot" (runs the real ProjectService): fails with expected [] to deeply equal [ 'finalize' ] when the handler drops scanCwd or the resolver returns cwd, passes with the fix.
• apps/server/src/provider/ProviderRegistry.test.ts › "scans scanCwd and keys the workspace snapshot by cwd": fails with expected [ '/worktree' ] to deeply equal [ '/project' ] when the registry ignores scanCwd.
• ws.test.ts, ProviderRegistry.test.ts, ProviderTurnStartService.test.ts, ProjectService.test.ts: 143 passed on 5ac4ccb47f. vp run check:changed passes; CI green on that head.

Evidence (before 8ee7183e6c = merge-base on main, after 5ac4ccb47f)

Environment: real web dev app, Chromium 157 on Linux, no device emulation, DPR 2, font scaling 100%, 1440×900 dark, frozen clock, fresh T3CODE_DEV_SEED=0 database per side, same synthetic project (.claude/skills/finalize/SKILL.md and .claude/commands/finalize-command.md committed). The thread's managed worktree is removed with git worktree remove (branch kept) and the server restarted, so the scan is uncached. CSS animations disabled (no native reduced-motion emulation).

Recordings, same scripted sequence: before-primary.mp4 · after-primary.mp4

Step	Before	After
Type $finalize (before 00:01.1, after 00:00.8)	"No skills found" by 00:02.3	finalize, Project Skill, by 00:01.8
Tab (before 00:04.4, after 00:03.9)	focus moves to Attach files	$finalize inserted, menu closed
Type /finalize-command	empty by 00:08.4	project command listed by 00:07.8
Type /skill:finalize	empty by 00:12.8	skill listed, Project badge, by 00:11.5

Sheets: Before | After above Diff0 | Diff16 (Diff0 marks every nonzero channel difference; Diff16 marks pixels whose largest channel difference exceeds 16/255).

Row, 1440×900 dark	Sheet
$finalize skill picker
/skill:finalize slash skill
/finalize-command project command

After at 390×844 light:

What else changed: only the picker (populated row, description, scope badge, highlight, menu height). Zero pixels changed outside the picker in all three pairs at threshold 0. Full evidence index.

Server side: R1.a-runtime.txt shows the snapshot request keyed by the missing worktree path, the finalize path under the project root, and the worktree still absent after scan and selection. R1.c-runtime.txt shows an existing worktree keeping its branch inventory and the project root scanning itself. Controls carried from the earlier run on ef5e92da9a and re-run against ProjectService at head: archived owner (archive-control.json), unmanaged, ownerless and branchless paths, error, path-semantics, cache and recreation cases; the Settings control (slash skills off, $ picker still lists finalize) in after-combined.mp4.

Seed and drivers (uploaded, not committed): reproduce.md · seed-fixture.py · branch-fixture.py · browser-driver.js · capture-driver.js · build-diffs.py · fixture matrix. An independent rebuild of the $finalize after capture matched with 0 changed pixels.

Not checked: desktop and mobile (no client code changed; they read the same server snapshot); providers other than Claude against a removed worktree. While the worktree is missing, the picker shows the project checkout's skills and commands, which can differ from the thread branch's; after the next turn recreates the worktree, an already-fetched snapshot keeps that list until its 5-minute TTL.

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

[macroscopeapp]

Approvability

Verdict: Approved at 5ac4ccb

Macroscope's review found this PR approvable — Removed managed worktrees retain their project's skills and commands in the picker by scanning the owning project while preserving the thread's snapshot identity. The fallback is narrowly gated and does not recreate worktrees or modify persisted data.

^{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: 8ee7183 · PR result: 5ac4ccb · 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

Workspace refreshes can scan a project directory when a managed worktree is missing. The provider registry stores the resulting snapshot under the requested worktree path.

Changes: Workspace skill discovery

Layer / File(s)	Summary
Resolve the workspace scan directory apps/server/src/project/ProjectService.ts, apps/server/src/project/ProjectService.test.ts, apps/server/src/orchestration-v2/ThreadLaunchService.test.ts, apps/server/src/relay/AgentAwarenessRelay.test.ts	ProjectService adds workspaceScanDirectory. For a missing managed worktree, it can return the project workspace root found through thread snapshots. Otherwise, it returns the requested directory. Test dependencies and mocks are updated for the new operation.
Scan and store workspace snapshots apps/server/src/provider/ProviderRegistry.ts, apps/server/src/provider/ProviderRegistry.test.ts, apps/server/src/ws.ts, apps/server/src/ws.test.ts	Provider refresh accepts an optional scan directory and continues to key snapshots by the requested directory. WebSocket refreshes pass the directory resolved by ProjectService. Tests cover scanning project skills for a missing worktree.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Change: Bug fix · Severity of issue fixed: Low

Sequence Diagram(s)

sequenceDiagram
  participant Client
  participant serverRefreshProviders
  participant ProjectService
  participant ProviderRegistry
  Client->>serverRefreshProviders: Request workspace snapshot for worktree
  serverRefreshProviders->>ProjectService: Resolve scan directory
  ProjectService-->>serverRefreshProviders: Return project directory
  serverRefreshProviders->>ProviderRegistry: Refresh with worktree cwd and project scanCwd
  ProviderRegistry-->>Client: Return snapshot keyed by worktree cwd

Loading

Suggested reviewers: t3dotgg, maria-rcks

Merge Risk: Minimal · up to 5ac4c

No confirmed issue currently prevents merging. Complete the normal checks before merge.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title clearly describes the main fix: keeping project skills available when a thread’s managed worktree is removed.
Linked Issues check		[#32459] ProjectService.workspaceScanDirectory uses the project root when cwd is a missing managed worktree with a branch-bearing thread. ws.ts passes that directory as scanCwd, and `ProviderR…
Out of Scope Changes check		The service helper, registry option, WebSocket integration, and tests support [#32459]. Including project commands follows from scanning the same workspace snapshot. The test dependency and mock updat…
Description check		The description includes the required Problem, Change, Scope and approval, and Verification sections. It explains the failure and fix, links issue #32459, and gives focused test results and detailed e…

Full details: Linked Issues check

Explanation

[#32459] ProjectService.workspaceScanDirectory uses the project root when cwd is a missing managed worktree with a branch-bearing thread. ws.ts passes that directory as scanCwd, and ProviderRegistry scans it while keeping the snapshot keyed by the requested worktree path. The WebSocket and registry tests cover skill discovery and snapshot-key behavior.

Full details: Out of Scope Changes check

Explanation

The service helper, registry option, WebSocket integration, and tests support [#32459]. Including project commands follows from scanning the same workspace snapshot. The test dependency and mock updates support the new service operation. No unrelated changes are evident.

Full details: Description check

Explanation

The description includes the required Problem, Change, Scope and approval, and Verification sections. It explains the failure and fix, links issue #32459, and gives focused test results and detailed evidence. The scope section does not state whether the issue was triaged or include an explicit maintainer approval comment, but the description is otherwise complete.

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

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: fix/issue-32459
• File: .coderabbit.config.ts
• Commit: 5ac4ccb
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: df837ea2-ca83-407c-a375-7961b885181e

Commits

Reviewing files that changed from the base of the PR and between a9e98bb and 5ac4ccb.

Files selected for processing: 6

• apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
• apps/server/src/project/ProjectService.test.ts
• apps/server/src/project/ProjectService.ts
• apps/server/src/relay/AgentAwarenessRelay.test.ts
• apps/server/src/ws.test.ts
• apps/server/src/ws.ts

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

[HoneyPaptan]

This matches the plan I posted on #32459, and I had the same change ready on a branch (scanCwd threaded through refreshWorkspaceSnapshot, keyed by the worktree cwd), so I won't open a duplicate. In case it helps review, here is the before and after from a dev build with the worktree removed and the Claude provider selected:

Before (main): $ shows "No skills found".

After: the project skill is listed while the worktree is still missing.

If it seems fair, a Co-authored-by: Honey Paptan <hpaptan@gmail.com> on the merge would be appreciated. Either way, thanks for the quick fix!

[macroscopeapp]

Effect Service Conventions: one service-placement violation was reported inline in apps/server/src/project/threadWorkspaceRoot.ts. Move the effectful workspace scan-directory resolution behind a domain service operation.

^{Posted via Macroscope — Effect Service Conventions}

Dismissing prior approval to re-evaluate 5ac4ccb