From 224ba30fb301bfb09d53fdd032a1482180d6a712 Mon Sep 17 00:00:00 2001 From: Mohamed Boudra Date: Tue, 17 Nov 2026 17:06:27 +0100 Subject: [PATCH] test(workspaces): verify detached checkout after restore Update the browser journey for detached restore and allow the daemon restart test enough time on Windows runners. --- .../app/e2e/browser/worktree-restore.spec.ts | 17 +++++++---------- .../hub/execution-session.websocket.test.ts | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/app/e2e/browser/worktree-restore.spec.ts b/packages/app/e2e/browser/worktree-restore.spec.ts index 5849415984..069a9725e6 100644 --- a/packages/app/e2e/browser/worktree-restore.spec.ts +++ b/packages/app/e2e/browser/worktree-restore.spec.ts @@ -361,6 +361,10 @@ test.describe("Worktree restore", () => { cwd: backingWorktree.workspaceDirectory, stdio: "pipe", }); + const originalHead = execFileSync("git", ["rev-parse", "HEAD"], { + cwd: backingWorktree.workspaceDirectory, + encoding: "utf8", + }).trim(); const created = await worktreeClient.createWorkspace({ source: { kind: "directory", path: backingWorktree.workspaceDirectory }, title: "Sample workspace", @@ -389,10 +393,7 @@ test.describe("Worktree restore", () => { await page.getByTestId(`agent-row-${getServerId()}-${agent.id}`).click(); await expect(page.getByText("Workspace archived", { exact: true })).toBeVisible(); await expect( - page.getByText( - "Restore Sample workspace to return to its agents. A new branch will start from the saved base or the repository default.", - { exact: true }, - ), + page.getByText("Restore Sample workspace to return to its agents.", { exact: true }), ).toBeVisible(); await captureBranchlessRestoreStep(page, "01-restore-workspace.png"); @@ -409,17 +410,13 @@ test.describe("Worktree restore", () => { cwd: backingWorktree.workspaceDirectory, encoding: "utf8", }).trim(); - const defaultHead = execFileSync("git", ["rev-parse", "main"], { - cwd: tempRepo.path, - encoding: "utf8", - }).trim(); - expect(restoredHead).toBe(defaultHead); + expect(restoredHead).toBe(originalHead); expect( execFileSync("git", ["branch", "--show-current"], { cwd: backingWorktree.workspaceDirectory, encoding: "utf8", }).trim(), - ).toMatch(/^restored\//); + ).toBe(""); }); test("restore failure stays visible and permits a successful retry", async ({ page }) => { diff --git a/packages/server/src/server/hub/execution-session.websocket.test.ts b/packages/server/src/server/hub/execution-session.websocket.test.ts index 7cc2db0480..f9f9227f40 100644 --- a/packages/server/src/server/hub/execution-session.websocket.test.ts +++ b/packages/server/src/server/hub/execution-session.websocket.test.ts @@ -554,7 +554,7 @@ test("Hub resolves persisted execution ownership after daemon restart", async () expect(workspaceId).toEqual(expect.any(String)); expect(await hub.archivedWorkspaceAt(workspaceId!)).toEqual(expect.any(String)); expect(await hub.worktreeState(worktreeCwd)).toEqual({ exists: false, listed: false }); -}, 20_000); +}, 60_000); test("Hub treats missing and foreign executions as already controlled without exposing ownership", async () => { const hub = await launchRelationship();