fix(tests): iteration 16

packages/app/e2e/helpers/agent-bottom-anchor.ts

@@ -165,8 +165,12 @@ export async function seedBottomAnchorAgent(input: {
   };
 }
 
+function getVisibleChatScroll(page: Page) {
+  return page.locator('[data-testid="agent-chat-scroll"]:visible').first();
+}
+
 export async function readScrollMetrics(page: Page): Promise<ScrollMetrics> {
-  return page.getByTestId("agent-chat-scroll").evaluate((root: Element) => {
+  return getVisibleChatScroll(page).evaluate((root: Element) => {
     const rootElement = root as HTMLElement;
     const candidates = [rootElement, ...Array.from(rootElement.querySelectorAll("*"))];
     const scrollElement =
@@ -194,7 +198,7 @@ export async function readScrollMetrics(page: Page): Promise<ScrollMetrics> {
 }
 
 export async function scrollUpFromBottom(page: Page, pixels: number): Promise<void> {
-  const scrollViewport = page.getByTestId("agent-chat-scroll");
+  const scrollViewport = getVisibleChatScroll(page);
   await expect(scrollViewport).toHaveCount(1, { timeout: 30000 });
   await scrollViewport.evaluate(
     (root: Element, amount: number) => {
@@ -240,7 +244,7 @@ export async function scrollUpFromBottom(page: Page, pixels: number): Promise<vo
 }
 
 export async function waitForAgentReady(page: Page, expectedTailText?: string): Promise<void> {
-  await expect(page.getByTestId("agent-chat-scroll")).toBeVisible({ timeout: 60000 });
+  await expect(getVisibleChatScroll(page)).toBeVisible({ timeout: 60000 });
   await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toBeVisible({
     timeout: 60000,
   });
@@ -287,9 +291,7 @@ export async function waitForContentGrowth(
 }
 
 export async function getChatContainerKey(page: Page): Promise<string | null> {
-  return page
-    .getByTestId("agent-chat-scroll")
-    .evaluate((element) => {
+  return getVisibleChatScroll(page).evaluate((element) => {
       const nativeId = (element as HTMLElement).id;
       const prefix = "agent-chat-scroll-";
       return nativeId.startsWith(prefix) ? nativeId.slice(prefix.length) : null;

packages/app/e2e/helpers/app.ts

@@ -136,14 +136,36 @@ async function assertE2EUsesSeededTestDaemon(page: Page): Promise<void> {
   }
 }
 
-export const gotoHome = async (page: Page) => {
+export const gotoAppShell = async (page: Page) => {
   await page.goto('/');
   await ensureE2EStorageSeeded(page);
-  await expect(page.getByText('New agent', { exact: true }).first()).toBeVisible();
+};
+
+export const gotoHome = async (page: Page) => {
+  await gotoAppShell(page);
   const composer = page.getByRole('textbox', { name: 'Message agent...' });
   if (!(await composer.first().isVisible().catch(() => false))) {
+    const addProjectCta = page.getByText('Add a project', { exact: true }).first();
+    const addProjectSidebar = page.getByText('Add project', { exact: true }).first();
     const newAgentButton = page.getByText('New agent', { exact: true }).first();
-    await newAgentButton.click();
+
+    await expect
+      .poll(
+        async () =>
+          (await addProjectCta.isVisible().catch(() => false)) ||
+          (await addProjectSidebar.isVisible().catch(() => false)) ||
+          (await newAgentButton.isVisible().catch(() => false)),
+        { timeout: 10000 }
+      )
+      .toBe(true);
+
+    if (await addProjectCta.isVisible().catch(() => false)) {
+      await addProjectCta.click();
+    } else if (await addProjectSidebar.isVisible().catch(() => false)) {
+      await addProjectSidebar.click();
+    } else {
+      await newAgentButton.click();
+    }
   }
   await expect(composer.first()).toBeVisible({ timeout: 30000 });
 };