fix: force remove worktrees from backend

Author: centdix

backend/src/__tests__/lifecycle-service.test.ts

@@ -479,7 +479,7 @@ describe("LifecycleService", () => {
     ]);
   });
 
-  it("rejects removing a dirty worktree", async () => {
+  it("force removes a dirty worktree", async () => {
     const repoRoot = await initRepo();
     const runtime = new ProjectRuntime();
     const tmux = new FakeTmuxGateway();
@@ -491,16 +491,14 @@ describe("LifecycleService", () => {
     const worktreePath = join(repoRoot, "__worktrees", "feature-dirty");
     await Bun.write(join(worktreePath, "README.md"), "# dirty\n");
 
-    await expect(lifecycle.removeWorktree("feature-dirty")).rejects.toThrow(
-      "Worktree has uncommitted changes: feature-dirty",
-    );
+    await lifecycle.removeWorktree("feature-dirty");
 
-    expect(hooks.calls.filter((call) => call.name === "preRemove")).toHaveLength(0);
-    expect(new BunGitGateway().listWorktrees(repoRoot).some((entry) => entry.path === worktreePath)).toBe(true);
-    expect(run(["git", "branch", "--list", "feature-dirty"], repoRoot)).toContain("feature-dirty");
+    expect(hooks.calls.filter((call) => call.name === "preRemove")).toHaveLength(1);
+    expect(new BunGitGateway().listWorktrees(repoRoot).some((entry) => entry.path === worktreePath)).toBe(false);
+    expect(run(["git", "branch", "--list", "feature-dirty"], repoRoot)).toBe("");
   });
 
-  it("rejects removing a clean worktree that is ahead of its upstream", async () => {
+  it("force removes a worktree that is ahead of its upstream", async () => {
     const repoRoot = await initRepo();
     const runtime = new ProjectRuntime();
     const tmux = new FakeTmuxGateway();
@@ -518,12 +516,10 @@ describe("LifecycleService", () => {
 
     await lifecycle.createWorktree({ branch: "feature-ahead" });
 
-    await expect(lifecycle.removeWorktree("feature-ahead")).rejects.toThrow(
-      "Worktree has unpushed commits: feature-ahead",
-    );
+    await lifecycle.removeWorktree("feature-ahead");
 
-    expect(hooks.calls.filter((call) => call.name === "preRemove")).toHaveLength(0);
-    expect(run(["git", "branch", "--list", "feature-ahead"], repoRoot)).toContain("feature-ahead");
+    expect(hooks.calls.filter((call) => call.name === "preRemove")).toHaveLength(1);
+    expect(run(["git", "branch", "--list", "feature-ahead"], repoRoot)).toBe("");
   });
 
   it("removes the sandbox container before deleting a docker worktree", async () => {

backend/src/services/lifecycle-service.ts

@@ -209,7 +209,7 @@ export class LifecycleService {
   async removeWorktree(branch: string): Promise<void> {
     try {
       const resolved = await this.resolveExistingWorktree(branch);
-      await this.removeResolvedWorktree(resolved, false);
+      await this.removeResolvedWorktree(resolved);
     } catch (error) {
       throw this.wrapOperationError(error);
     }
@@ -230,7 +230,7 @@ export class LifecycleService {
       );
 
       try {
-        await this.removeResolvedWorktree(resolved, true);
+        await this.removeResolvedWorktree(resolved);
       } catch (error) {
         throw new LifecycleError(
           `Merged ${branch} into ${this.deps.config.workspace.mainBranch} but cleanup failed: ${toErrorMessage(error)}`,
@@ -541,26 +541,13 @@ export class LifecycleService {
     }
   }
 
-  private ensureNoAheadCommits(entry: GitWorktreeEntry): void {
-    const status = this.deps.git.readWorktreeStatus(entry.path);
-    if (status.aheadCount > 0) {
-      throw new LifecycleError(`Worktree has unpushed commits: ${entry.branch ?? entry.path}`, 409);
-    }
-  }
-
   private controlUrl(): string {
     return `${this.deps.controlBaseUrl.replace(/\/+$/, "")}/api/runtime/events`;
   }
 
   private async removeResolvedWorktree(
     resolved: ResolvedLifecycleWorktree,
-    allowAheadCommits: boolean,
   ): Promise<void> {
-    this.ensureNoUncommittedChanges(resolved.entry);
-    if (!allowAheadCommits) {
-      this.ensureNoAheadCommits(resolved.entry);
-    }
-
     await this.runLifecycleHook({
       name: "preRemove",
       command: this.deps.config.lifecycleHooks.preRemove,