fix(opencode): cleanup orphaned worktree directories (#12399)

maharshi365 · web-flow · commit 89064c34c502 · 2026-02-06T16:18:03.000-06:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -411,8 +411,13 @@ export namespace Worktree {`
`411`	`411`	`if (key === directory) return item`
`412`	`412`	`}`
`413`	`413`	`})()`
	`414`	`+`
`414`	`415`	`if (!entry?.path) {`
`415`		`- throw new RemoveFailedError({ message: "Worktree not found" })`
	`416`	`+ const directoryExists = await exists(directory)`
	`417`	`+ if (directoryExists) {`
	`418`	`+ await fs.rm(directory, { recursive: true, force: true })`
	`419`	`+ }`
	`420`	`+ return true`
`416`	`421`	`}`
`417`	`422`
`418`	`423`	const removed = await $`git worktree remove --force ${entry.path}`.quiet().nothrow().cwd(Instance.worktree)