From de1d35cdcf81d951c1d094e87553745f21752e6c Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Mon, 28 Sep 2026 20:43:55 -0700 Subject: [PATCH 01/11] test: open agent panel idempotently --- .../agentAutogrowHandWiredLinkFixture.ts | 5 +- .../fixtures/agentConversationFixture.ts | 4 +- .../fixtures/agentCrdtIdCollisionFixture.ts | 4 +- .../fixtures/components/AgentPanel.ts | 45 +++++++++++---- .../agentAttachmentHistoryPersistence.spec.ts | 6 +- .../agent/agentBatchOutputAttachment.spec.ts | 6 +- .../agentCanvasBlanksDuringRunTurn.spec.ts | 5 +- .../agentCanvasLagsToolCallCompletion.spec.ts | 5 +- .../tests/agent/agentComposerPaste.spec.ts | 6 +- .../tests/agent/agentDebugPanel.spec.ts | 4 +- .../agentDuplicateWorkflowNameBinding.spec.ts | 6 +- .../agent/agentFirstTurnOnUnsavedTab.spec.ts | 4 +- .../agentGraphOpLostOnDisconnect.spec.ts | 5 +- .../tests/agent/agentInlinePrompt.spec.ts | 4 +- .../tests/agent/agentInlineReferences.spec.ts | 6 +- .../agent/agentNewChatTargetWorkflow.spec.ts | 12 ++-- .../tests/agent/agentOnboarding.spec.ts | 8 +-- .../tests/agent/agentPanelAppMode.spec.ts | 18 +++--- .../tests/agent/agentPanelLifecycle.spec.ts | 55 ++++++++++++++++--- .../tests/agent/agentReplyDrafts.spec.ts | 5 +- .../agent/agentRunApprovalConsent.spec.ts | 5 +- 21 files changed, 130 insertions(+), 88 deletions(-) diff --git a/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts b/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts index 51648fd785b..e782b0b7a8c 100644 --- a/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts +++ b/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts @@ -13,7 +13,7 @@ import { import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import { loadSeedIntoActiveTab } from '@e2e/fixtures/utils/seedActiveTab' @@ -264,8 +264,7 @@ async function setUpFixture(page: Page) { await test.step('open the agent panel and target the workflow', async () => { await loadSeedIntoActiveTab(page, seed) - await new AgentPanel(page).open() - await expect(panel).toBeVisible() + await openAgentPanel(page) await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) .click() diff --git a/browser_tests/fixtures/agentConversationFixture.ts b/browser_tests/fixtures/agentConversationFixture.ts index 46a02d14042..6de4b45bdd1 100644 --- a/browser_tests/fixtures/agentConversationFixture.ts +++ b/browser_tests/fixtures/agentConversationFixture.ts @@ -29,12 +29,12 @@ import { ComfyPage } from '@e2e/fixtures/ComfyPage' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import type { ClientDocFrame, HumanOpsHost } from '@e2e/fixtures/agentFollowerHostSocket' import { Topbar } from '@e2e/fixtures/components/Topbar' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { TestIds } from '@e2e/fixtures/selectors' import type { @@ -329,7 +329,7 @@ export class AgentConversationHarness { ) await loadSeedIntoActiveTab(this.page, this.conversation.workflow.seed) - await new AgentPanel(this.page).open() + await openAgentPanel(this.page, PANEL_MOUNT_TIMEOUT) await expect(this.panel).toBeVisible({ timeout: PANEL_MOUNT_TIMEOUT }) await this.selectWorkflowTarget() } diff --git a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts index 43068462c42..a62281f7f67 100644 --- a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts +++ b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts @@ -57,7 +57,7 @@ import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' import type { WireOpEnvelope } from '@e2e/fixtures/agentWireFrame' import { ContextMenu } from '@e2e/fixtures/components/ContextMenu' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { Topbar } from '@e2e/fixtures/components/Topbar' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' @@ -220,7 +220,7 @@ export class IdCollisionHarness { }, objectInfo: 'server' }) - await new AgentPanel(this.page).open() + await openAgentPanel(this.page, 30_000) await expect(this.panel).toBeVisible({ timeout: 30_000 }) await this.selectWorkflowTarget() // `useAgentSession` only binds the CRDT workflow id (which is what makes diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index a5a3b8e0c32..8b33579d0e7 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -3,6 +3,38 @@ import type { Locator, Page } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } +export async function openAgentPanel( + page: Page, + timeout?: number +): Promise { + const panel = page.locator('#agent-panel-root') + const openButton = page.getByRole('button', { + name: enMessages.agent.entryButton, + exact: true + }) + for (let attempt = 0; attempt < 2; attempt++) { + if (await panel.isVisible()) return panel + if ((await openButton.getAttribute('aria-pressed')) === 'true') { + await expect(panel).toBeVisible({ timeout }) + return panel + } + await openButton.click() + try { + await expect(panel).toBeVisible({ timeout: 1_000 }) + return panel + } catch (error) { + if ((await openButton.getAttribute('aria-pressed')) === 'true') { + await expect(panel).toBeVisible({ timeout }) + return panel + } + // Startup activation can open between the visibility read and click, + // making that click close the panel. Retry from the observed state. + if (attempt === 1) throw error + } + } + throw new Error('Agent panel did not become visible') +} + export class AgentPanel { public readonly root: Locator public readonly openButton: Locator @@ -75,18 +107,7 @@ export class AgentPanel { } async open(): Promise { - for (let attempt = 0; attempt < 2; attempt++) { - if (await this.root.isVisible()) return - await this.openButton.click() - try { - await expect(this.root).toBeVisible({ timeout: 1_000 }) - return - } catch { - // Startup activation can open between the visibility read and click, - // making that click close the panel. Retry from the observed state. - } - } - await expect(this.root).toBeVisible() + await openAgentPanel(this.page) } async selectWorkflow(name: string = 'Unsaved Workflow'): Promise { diff --git a/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts b/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts index c99bae4541e..fe1ca8155b2 100644 --- a/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts +++ b/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts @@ -5,7 +5,7 @@ import type { AgentMessage } from '@comfyorg/ingest-types' import enMessages from '@/locales/en/main.json' with { type: 'json' } import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { dropAssets, expectAssets @@ -163,15 +163,13 @@ for (const scenario of [ return route.fulfill(jsonRoute(messages)) }) - await new AgentPanel(page).open() + const panel = await openAgentPanel(page) await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, exact: true }) .click() - const panel = page.locator('#agent-panel-root') - await expect(panel).toBeVisible() await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) .click() diff --git a/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts b/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts index 086f1bb0f77..74c9867f1f5 100644 --- a/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts +++ b/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts @@ -4,7 +4,7 @@ import enMessages from '@/locales/en/main.json' with { type: 'json' } import { MIME_ASSET_INFO } from '@/platform/assets/schemas/mediaAssetSchema' import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { assetPath } from '@e2e/fixtures/utils/paths' test.use({ connectWebSocketToServer: false }) @@ -39,15 +39,13 @@ test( (route) => route.fulfill({ path: assetPath('image64x64.webp') }) ) - await new AgentPanel(page).open() + const panel = await openAgentPanel(page) await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, exact: true }) .click() - const panel = page.locator('#agent-panel-root') - await expect(panel).toBeVisible() await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) .click() diff --git a/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts b/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts index ceaf04c9c15..5c3b56ae656 100644 --- a/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts +++ b/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts @@ -21,7 +21,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import { loadSeedIntoActiveTab } from '@e2e/fixtures/utils/seedActiveTab' @@ -240,8 +240,7 @@ async function driveThroughDocReset( await loadSeedIntoActiveTab(page, SEED) const panel = page.locator('#agent-panel-root') - await new AgentPanel(page).open() - await expect(panel).toBeVisible({ timeout: 30_000 }) + await openAgentPanel(page, 30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts b/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts index b10854bff83..aba72942aeb 100644 --- a/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts +++ b/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts @@ -17,7 +17,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' @@ -200,8 +200,7 @@ async function driveThroughToolCallDone( }) const panel = page.locator('#agent-panel-root') - await new AgentPanel(page).open() - await expect(panel).toBeVisible({ timeout: 30_000 }) + await openAgentPanel(page, 30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentComposerPaste.spec.ts b/browser_tests/tests/agent/agentComposerPaste.spec.ts index f07d8528c32..f7747a59a45 100644 --- a/browser_tests/tests/agent/agentComposerPaste.spec.ts +++ b/browser_tests/tests/agent/agentComposerPaste.spec.ts @@ -7,7 +7,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' // Minimal node used only to prove the clipboard leak; the bug is not @@ -77,9 +77,7 @@ test( await canvas.click() await canvas.press('Control+c') - await new AgentPanel(page).open() - const panel = page.locator('#agent-panel-root') - await expect(panel).toBeVisible() + const panel = await openAgentPanel(page) const composer = panel.getByRole('textbox', { name: /^Describe ideas/ }) await composer.click() diff --git a/browser_tests/tests/agent/agentDebugPanel.spec.ts b/browser_tests/tests/agent/agentDebugPanel.spec.ts index 79889da01d0..ad4437206f2 100644 --- a/browser_tests/tests/agent/agentDebugPanel.spec.ts +++ b/browser_tests/tests/agent/agentDebugPanel.spec.ts @@ -4,7 +4,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' test.describe('Agent debug log', { tag: ['@cloud', '@agent', '@ui'] }, () => { test.beforeEach(async ({ page }) => { @@ -24,7 +24,7 @@ test.describe('Agent debug log', { tag: ['@cloud', '@agent', '@ui'] }, () => { } }, async ({ page }) => { - await new AgentPanel(page).open() + await openAgentPanel(page) await page.getByTestId('crdt-dev-panel-tab-log').click() const filter = page.getByTestId('crdt-dev-panel-filter') diff --git a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts index f1ea167e73d..ba01b1c4ffe 100644 --- a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts +++ b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts @@ -14,8 +14,8 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { Topbar } from '@e2e/fixtures/components/Topbar' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import type { WorkspaceStore } from '@e2e/types/globals' @@ -179,9 +179,7 @@ test( ) ).toBe(PORTRAIT_PATH) - await new AgentPanel(page).open() - const panel = page.locator('#agent-panel-root') - await expect(panel).toBeVisible() + const panel = await openAgentPanel(page) await expect(panel.getByTestId('user-message-bubble')).toHaveText([ 'Earlier request' ]) diff --git a/browser_tests/tests/agent/agentFirstTurnOnUnsavedTab.spec.ts b/browser_tests/tests/agent/agentFirstTurnOnUnsavedTab.spec.ts index ffa0ca10188..5b8a847be5d 100644 --- a/browser_tests/tests/agent/agentFirstTurnOnUnsavedTab.spec.ts +++ b/browser_tests/tests/agent/agentFirstTurnOnUnsavedTab.spec.ts @@ -11,7 +11,7 @@ import { agentTest } from '@e2e/fixtures/agentPanelFixture' import { workflowSelectionTest } from '@e2e/fixtures/agentWorkflowSelectionFixture' import { agentReplayNodeDefs } from '@e2e/fixtures/data/agentReplayNodeDefs' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' // Story 33 of qa/user-story-test-matrix.md (in-app-agent-program): @@ -86,7 +86,7 @@ test.describe( const topbar = new Topbar(page) await test.step('user opens the Agent and pins it to the tab they started on', async () => { - await new AgentPanel(page).open() + await openAgentPanel(page) await targetPicker.click() await page .getByRole('menuitemradio', { name: 'Unsaved Workflow', exact: true }) diff --git a/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts b/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts index 8bb21e2480f..9815676fee4 100644 --- a/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts +++ b/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts @@ -16,9 +16,9 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' @@ -171,8 +171,7 @@ test.describe( }) const panel = page.locator('#agent-panel-root') - await new AgentPanel(page).open() - await expect(panel).toBeVisible({ timeout: 30_000 }) + await openAgentPanel(page, 30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentInlinePrompt.spec.ts b/browser_tests/tests/agent/agentInlinePrompt.spec.ts index 8f28ed49ba3..02339e4b4f8 100644 --- a/browser_tests/tests/agent/agentInlinePrompt.spec.ts +++ b/browser_tests/tests/agent/agentInlinePrompt.spec.ts @@ -1,8 +1,8 @@ import { expect } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' test.use({ connectWebSocketToServer: false }) @@ -10,7 +10,7 @@ test( 'preserves inline workflow references through Send, history and Edit', { tag: ['@cloud', '@ui'] }, async ({ page, workflowSelection, promptHistory }) => { - await new AgentPanel(page).open() + await openAgentPanel(page) await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, diff --git a/browser_tests/tests/agent/agentInlineReferences.spec.ts b/browser_tests/tests/agent/agentInlineReferences.spec.ts index 4d97dfbe7f8..17307635214 100644 --- a/browser_tests/tests/agent/agentInlineReferences.spec.ts +++ b/browser_tests/tests/agent/agentInlineReferences.spec.ts @@ -1,12 +1,12 @@ import { expect } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { inlineReferencesTest as test, referenceNode, referenceWorkflow } from '@e2e/fixtures/agentInlineReferencesFixture' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { assetPath } from '@e2e/fixtures/utils/paths' test.use({ @@ -24,9 +24,7 @@ test( mimeType: 'application/json', buffer: Buffer.from(JSON.stringify(referenceWorkflow)) }) - const agentPanel = new AgentPanel(page) - await agentPanel.open() - const panel = agentPanel.root + const panel = await openAgentPanel(page) const editor = panel.getByRole('textbox') await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) diff --git a/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts b/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts index 0ae12bc3848..22cc93aae20 100644 --- a/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts +++ b/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts @@ -1,10 +1,10 @@ import { expect, mergeTests } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { agentTest } from '@e2e/fixtures/agentPanelFixture' import { Topbar } from '@e2e/fixtures/components/Topbar' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { workflowSelectionTest } from '@e2e/fixtures/agentWorkflowSelectionFixture' const test = mergeTests(agentTest, workflowSelectionTest) @@ -26,9 +26,8 @@ test.describe( page, workflowSelection }, testInfo) => { - const agentPanel = new AgentPanel(page) - await agentPanel.open() - const panel = agentPanel.root + await openAgentPanel(page) + const panel = page.locator('#agent-panel-root') const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow }) @@ -97,9 +96,8 @@ test.describe( page, workflowSelection }) => { - const agentPanel = new AgentPanel(page) - await agentPanel.open() - const panel = agentPanel.root + await openAgentPanel(page) + const panel = page.locator('#agent-panel-root') const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow }) diff --git a/browser_tests/tests/agent/agentOnboarding.spec.ts b/browser_tests/tests/agent/agentOnboarding.spec.ts index bc6b9f6b0ff..5480453df89 100644 --- a/browser_tests/tests/agent/agentOnboarding.spec.ts +++ b/browser_tests/tests/agent/agentOnboarding.spec.ts @@ -7,7 +7,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { test('returns to the previous card without completing the tour', async ({ @@ -17,7 +17,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: false }) - await new AgentPanel(page).open() + await openAgentPanel(page) const firstCard = page.getByRole('dialog', { name: enMessages.agent.coachTitle @@ -61,7 +61,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: true }) - await new AgentPanel(page).open() + await openAgentPanel(page) const firstCard = page.getByRole('dialog', { name: enMessages.agent.coachTitle @@ -100,7 +100,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: false }) - await new AgentPanel(page).open() + await openAgentPanel(page) const steps = [ [enMessages.agent.coachTitle, enMessages.agent.coachBody], [enMessages.agent.coachWorkflowTitle, enMessages.agent.coachWorkflowBody], diff --git a/browser_tests/tests/agent/agentPanelAppMode.spec.ts b/browser_tests/tests/agent/agentPanelAppMode.spec.ts index d5cc7d674ac..750fbb647d0 100644 --- a/browser_tests/tests/agent/agentPanelAppMode.spec.ts +++ b/browser_tests/tests/agent/agentPanelAppMode.spec.ts @@ -3,8 +3,8 @@ import { expect } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } import type { WorkspaceStore } from '@e2e/types/globals' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { agentTest as test } from '@e2e/tests/agent/agentPanelMocks' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' const OPEN_AGENT_LABEL = enMessages.agent.entryButton const OPEN_STORAGE_KEY = 'Comfy.AgentPanel.open' @@ -32,7 +32,7 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { exact: true }) await expect(openButton).toBeVisible() - await new AgentPanel(page).open() + await openAgentPanel(page) await expect(panelRoot).toHaveCount(1) await expect(panelRoot).toBeVisible() @@ -55,7 +55,7 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { await expect.poll(activeWorkflowPath).toBe(selectedWorkflowPath) }) - test('activation reopens a stored-closed panel across app mode changes', async ({ + test('keeps a stored-closed panel hidden when toggling app mode and back', async ({ comfyPage }) => { test.setTimeout(30_000) @@ -71,15 +71,15 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { ) await comfyPage.workflow.reloadAndWaitForApp() - await expect(dockedPanel).toBeVisible() - await expect.poll(storedOpenState).toBe('true') + await expect(dockedPanel).toHaveCount(0) + await expect.poll(storedOpenState).toBe('false') await comfyPage.appMode.toggleAppMode() - await expect(dockedPanel).toBeVisible() - await expect.poll(storedOpenState).toBe('true') + await expect(dockedPanel).toHaveCount(0) + await expect.poll(storedOpenState).toBe('false') await comfyPage.appMode.toggleAppMode() - await expect(dockedPanel).toBeVisible() - await expect.poll(storedOpenState).toBe('true') + await expect(dockedPanel).toHaveCount(0) + await expect.poll(storedOpenState).toBe('false') }) }) diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index fd0a4449573..3fa1a8a6abd 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -6,8 +6,8 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { Topbar } from '@e2e/fixtures/components/Topbar' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' const OPEN_AGENT_LABEL = enMessages.agent.entryButton const OPEN_STORAGE_KEY = 'Comfy.AgentPanel.open' @@ -51,7 +51,7 @@ test.describe( const panel = page.getByTestId('docked-agent-panel') await expect(openButton).toBeVisible() - await new AgentPanel(page).open() + await openAgentPanel(page) await expect(panel).toBeVisible() await expect( page.getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) @@ -84,7 +84,7 @@ test.describe( exact: true }) const panel = page.getByTestId('docked-agent-panel') - await new AgentPanel(page).open() + await openAgentPanel(page) await panel.getByRole('button', { name: enMessages.g.close }).click() await openButton.focus() await openButton.press('Enter') @@ -105,12 +105,51 @@ test.describe( await expect(openButton).toBeVisible() }) + test('does not toggle closed while a pressed panel is still mounting', async ({ + page + }) => { + await bootAgentApp(page, true) + const openButton = page.getByRole('button', { + name: OPEN_AGENT_LABEL, + exact: true + }) + const panel = page.locator('#agent-panel-root') + const delayedMountStyle = await page.addStyleTag({ + content: '#agent-panel-root { display: none !important; }' + }) + await expect(openButton).toHaveAttribute('aria-pressed', 'true', { + timeout: 8_000 + }) + await openButton.evaluate((button) => { + button.dataset.testClickCount = '0' + button.addEventListener('click', () => { + button.dataset.testClickCount = String( + Number(button.dataset.testClickCount) + 1 + ) + }) + }) + + const opening = openAgentPanel(page) + await page.evaluate( + () => + new Promise((resolve) => requestAnimationFrame(() => resolve())) + ) + await delayedMountStyle.evaluate((style) => + style.parentNode?.removeChild(style) + ) + await opening + + await expect(panel).toBeVisible() + await expect(openButton).toHaveAttribute('aria-pressed', 'true') + await expect(openButton).toHaveAttribute('data-test-click-count', '0') + }) + test('keeps the dock within the viewport and its documented width cap', async ({ page }) => { await bootAgentApp(page, true) - await new AgentPanel(page).open() + await openAgentPanel(page) const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() @@ -135,7 +174,7 @@ test.describe( await page.setViewportSize({ width: 1600, height: 900 }) await bootAgentApp(page, true) - await new AgentPanel(page).open() + await openAgentPanel(page) const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() @@ -181,7 +220,7 @@ test.describe( await page.setViewportSize({ width: 1300, height: 900 }) await bootAgentApp(page, true) - await new AgentPanel(page).open() + await openAgentPanel(page) const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() await panel @@ -219,7 +258,7 @@ test.describe( test('restores an open panel after a browser reload', async ({ page }) => { await bootAgentApp(page, true) - await new AgentPanel(page).open() + await openAgentPanel(page) await expect(page.getByTestId('docked-agent-panel')).toBeVisible() await expect .poll(() => @@ -243,7 +282,7 @@ test.describe( }) => { await bootAgentApp(page, agentFlagEnabled) - await new AgentPanel(page).open() + await openAgentPanel(page) const panel = page.getByTestId('docked-agent-panel') const tabs = new Topbar(page).tabs diff --git a/browser_tests/tests/agent/agentReplyDrafts.spec.ts b/browser_tests/tests/agent/agentReplyDrafts.spec.ts index 47b23d93d95..e7944154993 100644 --- a/browser_tests/tests/agent/agentReplyDrafts.spec.ts +++ b/browser_tests/tests/agent/agentReplyDrafts.spec.ts @@ -16,7 +16,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' const WORKFLOW_ID = 'b4d7e1f2-8a3c-4d5e-9f60-7a1b2c3d4e5f' @@ -119,8 +119,7 @@ async function startTurn(page: Page, prompt: string): Promise { 'true', { timeout: 8_000 } ) - await new AgentPanel(page).open() - await expect(panel).toBeVisible({ timeout: 30_000 }) + await openAgentPanel(page, 30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts b/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts index 6debf0be30b..660b5ebcdcf 100644 --- a/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts +++ b/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts @@ -15,7 +15,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' // The consent contract this suite pins (fire-2, PM-1494 / PM-1450, slack-18): @@ -181,8 +181,7 @@ async function startTurn( 'true', { timeout: 8_000 } ) - await new AgentPanel(page).open() - await expect(panel).toBeVisible({ timeout: 30_000 }) + await openAgentPanel(page, 30_000) await mockWorkflowPersistence(page, WORKFLOW_ID) From 137ba820a19fe5148afa4788d2b7d6df4c61c977 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 00:35:18 -0700 Subject: [PATCH 02/11] test: settle activation before closed App Mode checks --- browser_tests/tests/agent/agentPanelAppMode.spec.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/browser_tests/tests/agent/agentPanelAppMode.spec.ts b/browser_tests/tests/agent/agentPanelAppMode.spec.ts index 750fbb647d0..be4219c405a 100644 --- a/browser_tests/tests/agent/agentPanelAppMode.spec.ts +++ b/browser_tests/tests/agent/agentPanelAppMode.spec.ts @@ -65,11 +65,12 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { const storedOpenState = () => page.evaluate((key) => localStorage.getItem(key), OPEN_STORAGE_KEY) - await page.evaluate( - ([key, value]) => localStorage.setItem(key, value), - [OPEN_STORAGE_KEY, 'false'] - ) - await comfyPage.workflow.reloadAndWaitForApp() + // Startup activation intentionally opens the panel. Close it through the + // user-facing control so this case starts from a settled, persisted close. + await expect(dockedPanel).toBeVisible() + await dockedPanel + .getByRole('button', { name: enMessages.g.close, exact: true }) + .click() await expect(dockedPanel).toHaveCount(0) await expect.poll(storedOpenState).toBe('false') From 2044e5409002da0d8b53af17afb4bd5fd5311616 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 10:03:59 -0700 Subject: [PATCH 03/11] fix: synchronize hidden agent panel lifecycle test Addresses review feedback:\nhttps://github.com/Comfy-Org/ComfyUI_frontend/pull/19413#discussion_r4132450595 --- browser_tests/fixtures/components/AgentPanel.ts | 4 +++- .../tests/agent/agentPanelLifecycle.spec.ts | 13 +++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index 8b33579d0e7..1e08ad20fbd 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -5,7 +5,8 @@ import enMessages from '@/locales/en/main.json' with { type: 'json' } export async function openAgentPanel( page: Page, - timeout?: number + timeout?: number, + onPanelHidden?: () => void | Promise ): Promise { const panel = page.locator('#agent-panel-root') const openButton = page.getByRole('button', { @@ -14,6 +15,7 @@ export async function openAgentPanel( }) for (let attempt = 0; attempt < 2; attempt++) { if (await panel.isVisible()) return panel + await onPanelHidden?.() if ((await openButton.getAttribute('aria-pressed')) === 'true') { await expect(panel).toBeVisible({ timeout }) return panel diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index 3fa1a8a6abd..303328b054b 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -129,14 +129,11 @@ test.describe( }) }) - const opening = openAgentPanel(page) - await page.evaluate( - () => - new Promise((resolve) => requestAnimationFrame(() => resolve())) - ) - await delayedMountStyle.evaluate((style) => - style.parentNode?.removeChild(style) - ) + const opening = openAgentPanel(page, undefined, async () => { + await delayedMountStyle.evaluate((style) => + style.parentNode?.removeChild(style) + ) + }) await opening await expect(panel).toBeVisible() From 394d1766c0d65bdadaaf0777bd16459d2261f477 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 10:44:52 -0700 Subject: [PATCH 04/11] test: repair activation panel opening coverage --- .../agentAutogrowHandWiredLinkFixture.ts | 4 +- .../fixtures/agentConversationFixture.ts | 4 +- .../fixtures/agentCrdtIdCollisionFixture.ts | 4 +- .../fixtures/components/AgentPanel.ts | 51 ++++---------- .../agentAttachmentHistoryPersistence.spec.ts | 4 +- .../agent/agentBatchOutputAttachment.spec.ts | 4 +- .../agentCanvasBlanksDuringRunTurn.spec.ts | 4 +- .../agentCanvasLagsToolCallCompletion.spec.ts | 4 +- .../tests/agent/agentComposerPaste.spec.ts | 4 +- .../tests/agent/agentDebugPanel.spec.ts | 4 +- .../agentDuplicateWorkflowNameBinding.spec.ts | 4 +- .../agent/agentFirstTurnOnUnsavedTab.spec.ts | 4 +- .../agentGraphOpLostOnDisconnect.spec.ts | 4 +- .../tests/agent/agentInlinePrompt.spec.ts | 4 +- .../tests/agent/agentInlineReferences.spec.ts | 4 +- .../agent/agentNewChatTargetWorkflow.spec.ts | 6 +- .../tests/agent/agentOnboarding.spec.ts | 8 +-- .../tests/agent/agentPanelAppMode.spec.ts | 61 ++++++++++++---- .../tests/agent/agentPanelLifecycle.spec.ts | 70 +++++++++++++++---- .../tests/agent/agentReplyDrafts.spec.ts | 4 +- .../agent/agentRunApprovalConsent.spec.ts | 4 +- 21 files changed, 157 insertions(+), 103 deletions(-) diff --git a/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts b/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts index e782b0b7a8c..5a854116b18 100644 --- a/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts +++ b/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts @@ -13,7 +13,7 @@ import { import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import { loadSeedIntoActiveTab } from '@e2e/fixtures/utils/seedActiveTab' @@ -264,7 +264,7 @@ async function setUpFixture(page: Page) { await test.step('open the agent panel and target the workflow', async () => { await loadSeedIntoActiveTab(page, seed) - await openAgentPanel(page) + await new AgentPanel(page).open() await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) .click() diff --git a/browser_tests/fixtures/agentConversationFixture.ts b/browser_tests/fixtures/agentConversationFixture.ts index 6de4b45bdd1..c37e8258b7c 100644 --- a/browser_tests/fixtures/agentConversationFixture.ts +++ b/browser_tests/fixtures/agentConversationFixture.ts @@ -34,7 +34,7 @@ import type { HumanOpsHost } from '@e2e/fixtures/agentFollowerHostSocket' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { TestIds } from '@e2e/fixtures/selectors' import type { @@ -329,7 +329,7 @@ export class AgentConversationHarness { ) await loadSeedIntoActiveTab(this.page, this.conversation.workflow.seed) - await openAgentPanel(this.page, PANEL_MOUNT_TIMEOUT) + await new AgentPanel(this.page).open(PANEL_MOUNT_TIMEOUT) await expect(this.panel).toBeVisible({ timeout: PANEL_MOUNT_TIMEOUT }) await this.selectWorkflowTarget() } diff --git a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts index a62281f7f67..235d0671ddb 100644 --- a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts +++ b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts @@ -57,7 +57,7 @@ import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' import type { WireOpEnvelope } from '@e2e/fixtures/agentWireFrame' import { ContextMenu } from '@e2e/fixtures/components/ContextMenu' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { Topbar } from '@e2e/fixtures/components/Topbar' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' @@ -220,7 +220,7 @@ export class IdCollisionHarness { }, objectInfo: 'server' }) - await openAgentPanel(this.page, 30_000) + await new AgentPanel(this.page).open(30_000) await expect(this.panel).toBeVisible({ timeout: 30_000 }) await this.selectWorkflowTarget() // `useAgentSession` only binds the CRDT workflow id (which is what makes diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index 1e08ad20fbd..7d9b282828b 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -3,40 +3,6 @@ import type { Locator, Page } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } -export async function openAgentPanel( - page: Page, - timeout?: number, - onPanelHidden?: () => void | Promise -): Promise { - const panel = page.locator('#agent-panel-root') - const openButton = page.getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - for (let attempt = 0; attempt < 2; attempt++) { - if (await panel.isVisible()) return panel - await onPanelHidden?.() - if ((await openButton.getAttribute('aria-pressed')) === 'true') { - await expect(panel).toBeVisible({ timeout }) - return panel - } - await openButton.click() - try { - await expect(panel).toBeVisible({ timeout: 1_000 }) - return panel - } catch (error) { - if ((await openButton.getAttribute('aria-pressed')) === 'true') { - await expect(panel).toBeVisible({ timeout }) - return panel - } - // Startup activation can open between the visibility read and click, - // making that click close the panel. Retry from the observed state. - if (attempt === 1) throw error - } - } - throw new Error('Agent panel did not become visible') -} - export class AgentPanel { public readonly root: Locator public readonly openButton: Locator @@ -108,8 +74,21 @@ export class AgentPanel { ) } - async open(): Promise { - await openAgentPanel(this.page) + async open( + timeout?: number, + onPanelHidden?: () => void | Promise + ): Promise { + if (await this.root.isVisible()) return this.root + await onPanelHidden?.() + + if ((await this.openButton.getAttribute('aria-pressed')) !== 'true') { + await this.openButton.click() + } + + // A click may be waiting on consent while aria-pressed remains false. + // Waiting on the caller's contract avoids an unsafe second toggle. + await expect(this.root).toBeVisible({ timeout }) + return this.root } async selectWorkflow(name: string = 'Unsaved Workflow'): Promise { diff --git a/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts b/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts index fe1ca8155b2..e34d71ddc75 100644 --- a/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts +++ b/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts @@ -5,7 +5,7 @@ import type { AgentMessage } from '@comfyorg/ingest-types' import enMessages from '@/locales/en/main.json' with { type: 'json' } import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { dropAssets, expectAssets @@ -163,7 +163,7 @@ for (const scenario of [ return route.fulfill(jsonRoute(messages)) }) - const panel = await openAgentPanel(page) + const panel = await new AgentPanel(page).open() await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, diff --git a/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts b/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts index 74c9867f1f5..5981d09fd0e 100644 --- a/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts +++ b/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts @@ -4,7 +4,7 @@ import enMessages from '@/locales/en/main.json' with { type: 'json' } import { MIME_ASSET_INFO } from '@/platform/assets/schemas/mediaAssetSchema' import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { assetPath } from '@e2e/fixtures/utils/paths' test.use({ connectWebSocketToServer: false }) @@ -39,7 +39,7 @@ test( (route) => route.fulfill({ path: assetPath('image64x64.webp') }) ) - const panel = await openAgentPanel(page) + const panel = await new AgentPanel(page).open() await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, diff --git a/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts b/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts index 5c3b56ae656..d5661f18b86 100644 --- a/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts +++ b/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts @@ -21,7 +21,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import { loadSeedIntoActiveTab } from '@e2e/fixtures/utils/seedActiveTab' @@ -240,7 +240,7 @@ async function driveThroughDocReset( await loadSeedIntoActiveTab(page, SEED) const panel = page.locator('#agent-panel-root') - await openAgentPanel(page, 30_000) + await new AgentPanel(page).open(30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts b/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts index aba72942aeb..d36c0fc0532 100644 --- a/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts +++ b/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts @@ -17,7 +17,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' @@ -200,7 +200,7 @@ async function driveThroughToolCallDone( }) const panel = page.locator('#agent-panel-root') - await openAgentPanel(page, 30_000) + await new AgentPanel(page).open(30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentComposerPaste.spec.ts b/browser_tests/tests/agent/agentComposerPaste.spec.ts index f7747a59a45..d4fb6c39967 100644 --- a/browser_tests/tests/agent/agentComposerPaste.spec.ts +++ b/browser_tests/tests/agent/agentComposerPaste.spec.ts @@ -7,7 +7,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' // Minimal node used only to prove the clipboard leak; the bug is not @@ -77,7 +77,7 @@ test( await canvas.click() await canvas.press('Control+c') - const panel = await openAgentPanel(page) + const panel = await new AgentPanel(page).open() const composer = panel.getByRole('textbox', { name: /^Describe ideas/ }) await composer.click() diff --git a/browser_tests/tests/agent/agentDebugPanel.spec.ts b/browser_tests/tests/agent/agentDebugPanel.spec.ts index ad4437206f2..79889da01d0 100644 --- a/browser_tests/tests/agent/agentDebugPanel.spec.ts +++ b/browser_tests/tests/agent/agentDebugPanel.spec.ts @@ -4,7 +4,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' test.describe('Agent debug log', { tag: ['@cloud', '@agent', '@ui'] }, () => { test.beforeEach(async ({ page }) => { @@ -24,7 +24,7 @@ test.describe('Agent debug log', { tag: ['@cloud', '@agent', '@ui'] }, () => { } }, async ({ page }) => { - await openAgentPanel(page) + await new AgentPanel(page).open() await page.getByTestId('crdt-dev-panel-tab-log').click() const filter = page.getByTestId('crdt-dev-panel-filter') diff --git a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts index ba01b1c4ffe..24c0ba975ad 100644 --- a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts +++ b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts @@ -15,7 +15,7 @@ import { bootAgentApp } from '@e2e/fixtures/agentPanelFixture' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import type { WorkspaceStore } from '@e2e/types/globals' @@ -179,7 +179,7 @@ test( ) ).toBe(PORTRAIT_PATH) - const panel = await openAgentPanel(page) + const panel = await new AgentPanel(page).open() await expect(panel.getByTestId('user-message-bubble')).toHaveText([ 'Earlier request' ]) diff --git a/browser_tests/tests/agent/agentFirstTurnOnUnsavedTab.spec.ts b/browser_tests/tests/agent/agentFirstTurnOnUnsavedTab.spec.ts index 5b8a847be5d..ffa0ca10188 100644 --- a/browser_tests/tests/agent/agentFirstTurnOnUnsavedTab.spec.ts +++ b/browser_tests/tests/agent/agentFirstTurnOnUnsavedTab.spec.ts @@ -11,7 +11,7 @@ import { agentTest } from '@e2e/fixtures/agentPanelFixture' import { workflowSelectionTest } from '@e2e/fixtures/agentWorkflowSelectionFixture' import { agentReplayNodeDefs } from '@e2e/fixtures/data/agentReplayNodeDefs' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' // Story 33 of qa/user-story-test-matrix.md (in-app-agent-program): @@ -86,7 +86,7 @@ test.describe( const topbar = new Topbar(page) await test.step('user opens the Agent and pins it to the tab they started on', async () => { - await openAgentPanel(page) + await new AgentPanel(page).open() await targetPicker.click() await page .getByRole('menuitemradio', { name: 'Unsaved Workflow', exact: true }) diff --git a/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts b/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts index 9815676fee4..ec0ada61201 100644 --- a/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts +++ b/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts @@ -18,7 +18,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' @@ -171,7 +171,7 @@ test.describe( }) const panel = page.locator('#agent-panel-root') - await openAgentPanel(page, 30_000) + await new AgentPanel(page).open(30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentInlinePrompt.spec.ts b/browser_tests/tests/agent/agentInlinePrompt.spec.ts index 02339e4b4f8..df70c106ab6 100644 --- a/browser_tests/tests/agent/agentInlinePrompt.spec.ts +++ b/browser_tests/tests/agent/agentInlinePrompt.spec.ts @@ -2,7 +2,7 @@ import { expect } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' test.use({ connectWebSocketToServer: false }) @@ -10,7 +10,7 @@ test( 'preserves inline workflow references through Send, history and Edit', { tag: ['@cloud', '@ui'] }, async ({ page, workflowSelection, promptHistory }) => { - await openAgentPanel(page) + await new AgentPanel(page).open() await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, diff --git a/browser_tests/tests/agent/agentInlineReferences.spec.ts b/browser_tests/tests/agent/agentInlineReferences.spec.ts index 17307635214..9f736c3ea38 100644 --- a/browser_tests/tests/agent/agentInlineReferences.spec.ts +++ b/browser_tests/tests/agent/agentInlineReferences.spec.ts @@ -6,7 +6,7 @@ import { referenceNode, referenceWorkflow } from '@e2e/fixtures/agentInlineReferencesFixture' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { assetPath } from '@e2e/fixtures/utils/paths' test.use({ @@ -24,7 +24,7 @@ test( mimeType: 'application/json', buffer: Buffer.from(JSON.stringify(referenceWorkflow)) }) - const panel = await openAgentPanel(page) + const panel = await new AgentPanel(page).open() const editor = panel.getByRole('textbox') await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) diff --git a/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts b/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts index 22cc93aae20..5423f9076ae 100644 --- a/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts +++ b/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts @@ -4,7 +4,7 @@ import enMessages from '@/locales/en/main.json' with { type: 'json' } import { agentTest } from '@e2e/fixtures/agentPanelFixture' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { workflowSelectionTest } from '@e2e/fixtures/agentWorkflowSelectionFixture' const test = mergeTests(agentTest, workflowSelectionTest) @@ -26,7 +26,7 @@ test.describe( page, workflowSelection }, testInfo) => { - await openAgentPanel(page) + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow @@ -96,7 +96,7 @@ test.describe( page, workflowSelection }) => { - await openAgentPanel(page) + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow diff --git a/browser_tests/tests/agent/agentOnboarding.spec.ts b/browser_tests/tests/agent/agentOnboarding.spec.ts index 5480453df89..bc6b9f6b0ff 100644 --- a/browser_tests/tests/agent/agentOnboarding.spec.ts +++ b/browser_tests/tests/agent/agentOnboarding.spec.ts @@ -7,7 +7,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { test('returns to the previous card without completing the tour', async ({ @@ -17,7 +17,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: false }) - await openAgentPanel(page) + await new AgentPanel(page).open() const firstCard = page.getByRole('dialog', { name: enMessages.agent.coachTitle @@ -61,7 +61,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: true }) - await openAgentPanel(page) + await new AgentPanel(page).open() const firstCard = page.getByRole('dialog', { name: enMessages.agent.coachTitle @@ -100,7 +100,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: false }) - await openAgentPanel(page) + await new AgentPanel(page).open() const steps = [ [enMessages.agent.coachTitle, enMessages.agent.coachBody], [enMessages.agent.coachWorkflowTitle, enMessages.agent.coachWorkflowBody], diff --git a/browser_tests/tests/agent/agentPanelAppMode.spec.ts b/browser_tests/tests/agent/agentPanelAppMode.spec.ts index be4219c405a..40344f38170 100644 --- a/browser_tests/tests/agent/agentPanelAppMode.spec.ts +++ b/browser_tests/tests/agent/agentPanelAppMode.spec.ts @@ -4,7 +4,7 @@ import enMessages from '@/locales/en/main.json' with { type: 'json' } import type { WorkspaceStore } from '@e2e/types/globals' import { agentTest as test } from '@e2e/tests/agent/agentPanelMocks' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' const OPEN_AGENT_LABEL = enMessages.agent.entryButton const OPEN_STORAGE_KEY = 'Comfy.AgentPanel.open' @@ -32,7 +32,7 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { exact: true }) await expect(openButton).toBeVisible() - await openAgentPanel(page) + await new AgentPanel(page).open() await expect(panelRoot).toHaveCount(1) await expect(panelRoot).toBeVisible() @@ -55,7 +55,7 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { await expect.poll(activeWorkflowPath).toBe(selectedWorkflowPath) }) - test('keeps a stored-closed panel hidden when toggling app mode and back', async ({ + test('keeps a user-closed panel hidden when toggling app mode and back', async ({ comfyPage }) => { test.setTimeout(30_000) @@ -65,22 +65,53 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { const storedOpenState = () => page.evaluate((key) => localStorage.getItem(key), OPEN_STORAGE_KEY) - // Startup activation intentionally opens the panel. Close it through the - // user-facing control so this case starts from a settled, persisted close. - await expect(dockedPanel).toBeVisible() - await dockedPanel - .getByRole('button', { name: enMessages.g.close, exact: true }) - .click() + await test.step('close and persist the panel state', async () => { + await expect(dockedPanel).toBeVisible({ timeout: 8_000 }) + await dockedPanel + .getByRole('button', { name: enMessages.g.close, exact: true }) + .click() + await expect(dockedPanel).toHaveCount(0) + await expect.poll(storedOpenState).toBe('false') + }) + + await test.step('keep the panel closed in app mode', async () => { + await comfyPage.appMode.toggleAppMode() + await expect(dockedPanel).toHaveCount(0) + await expect.poll(storedOpenState).toBe('false') + }) + + await test.step('keep the panel closed after returning to graph mode', async () => { + await comfyPage.appMode.toggleAppMode() + await expect(dockedPanel).toHaveCount(0) + await expect.poll(storedOpenState).toBe('false') + }) + }) - await expect(dockedPanel).toHaveCount(0) - await expect.poll(storedOpenState).toBe('false') + test('activation reopens a stored-closed panel across app mode changes', async ({ + comfyPage + }) => { + test.setTimeout(30_000) + + const page = comfyPage.page + const dockedPanel = page.getByTestId('docked-agent-panel') + const storedOpenState = () => + page.evaluate((key) => localStorage.getItem(key), OPEN_STORAGE_KEY) + + await page.evaluate( + ([key, value]) => localStorage.setItem(key, value), + [OPEN_STORAGE_KEY, 'false'] + ) + await comfyPage.workflow.reloadAndWaitForApp() + + await expect(dockedPanel).toBeVisible({ timeout: 8_000 }) + await expect.poll(storedOpenState).toBe('true') await comfyPage.appMode.toggleAppMode() - await expect(dockedPanel).toHaveCount(0) - await expect.poll(storedOpenState).toBe('false') + await expect(dockedPanel).toBeVisible() + await expect.poll(storedOpenState).toBe('true') await comfyPage.appMode.toggleAppMode() - await expect(dockedPanel).toHaveCount(0) - await expect.poll(storedOpenState).toBe('false') + await expect(dockedPanel).toBeVisible() + await expect.poll(storedOpenState).toBe('true') }) }) diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index 303328b054b..d121578653e 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -7,7 +7,7 @@ import { bootAgentApp } from '@e2e/fixtures/agentPanelFixture' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' const OPEN_AGENT_LABEL = enMessages.agent.entryButton const OPEN_STORAGE_KEY = 'Comfy.AgentPanel.open' @@ -51,7 +51,7 @@ test.describe( const panel = page.getByTestId('docked-agent-panel') await expect(openButton).toBeVisible() - await openAgentPanel(page) + await new AgentPanel(page).open() await expect(panel).toBeVisible() await expect( page.getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) @@ -84,7 +84,7 @@ test.describe( exact: true }) const panel = page.getByTestId('docked-agent-panel') - await openAgentPanel(page) + await new AgentPanel(page).open() await panel.getByRole('button', { name: enMessages.g.close }).click() await openButton.focus() await openButton.press('Enter') @@ -105,7 +105,7 @@ test.describe( await expect(openButton).toBeVisible() }) - test('does not toggle closed while a pressed panel is still mounting', async ({ + test('does not click a pressed entry button while the panel is hidden', async ({ page }) => { await bootAgentApp(page, true) @@ -115,7 +115,7 @@ test.describe( }) const panel = page.locator('#agent-panel-root') const delayedMountStyle = await page.addStyleTag({ - content: '#agent-panel-root { display: none !important; }' + content: '#agent-panel-root { display: none; }' }) await expect(openButton).toHaveAttribute('aria-pressed', 'true', { timeout: 8_000 @@ -129,24 +129,68 @@ test.describe( }) }) - const opening = openAgentPanel(page, undefined, async () => { + await new AgentPanel(page).open(undefined, async () => { await delayedMountStyle.evaluate((style) => - style.parentNode?.removeChild(style) + (style as HTMLElement).remove() ) }) - await opening await expect(panel).toBeVisible() await expect(openButton).toHaveAttribute('aria-pressed', 'true') await expect(openButton).toHaveAttribute('data-test-click-count', '0') }) + test('honors the caller timeout without re-clicking while an open is delayed', async ({ + page + }) => { + await bootAgentApp(page, true) + const agentPanel = new AgentPanel(page) + await expect(agentPanel.root).toBeVisible({ timeout: 8_000 }) + await agentPanel.root + .getByRole('button', { name: enMessages.g.close }) + .click() + await expect(agentPanel.root).toHaveCount(0) + + await agentPanel.open(3_000, async () => { + await agentPanel.openButton.evaluate((button) => { + button.dataset.testClickCount = '0' + button.addEventListener( + 'click', + () => { + button.dataset.testClickCount = String( + Number(button.dataset.testClickCount) + 1 + ) + }, + true + ) + + let delayed = false + const delayOpen = (event: Event) => { + event.stopImmediatePropagation() + if (delayed) return + delayed = true + window.setTimeout(() => { + button.removeEventListener('click', delayOpen, true) + ;(button as HTMLElement).click() + }, 1_500) + } + button.addEventListener('click', delayOpen, true) + }) + }) + + await expect(agentPanel.root).toBeVisible() + await expect(agentPanel.openButton).toHaveAttribute( + 'data-test-click-count', + '2' + ) + }) + test('keeps the dock within the viewport and its documented width cap', async ({ page }) => { await bootAgentApp(page, true) - await openAgentPanel(page) + await new AgentPanel(page).open() const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() @@ -171,7 +215,7 @@ test.describe( await page.setViewportSize({ width: 1600, height: 900 }) await bootAgentApp(page, true) - await openAgentPanel(page) + await new AgentPanel(page).open() const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() @@ -217,7 +261,7 @@ test.describe( await page.setViewportSize({ width: 1300, height: 900 }) await bootAgentApp(page, true) - await openAgentPanel(page) + await new AgentPanel(page).open() const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() await panel @@ -255,7 +299,7 @@ test.describe( test('restores an open panel after a browser reload', async ({ page }) => { await bootAgentApp(page, true) - await openAgentPanel(page) + await new AgentPanel(page).open() await expect(page.getByTestId('docked-agent-panel')).toBeVisible() await expect .poll(() => @@ -279,7 +323,7 @@ test.describe( }) => { await bootAgentApp(page, agentFlagEnabled) - await openAgentPanel(page) + await new AgentPanel(page).open() const panel = page.getByTestId('docked-agent-panel') const tabs = new Topbar(page).tabs diff --git a/browser_tests/tests/agent/agentReplyDrafts.spec.ts b/browser_tests/tests/agent/agentReplyDrafts.spec.ts index e7944154993..267ac277c82 100644 --- a/browser_tests/tests/agent/agentReplyDrafts.spec.ts +++ b/browser_tests/tests/agent/agentReplyDrafts.spec.ts @@ -16,7 +16,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' const WORKFLOW_ID = 'b4d7e1f2-8a3c-4d5e-9f60-7a1b2c3d4e5f' @@ -119,7 +119,7 @@ async function startTurn(page: Page, prompt: string): Promise { 'true', { timeout: 8_000 } ) - await openAgentPanel(page, 30_000) + await new AgentPanel(page).open(30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts b/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts index 660b5ebcdcf..63359dc0781 100644 --- a/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts +++ b/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts @@ -15,7 +15,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { openAgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' // The consent contract this suite pins (fire-2, PM-1494 / PM-1450, slack-18): @@ -181,7 +181,7 @@ async function startTurn( 'true', { timeout: 8_000 } ) - await openAgentPanel(page, 30_000) + await new AgentPanel(page).open(30_000) await mockWorkflowPersistence(page, WORKFLOW_ID) From 270bda1656de36667bb5214a436663a5851d481f Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 11:16:58 -0700 Subject: [PATCH 05/11] test: make agent panel opening race-safe --- .../fixtures/components/AgentPanel.ts | 10 +++++-- .../tests/agent/agentPanelLifecycle.spec.ts | 29 +++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index 7d9b282828b..b57754d1c4b 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -81,9 +81,13 @@ export class AgentPanel { if (await this.root.isVisible()) return this.root await onPanelHidden?.() - if ((await this.openButton.getAttribute('aria-pressed')) !== 'true') { - await this.openButton.click() - } + await this.openButton.evaluate((button) => { + // Keep the state check and click in one browser task. Startup activation + // can otherwise open after a Playwright attribute read but before its + // later click lands, turning that click into an unintended close. + if (button.getAttribute('aria-pressed') !== 'true') + (button as HTMLElement).click() + }) // A click may be waiting on consent while aria-pressed remains false. // Waiting on the caller's contract avoids an unsafe second toggle. diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index d121578653e..101b485c2b4 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -185,6 +185,35 @@ test.describe( ) }) + test('does not close startup activation that wins before the click', async ({ + page + }) => { + await bootAgentApp(page, true) + const agentPanel = new AgentPanel(page) + await expect(agentPanel.root).toBeVisible({ timeout: 8_000 }) + await agentPanel.root + .getByRole('button', { name: enMessages.g.close }) + .click() + await expect(agentPanel.root).toHaveCount(0) + + await agentPanel.open(undefined, async () => { + await agentPanel.openButton.evaluate((button) => { + const element = button as HTMLElement + element.style.pointerEvents = 'none' + window.setTimeout(() => { + if (button.getAttribute('aria-pressed') !== 'true') element.click() + element.style.removeProperty('pointer-events') + }, 100) + }) + }) + + await expect(agentPanel.root).toBeVisible() + await expect(agentPanel.openButton).toHaveAttribute( + 'aria-pressed', + 'true' + ) + }) + test('keeps the dock within the viewport and its documented width cap', async ({ page }) => { From abbcca8afb0deb3fbcd38ecca90c5f9219747a81 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 11:35:16 -0700 Subject: [PATCH 06/11] test: harden activation panel race coverage --- .../fixtures/agentConversationFixture.ts | 1 - .../fixtures/agentCrdtIdCollisionFixture.ts | 1 - .../tests/agent/agentPanelLifecycle.spec.ts | 99 ++++++++++++------- 3 files changed, 65 insertions(+), 36 deletions(-) diff --git a/browser_tests/fixtures/agentConversationFixture.ts b/browser_tests/fixtures/agentConversationFixture.ts index c37e8258b7c..d15529ba576 100644 --- a/browser_tests/fixtures/agentConversationFixture.ts +++ b/browser_tests/fixtures/agentConversationFixture.ts @@ -330,7 +330,6 @@ export class AgentConversationHarness { await loadSeedIntoActiveTab(this.page, this.conversation.workflow.seed) await new AgentPanel(this.page).open(PANEL_MOUNT_TIMEOUT) - await expect(this.panel).toBeVisible({ timeout: PANEL_MOUNT_TIMEOUT }) await this.selectWorkflowTarget() } diff --git a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts index 235d0671ddb..c6dbb623a30 100644 --- a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts +++ b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts @@ -221,7 +221,6 @@ export class IdCollisionHarness { objectInfo: 'server' }) await new AgentPanel(this.page).open(30_000) - await expect(this.panel).toBeVisible({ timeout: 30_000 }) await this.selectWorkflowTarget() // `useAgentSession` only binds the CRDT workflow id (which is what makes // the follower's `isTargetActive` watch subscribe) once a turn's POST ack diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index 101b485c2b4..6595e4c97de 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -130,8 +130,8 @@ test.describe( }) await new AgentPanel(page).open(undefined, async () => { - await delayedMountStyle.evaluate((style) => - (style as HTMLElement).remove() + await delayedMountStyle.evaluate((style) => + style.remove() ) }) @@ -140,7 +140,7 @@ test.describe( await expect(openButton).toHaveAttribute('data-test-click-count', '0') }) - test('honors the caller timeout without re-clicking while an open is delayed', async ({ + test('waits for a delayed open without clicking again', async ({ page }) => { await bootAgentApp(page, true) @@ -151,32 +151,31 @@ test.describe( .click() await expect(agentPanel.root).toHaveCount(0) - await agentPanel.open(3_000, async () => { - await agentPanel.openButton.evaluate((button) => { - button.dataset.testClickCount = '0' - button.addEventListener( - 'click', - () => { - button.dataset.testClickCount = String( - Number(button.dataset.testClickCount) + 1 - ) - }, - true - ) + await agentPanel.openButton.evaluate((button) => { + button.dataset.testClickCount = '0' + button.addEventListener( + 'click', + () => { + button.dataset.testClickCount = String( + Number(button.dataset.testClickCount) + 1 + ) + }, + true + ) - let delayed = false - const delayOpen = (event: Event) => { - event.stopImmediatePropagation() - if (delayed) return - delayed = true - window.setTimeout(() => { - button.removeEventListener('click', delayOpen, true) - ;(button as HTMLElement).click() - }, 1_500) - } - button.addEventListener('click', delayOpen, true) - }) + let delayed = false + const delayOpen = (event: Event) => { + event.stopImmediatePropagation() + if (delayed) return + delayed = true + window.setTimeout(() => { + button.removeEventListener('click', delayOpen, true) + button.click() + }, 1_500) + } + button.addEventListener('click', delayOpen, true) }) + await agentPanel.open(3_000) await expect(agentPanel.root).toBeVisible() await expect(agentPanel.openButton).toHaveAttribute( @@ -185,6 +184,29 @@ test.describe( ) }) + test('honors the caller timeout while an open stays pending', async ({ + page + }) => { + await bootAgentApp(page, true) + const agentPanel = new AgentPanel(page) + await expect(agentPanel.root).toBeVisible({ timeout: 8_000 }) + await agentPanel.root + .getByRole('button', { name: enMessages.g.close }) + .click() + await expect(agentPanel.root).toHaveCount(0) + await agentPanel.openButton.evaluate((button) => { + button.addEventListener( + 'click', + (event) => event.stopImmediatePropagation(), + true + ) + }) + + const startedAt = Date.now() + await expect(agentPanel.open(250)).rejects.toThrow() + expect(Date.now() - startedAt).toBeLessThan(2_000) + }) + test('does not close startup activation that wins before the click', async ({ page }) => { @@ -197,14 +219,19 @@ test.describe( await expect(agentPanel.root).toHaveCount(0) await agentPanel.open(undefined, async () => { - await agentPanel.openButton.evaluate((button) => { - const element = button as HTMLElement - element.style.pointerEvents = 'none' - window.setTimeout(() => { - if (button.getAttribute('aria-pressed') !== 'true') element.click() - element.style.removeProperty('pointer-events') - }, 100) + await agentPanel.openButton.evaluate((button) => { + button.dataset.testClickCount = '0' + button.addEventListener('click', () => { + button.dataset.testClickCount = String( + Number(button.dataset.testClickCount) + 1 + ) + }) + button.click() }) + await expect(agentPanel.openButton).toHaveAttribute( + 'aria-pressed', + 'true' + ) }) await expect(agentPanel.root).toBeVisible() @@ -212,6 +239,10 @@ test.describe( 'aria-pressed', 'true' ) + await expect(agentPanel.openButton).toHaveAttribute( + 'data-test-click-count', + '1' + ) }) test('keeps the dock within the viewport and its documented width cap', async ({ From a71fadca4b082046958aa7ddbd0a396e8bc32ca7 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 12:17:58 -0700 Subject: [PATCH 07/11] test: preserve actionable agent panel opening --- browser_tests/fixtures/components/AgentPanel.ts | 16 +++++++++------- .../tests/agent/agentPanelLifecycle.spec.ts | 16 +++++++++++----- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index b57754d1c4b..b5dd20ae08e 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -81,13 +81,15 @@ export class AgentPanel { if (await this.root.isVisible()) return this.root await onPanelHidden?.() - await this.openButton.evaluate((button) => { - // Keep the state check and click in one browser task. Startup activation - // can otherwise open after a Playwright attribute read but before its - // later click lands, turning that click into an unintended close. - if (button.getAttribute('aria-pressed') !== 'true') - (button as HTMLElement).click() - }) + // Startup activation owns the panel until the feature gate settles. Wait + // for that decision before using an actionable click so activation cannot + // open between a stale state read and the click and turn it into a close. + await expect( + this.page.getByTestId('integrated-tab-bar-actions') + ).toHaveAttribute('data-agent-gate-settled', 'true', { timeout }) + if (await this.root.isVisible()) return this.root + if ((await this.openButton.getAttribute('aria-pressed')) !== 'true') + await this.openButton.click({ timeout }) // A click may be waiting on consent while aria-pressed remains false. // Waiting on the caller's contract avoids an unsafe second toggle. diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index 6595e4c97de..178338322d6 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -207,7 +207,7 @@ test.describe( expect(Date.now() - startedAt).toBeLessThan(2_000) }) - test('does not close startup activation that wins before the click', async ({ + test('waits for startup activation before deciding to click', async ({ page }) => { await bootAgentApp(page, true) @@ -217,6 +217,10 @@ test.describe( .getByRole('button', { name: enMessages.g.close }) .click() await expect(agentPanel.root).toHaveCount(0) + const actions = page.getByTestId('integrated-tab-bar-actions') + await actions.evaluate((element) => + element.removeAttribute('data-agent-gate-settled') + ) await agentPanel.open(undefined, async () => { await agentPanel.openButton.evaluate((button) => { @@ -226,11 +230,13 @@ test.describe( Number(button.dataset.testClickCount) + 1 ) }) - button.click() + window.setTimeout(() => button.click(), 100) }) - await expect(agentPanel.openButton).toHaveAttribute( - 'aria-pressed', - 'true' + await actions.evaluate((element) => + window.setTimeout( + () => element.setAttribute('data-agent-gate-settled', 'true'), + 100 + ) ) }) From 90c7634fa344c60167dffab927728db62e5a0c91 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 13:37:05 -0700 Subject: [PATCH 08/11] test: guard activation panel click dispatch --- .../fixtures/components/AgentPanel.ts | 37 +++++++++++++++---- .../tests/agent/agentPanelLifecycle.spec.ts | 30 ++++++--------- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index b5dd20ae08e..2c3d1e7e1df 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -81,15 +81,38 @@ export class AgentPanel { if (await this.root.isVisible()) return this.root await onPanelHidden?.() - // Startup activation owns the panel until the feature gate settles. Wait - // for that decision before using an actionable click so activation cannot - // open between a stale state read and the click and turn it into a close. - await expect( - this.page.getByTestId('integrated-tab-bar-actions') - ).toHaveAttribute('data-agent-gate-settled', 'true', { timeout }) if (await this.root.isVisible()) return this.root - if ((await this.openButton.getAttribute('aria-pressed')) !== 'true') + + // Keep Playwright's actionability checks, but decide whether the click is + // still safe when it is dispatched. Startup activation can open after the + // visibility read (even after the feature gate settles) and before the + // pointer sequence reaches `click`; in that case the guard consumes only + // the now-stale click instead of closing the panel again. + await this.openButton.evaluate((button) => { + const guardedButton = button as HTMLElement & { + __agentPanelOpenGuard?: EventListener + } + const guard: EventListener = (event) => { + if (button.getAttribute('aria-pressed') !== 'true') return + event.preventDefault() + event.stopImmediatePropagation() + } + guardedButton.__agentPanelOpenGuard = guard + button.addEventListener('click', guard, true) + }) + try { await this.openButton.click({ timeout }) + } finally { + await this.openButton.evaluate((button) => { + const guardedButton = button as HTMLElement & { + __agentPanelOpenGuard?: EventListener + } + const guard = guardedButton.__agentPanelOpenGuard + if (!guard) return + button.removeEventListener('click', guard, true) + delete guardedButton.__agentPanelOpenGuard + }) + } // A click may be waiting on consent while aria-pressed remains false. // Waiting on the caller's contract avoids an unsafe second toggle. diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index 178338322d6..ee52e4a1543 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -217,28 +217,20 @@ test.describe( .getByRole('button', { name: enMessages.g.close }) .click() await expect(agentPanel.root).toHaveCount(0) - const actions = page.getByTestId('integrated-tab-bar-actions') - await actions.evaluate((element) => - element.removeAttribute('data-agent-gate-settled') - ) - await agentPanel.open(undefined, async () => { - await agentPanel.openButton.evaluate((button) => { - button.dataset.testClickCount = '0' - button.addEventListener('click', () => { - button.dataset.testClickCount = String( - Number(button.dataset.testClickCount) + 1 - ) - }) - window.setTimeout(() => button.click(), 100) - }) - await actions.evaluate((element) => - window.setTimeout( - () => element.setAttribute('data-agent-gate-settled', 'true'), - 100 + await agentPanel.openButton.evaluate((button) => { + button.dataset.testClickCount = '0' + button.addEventListener('click', () => { + button.dataset.testClickCount = String( + Number(button.dataset.testClickCount) + 1 ) - ) + }) + button.addEventListener('pointerdown', () => button.click(), { + capture: true, + once: true + }) }) + await agentPanel.open() await expect(agentPanel.root).toBeVisible() await expect(agentPanel.openButton).toHaveAttribute( From 22bf1c4ce5d48b6367bf85d56daa647b481f5485 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 13:56:28 -0700 Subject: [PATCH 09/11] test: exercise activation click guard --- .../fixtures/components/AgentPanel.ts | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index 2c3d1e7e1df..a0e4a280de7 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -81,37 +81,32 @@ export class AgentPanel { if (await this.root.isVisible()) return this.root await onPanelHidden?.() - if (await this.root.isVisible()) return this.root - // Keep Playwright's actionability checks, but decide whether the click is // still safe when it is dispatched. Startup activation can open after the // visibility read (even after the feature gate settles) and before the // pointer sequence reaches `click`; in that case the guard consumes only // the now-stale click instead of closing the panel again. - await this.openButton.evaluate((button) => { - const guardedButton = button as HTMLElement & { - __agentPanelOpenGuard?: EventListener - } - const guard: EventListener = (event) => { + const guard = await this.openButton.evaluateHandle< + EventListener, + HTMLElement + >((button) => { + const listener: EventListener = (event) => { if (button.getAttribute('aria-pressed') !== 'true') return event.preventDefault() event.stopImmediatePropagation() } - guardedButton.__agentPanelOpenGuard = guard - button.addEventListener('click', guard, true) + button.addEventListener('click', listener, true) + return listener }) try { await this.openButton.click({ timeout }) } finally { - await this.openButton.evaluate((button) => { - const guardedButton = button as HTMLElement & { - __agentPanelOpenGuard?: EventListener - } - const guard = guardedButton.__agentPanelOpenGuard - if (!guard) return - button.removeEventListener('click', guard, true) - delete guardedButton.__agentPanelOpenGuard - }) + await this.openButton.evaluate( + (button, listener) => + button.removeEventListener('click', listener, true), + guard + ) + await guard.dispose() } // A click may be waiting on consent while aria-pressed remains false. From b93cd4d1720e31101faeeae12a1171f2625e5a24 Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Tue, 29 Sep 2026 21:08:35 +0000 Subject: [PATCH 10/11] test: retry undelivered agent panel clicks and trim opener coverage - Retry the open click only when Playwright could not deliver it, and stop as soon as the panel is visible. When activation opens the panel during the click's actionability wait, the onboarding overlay covers the entry button and a single click hung until the test timeout (agentOnboarding.spec.ts failed 12/18 with --repeat-each=6 at 90c7634). - Apply the caller timeout to the visibility wait only. - Drop the onPanelHidden hook and the pressed-and-hidden test; the activation test exercises the same click-time guard. - Share the user-closed setup across the three opener tests and assert the timeout through the rejection message instead of wall-clock time. - Revert import reordering and the agentNewChatTargetWorkflow churn. Amp-Thread-ID: https://ampcode.com/threads/T-01a0ee23-9d40-735c-9906-bb6208331e3c --- .../fixtures/agentConversationFixture.ts | 2 +- .../fixtures/components/AgentPanel.ts | 42 ++-- .../agentDuplicateWorkflowNameBinding.spec.ts | 2 +- .../agentGraphOpLostOnDisconnect.spec.ts | 2 +- .../tests/agent/agentInlinePrompt.spec.ts | 2 +- .../tests/agent/agentInlineReferences.spec.ts | 2 +- .../agent/agentNewChatTargetWorkflow.spec.ts | 12 +- .../tests/agent/agentPanelAppMode.spec.ts | 2 +- .../tests/agent/agentPanelLifecycle.spec.ts | 193 +++++++----------- 9 files changed, 101 insertions(+), 158 deletions(-) diff --git a/browser_tests/fixtures/agentConversationFixture.ts b/browser_tests/fixtures/agentConversationFixture.ts index d15529ba576..fb514ae82d7 100644 --- a/browser_tests/fixtures/agentConversationFixture.ts +++ b/browser_tests/fixtures/agentConversationFixture.ts @@ -29,12 +29,12 @@ import { ComfyPage } from '@e2e/fixtures/ComfyPage' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import { AgentFollowerHostSocket } from '@e2e/fixtures/agentFollowerHostSocket' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import type { ClientDocFrame, HumanOpsHost } from '@e2e/fixtures/agentFollowerHostSocket' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { TestIds } from '@e2e/fixtures/selectors' import type { diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index a0e4a280de7..faf5da598f9 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -74,43 +74,33 @@ export class AgentPanel { ) } - async open( - timeout?: number, - onPanelHidden?: () => void | Promise - ): Promise { + async open(timeout?: number): Promise { if (await this.root.isVisible()) return this.root - await onPanelHidden?.() - // Keep Playwright's actionability checks, but decide whether the click is - // still safe when it is dispatched. Startup activation can open after the - // visibility read (even after the feature gate settles) and before the - // pointer sequence reaches `click`; in that case the guard consumes only - // the now-stale click instead of closing the panel again. - const guard = await this.openButton.evaluateHandle< - EventListener, - HTMLElement - >((button) => { - const listener: EventListener = (event) => { - if (button.getAttribute('aria-pressed') !== 'true') return - event.preventDefault() - event.stopImmediatePropagation() + const dropClickIfAlreadyOpen = await this.openButton.evaluateHandle( + (button) => { + const listener = (event: Event) => { + if (button.getAttribute('aria-pressed') === 'true') + event.stopImmediatePropagation() + } + button.addEventListener('click', listener, true) + return listener } - button.addEventListener('click', listener, true) - return listener - }) + ) try { - await this.openButton.click({ timeout }) + await expect(async () => { + if (await this.root.isVisible()) return + await this.openButton.click({ timeout: 1_000 }) + }).toPass({ timeout }) } finally { await this.openButton.evaluate( (button, listener) => button.removeEventListener('click', listener, true), - guard + dropClickIfAlreadyOpen ) - await guard.dispose() + await dropClickIfAlreadyOpen.dispose() } - // A click may be waiting on consent while aria-pressed remains false. - // Waiting on the caller's contract avoids an unsafe second toggle. await expect(this.root).toBeVisible({ timeout }) return this.root } diff --git a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts index 24c0ba975ad..35b17631761 100644 --- a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts +++ b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts @@ -14,8 +14,8 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { Topbar } from '@e2e/fixtures/components/Topbar' import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { Topbar } from '@e2e/fixtures/components/Topbar' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import type { WorkspaceStore } from '@e2e/types/globals' diff --git a/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts b/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts index ec0ada61201..582af89f8b7 100644 --- a/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts +++ b/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts @@ -16,9 +16,9 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' diff --git a/browser_tests/tests/agent/agentInlinePrompt.spec.ts b/browser_tests/tests/agent/agentInlinePrompt.spec.ts index df70c106ab6..8f28ed49ba3 100644 --- a/browser_tests/tests/agent/agentInlinePrompt.spec.ts +++ b/browser_tests/tests/agent/agentInlinePrompt.spec.ts @@ -1,8 +1,8 @@ import { expect } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } -import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { promptHistoryTest as test } from '@e2e/fixtures/agentPromptHistoryFixture' test.use({ connectWebSocketToServer: false }) diff --git a/browser_tests/tests/agent/agentInlineReferences.spec.ts b/browser_tests/tests/agent/agentInlineReferences.spec.ts index 9f736c3ea38..7deb81ebb51 100644 --- a/browser_tests/tests/agent/agentInlineReferences.spec.ts +++ b/browser_tests/tests/agent/agentInlineReferences.spec.ts @@ -1,12 +1,12 @@ import { expect } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { inlineReferencesTest as test, referenceNode, referenceWorkflow } from '@e2e/fixtures/agentInlineReferencesFixture' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { assetPath } from '@e2e/fixtures/utils/paths' test.use({ diff --git a/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts b/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts index 5423f9076ae..0ae12bc3848 100644 --- a/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts +++ b/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts @@ -1,10 +1,10 @@ import { expect, mergeTests } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { agentTest } from '@e2e/fixtures/agentPanelFixture' import { Topbar } from '@e2e/fixtures/components/Topbar' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { workflowSelectionTest } from '@e2e/fixtures/agentWorkflowSelectionFixture' const test = mergeTests(agentTest, workflowSelectionTest) @@ -26,8 +26,9 @@ test.describe( page, workflowSelection }, testInfo) => { - await new AgentPanel(page).open() - const panel = page.locator('#agent-panel-root') + const agentPanel = new AgentPanel(page) + await agentPanel.open() + const panel = agentPanel.root const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow }) @@ -96,8 +97,9 @@ test.describe( page, workflowSelection }) => { - await new AgentPanel(page).open() - const panel = page.locator('#agent-panel-root') + const agentPanel = new AgentPanel(page) + await agentPanel.open() + const panel = agentPanel.root const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow }) diff --git a/browser_tests/tests/agent/agentPanelAppMode.spec.ts b/browser_tests/tests/agent/agentPanelAppMode.spec.ts index 40344f38170..e32c2af432b 100644 --- a/browser_tests/tests/agent/agentPanelAppMode.spec.ts +++ b/browser_tests/tests/agent/agentPanelAppMode.spec.ts @@ -1,10 +1,10 @@ import { expect } from '@playwright/test' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import enMessages from '@/locales/en/main.json' with { type: 'json' } import type { WorkspaceStore } from '@e2e/types/globals' import { agentTest as test } from '@e2e/tests/agent/agentPanelMocks' -import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' const OPEN_AGENT_LABEL = enMessages.agent.entryButton const OPEN_STORAGE_KEY = 'Comfy.AgentPanel.open' diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index ee52e4a1543..54325d8c1f3 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -6,8 +6,8 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' -import { Topbar } from '@e2e/fixtures/components/Topbar' import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' +import { Topbar } from '@e2e/fixtures/components/Topbar' const OPEN_AGENT_LABEL = enMessages.agent.entryButton const OPEN_STORAGE_KEY = 'Comfy.AgentPanel.open' @@ -105,142 +105,93 @@ test.describe( await expect(openButton).toBeVisible() }) - test('does not click a pressed entry button while the panel is hidden', async ({ - page - }) => { - await bootAgentApp(page, true) - const openButton = page.getByRole('button', { - name: OPEN_AGENT_LABEL, - exact: true - }) - const panel = page.locator('#agent-panel-root') - const delayedMountStyle = await page.addStyleTag({ - content: '#agent-panel-root { display: none; }' - }) - await expect(openButton).toHaveAttribute('aria-pressed', 'true', { - timeout: 8_000 + test.describe('opening from a user-closed panel', () => { + test.beforeEach(async ({ page }) => { + await bootAgentApp(page, true) + const agentPanel = new AgentPanel(page) + await expect(agentPanel.root).toBeVisible({ timeout: 8_000 }) + await agentPanel.root + .getByRole('button', { name: enMessages.g.close }) + .click() + await expect(agentPanel.root).toHaveCount(0) }) - await openButton.evaluate((button) => { - button.dataset.testClickCount = '0' - button.addEventListener('click', () => { - button.dataset.testClickCount = String( - Number(button.dataset.testClickCount) + 1 + + test('waits for a delayed open without clicking again', async ({ + page + }) => { + const agentPanel = new AgentPanel(page) + await agentPanel.openButton.evaluate((button) => { + button.dataset.testClickCount = '0' + button.addEventListener( + 'click', + () => { + button.dataset.testClickCount = String( + Number(button.dataset.testClickCount) + 1 + ) + }, + true ) + + let delayed = false + const delayOpen = (event: Event) => { + event.stopImmediatePropagation() + if (delayed) return + delayed = true + window.setTimeout(() => { + button.removeEventListener('click', delayOpen, true) + button.click() + }, 1_500) + } + button.addEventListener('click', delayOpen, true) }) - }) - await new AgentPanel(page).open(undefined, async () => { - await delayedMountStyle.evaluate((style) => - style.remove() + await agentPanel.open(3_000) + + await expect(agentPanel.openButton).toHaveAttribute( + 'data-test-click-count', + '2' ) }) - await expect(panel).toBeVisible() - await expect(openButton).toHaveAttribute('aria-pressed', 'true') - await expect(openButton).toHaveAttribute('data-test-click-count', '0') - }) + test('rejects with the caller timeout while an open stays pending', async ({ + page + }) => { + const agentPanel = new AgentPanel(page) + await agentPanel.openButton.evaluate((button) => { + button.addEventListener( + 'click', + (event) => event.stopImmediatePropagation(), + true + ) + }) - test('waits for a delayed open without clicking again', async ({ - page - }) => { - await bootAgentApp(page, true) - const agentPanel = new AgentPanel(page) - await expect(agentPanel.root).toBeVisible({ timeout: 8_000 }) - await agentPanel.root - .getByRole('button', { name: enMessages.g.close }) - .click() - await expect(agentPanel.root).toHaveCount(0) + await expect(agentPanel.open(250)).rejects.toThrow('250ms') + }) - await agentPanel.openButton.evaluate((button) => { - button.dataset.testClickCount = '0' - button.addEventListener( - 'click', - () => { + test('drops its click when activation opens the panel just before it lands', async ({ + page + }) => { + const agentPanel = new AgentPanel(page) + await agentPanel.openButton.evaluate((button) => { + button.dataset.testClickCount = '0' + button.addEventListener('click', () => { button.dataset.testClickCount = String( Number(button.dataset.testClickCount) + 1 ) - }, - true - ) + }) + button.addEventListener('pointerdown', () => button.click(), { + capture: true, + once: true + }) + }) - let delayed = false - const delayOpen = (event: Event) => { - event.stopImmediatePropagation() - if (delayed) return - delayed = true - window.setTimeout(() => { - button.removeEventListener('click', delayOpen, true) - button.click() - }, 1_500) - } - button.addEventListener('click', delayOpen, true) - }) - await agentPanel.open(3_000) + await agentPanel.open() - await expect(agentPanel.root).toBeVisible() - await expect(agentPanel.openButton).toHaveAttribute( - 'data-test-click-count', - '2' - ) - }) - - test('honors the caller timeout while an open stays pending', async ({ - page - }) => { - await bootAgentApp(page, true) - const agentPanel = new AgentPanel(page) - await expect(agentPanel.root).toBeVisible({ timeout: 8_000 }) - await agentPanel.root - .getByRole('button', { name: enMessages.g.close }) - .click() - await expect(agentPanel.root).toHaveCount(0) - await agentPanel.openButton.evaluate((button) => { - button.addEventListener( - 'click', - (event) => event.stopImmediatePropagation(), - true + await expect(agentPanel.openButton).toHaveAttribute( + 'data-test-click-count', + '1' ) }) - - const startedAt = Date.now() - await expect(agentPanel.open(250)).rejects.toThrow() - expect(Date.now() - startedAt).toBeLessThan(2_000) - }) - - test('waits for startup activation before deciding to click', async ({ - page - }) => { - await bootAgentApp(page, true) - const agentPanel = new AgentPanel(page) - await expect(agentPanel.root).toBeVisible({ timeout: 8_000 }) - await agentPanel.root - .getByRole('button', { name: enMessages.g.close }) - .click() - await expect(agentPanel.root).toHaveCount(0) - - await agentPanel.openButton.evaluate((button) => { - button.dataset.testClickCount = '0' - button.addEventListener('click', () => { - button.dataset.testClickCount = String( - Number(button.dataset.testClickCount) + 1 - ) - }) - button.addEventListener('pointerdown', () => button.click(), { - capture: true, - once: true - }) - }) - await agentPanel.open() - - await expect(agentPanel.root).toBeVisible() - await expect(agentPanel.openButton).toHaveAttribute( - 'aria-pressed', - 'true' - ) - await expect(agentPanel.openButton).toHaveAttribute( - 'data-test-click-count', - '1' - ) }) test('keeps the dock within the viewport and its documented width cap', async ({ From ce39e5aeb7e7ab0a63ea56ccb4ecb3c57accd007 Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 29 Sep 2026 14:15:09 -0700 Subject: [PATCH 11/11] test: prove activation click ordering --- .../tests/agent/agentPanelLifecycle.spec.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index 54325d8c1f3..e6881293029 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -174,10 +174,16 @@ test.describe( const agentPanel = new AgentPanel(page) await agentPanel.openButton.evaluate((button) => { button.dataset.testClickCount = '0' - button.addEventListener('click', () => { + button.dataset.testActivationClickCount = '0' + button.addEventListener('click', (event) => { button.dataset.testClickCount = String( Number(button.dataset.testClickCount) + 1 ) + if (!event.isTrusted) { + button.dataset.testActivationClickCount = String( + Number(button.dataset.testActivationClickCount) + 1 + ) + } }) button.addEventListener('pointerdown', () => button.click(), { capture: true, @@ -191,6 +197,10 @@ test.describe( 'data-test-click-count', '1' ) + await expect(agentPanel.openButton).toHaveAttribute( + 'data-test-activation-click-count', + '1' + ) }) })