Forget unmanaged orphan worktrees safely

packages/web/server/lib/git/service.js

@@ -3680,12 +3680,11 @@ export async function removeWorktree(directory, input = {}) {
   })();
 
   if (!matchedEntry?.worktree) {
-    if (targetCanonical === worktreeRootCanonical || !isInsideOrSameDirectory(worktreeRootCanonical, targetCanonical)) {
-      throw new Error('Cannot remove unmanaged worktree directory');
-    }
+    const isManagedOrphan = targetCanonical !== worktreeRootCanonical
+      && isInsideOrSameDirectory(worktreeRootCanonical, targetCanonical);
 
     const targetExists = await checkPathExists(targetDirectory);
-    if (targetExists) {
+    if (targetExists && isManagedOrphan) {
       await fsp.rm(targetDirectory, { recursive: true, force: true });
     }
 

packages/web/server/lib/git/service.test.js

@@ -145,7 +145,7 @@ describe('getStatus', () => {
 // ---------------------------------------------------------------------------
 
 describe('removeWorktree', () => {
-  it('refuses orphan cleanup outside the managed worktree root', async () => {
+  it('forgets unmanaged orphan worktree entries without deleting files', async () => {
     if (!canRunGit()) return;
 
     const previousXdgDataHome = process.env.XDG_DATA_HOME;
@@ -168,7 +168,7 @@ describe('removeWorktree', () => {
       await expect(removeWorktree(repo, {
         directory: sentinel,
         deleteLocalBranch: false,
-      })).rejects.toThrow('Cannot remove unmanaged worktree directory');
+      })).resolves.toBe(true);
       expect(fs.existsSync(canary)).toBe(true);
     } finally {
       if (previousXdgDataHome === undefined) {