Skip to content

fix(opencode): cleanup orphaned worktree directories #12399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdotdevin merged 3 commits into from
Feb 6, 2026
Merged

fix(opencode): cleanup orphaned worktree directories #12399

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
311875d
fix(opencode): cleanup orphaned worktree directories
maharshi365 Feb 6, 2026
4728ad1
Merge branch 'dev' into fix/orphaned-worktree-cleanup
maharshi365 Feb 6, 2026
4117e25
Merge branch 'dev' into fix/orphaned-worktree-cleanup
maharshi365 Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/opencode/src/worktree/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading