Fix Playwright workspace isolation (#1627)

* Fix Playwright workspace isolation

* Clean up empty project E2E cleanup

* Clean up worktree restore E2E projects

packages/app/e2e/empty-project-persists.spec.ts

@@ -4,7 +4,7 @@ import { gotoAppShell } from "./helpers/app";
 import { connectSeedClient, seedWorkspace } from "./helpers/seed-client";
 import { getServerId } from "./helpers/server-id";
 import { createTempGitRepo } from "./helpers/workspace";
-import { waitForNoProjectsInSidebar, waitForSidebarHydration } from "./helpers/workspace-ui";
+import { waitForSidebarHydration } from "./helpers/workspace-ui";
 
 function workspaceRowTestId(workspaceId: string): string {
   return `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
@@ -66,6 +66,13 @@ async function addProjectFromPicker(page: Page, projectPath: string): Promise<st
   return testId!.replace("sidebar-project-row-", "");
 }
 
+async function waitForSidebarProjectListReady(page: Page): Promise<void> {
+  await page
+    .locator('[data-testid="sidebar-project-empty-state"], [data-testid^="sidebar-project-row-"]')
+    .first()
+    .waitFor({ state: "visible", timeout: 60_000 });
+}
+
 // Projects are parents in the sidebar. Archiving the last workspace leaves the
 // project row in place with a ghost "+ New workspace" child row.
 test.describe("Project with no workspaces persists", () => {
@@ -76,7 +83,7 @@ test.describe("Project with no workspaces persists", () => {
 
     try {
       await gotoAppShell(page);
-      await waitForNoProjectsInSidebar(page);
+      await waitForSidebarProjectListReady(page);
 
       projectId = await addProjectFromPicker(page, repo.path);
       const projectRow = page.getByTestId(`sidebar-project-row-${projectId}`);
@@ -92,7 +99,7 @@ test.describe("Project with no workspaces persists", () => {
       expect(workspaces.entries).toEqual([]);
     } finally {
       if (projectId) {
-        await removeProjectFromSidebar(page, projectId).catch(() => undefined);
+        await client.removeProject(projectId).catch(() => undefined);
       }
       await client.close().catch(() => undefined);
       await repo.cleanup().catch(() => undefined);
@@ -163,7 +170,7 @@ test.describe("Project remove", () => {
       await expect(projectRow).toHaveCount(0, { timeout: 30_000 });
 
       await page.reload();
-      await waitForSidebarHydration(page);
+      await waitForSidebarProjectListReady(page);
       await expect(projectRow).toHaveCount(0, { timeout: 30_000 });
 
       const readded = await workspace.client.addProject(workspace.repoPath);
@@ -179,7 +186,6 @@ test.describe("Project remove", () => {
         page.getByTestId(`sidebar-project-new-workspace-row-${workspace.projectId}`),
       ).toBeVisible({ timeout: 30_000 });
     } finally {
-      await removeProjectFromSidebar(page, workspace.projectId).catch(() => undefined);
       await workspace.cleanup();
     }
   });