fix(archive): don't let a broken worktree block archiving (#3049)

Author: frankh

packages/workspace-server/src/services/archive/archive.integration.test.ts

@@ -395,6 +395,67 @@ describe("ArchiveService integration", () => {
         expect(archived.branchName).toBeNull();
         expect(ctx.archiveRepo.findAll()).toHaveLength(1);
       }));
+
+    it("archive succeeds when worktree has an in-progress merge conflict", () =>
+      withTestContext({}, async (ctx) => {
+        const { worktreePath } = await ctx.setupWorktree("detached");
+
+        const wt = (cmd: string) =>
+          execSync(`git ${cmd}`, {
+            cwd: worktreePath,
+            encoding: "utf8",
+            stdio: "pipe",
+          });
+
+        await fs.writeFile(path.join(worktreePath, "c.txt"), "base\n");
+        wt("add c.txt");
+        wt("commit -m base");
+        wt("tag base_commit");
+
+        await fs.writeFile(path.join(worktreePath, "c.txt"), "AAA\n");
+        wt("add c.txt");
+        wt("commit -m a");
+        wt("tag commit_a");
+
+        wt("reset --hard base_commit");
+        await fs.writeFile(path.join(worktreePath, "c.txt"), "BBB\n");
+        wt("add c.txt");
+        wt("commit -m b");
+
+        wt("merge commit_a || true");
+
+        const archived = await ctx.service.archiveTask(ctx.archiveInput());
+
+        expect(archived.checkpointId).toBeNull();
+        expect(await pathExists(worktreePath)).toBe(false);
+        expect(ctx.archiveRepo.findAll()).toHaveLength(1);
+      }));
+
+    it("archive succeeds and drops the checkpoint when worktree removal fails", () =>
+      withTestContext({}, async (ctx) => {
+        await ctx.setupWorktree("detached");
+
+        // Simulate git refusing to remove the worktree (e.g. a stale lock).
+        // Capture succeeded, so the checkpoint ref exists — but since the
+        // worktree stays registered, keeping the restore point would make a
+        // later unarchive fail to re-add it. The archive must still be recorded
+        // and its checkpoint dropped.
+        const deleteSpy = vi
+          .spyOn(WorktreeManager.prototype, "deleteWorktree")
+          .mockRejectedValue(new Error("worktree is locked"));
+
+        try {
+          const archived = await ctx.service.archiveTask(ctx.archiveInput());
+
+          expect(deleteSpy).toHaveBeenCalled();
+          expect(archived.checkpointId).toBeNull();
+          const records = ctx.archiveRepo.findAll();
+          expect(records).toHaveLength(1);
+          expect(records[0].checkpointId).toBeNull();
+        } finally {
+          deleteSpy.mockRestore();
+        }
+      }));
   });
 
   describe("local/cloud mode", () => {

packages/workspace-server/src/services/archive/archive.ts

@@ -246,24 +246,30 @@ export class ArchiveService {
             archivedTask.branchName = actualBranch;
           }
 
-          await step(
-            async () => {
-              if (!archivedTask.checkpointId) {
-                throw new Error("checkpointId must be set for worktree mode");
-              }
-              await this.captureWorktreeCheckpoint(
-                folderPath,
-                worktreePath,
-                archivedTask.checkpointId,
-              );
-            },
-            async () => {
-              if (archivedTask.checkpointId) {
+          const checkpointId = archivedTask.checkpointId;
+          try {
+            if (!checkpointId) {
+              throw new Error("checkpointId must be set for worktree mode");
+            }
+            await step(
+              () =>
+                this.captureWorktreeCheckpoint(
+                  folderPath,
+                  worktreePath,
+                  checkpointId,
+                ),
+              async () => {
                 const git = createGitClient(folderPath);
-                await deleteCheckpoint(git, archivedTask.checkpointId);
-              }
-            },
-          );
+                await deleteCheckpoint(git, checkpointId);
+              },
+            );
+          } catch (error) {
+            this.log.warn(
+              `Failed to capture checkpoint for ${worktreePath}; archiving without a restore point`,
+              { error },
+            );
+            archivedTask.checkpointId = null;
+          }
         }
 
         await step(
@@ -277,13 +283,39 @@ export class ArchiveService {
 
         await step(
           async () => {
-            const manager = new WorktreeManager({
-              mainRepoPath: folderPath,
-              worktreeBasePath: this.workspaceSettings.getWorktreeLocation(),
-            });
-            await manager.deleteWorktree(worktreePath);
-            const parentDir = path.dirname(worktreePath);
-            await forceRemove(parentDir);
+            try {
+              const manager = new WorktreeManager({
+                mainRepoPath: folderPath,
+                worktreeBasePath: this.workspaceSettings.getWorktreeLocation(),
+              });
+              await manager.deleteWorktree(worktreePath);
+              const parentDir = path.dirname(worktreePath);
+              await forceRemove(parentDir);
+            } catch (error) {
+              this.log.warn(
+                `Failed to remove worktree at ${worktreePath}; archiving anyway (on-disk worktree may need manual cleanup)`,
+                { error },
+              );
+              // The worktree is still registered under its original name, so a
+              // later unarchive can't re-add it from the checkpoint (git rejects
+              // the duplicate name/path), leaving the task un-restorable. Drop
+              // the restore point — and its now-orphaned checkpoint ref — so the
+              // archive record stays internally consistent, matching how a
+              // failed capture above already sets checkpointId to null.
+              const orphanedCheckpointId = archivedTask.checkpointId;
+              if (orphanedCheckpointId) {
+                archivedTask.checkpointId = null;
+                try {
+                  const git = createGitClient(folderPath);
+                  await deleteCheckpoint(git, orphanedCheckpointId);
+                } catch (cleanupError) {
+                  this.log.warn(
+                    `Failed to delete orphaned checkpoint ${orphanedCheckpointId}`,
+                    { error: cleanupError },
+                  );
+                }
+              }
+            }
           },
           async () => {},
         );