From 89064c34c502a82d44b78030cc9b522f7e5966be Mon Sep 17 00:00:00 2001 From: Maharshi Patel Date: Fri, 6 Feb 2026 17:18:03 -0500 Subject: [PATCH] fix(opencode): cleanup orphaned worktree directories (#12399) --- packages/opencode/src/worktree/index.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/opencode/src/worktree/index.ts b/packages/opencode/src/worktree/index.ts index b0dfd57dd..2e095136e 100644 --- a/packages/opencode/src/worktree/index.ts +++ b/packages/opencode/src/worktree/index.ts @@ -411,8 +411,13 @@ export namespace Worktree { if (key === directory) return item } })() + if (!entry?.path) { - throw new RemoveFailedError({ message: "Worktree not found" }) + const directoryExists = await exists(directory) + if (directoryExists) { + await fs.rm(directory, { recursive: true, force: true }) + } + return true } const removed = await $`git worktree remove --force ${entry.path}`.quiet().nothrow().cwd(Instance.worktree)