refactor(worktree): resolve worktree path from stored value, not derived from name

[haacked]

Problem

Note

This is pretty much a pure refactoring to make room for some future Worktree improvements.

WorkspaceService ignored the worktrees.path column and recomputed each task's worktree path everywhere from the worktree name, assuming it lives at <base>/<name>/<repo>. That means a worktree located outside the app's managed base path can't round-trip through the name-to-path formula, so it can't be attached to a task. This is a standalone prerequisite that unblocks a later feature: importing worktrees created by other tools.

Changes

The persisted path column is now the source of truth. A task resolves its worktree path by reading the worktree row, never by deriving it from name plus base path.

The TaskAssociation worktree variant carries the authoritative path (read straight from the row that findTaskAssociation/getAllTaskAssociations already load) alongside the now-cosmetic name. All 9 read, delete, and occupancy call sites use assoc.path instead of re-deriving: the branch-rename watchers (handleFocusBranchRenamed, handleGitStateChanged), deleteWorkspace, verifyWorkspaceExists, getWorkspace, getWorkspaceInfo, getAllWorkspaces, and getWorktreeTasks. The private deriveWorktreePath helper is removed from this service.

cleanupRepoWorktreeFolder is guarded so it only reclaims the managed <base>/<repo> parent folder when the deleted worktree actually lived under the managed base path. Externally located worktrees never created it, so their parent dirs stay untouched. The under-path check uses path.relative, not startsWith, which would false-positive /base-evil against /base.

This is a behavioral no-op for app-created worktrees. I checked the local dev and prod SQLite worktrees tables and every stored path already equals <base>/<name>/<repo>, which is exactly what deriveWorktreePath returned, so no data migration is needed.

The legacy name-recovery hack the original scope referenced (findExistingWorktreeForBranch and the finalSegment === repoName ? parent : finalSegment logic) no longer exists in the tree, already removed in a prior change, so that item produced no diff. The shared worktree-path/worktree-path.ts module stays because archive, shell, and suspension still use it. The "import existing worktree" UI and the adopted deletion flag remain out of scope for a future PR.

How did you test this?

pnpm --filter @posthog/workspace-server test workspace.test passes with 16 tests: the 12 existing ones unchanged (proving the no-op for managed worktrees) plus 4 new ones. The new coverage exercises a worktree whose path is not under the base path: its projection resolves to the stored path, occupancy via getWorktreeTasks matches by stored path, and delete uses the stored path without removing any parent folder. A contrast test with a managed path under the base proves the cleanup guard discriminates rather than being a blanket no-op. I confirmed it is non-vacuous by mutation: removing the guard fails exactly the external-worktree test.

pnpm --filter @posthog/workspace-server typecheck passes and Biome lint/format is clean on the changed files.

The repo's repositories.test.ts DB round-trip suite fails locally with a pre-existing better-sqlite3 native ABI mismatch (node 20 versus the expected node 22), unrelated to this change and in files I did not touch.

Automatic notifications

• Publish to changelog?
• Alert Sales and Marketing teams?

[github-actions]

React Doctor found no issues in the changed files. 🎉

_{Reviewed by React Doctor for commit 1791182.}

[greptile-apps]

Prompt To Fix All With AI

Fix the following 1 code review issue. Work through them one at a time, proposing concise fixes.

---

### Issue 1 of 1
packages/workspace-server/src/services/workspace/workspace.test.ts:370-416
**Delete guard tests could be parameterised**

Tests 3 and 4 exercise the same `deleteWorkspace` method with the only meaningful difference being whether the stored worktree path lives under the managed base. Per the team's preference for parameterised tests, these two cases are a natural `it.each` table: each row supplies a `worktreePath` factory (external temp dir vs `path.join(base, "some-name", "myrepo")`) and the expected post-delete existence of `managedParent`. The current form repeats the identical boilerplate — `mkTemp("wt-base-")`, `mkdirSync(managedParent)`, `seedWorktreeTask`, `deleteWorkspace`, `expect(existsSync(managedParent))` — across two independent `it` blocks.

_{Reviews (1): Last reviewed commit: "refactor(worktree): resolve worktree pat..." | Re-trigger Greptile}

[greptile-apps]

_{Reviews (2): Last reviewed commit: "Add test for worktree verification with ..." | Re-trigger Greptile}

[github-actions]

Clean refactor that reads worktree paths from the stored DB row instead of re-deriving them, fixing correctness for external worktree locations. The isPathUnder helper is sound, the null-safety concern is covered by TypeScript flow narrowing at the call site, and the PR includes thorough test coverage for all changed behaviors including the it.each pattern the bot comment suggested.

[Copilot]

Pull request overview

Refactors WorkspaceService worktree path resolution so the persisted worktrees.path column becomes the source of truth, enabling support for externally located worktrees (a prerequisite for future “import existing worktree” functionality).

Changes:

• Extends the internal TaskAssociation (worktree mode) to carry the authoritative path from the worktree row and updates all relevant call sites to use it.
• Removes derived-path logic from WorkspaceService and guards managed-folder cleanup so it only applies to worktrees actually under the configured base path.
• Adds unit tests covering externally located worktrees (projection, occupancy matching, existence verification, and delete/cleanup behavior).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
packages/workspace-server/src/services/workspace/workspace.ts	Switches worktree path usage to the stored DB value; adds a base-path guard for managed-folder cleanup.
packages/workspace-server/src/services/workspace/workspace.test.ts	Adds coverage for external worktree paths and for cleanup behavior discrimination (external vs managed).

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.