Fix Playwright workspace isolation (#1627)

* Fix Playwright workspace isolation

* Clean up empty project E2E cleanup

* Clean up worktree restore E2E projects

packages/app/e2e/helpers/archive-tab.ts

@@ -35,10 +35,6 @@ function buildSeededStoragePayload() {
  * idle agent from the same client it uses for everything else.
  */
 export interface IdleAgentSeedClient {
-  createWorkspace(input: { source: { kind: "directory"; path: string } }): Promise<{
-    workspace: { id: string } | null;
-    error: string | null;
-  }>;
   createAgent(options: {
     provider: string;
     model: string;
@@ -56,20 +52,14 @@ export interface IdleAgentSeedClient {
 
 export async function createIdleAgent(
   client: IdleAgentSeedClient,
-  input: { cwd: string; title: string },
+  input: { cwd: string; workspaceId: string; title: string },
 ): Promise<ArchiveTabAgent> {
-  const createdWorkspace = await client.createWorkspace({
-    source: { kind: "directory", path: input.cwd },
-  });
-  if (!createdWorkspace.workspace) {
-    throw new Error(createdWorkspace.error ?? `Failed to create workspace ${input.cwd}`);
-  }
   const created = await client.createAgent({
     provider: "opencode",
     model: "opencode/gpt-5-nano",
     modeId: "bypassPermissions",
     cwd: input.cwd,
-    workspaceId: createdWorkspace.workspace.id,
+    workspaceId: input.workspaceId,
     title: input.title,
   });
   const snapshot = await client.waitForAgentUpsert(
@@ -84,7 +74,7 @@ export async function createIdleAgent(
     id: created.id,
     title: input.title,
     cwd: input.cwd,
-    workspaceId: createdWorkspace.workspace.id,
+    workspaceId: input.workspaceId,
   };
 }
 

packages/app/e2e/helpers/composer.ts

@@ -149,6 +149,7 @@ export async function selectGithubOption(
 export interface MockAgentSetup {
   client: SeedDaemonClient;
   repo: Awaited<ReturnType<typeof createTempGitRepo>>;
+  cleanup: () => Promise<void>;
 }
 
 /** Create a temp repo, start a mock agent, navigate to it, and wait for it to be running. */
@@ -166,20 +167,29 @@ export async function startRunningMockAgent(
   if (!createdWorkspace.workspace) {
     throw new Error(createdWorkspace.error ?? "Failed to create workspace");
   }
+  const workspace = createdWorkspace.workspace;
   const agent = await client.createAgent({
     provider: "mock",
     cwd: repo.path,
-    workspaceId: createdWorkspace.workspace.id,
+    workspaceId: workspace.id,
     model: opts.model,
   });
-  const agentUrl = `${buildHostWorkspaceRoute(serverId, createdWorkspace.workspace.id)}?open=${encodeURIComponent(`agent:${agent.id}`)}`;
+  const agentUrl = `${buildHostWorkspaceRoute(serverId, workspace.id)}?open=${encodeURIComponent(`agent:${agent.id}`)}`;
   await page.goto(agentUrl);
   await expectComposerVisible(page);
   await client.sendAgentMessage(agent.id, opts.prompt);
   await expect(page.getByRole("button", { name: /stop|cancel/i }).first()).toBeVisible({
     timeout: 30_000,
   });
-  return { client, repo };
+  return {
+    client,
+    repo,
+    cleanup: async () => {
+      await client.removeProject(workspace.projectId).catch(() => undefined);
+      await client.close().catch(() => undefined);
+      await repo.cleanup().catch(() => undefined);
+    },
+  };
 }
 
 export interface GithubWorkspaceHandle {
@@ -198,8 +208,14 @@ export async function openGithubWorkspace(
   if (!createdWorkspace.workspace) {
     throw new Error(createdWorkspace.error ?? `Failed to create workspace ${repoPath}`);
   }
+  const workspace = createdWorkspace.workspace;
   await gotoAppShell(page);
-  await selectWorkspaceInSidebar(page, createdWorkspace.workspace.id);
+  await selectWorkspaceInSidebar(page, workspace.id);
   await waitForTabBar(page);
-  return { cleanup: () => client.close().catch(() => undefined) };
+  return {
+    cleanup: async () => {
+      await client.removeProject(workspace.projectId).catch(() => undefined);
+      await client.close().catch(() => undefined);
+    },
+  };
 }

packages/app/e2e/helpers/new-workspace.ts

@@ -18,6 +18,7 @@ type NewWorkspaceDaemonClient = Pick<
   | "getPaseoWorktreeList"
   | "getDaemonConfig"
   | "patchDaemonConfig"
+  | "removeProject"
 >;
 
 type CreateWorkspacePayload = Awaited<ReturnType<NewWorkspaceDaemonClient["createWorkspace"]>>;

packages/app/e2e/helpers/rewind-flow.ts

@@ -14,6 +14,7 @@ export interface AgentHandle {
   page: Page;
   client: SeedDaemonClient;
   agentId: string;
+  projectId: string;
   workspaceId: string;
   cwd: string;
   provider: RewindFlowProvider;
@@ -187,6 +188,7 @@ export async function launchAgent(input: {
     page: input.page,
     client,
     agentId: agent.id,
+    projectId: createdWorkspace.workspace.projectId,
     workspaceId: createdWorkspace.workspace.id,
     cwd: input.cwd,
     provider: input.provider,
@@ -196,6 +198,7 @@ export async function launchAgent(input: {
 }
 
 export async function closeAgent(handle: AgentHandle): Promise<void> {
+  await handle.client.removeProject(handle.projectId).catch(() => undefined);
   await handle.client.close().catch(() => undefined);
 }
 

packages/app/e2e/helpers/seed-client.ts

@@ -30,6 +30,7 @@ export interface SeedDaemonClient {
     } | null;
     error: string | null;
   }>;
+  removeProject(projectId: string): Promise<{ removedWorkspaceIds: string[] }>;
   fetchWorkspaces(options?: { filter?: { projectId?: string } }): Promise<{
     entries: SeedWorkspaceDescriptor[];
   }>;
@@ -199,15 +200,17 @@ export async function seedWorkspace(options: {
     if (!created.workspace) {
       throw new Error(created.error ?? `Failed to create workspace ${project.path}`);
     }
+    const workspace = created.workspace;
     return {
       client,
       repoPath: project.path,
-      workspaceId: created.workspace.id,
-      workspaceName: created.workspace.name,
-      workspaceDirectory: created.workspace.workspaceDirectory,
-      projectId: created.workspace.projectId,
-      projectDisplayName: created.workspace.projectDisplayName,
+      workspaceId: workspace.id,
+      workspaceName: workspace.name,
+      workspaceDirectory: workspace.workspaceDirectory,
+      projectId: workspace.projectId,
+      projectDisplayName: workspace.projectDisplayName,
       cleanup: async () => {
+        await client.removeProject(workspace.projectId).catch(() => undefined);
         await client.close().catch(() => undefined);
         await project.cleanup().catch(() => undefined);
       },

packages/app/e2e/helpers/terminal-dsl.ts

@@ -28,15 +28,18 @@ function sleep(ms: number): Promise<void> {
 export class TerminalE2EHarness {
   readonly client: SeedDaemonClient;
   readonly tempRepo: TempRepo;
+  readonly projectId: string;
   readonly workspaceId: string;
 
   private constructor(input: {
     client: SeedDaemonClient;
     tempRepo: TempRepo;
+    projectId: string;
     workspaceId: string;
   }) {
     this.client = input.client;
     this.tempRepo = input.tempRepo;
+    this.projectId = input.projectId;
     this.workspaceId = input.workspaceId;
   }
 
@@ -54,11 +57,13 @@ export class TerminalE2EHarness {
     return new TerminalE2EHarness({
       client,
       tempRepo,
+      projectId: seedResult.workspace.projectId,
       workspaceId: seedResult.workspace.id,
     });
   }
 
   async cleanup(): Promise<void> {
+    await this.client.removeProject(this.projectId).catch(() => {});
     await this.client.close().catch(() => {});
     await this.tempRepo.cleanup().catch(() => {});
   }

packages/app/e2e/helpers/with-workspace.ts

@@ -37,6 +37,7 @@ export function createWithWorkspace(page: Page): WithWorkspaceHandle {
   let client: WorkspaceSetupDaemonClient | null = null;
   const repos: Array<{ cleanup: () => Promise<void> }> = [];
   const worktrees: WorktreeRecord[] = [];
+  const projectIds = new Set<string>();
 
   const withWorkspace: WithWorkspace = async (options) => {
     if (!client) {
@@ -64,6 +65,7 @@ export function createWithWorkspace(page: Page): WithWorkspaceHandle {
       if (!added.project) {
         throw new Error(added.error ?? `Failed to add project ${repo.path}`);
       }
+      projectIds.add(added.project.projectId);
     }
 
     const created = await client.createWorkspace({
@@ -73,6 +75,7 @@ export function createWithWorkspace(page: Page): WithWorkspaceHandle {
       throw new Error(created.error ?? `Failed to create workspace ${workspacePath}`);
     }
     const workspaceId = created.workspace.id;
+    projectIds.add(created.workspace.projectId);
 
     return {
       workspaceId,
@@ -88,6 +91,11 @@ export function createWithWorkspace(page: Page): WithWorkspaceHandle {
   return {
     withWorkspace,
     cleanup: async () => {
+      if (client) {
+        for (const projectId of projectIds) {
+          await client.removeProject(projectId).catch(() => undefined);
+        }
+      }
       for (const { repoPath, worktreePath } of worktrees) {
         try {
           execSync(`git worktree remove ${JSON.stringify(worktreePath)} --force`, {

packages/app/e2e/helpers/workspace-setup.ts

@@ -19,6 +19,7 @@ type WorkspaceSetupDaemonClient = Pick<
   | "fetchAgents"
   | "fetchWorkspaces"
   | "listTerminals"
+  | "removeProject"
   | "subscribeRawMessages"
 >;