From 740c899dd726bda3b41e67649540cf5cd2caad1e Mon Sep 17 00:00:00 2001 From: gsxdsm Date: Fri, 6 Feb 2026 02:29:39 -0800 Subject: [PATCH] fix: Allow removing a worktree that has been removed elsewhere (#333) --- packages/web/server/lib/git-service.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/web/server/lib/git-service.js b/packages/web/server/lib/git-service.js index 2299d02a..c1189c67 100644 --- a/packages/web/server/lib/git-service.js +++ b/packages/web/server/lib/git-service.js @@ -1064,6 +1064,12 @@ export async function removeWorktree(directory, worktreePath, options = {}) { return { success: true }; } catch (error) { + // If the worktree doesn't exist or isn't recognized by git, treat as success + // since the goal (removing the worktree) is already achieved. + const errorMessage = String(error?.message || error || ''); + if (errorMessage.includes('is not a working tree') || errorMessage.includes('is not a valid path')) { + return { success: true }; + } console.error('Failed to remove worktree:', error); throw error; }