diff --git a/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts b/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts index 51648fd785b..5a854116b18 100644 --- a/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts +++ b/browser_tests/fixtures/agentAutogrowHandWiredLinkFixture.ts @@ -265,7 +265,6 @@ 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 panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) .click() diff --git a/browser_tests/fixtures/agentConversationFixture.ts b/browser_tests/fixtures/agentConversationFixture.ts index 46a02d14042..fb514ae82d7 100644 --- a/browser_tests/fixtures/agentConversationFixture.ts +++ b/browser_tests/fixtures/agentConversationFixture.ts @@ -329,8 +329,7 @@ export class AgentConversationHarness { ) await loadSeedIntoActiveTab(this.page, this.conversation.workflow.seed) - await new AgentPanel(this.page).open() - await expect(this.panel).toBeVisible({ timeout: PANEL_MOUNT_TIMEOUT }) + await new AgentPanel(this.page).open(PANEL_MOUNT_TIMEOUT) await this.selectWorkflowTarget() } diff --git a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts index 43068462c42..c6dbb623a30 100644 --- a/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts +++ b/browser_tests/fixtures/agentCrdtIdCollisionFixture.ts @@ -220,8 +220,7 @@ export class IdCollisionHarness { }, objectInfo: 'server' }) - await new AgentPanel(this.page).open() - await expect(this.panel).toBeVisible({ timeout: 30_000 }) + await new AgentPanel(this.page).open(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/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index a5a3b8e0c32..faf5da598f9 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -74,19 +74,35 @@ 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. + async open(timeout?: number): Promise { + if (await this.root.isVisible()) return this.root + + 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 } + ) + try { + 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), + dropClickIfAlreadyOpen + ) + await dropClickIfAlreadyOpen.dispose() } - await expect(this.root).toBeVisible() + + 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 c99bae4541e..e34d71ddc75 100644 --- a/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts +++ b/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts @@ -163,15 +163,13 @@ for (const scenario of [ return route.fulfill(jsonRoute(messages)) }) - await new AgentPanel(page).open() + const panel = await new AgentPanel(page).open() 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..5981d09fd0e 100644 --- a/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts +++ b/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts @@ -39,15 +39,13 @@ test( (route) => route.fulfill({ path: assetPath('image64x64.webp') }) ) - await new AgentPanel(page).open() + const panel = await new AgentPanel(page).open() 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..d5661f18b86 100644 --- a/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts +++ b/browser_tests/tests/agent/agentCanvasBlanksDuringRunTurn.spec.ts @@ -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 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 b10854bff83..d36c0fc0532 100644 --- a/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts +++ b/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts @@ -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 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 f07d8528c32..d4fb6c39967 100644 --- a/browser_tests/tests/agent/agentComposerPaste.spec.ts +++ b/browser_tests/tests/agent/agentComposerPaste.spec.ts @@ -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 new AgentPanel(page).open() const composer = panel.getByRole('textbox', { name: /^Describe ideas/ }) await composer.click() diff --git a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts index f1ea167e73d..35b17631761 100644 --- a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts +++ b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts @@ -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 new AgentPanel(page).open() await expect(panel.getByTestId('user-message-bubble')).toHaveText([ 'Earlier request' ]) diff --git a/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts b/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts index 8bb21e2480f..582af89f8b7 100644 --- a/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts +++ b/browser_tests/tests/agent/agentGraphOpLostOnDisconnect.spec.ts @@ -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 new AgentPanel(page).open(30_000) let savedName: string | undefined await page.route('**/api/userdata/*', (route) => { diff --git a/browser_tests/tests/agent/agentInlineReferences.spec.ts b/browser_tests/tests/agent/agentInlineReferences.spec.ts index 4d97dfbe7f8..7deb81ebb51 100644 --- a/browser_tests/tests/agent/agentInlineReferences.spec.ts +++ b/browser_tests/tests/agent/agentInlineReferences.spec.ts @@ -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 new AgentPanel(page).open() const editor = panel.getByRole('textbox') await 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 d5cc7d674ac..e32c2af432b 100644 --- a/browser_tests/tests/agent/agentPanelAppMode.spec.ts +++ b/browser_tests/tests/agent/agentPanelAppMode.spec.ts @@ -1,9 +1,9 @@ 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 { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { agentTest as test } from '@e2e/tests/agent/agentPanelMocks' const OPEN_AGENT_LABEL = enMessages.agent.entryButton @@ -55,6 +55,38 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { await expect.poll(activeWorkflowPath).toBe(selectedWorkflowPath) }) + test('keeps a user-closed panel hidden when toggling app mode and back', 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 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') + }) + }) + test('activation reopens a stored-closed panel across app mode changes', async ({ comfyPage }) => { @@ -71,7 +103,7 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { ) await comfyPage.workflow.reloadAndWaitForApp() - await expect(dockedPanel).toBeVisible() + await expect(dockedPanel).toBeVisible({ timeout: 8_000 }) await expect.poll(storedOpenState).toBe('true') await comfyPage.appMode.toggleAppMode() diff --git a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts index fd0a4449573..e6881293029 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -105,6 +105,105 @@ test.describe( await expect(openButton).toBeVisible() }) + 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) + }) + + 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 agentPanel.open(3_000) + + await expect(agentPanel.openButton).toHaveAttribute( + 'data-test-click-count', + '2' + ) + }) + + 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 + ) + }) + + await expect(agentPanel.open(250)).rejects.toThrow('250ms') + }) + + 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.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, + once: true + }) + }) + + await agentPanel.open() + + await expect(agentPanel.openButton).toHaveAttribute( + 'data-test-click-count', + '1' + ) + await expect(agentPanel.openButton).toHaveAttribute( + 'data-test-activation-click-count', + '1' + ) + }) + }) + test('keeps the dock within the viewport and its documented width cap', async ({ page }) => { diff --git a/browser_tests/tests/agent/agentReplyDrafts.spec.ts b/browser_tests/tests/agent/agentReplyDrafts.spec.ts index 47b23d93d95..267ac277c82 100644 --- a/browser_tests/tests/agent/agentReplyDrafts.spec.ts +++ b/browser_tests/tests/agent/agentReplyDrafts.spec.ts @@ -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 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 6debf0be30b..63359dc0781 100644 --- a/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts +++ b/browser_tests/tests/agent/agentRunApprovalConsent.spec.ts @@ -181,8 +181,7 @@ async function startTurn( 'true', { timeout: 8_000 } ) - await new AgentPanel(page).open() - await expect(panel).toBeVisible({ timeout: 30_000 }) + await new AgentPanel(page).open(30_000) await mockWorkflowPersistence(page, WORKFLOW_ID)