diff --git a/browser_tests/fixtures/agentConversationFixture.ts b/browser_tests/fixtures/agentConversationFixture.ts index 60e11ccb418..cad515ed45b 100644 --- a/browser_tests/fixtures/agentConversationFixture.ts +++ b/browser_tests/fixtures/agentConversationFixture.ts @@ -28,6 +28,7 @@ import { 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 @@ -61,7 +62,6 @@ const VUE_NODES_TAG = '@vue-nodes' const PANEL_MOUNT_TIMEOUT = 30_000 const CANCEL_TIMEOUT = 10_000 -const OPEN_AGENT_LABEL = enMessages.agent.entryButton const SEND_LABEL = enMessages.agent.send const STOP_LABEL = enMessages.agent.stop // The composer names itself with the rendered message, escapes resolved; the @@ -319,9 +319,7 @@ export class AgentConversationHarness { `${this.page.url()} serves no node definitions for ${unregistered.join(', ')}; the replay needs a ComfyUI backend behind the dev server (browser_tests/README.md, "Replay coverage for agent bug fixes")` ) - await this.page - .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) - .click() + await new AgentPanel(this.page).open() await expect(this.panel).toBeVisible({ timeout: PANEL_MOUNT_TIMEOUT }) await this.selectWorkflowTarget() } diff --git a/browser_tests/fixtures/components/AgentPanel.ts b/browser_tests/fixtures/components/AgentPanel.ts index 06a32754b81..a5850c1a436 100644 --- a/browser_tests/fixtures/components/AgentPanel.ts +++ b/browser_tests/fixtures/components/AgentPanel.ts @@ -75,7 +75,18 @@ export class AgentPanel { } async open(): Promise { - await this.openButton.click() + for (let attempt = 0; attempt < 2; attempt++) { + if (await this.root.isVisible()) return + try { + await this.openButton.click({ timeout: 1_000 }) + await expect(this.root).toBeVisible({ timeout: 1_000 }) + return + } catch { + // Startup activation can open between the visibility read and click. + // The click can then either close the panel or briefly match both the + // entry and panel controls. Retry from the newly observed state. + } + } await expect(this.root).toBeVisible() } diff --git a/browser_tests/fixtures/minimaxAutogrowFixture.ts b/browser_tests/fixtures/minimaxAutogrowFixture.ts index 567f838cfb5..2cd7c0f58df 100644 --- a/browser_tests/fixtures/minimaxAutogrowFixture.ts +++ b/browser_tests/fixtures/minimaxAutogrowFixture.ts @@ -15,6 +15,7 @@ import type { import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' import { agentTest, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { isValidDocOpsBatch, parseWireOps } from '@e2e/fixtures/agentWireFrame' import { referenceCatalog, @@ -145,13 +146,9 @@ export const minimaxAutogrowTest = agentTest.extend<{ return route.fulfill(jsonRoute(response)) }) - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() - const panel = page.locator('#agent-panel-root') + const agentPanel = new AgentPanel(page) + await agentPanel.open() + const panel = agentPanel.root await expect(panel).toBeVisible() await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) diff --git a/browser_tests/tests/agent/agentActivationConsent.spec.ts b/browser_tests/tests/agent/agentActivationConsent.spec.ts new file mode 100644 index 00000000000..b213f26bbb2 --- /dev/null +++ b/browser_tests/tests/agent/agentActivationConsent.spec.ts @@ -0,0 +1,138 @@ +import { expect } from '@playwright/test' + +import enMessages from '@/locales/en/main.json' with { type: 'json' } + +import { agentTest as test } from '@e2e/tests/agent/agentPanelMocks' + +test.describe( + 'Agent activation consent boundary', + { tag: ['@cloud', '@ui'] }, + () => { + test.use({ + agentConsentAccepted: false, + initialLocalStorage: { + 'Comfy.AgentConsent.AutoShown.test-user-e2e.ws-personal': 'true' + } + }) + + test('opens before consent and resumes the held first send exactly once', async ({ + agentConsentSave, + agentConsentWrites, + agentPanel, + comfyPage, + postedMessages + }) => { + await expect(agentPanel.root).toBeVisible() + await expect(agentPanel.openButton).toHaveAttribute( + 'aria-pressed', + 'true' + ) + + await agentPanel.selectWorkflow() + await agentPanel.composer.fill('Build a product photo workflow') + await agentPanel.sendButton.click() + + const dialog = comfyPage.page.getByRole('dialog', { + name: enMessages.agent.consent.title + }) + await expect(dialog).toBeVisible() + expect(postedMessages).toHaveLength(0) + + let releaseConsentSave = () => {} + agentConsentSave.pending = new Promise((resolve) => { + releaseConsentSave = resolve + }) + await dialog + .getByRole('button', { name: enMessages.agent.consent.accept }) + .click() + + await expect.poll(() => agentConsentWrites).toEqual([true]) + expect(postedMessages).toHaveLength(0) + releaseConsentSave() + + await expect(dialog).toHaveCount(0) + await expect(agentPanel.composer).toHaveText('') + await expect.poll(() => postedMessages).toHaveLength(1) + }) + + test('keeps a cancelled held draft unsent and lets the user retry', async ({ + agentPanel, + comfyPage, + postedMessages + }) => { + const page = comfyPage.page + await agentPanel.selectWorkflow() + await agentPanel.composer.fill('Build a product photo workflow') + await agentPanel.sendButton.click() + + const dialog = page.getByRole('dialog', { + name: enMessages.agent.consent.title + }) + await expect(dialog).toBeVisible() + await page.keyboard.press('Escape') + + await expect(dialog).toHaveCount(0) + expect(postedMessages).toHaveLength(0) + await expect(agentPanel.composer).toHaveText( + 'Build a product photo workflow' + ) + + await agentPanel.sendButton.click() + await expect(dialog).toBeVisible() + await dialog + .getByRole('button', { name: enMessages.agent.consent.accept }) + .click() + await expect.poll(() => postedMessages).toHaveLength(1) + }) + } +) + +test.describe( + 'Agent activation with existing consent', + { tag: ['@cloud', '@ui'] }, + () => { + test.use({ agentConsentAccepted: true }) + + test('opens on activation and sends without another consent prompt', async ({ + agentPanel, + comfyPage, + postedMessages + }) => { + await expect(agentPanel.root).toBeVisible() + await agentPanel.selectWorkflow() + await agentPanel.composer.fill('Build a product photo workflow') + await agentPanel.sendButton.click() + + await expect( + comfyPage.page.getByRole('dialog', { + name: enMessages.agent.consent.title + }) + ).toHaveCount(0) + await expect.poll(() => postedMessages).toHaveLength(1) + }) + } +) + +test.describe( + 'Agent activation with a persisted open preference', + { tag: ['@cloud', '@ui'] }, + () => { + test.use({ + agentConsentAccepted: false, + agentPanelInitiallyOpen: true, + initialLocalStorage: { + 'Comfy.AgentConsent.AutoShown.test-user-e2e.ws-personal': 'true' + } + }) + + test('keeps the restored panel visible before consent', async ({ + agentPanel + }) => { + await expect(agentPanel.root).toBeVisible() + await expect(agentPanel.openButton).toHaveAttribute( + 'aria-pressed', + 'true' + ) + }) + } +) diff --git a/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts b/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts index 6392822a26b..ca3bba0a9c8 100644 --- a/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts +++ b/browser_tests/tests/agent/agentAttachmentHistoryPersistence.spec.ts @@ -5,6 +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 { dropAssets, expectAssets @@ -167,12 +168,7 @@ for (const scenario of [ return route.fulfill(jsonRoute(messages)) }) - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, diff --git a/browser_tests/tests/agent/agentAttachmentUpload.spec.ts b/browser_tests/tests/agent/agentAttachmentUpload.spec.ts index e7e3160f701..f59fee1e7e4 100644 --- a/browser_tests/tests/agent/agentAttachmentUpload.spec.ts +++ b/browser_tests/tests/agent/agentAttachmentUpload.spec.ts @@ -24,7 +24,7 @@ test.describe('Agent attachment cancellation', { tag: '@cloud' }, () => { name: enMessages.agent.entryButton, exact: true }) - await openButton.click() + await agentPanel.open() await agentPanel.selectWorkflow() const panel = page.locator('#agent-panel-root') const composer = panel.getByRole('textbox', { name: /^Describe ideas/ }) diff --git a/browser_tests/tests/agent/agentAutogrowTabSwitchReconcile.spec.ts b/browser_tests/tests/agent/agentAutogrowTabSwitchReconcile.spec.ts index 018a608b814..486c7260d11 100644 --- a/browser_tests/tests/agent/agentAutogrowTabSwitchReconcile.spec.ts +++ b/browser_tests/tests/agent/agentAutogrowTabSwitchReconcile.spec.ts @@ -14,6 +14,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' 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 { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' @@ -381,15 +382,11 @@ test.describe( '[aria-invalid="true"]' ) - const panel = page.locator('#agent-panel-root') + const agentPanel = new AgentPanel(page) + const panel = agentPanel.root await test.step('open the agent panel and target the workflow', async () => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await agentPanel.open() await expect(panel).toBeVisible() await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) @@ -498,12 +495,7 @@ test.describe( // the CRDT follower and its mint ports. Reopen it before exercising a // local edit, and prove the replacement follower has rebound this doc. subscribedTo = null - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await agentPanel.open() await expect(panel).toBeVisible() await expect .poll(() => subscribedTo, { timeout: 20_000 }) diff --git a/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts b/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts index 00d20e8e927..086f1bb0f77 100644 --- a/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts +++ b/browser_tests/tests/agent/agentBatchOutputAttachment.spec.ts @@ -4,6 +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 { assetPath } from '@e2e/fixtures/utils/paths' test.use({ connectWebSocketToServer: false }) @@ -38,9 +39,7 @@ test( (route) => route.fulfill({ path: assetPath('image64x64.webp') }) ) - await page - .getByRole('button', { name: enMessages.agent.entryButton }) - .click() + await new AgentPanel(page).open() await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, diff --git a/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts b/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts index faf6913724b..a23d3733188 100644 --- a/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts +++ b/browser_tests/tests/agent/agentCanvasLagsToolCallCompletion.spec.ts @@ -17,6 +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 { VueNodeHelpers } from '@e2e/fixtures/VueNodeHelpers' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' @@ -91,7 +92,6 @@ const CATALOG: WidgetCatalog = { } const SEED: WorkflowJSON = { nodes: [], links: [] } -const OPEN_AGENT_LABEL = enMessages.agent.entryButton const SEND_LABEL = enMessages.agent.send const COMPOSER_LABEL = createI18n({ legacy: false, @@ -200,9 +200,7 @@ async function driveThroughToolCallDone( }) const panel = page.locator('#agent-panel-root') - await page - .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) - .click() + await new AgentPanel(page).open() await expect(panel).toBeVisible({ timeout: 30_000 }) let savedName: string | undefined diff --git a/browser_tests/tests/agent/agentConsent.spec.ts b/browser_tests/tests/agent/agentConsent.spec.ts index c4de5760567..65fa8a39aa2 100644 --- a/browser_tests/tests/agent/agentConsent.spec.ts +++ b/browser_tests/tests/agent/agentConsent.spec.ts @@ -1,11 +1,26 @@ import type { DesktopLoginCodeRedeemResponse } from '@comfyorg/ingest-types' import { expect } from '@playwright/test' +import type { Page } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } import frMessages from '@/locales/fr/main.json' with { type: 'json' } import { agentConsentTest as test } from '@e2e/fixtures/agentConsentFixture' +async function requestConsentFromOpenPanel(page: Page): Promise { + const openButton = page.getByRole('button', { + name: enMessages.agent.entryButton, + exact: true + }) + const panel = page.locator('#agent-panel-root') + + await expect(panel).toBeVisible() + await expect(openButton).toHaveAttribute('aria-pressed', 'true') + await openButton.click() + await expect(panel).toHaveCount(0) + await openButton.click() +} + test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { test.use({ agentConsentAccepted: false, @@ -14,7 +29,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { } }) - test('dismisses without activation and persists acceptance before opening', async ({ + test('dismisses without consent and persists acceptance before reopening', async ({ comfyPage, agentConsentSave, agentConsentWrites @@ -29,8 +44,8 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { }) const panel = page.locator('#agent-panel-root') - await test.step('Skip leaves Agent closed without saving consent', async () => { - await openButton.click() + await test.step('Activation opens Agent before consent; Skip leaves it closed without saving', async () => { + await requestConsentFromOpenPanel(page) await expect(dialog).toBeVisible() await expect(panel).toHaveCount(0) @@ -106,7 +121,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { test.describe('with a restored open intent', () => { test.use({ agentPanelInitiallyOpen: true }) - test('keeps the panel hidden until the user accepts', async ({ + test('keeps the activated panel visible until consent is requested', async ({ comfyPage, agentPanelFlash }) => { @@ -116,18 +131,13 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { name: enMessages.agent.consent.title }) - await test.step('Restoring open intent never renders the unaccepted panel during boot', async () => { - expect(await agentPanelFlash.hasFlashed()).toBe(false) - await expect(panel).toHaveCount(0) + await test.step('Restoring open intent renders the panel before consent', async () => { + await expect(panel).toBeVisible() + expect(await agentPanelFlash.hasFlashed()).toBe(true) }) - await test.step('Explicit acceptance makes the panel visible', async () => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await test.step('Explicit acceptance reopens the panel', async () => { + await requestConsentFromOpenPanel(page) await expect(dialog).toBeVisible() await expect(panel).toHaveCount(0) await dialog @@ -156,12 +166,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { await test.step('A failed save leaves the panel closed and allows retry', async () => { agentConsentSave.status = 500 - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await requestConsentFromOpenPanel(page) await accept.click() await expect.poll(() => agentConsentWrites).toEqual([true]) @@ -191,12 +196,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { }) await test.step('Consent keeps its dark surface and readable heading', async () => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await requestConsentFromOpenPanel(page) await expect(page.getByTestId('agent-consent-card')).toHaveCSS( 'background-color', 'rgb(23, 23, 24)' @@ -232,12 +232,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { }) await test.step('Narrow layout keeps media widescreen and actions in visual order', async () => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await requestConsentFromOpenPanel(page) await expect .poll(async () => { const box = await video.boundingBox() @@ -276,12 +271,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { test('plays the MP4 fallback', async ({ comfyPage }) => { const page = comfyPage.page - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await requestConsentFromOpenPanel(page) const video = page.getByTestId('agent-consent-video') await expect(video).toHaveJSProperty( @@ -307,12 +297,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { comfyPage }) => { const page = comfyPage.page - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await requestConsentFromOpenPanel(page) const dialog = page.getByRole('dialog', { name: enMessages.agent.consent.title @@ -341,12 +326,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { }) => { const page = comfyPage.page await comfyPage.settings.setSetting('Comfy.Locale', 'fr') - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await requestConsentFromOpenPanel(page) const dialog = page.getByRole('dialog', { name: frMessages.agent.consent.title @@ -393,12 +373,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { await test.step('Short wide layout keeps both actions reachable', async () => { await page.setViewportSize({ width: 1280, height: 480 }) - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await requestConsentFromOpenPanel(page) await accept.scrollIntoViewIfNeeded() await expect(accept).toBeInViewport({ ratio: 1 }) await expect(reject).toBeInViewport({ ratio: 1 }) @@ -426,12 +401,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { await test.step('Short narrow layout lets the user reach the heading', async () => { await page.setViewportSize({ width: 430, height: 600 }) - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await requestConsentFromOpenPanel(page) await heading.scrollIntoViewIfNeeded() await expect(heading).toBeInViewport({ ratio: 1 }) }) @@ -448,9 +418,7 @@ test.describe('Manual agent consent gate', { tag: ['@cloud', '@ui'] }, () => { comfyPage }) => { const page = comfyPage.page - await page - .getByRole('button', { name: enMessages.agent.entryButton, exact: true }) - .click() + await requestConsentFromOpenPanel(page) const dialog = page.getByRole('dialog', { name: enMessages.agent.consent.title }) @@ -490,16 +458,16 @@ test.describe('Automatic agent consent', { tag: ['@cloud', '@ui'] }, () => { await test.step('First load shows consent without clicking the entry button', async () => { await expect(dialog).toBeVisible() - await expect(agentPanel.root).toHaveCount(0) + await expect(agentPanel.root).toBeVisible() expect(agentConsentWrites).toHaveLength(0) }) - await test.step('Skip dismisses the offer without accepting or opening Agent', async () => { + await test.step('Skip dismisses the offer without accepting or closing Agent', async () => { await dialog .getByRole('button', { name: enMessages.agent.consent.reject }) .click() await expect(dialog).toHaveCount(0) - await expect(agentPanel.root).toHaveCount(0) + await expect(agentPanel.root).toBeVisible() expect(agentConsentWrites).toHaveLength(0) }) @@ -507,12 +475,12 @@ test.describe('Automatic agent consent', { tag: ['@cloud', '@ui'] }, () => { await comfyPage.workflow.reloadAndWaitForApp() await expect(agentPanel.openButton).toBeEnabled() await expect(dialog).toHaveCount(0) - await expect(agentPanel.root).toHaveCount(0) + await expect(agentPanel.root).toBeVisible() expect(agentConsentWrites).toHaveLength(0) }) await test.step('The entry button can still request consent and activate Agent', async () => { - await agentPanel.openButton.click() + await requestConsentFromOpenPanel(page) await expect(dialog).toBeVisible() await dialog .getByRole('button', { name: enMessages.agent.consent.accept }) @@ -567,7 +535,7 @@ test.describe( }) .toBeGreaterThan(0) await expect(consent).toHaveCount(0) - await expect(agentPanel.root).toHaveCount(0) + await expect(agentPanel.root).toBeVisible() expect( await page.evaluate((key) => localStorage.getItem(key), autoShownKey) ).toBeNull() @@ -577,7 +545,7 @@ test.describe( await page.getByTestId('getting-started-blank').click() await expect(gettingStarted).toHaveCount(0) await expect(consent).toBeVisible() - await expect(agentPanel.root).toHaveCount(0) + await expect(agentPanel.root).toBeVisible() expect(agentConsentWrites).toHaveLength(0) }) }) @@ -640,7 +608,7 @@ test.describe( await test.step('The approval owns the screen and the offer waits behind it', async () => { await approve.click({ trial: true }) await expect(consent).toHaveCount(0) - await expect(agentPanel.root).toHaveCount(0) + await expect(agentPanel.root).toBeVisible() expect( await page.evaluate((key) => localStorage.getItem(key), autoShownKey) ).toBeNull() diff --git a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts index dc8f4bdd7c6..c7ff9921289 100644 --- a/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts +++ b/browser_tests/tests/agent/agentDuplicateWorkflowNameBinding.spec.ts @@ -13,6 +13,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' +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' @@ -174,9 +175,7 @@ test( ) ).toBe(PORTRAIT_PATH) - await page - .getByRole('button', { name: enMessages.agent.entryButton, exact: true }) - .click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') await expect(panel).toBeVisible() await expect(panel.getByTestId('user-message-bubble')).toHaveText([ diff --git a/browser_tests/tests/agent/agentInlinePrompt.spec.ts b/browser_tests/tests/agent/agentInlinePrompt.spec.ts index 911d103a35f..8f28ed49ba3 100644 --- a/browser_tests/tests/agent/agentInlinePrompt.spec.ts +++ b/browser_tests/tests/agent/agentInlinePrompt.spec.ts @@ -1,6 +1,7 @@ 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' test.use({ connectWebSocketToServer: false }) @@ -9,9 +10,7 @@ test( 'preserves inline workflow references through Send, history and Edit', { tag: ['@cloud', '@ui'] }, async ({ page, workflowSelection, promptHistory }) => { - await page - .getByRole('button', { name: enMessages.agent.entryButton, exact: true }) - .click() + 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 afacceae1b6..4d97dfbe7f8 100644 --- a/browser_tests/tests/agent/agentInlineReferences.spec.ts +++ b/browser_tests/tests/agent/agentInlineReferences.spec.ts @@ -1,6 +1,7 @@ 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, @@ -23,10 +24,9 @@ test( mimeType: 'application/json', buffer: Buffer.from(JSON.stringify(referenceWorkflow)) }) - await page - .getByRole('button', { name: enMessages.agent.entryButton, exact: true }) - .click() - const panel = page.locator('#agent-panel-root') + const agentPanel = new AgentPanel(page) + await agentPanel.open() + const panel = agentPanel.root 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 a8ce2783e78..70f00224081 100644 --- a/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts +++ b/browser_tests/tests/agent/agentNewChatTargetWorkflow.spec.ts @@ -1,6 +1,7 @@ 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 { workflowSelectionTest } from '@e2e/fixtures/agentWorkflowSelectionFixture' @@ -24,13 +25,9 @@ test.describe( page, workflowSelection }, testInfo) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() - 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 }) @@ -100,13 +97,9 @@ test.describe( page, workflowSelection }) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() - 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/agentOnboarding.spec.ts b/browser_tests/tests/agent/agentOnboarding.spec.ts index 247a282c6ed..bc6b9f6b0ff 100644 --- a/browser_tests/tests/agent/agentOnboarding.spec.ts +++ b/browser_tests/tests/agent/agentOnboarding.spec.ts @@ -7,6 +7,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' +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 ({ @@ -16,9 +17,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: false }) - await page - .getByRole('button', { name: enMessages.agent.entryButton, exact: true }) - .click() + await new AgentPanel(page).open() const firstCard = page.getByRole('dialog', { name: enMessages.agent.coachTitle @@ -62,9 +61,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: true }) - await page - .getByRole('button', { name: enMessages.agent.entryButton, exact: true }) - .click() + await new AgentPanel(page).open() const firstCard = page.getByRole('dialog', { name: enMessages.agent.coachTitle @@ -103,9 +100,7 @@ test.describe('Agent onboarding tour', { tag: ['@cloud', '@ui'] }, () => { await bootAgentApp(page, agentFlagEnabled, { onboardingCompleted: false }) - await page - .getByRole('button', { name: enMessages.agent.entryButton, exact: true }) - .click() + 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/agentPanel.spec.ts b/browser_tests/tests/agent/agentPanel.spec.ts index 0e574ef72d9..6c54919a72b 100644 --- a/browser_tests/tests/agent/agentPanel.spec.ts +++ b/browser_tests/tests/agent/agentPanel.spec.ts @@ -4,6 +4,7 @@ import type { WebSocketRoute } from '@playwright/test' import { expect, mergeTests } from '@playwright/test' import { TopUpCreditsDialog } from '@e2e/fixtures/components/TopUpCreditsDialog' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { webSocketFixture } from '@e2e/fixtures/ws' import { agentTest as diagnosticTest, @@ -64,11 +65,9 @@ test.describe('In-App Agent panel', { tag: '@cloud' }, () => { const page = comfyPage.page - const openButton = page.getByRole('button', { name: OPEN_AGENT_LABEL }) - await expect(openButton).toBeVisible() - await openButton.click() - - const panel = page.locator('#agent-panel-root') + const agentPanel = new AgentPanel(page) + await agentPanel.open() + const panel = agentPanel.root await expect(panel).toBeVisible() await selectAgentWorkflow(page) @@ -348,7 +347,7 @@ test.describe('In-App Agent panel', { tag: '@cloud' }, () => { comfyPage }) => { const page = comfyPage.page - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const composer = panel.getByRole('textbox', { name: /^Describe ideas/ }) @@ -417,7 +416,7 @@ test.describe('In-App Agent panel', { tag: '@cloud' }, () => { comfyPage }) => { const page = comfyPage.page - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() + await new AgentPanel(page).open() const scrollContainer = page .locator('#agent-panel-root div.overflow-y-auto') @@ -441,7 +440,7 @@ test.describe('In-App Agent panel', { tag: '@cloud' }, () => { comfyPage }) => { const page = comfyPage.page - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') await panel @@ -538,7 +537,7 @@ test.describe('In-App Agent panel', { tag: '@cloud' }, () => { comfyPage }) => { const page = comfyPage.page - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() + await new AgentPanel(page).open() await selectAgentWorkflow(page) @@ -561,7 +560,7 @@ test.describe('In-App Agent panel', { tag: '@cloud' }, () => { getWebSocket }) => { const page = comfyPage.page - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() + await new AgentPanel(page).open() await selectAgentWorkflow(page) @@ -621,7 +620,7 @@ diagnosticTest.describe( diagnosticTest( 'copies cloud logs and all optional sources by default', async ({ page }) => { - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') for (const name of ['Server logs', 'Settings', 'Workflow JSON']) { @@ -641,7 +640,7 @@ diagnosticTest.describe( diagnosticTest( 'copies with privacy sources turned off', async ({ page }) => { - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') for (const name of ['Server logs', 'Settings', 'Workflow JSON']) { @@ -676,7 +675,7 @@ diagnosticTest.describe( logsRequests++ } }) - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') await page.evaluate(() => { const clipboard = navigator.clipboard diff --git a/browser_tests/tests/agent/agentPanelAppMode.spec.ts b/browser_tests/tests/agent/agentPanelAppMode.spec.ts index 8c9af4ad3ec..d5cc7d674ac 100644 --- a/browser_tests/tests/agent/agentPanelAppMode.spec.ts +++ b/browser_tests/tests/agent/agentPanelAppMode.spec.ts @@ -3,6 +3,7 @@ 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' const OPEN_AGENT_LABEL = enMessages.agent.entryButton @@ -31,7 +32,7 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { exact: true }) await expect(openButton).toBeVisible() - await openButton.click() + await new AgentPanel(page).open() await expect(panelRoot).toHaveCount(1) await expect(panelRoot).toBeVisible() @@ -54,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('activation reopens a stored-closed panel across app mode changes', async ({ comfyPage }) => { test.setTimeout(30_000) @@ -70,15 +71,15 @@ test.describe('In-App Agent panel across view modes', { tag: '@cloud' }, () => { ) await comfyPage.workflow.reloadAndWaitForApp() - 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') 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 46cf4f252ad..8ae33eb5a2a 100644 --- a/browser_tests/tests/agent/agentPanelLifecycle.spec.ts +++ b/browser_tests/tests/agent/agentPanelLifecycle.spec.ts @@ -6,6 +6,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' const OPEN_AGENT_LABEL = enMessages.agent.entryButton const OPEN_STORAGE_KEY = 'Comfy.AgentPanel.open' @@ -49,7 +50,7 @@ test.describe( const panel = page.getByTestId('docked-agent-panel') await expect(openButton).toBeVisible() - await openButton.click() + await new AgentPanel(page).open() await expect(panel).toBeVisible() await expect( page.getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) @@ -81,10 +82,12 @@ test.describe( name: OPEN_AGENT_LABEL, exact: true }) + const panel = page.getByTestId('docked-agent-panel') + await new AgentPanel(page).open() + await panel.getByRole('button', { name: enMessages.g.close }).click() await openButton.focus() await openButton.press('Enter') - const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() await expect(panel).toHaveAttribute('role', 'complementary') await expect(panel).toHaveAttribute( @@ -106,9 +109,7 @@ test.describe( }) => { await bootAgentApp(page, true) - await page - .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) - .click() + await new AgentPanel(page).open() const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() @@ -133,9 +134,7 @@ test.describe( await page.setViewportSize({ width: 1600, height: 900 }) await bootAgentApp(page, true) - await page - .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) - .click() + await new AgentPanel(page).open() const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() @@ -181,9 +180,7 @@ test.describe( await page.setViewportSize({ width: 1300, height: 900 }) await bootAgentApp(page, true) - await page - .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) - .click() + await new AgentPanel(page).open() const panel = page.getByTestId('docked-agent-panel') await expect(panel).toBeVisible() await panel @@ -221,9 +218,7 @@ test.describe( test('restores an open panel after a browser reload', async ({ page }) => { await bootAgentApp(page, true) - await page - .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) - .click() + await new AgentPanel(page).open() await expect(page.getByTestId('docked-agent-panel')).toBeVisible() await expect .poll(() => @@ -247,11 +242,7 @@ test.describe( }) => { await bootAgentApp(page, agentFlagEnabled) - const openButton = page.getByRole('button', { - name: OPEN_AGENT_LABEL, - exact: true - }) - await openButton.click() + await new AgentPanel(page).open() const panel = page.getByTestId('docked-agent-panel') const tabs = page.locator('.workflow-tabs .p-togglebutton') diff --git a/browser_tests/tests/agent/agentSelectionWorkflowOwnership.spec.ts b/browser_tests/tests/agent/agentSelectionWorkflowOwnership.spec.ts index 28f5052a3f8..33347168c92 100644 --- a/browser_tests/tests/agent/agentSelectionWorkflowOwnership.spec.ts +++ b/browser_tests/tests/agent/agentSelectionWorkflowOwnership.spec.ts @@ -10,6 +10,7 @@ import { referenceNode, referenceWorkflow } from '@e2e/fixtures/agentInlineReferencesFixture' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' test.use({ connectWebSocketToServer: false, @@ -48,10 +49,9 @@ test( mimeType: 'application/json', buffer: Buffer.from(JSON.stringify(referenceWorkflow)) }) - await page - .getByRole('button', { name: enMessages.agent.entryButton, exact: true }) - .click() - 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/agentStaleWorkflowTabBinding.spec.ts b/browser_tests/tests/agent/agentStaleWorkflowTabBinding.spec.ts index 7004d253c08..6aefe6b82e8 100644 --- a/browser_tests/tests/agent/agentStaleWorkflowTabBinding.spec.ts +++ b/browser_tests/tests/agent/agentStaleWorkflowTabBinding.spec.ts @@ -18,10 +18,10 @@ import { bootAgentApp } from '@e2e/fixtures/agentPanelFixture' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { Topbar } from '@e2e/fixtures/components/Topbar' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' -const OPEN_AGENT_LABEL = enMessages.agent.entryButton const LEGACY_BINDING_KEY = 'Comfy.Agent.WorkflowTabBindings' const THREAD_KEY = 'Comfy.Agent.ThreadId' const DEFAULT_TAB_PATH = 'workflows/Unsaved Workflow.json' @@ -248,8 +248,9 @@ test.describe( .allTextContents() // A brand-new page on the surviving thread: nobody has sent anything. - await page.getByRole('button', { name: OPEN_AGENT_LABEL }).click() - const panel = page.locator('#agent-panel-root') + const agentPanel = new AgentPanel(page) + await agentPanel.open() + const panel = agentPanel.root await expect(panel).toBeVisible() await expect(panel.getByTestId('user-message-bubble')).toHaveText([ EARLIER_REQUEST diff --git a/browser_tests/tests/agent/agentTemplatePlacement.spec.ts b/browser_tests/tests/agent/agentTemplatePlacement.spec.ts index 21cab6ea801..b4004fddbc8 100644 --- a/browser_tests/tests/agent/agentTemplatePlacement.spec.ts +++ b/browser_tests/tests/agent/agentTemplatePlacement.spec.ts @@ -6,7 +6,6 @@ import type { AgentMessages, AgentWsEvent } from '@/workbench/extensions/agent/schemas/agentApiSchema' -import enMessages from '@/locales/en/main.json' with { type: 'json' } import { parseServerDocFrame } from '@/workbench/extensions/agent/crdt/docFrameClient' import { parseAgentWsEvent } from '@/workbench/extensions/agent/schemas/agentApiSchema' @@ -16,6 +15,7 @@ import { } from '@e2e/fixtures/agentPanelFixture' import type { HostFrame } from '@e2e/fixtures/agentConversationHostDoc' import { HostDoc } from '@e2e/fixtures/agentConversationHostDoc' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import { nextFrame } from '@e2e/fixtures/utils/timing' @@ -151,12 +151,7 @@ class TemplatePlacementHarness { } }) - await this.page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(this.page).open() const panel = this.page.locator('#agent-panel-root') await expect(panel).toBeVisible({ timeout: 30_000 }) await this.selectWorkflowTarget() diff --git a/browser_tests/tests/agent/agentToolCallHistoryPersistence.spec.ts b/browser_tests/tests/agent/agentToolCallHistoryPersistence.spec.ts index c06279e8572..17acc1b70fd 100644 --- a/browser_tests/tests/agent/agentToolCallHistoryPersistence.spec.ts +++ b/browser_tests/tests/agent/agentToolCallHistoryPersistence.spec.ts @@ -5,6 +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 { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' // FE-1305: a completed turn's tool calls (the work-summary trace shown live, @@ -25,12 +26,7 @@ test( 'keeps a completed turn work summary after reload and chat switching', { tag: ['@cloud', '@ui'] }, async ({ page, promptHistory, workflowSelection }) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, diff --git a/browser_tests/tests/agent/agentUploadedImageAttachment.spec.ts b/browser_tests/tests/agent/agentUploadedImageAttachment.spec.ts index 4609fa94d69..391b8691053 100644 --- a/browser_tests/tests/agent/agentUploadedImageAttachment.spec.ts +++ b/browser_tests/tests/agent/agentUploadedImageAttachment.spec.ts @@ -4,6 +4,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 { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import { assetPath } from '@e2e/fixtures/utils/paths' @@ -25,9 +26,7 @@ test( route.fulfill({ path: assetPath('image32x32.webp') }) ) - await page - .getByRole('button', { name: enMessages.agent.entryButton }) - .click() + await new AgentPanel(page).open() await page .getByRole('button', { name: enMessages.sideToolbar.newBlankWorkflow, diff --git a/browser_tests/tests/agent/agentUxScenarios.spec.ts b/browser_tests/tests/agent/agentUxScenarios.spec.ts index 6611ec4e4b5..2d4a91650c5 100644 --- a/browser_tests/tests/agent/agentUxScenarios.spec.ts +++ b/browser_tests/tests/agent/agentUxScenarios.spec.ts @@ -6,17 +6,14 @@ import { TestIds } from '@e2e/fixtures/selectors' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' import { agentTest as test } from '@e2e/tests/agent/agentPanelMocks' -const OPEN_AGENT_LABEL = enMessages.agent.entryButton - test.describe('Linear Agent UX scenarios', { tag: '@cloud' }, () => { for (const width of [480, 640]) { test(`X-01 / PM-672 keeps controls usable at ${width}px panel width`, async ({ + agentPanel, comfyPage }) => { const page = comfyPage.page - await page - .getByRole('button', { name: OPEN_AGENT_LABEL, exact: true }) - .click() + await agentPanel.open() const panel = page.locator('#agent-panel-root') const dock = page.getByTestId('docked-agent-panel') diff --git a/browser_tests/tests/agent/agentWorkflowSelection.spec.ts b/browser_tests/tests/agent/agentWorkflowSelection.spec.ts index 86d8bbff188..af0cb2979f6 100644 --- a/browser_tests/tests/agent/agentWorkflowSelection.spec.ts +++ b/browser_tests/tests/agent/agentWorkflowSelection.spec.ts @@ -3,6 +3,7 @@ import { expect, mergeTests } from '@playwright/test' import enMessages from '@/locales/en/main.json' with { type: 'json' } import { agentTest } from '@e2e/fixtures/agentPanelFixture' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { workflowSelectionTest } from '@e2e/fixtures/agentWorkflowSelectionFixture' const test = mergeTests(agentTest, workflowSelectionTest) @@ -15,9 +16,7 @@ test.describe( page, workflowSelection }, testInfo) => { - await page - .getByRole('button', { name: enMessages.agent.entryButton }) - .click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') await panel .getByRole('button', { name: enMessages.agent.switchWorkflow }) @@ -55,12 +54,7 @@ test.describe( page, workflowSelection }) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow @@ -118,12 +112,7 @@ test.describe( page, workflowSelection }) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow @@ -168,12 +157,7 @@ test.describe( page, workflowSelection }, testInfo) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const targetPicker = panel.getByRole('button', { name: enMessages.agent.switchWorkflow @@ -229,12 +213,7 @@ test.describe( await expect(tabs).toHaveCount(1) await panel.getByRole('button', { name: enMessages.g.close }).click() await expect(panel).toHaveCount(0) - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() await expect(composer).toHaveText( 'Unsaved Workflow Use this workflow as inspiration' ) @@ -293,12 +272,7 @@ test.describe( page, workflowSelection }, testInfo) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const composer = panel.getByRole('textbox', { includeHidden: true }) await composer.fill('Start in this workflow') @@ -401,12 +375,7 @@ test.describe( const editorTabs = page.locator('.workflow-tabs .p-togglebutton') await expect(editorTabs).toHaveCount(2) await editorTabs.first().click() - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() await page .getByRole('button', { name: enMessages.agent.switchWorkflow }) .click() @@ -451,12 +420,7 @@ test.describe( page, workflowSelection }, testInfo) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const composer = panel.getByRole('textbox', { includeHidden: true }) await expect( @@ -573,12 +537,7 @@ test.describe( await panel.getByRole('button', { name: enMessages.g.close }).click() await expect(targetMarker).toBeVisible() - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() await expect( panel.getByRole('button', { name: enMessages.agent.switchWorkflow }) ).toHaveText('Unsaved Workflow') @@ -627,12 +586,7 @@ test.describe( page, workflowSelection }) => { - await page - .getByRole('button', { - name: enMessages.agent.entryButton, - exact: true - }) - .click() + await new AgentPanel(page).open() const panel = page.locator('#agent-panel-root') const composer = panel.getByRole('textbox', { includeHidden: true }) await composer.fill('Keep this draft') diff --git a/browser_tests/tests/agent/renameFocus.spec.ts b/browser_tests/tests/agent/renameFocus.spec.ts index a0daaef4b1d..ee0f7845980 100644 --- a/browser_tests/tests/agent/renameFocus.spec.ts +++ b/browser_tests/tests/agent/renameFocus.spec.ts @@ -7,6 +7,7 @@ import { agentTest as test, bootAgentApp } from '@e2e/fixtures/agentPanelFixture' +import { AgentPanel } from '@e2e/fixtures/components/AgentPanel' import { jsonRoute } from '@e2e/fixtures/utils/jsonRoute' const OPEN_AGENT_LABEL = enMessages.agent.entryButton @@ -66,7 +67,7 @@ test.describe('Agent chat history rename', { tag: '@cloud' }, () => { exact: true }) await expect(openButton).toBeVisible() - await openButton.click() + await new AgentPanel(page).open() // Staged: the docked shell renders immediately, the async root arrives // after its chunk. Asserting the shell first keeps a later failure diff --git a/src/components/LiteGraphCanvasSplitterOverlay.test.ts b/src/components/LiteGraphCanvasSplitterOverlay.test.ts index 866d031968b..b4d4ebc3487 100644 --- a/src/components/LiteGraphCanvasSplitterOverlay.test.ts +++ b/src/components/LiteGraphCanvasSplitterOverlay.test.ts @@ -164,7 +164,7 @@ describe('LiteGraphCanvasSplitterOverlay', () => { it('refreshes the splitter only when the Agent panel becomes visible', async () => { const agentPanelStore = useAgentPanelStore() agentPanelStore.enabled = true - agentPanelStore.isOpen = true + agentPanelStore.isOpen = false agentPanelStore.consentAccepted = false const splitterMounts = vi.fn() @@ -186,13 +186,13 @@ describe('LiteGraphCanvasSplitterOverlay', () => { } } }) - const mountsBeforeConsent = splitterMounts.mock.calls.length + const mountsBeforePanelOpen = splitterMounts.mock.calls.length - agentPanelStore.consentAccepted = true + agentPanelStore.isOpen = true await nextTick() expect(splitterMounts.mock.calls.length).toBeGreaterThan( - mountsBeforeConsent + mountsBeforePanelOpen ) }) }) diff --git a/src/components/topbar/WorkflowTabs.test.ts b/src/components/topbar/WorkflowTabs.test.ts index a6df850a810..0cd6799be60 100644 --- a/src/components/topbar/WorkflowTabs.test.ts +++ b/src/components/topbar/WorkflowTabs.test.ts @@ -400,7 +400,7 @@ describe('WorkflowTabs agent entry button', () => { ).toBeInTheDocument() }) - it('keeps a hidden restored intent reachable and clears it before requesting consent', async () => { + it('closes a restored pre-consent panel from the entry button', async () => { useAgentPanelStore().open() withConsent.mockImplementationOnce(async (_trigger, onAccept) => { expect(useAgentPanelStore().isOpen).toBe(false) @@ -413,8 +413,8 @@ describe('WorkflowTabs agent entry button', () => { screen.getByRole('button', { name: enMessages.agent.entryButton }) ) - expect(withConsent).toHaveBeenCalledOnce() - expect(useAgentPanelStore().isVisible).toBe(true) + expect(withConsent).not.toHaveBeenCalled() + expect(useAgentPanelStore().isVisible).toBe(false) }) it('exposes the gate-settled signal on the actions container once the gate settles', async () => { diff --git a/src/extensions/core/agentPanel.test.ts b/src/extensions/core/agentPanel.test.ts index 4cef11e7857..083bd287362 100644 --- a/src/extensions/core/agentPanel.test.ts +++ b/src/extensions/core/agentPanel.test.ts @@ -284,10 +284,63 @@ describe('AgentPanel extension flag gate', () => { expect(vi.mocked(useAgentConsent().withConsent).mock.calls[0][0]).toBe( 'first_load' ) - expect(agentStore.open).toHaveBeenCalledExactlyOnceWith('automatic_consent') - expect(trackAgentPanelOpened).toHaveBeenCalledExactlyOnceWith({ - source: 'automatic_consent' + expect(agentStore.open).not.toHaveBeenCalled() + expect( + useTelemetry()?.trackAgentPanelOpened + ).toHaveBeenCalledExactlyOnceWith({ source: 'restored' }) + }) + + it.for([ + { session: 'cloud logged in without consent', user: { id: 'account-a' } }, + { session: 'local logged out', user: null } + ])('opens after startup for $session', async ({ user }) => { + agentFlagEnabled.value = true + currentUser.value = user + Object.assign(consentStore, { accepted: false, isChecking: false }) + agentStore.isOpen = false + + await loadEntryAndSetup() + await vi.waitFor(() => + expect(agentStore.open).toHaveBeenCalledWith('activation') + ) + + expect(agentStore.isVisible).toBe(true) + }) + + it('waits for the general onboarding decision before activation', async () => { + agentFlagEnabled.value = true + agentStore.isOpen = false + let decide = (_: boolean) => {} + startupDecision = new Promise((resolve) => { + decide = resolve }) + + await loadEntryAndSetup() + expect(agentStore.open).not.toHaveBeenCalled() + + decide(true) + await vi.waitFor(() => + expect(agentStore.open).toHaveBeenCalledExactlyOnceWith('activation') + ) + }) + + it('does not reopen a dismissed activation panel after flag synchronization', async () => { + agentFlagEnabled.value = true + agentStore.isOpen = false + + await loadEntryAndSetup() + await vi.waitFor(() => + expect(agentStore.open).toHaveBeenCalledExactlyOnceWith('activation') + ) + + agentStore.close('close_button') + agentFlagEnabled.value = false + await nextTick() + agentFlagEnabled.value = true + await flush() + + expect(agentStore.isOpen).toBe(false) + expect(agentStore.open).toHaveBeenCalledOnce() }) it('keeps the panel closed if the feature is disabled before acceptance', async () => { @@ -361,8 +414,7 @@ describe('AgentPanel extension flag gate', () => { await vi.waitFor(() => expect(useAgentConsent().withConsent).toHaveBeenCalledOnce() ) - - expect(agentStore.open).toHaveBeenCalledOnce() + expect(agentStore.open).not.toHaveBeenCalled() }) const AUTO_SHOWN_KEY = 'Comfy.AgentConsent.AutoShown.account-a.workspace-a' @@ -578,7 +630,7 @@ describe('AgentPanel extension flag gate', () => { expect(useAgentConsent().withConsent).toHaveBeenCalledTimes(2) ) expect(localStorage.getItem(AUTO_SHOWN_KEY)).toBe('true') - expect(agentStore.open).toHaveBeenCalledOnce() + expect(agentStore.open).not.toHaveBeenCalled() }) it('stays silent after a tour ends when the saved consent cannot be read', async () => { diff --git a/src/extensions/core/agentPanel.ts b/src/extensions/core/agentPanel.ts index 62821f1a4b7..e493e6fd9b6 100644 --- a/src/extensions/core/agentPanel.ts +++ b/src/extensions/core/agentPanel.ts @@ -119,7 +119,7 @@ export function registerAgentPanelExtension(): void { notifyMintPortsBeforeGraphLoad() openWidgetDirtySuppression() const agentPanelStore = useAgentPanelStore() - if (!agentPanelStore.isVisible) return + if (!agentPanelStore.isVisible || !agentPanelStore.consentAccepted) return const nodeSelectionStore = useAgentNodeSelectionStore() nodeSelectionStore.beginWorkflowLoad() @@ -128,7 +128,7 @@ export function registerAgentPanelExtension(): void { const agentPanelStore = useAgentPanelStore() const nodeSelectionStore = useAgentNodeSelectionStore() if (!nodeSelectionStore.isLoadingWorkflow) return - if (!agentPanelStore.isVisible) { + if (!agentPanelStore.isVisible || !agentPanelStore.consentAccepted) { nodeSelectionStore.finishWorkflowLoad() return } @@ -276,7 +276,7 @@ export function registerAgentPanelExtension(): void { void withConsent( 'first_load', () => { - if (!agentPanelStore.enabled) return + if (!agentPanelStore.enabled || agentPanelStore.isOpen) return agentPanelStore.open('automatic_consent') }, { @@ -310,6 +310,29 @@ export function registerAgentPanelExtension(): void { }) } + let activationPending = false + let activationOffered = false + const openWhenStartupDecided = (): void => { + if (!agentPanelStore.enabled || activationPending || activationOffered) + return + activationPending = true + whenStartupDecided() + .then((decided) => { + if (decided && agentPanelStore.enabled) { + activationOffered = true + if (!agentPanelStore.isOpen) agentPanelStore.open('activation') + } + }) + .catch((error: unknown) => { + reportError(error, { + errorType: 'agent_panel_activation_failure' + }) + }) + .finally(() => { + activationPending = false + }) + } + const loadConsentIfEligible = (): void => { if (!agentPanelStore.enabled || !resolvedUserInfo.value) return void consentStore @@ -337,6 +360,7 @@ export function registerAgentPanelExtension(): void { ) setupFlagGate( loadConsentIfEligible, + openWhenStartupDecided, () => isAuthInitialized.value && resolvedUserInfo.value === null ) } @@ -345,6 +369,7 @@ export function registerAgentPanelExtension(): void { function setupFlagGate( loadConsentIfEligible: () => void, + openWhenStartupDecided: () => void, isSignedOut: () => boolean ): void { const agentPanelStore = useAgentPanelStore() @@ -360,6 +385,7 @@ function setupFlagGate( ([enabled]) => { agentPanelStore.enabled = enabled loadConsentIfEligible() + openWhenStartupDecided() if (!enabled) { const nodeSelectionStore = useAgentNodeSelectionStore() if (nodeSelectionStore.isLoadingWorkflow) diff --git a/src/platform/telemetry/types.ts b/src/platform/telemetry/types.ts index cc7dc862d04..ae633f7b2d9 100644 --- a/src/platform/telemetry/types.ts +++ b/src/platform/telemetry/types.ts @@ -593,7 +593,7 @@ export type AgentPanelCloseSource = | 'topbar_button' | 'pagehide' export interface AgentPanelOpenedMetadata extends Record { - source: 'restored' | 'topbar_button' | 'automatic_consent' + source: 'restored' | 'topbar_button' | 'automatic_consent' | 'activation' } export type AgentConsentNotOfferedReason = | 'first_run_screen' @@ -746,7 +746,10 @@ export interface AgentEntryButtonClickedMetadata extends Record< > { resulting_state: 'opened' | 'closed' } -export type AgentConsentTrigger = 'first_load' | 'button_click' +export type AgentConsentTrigger = + | 'first_load' + | 'button_click' + | 'first_message' export interface AgentConsentShownMetadata extends Record { trigger: AgentConsentTrigger } diff --git a/src/workbench/extensions/agent/AgentPanelRoot.test.ts b/src/workbench/extensions/agent/AgentPanelRoot.test.ts index ab96ee7304a..732c2b89387 100644 --- a/src/workbench/extensions/agent/AgentPanelRoot.test.ts +++ b/src/workbench/extensions/agent/AgentPanelRoot.test.ts @@ -53,6 +53,7 @@ import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/w import { validateComfyWorkflow } from '@/platform/workflow/validation/schemas/workflowSchema' import { useBillingContext } from '@/composables/billing/useBillingContext' import { useTelemetry } from '@/platform/telemetry' +import type { AgentConsentTrigger } from '@/platform/telemetry/types' import { useBillingCapabilities } from '@/platform/workspace/composables/useBillingCapabilities' import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI' import { app } from '@/scripts/app' @@ -81,6 +82,15 @@ const getServerFeature = vi.hoisted(() => ) const focusNodeInstance = vi.hoisted(() => vi.fn()) const socketSend = vi.hoisted(() => vi.fn()) +const withConsent = vi.hoisted(() => + vi.fn<(trigger: AgentConsentTrigger, onAccept: () => void) => Promise>( + async (_trigger, onAccept) => onAccept() + ) +) + +vi.mock(import('./composables/agent/useAgentConsent'), () => ({ + useAgentConsent: () => ({ withConsent }) +})) vi.mock(import('@/composables/canvas/useFocusNode'), () => ({ useFocusNode: () => ({ focusNodeInstance }) @@ -4246,6 +4256,71 @@ describe('AgentPanelRoot workflow binding', () => { } ) + it('keeps the first send pending until consent succeeds, then resumes it', async () => { + makeTab('wf-42') + const bodies = mockMessagesEndpoint('wf-42') + Object.assign(useAgentConsentStore(), { accepted: false }) + let accept = () => {} + withConsent.mockImplementationOnce( + (_trigger, onAccept) => + new Promise((resolve) => { + accept = () => { + onAccept() + resolve() + } + }) + ) + renderWithSelectedTarget() + + const textbox = screen.getByRole('textbox') + await userEvent.click(textbox) + await userEvent.paste('build me a workflow') + await userEvent.click(screen.getByRole('button', { name: 'Send' })) + + expect(withConsent).toHaveBeenCalledExactlyOnceWith( + 'first_message', + expect.any(Function) + ) + expect(bodies).toHaveLength(0) + + accept() + await screen.findByRole('button', { name: 'Stop' }) + await waitFor(() => expect(bodies).toHaveLength(1)) + }) + + it('does not resume a consent-held send after the panel unmounts', async () => { + makeTab('wf-42') + const bodies = mockMessagesEndpoint('wf-42') + const settleSubmission = vi.spyOn( + useAgentComposerStore(), + 'settleSubmission' + ) + Object.assign(useAgentConsentStore(), { accepted: false }) + let accept = () => {} + withConsent.mockImplementationOnce( + (_trigger, onAccept) => + new Promise((resolve) => { + accept = () => { + onAccept() + resolve() + } + }) + ) + const { unmount } = renderWithSelectedTarget() + + const textbox = screen.getByRole('textbox') + await userEvent.click(textbox) + await userEvent.paste('build me a workflow') + await userEvent.click(screen.getByRole('button', { name: 'Send' })) + + unmount() + accept() + await waitFor(() => + expect(settleSubmission).toHaveBeenCalledWith(expect.any(Number), false) + ) + expect(bodies).toHaveLength(0) + }) + it('reports a message sent from an empty-state suggestion chip as a suggestion', async () => { makeTab('wf-42') mockMessagesEndpoint('wf-42') diff --git a/src/workbench/extensions/agent/AgentPanelRoot.vue b/src/workbench/extensions/agent/AgentPanelRoot.vue index bbeb751938b..276a4285322 100644 --- a/src/workbench/extensions/agent/AgentPanelRoot.vue +++ b/src/workbench/extensions/agent/AgentPanelRoot.vue @@ -104,6 +104,7 @@ import type { WorkflowTurnContext } from './composables/agent/useAgentSession' import type { CoachStep } from './composables/agent/useOnboarding' +import { useAgentConsent } from './composables/agent/useAgentConsent' import { useAgentWorkflowResolver } from './composables/agent/useAgentWorkflowResolver' import { useAgentWorkflowSelection } from './composables/agent/useAgentWorkflowSelection' import { @@ -435,6 +436,7 @@ watch( { immediate: true } ) const { accepted: consentAccepted } = storeToRefs(useAgentConsentStore()) +const { withConsent } = useAgentConsent() const workspaceStore = useTeamWorkspaceStore() const onboardingKey = computed(() => scopedOnboardingKey( @@ -1263,6 +1265,8 @@ async function onAnswerAsk( void refreshCloudWorkflowIds() onBeforeUnmount(() => { ++activeTabGeneration + if (composerStore.submission?.id === consentHeldSubmissionId) + composerStore.invalidateSubmission() mintPortWiring.detach() exitNodeSelectionMode() stop() @@ -1392,6 +1396,23 @@ const coachSteps = computed(() => [ } ]) +let consentHeldSubmissionId: number | undefined +async function consentAllowsSubmission( + submissionId: number | undefined +): Promise { + let hasConsent = false + consentHeldSubmissionId = submissionId + try { + await withConsent('first_message', () => { + hasConsent = true + }) + } finally { + if (consentHeldSubmissionId === submissionId) + consentHeldSubmissionId = undefined + } + return composerStore.submission?.id === submissionId && hasConsent +} + const { submit: onSend } = useAgentDraftSubmission({ canSubmit: () => !workflowSelecting.value && !isSending.value, onSubmit: agentPanelStore.retainWorkflowTarget, @@ -1406,6 +1427,13 @@ const { submit: onSend } = useAgentDraftSubmission({ }, // fallow-ignore-next-line complexity -- Existing PR logic; this lane changes only the composing panel test. send: async (text, attachments, nodes, references, meta) => { + const submissionId = composerStore.submission?.id + if ( + !consentAccepted.value && + !(await consentAllowsSubmission(submissionId)) + ) + return false + // The same origin `performSend` pins the turn to, taken in the same tick, // so the report follows the tab the turn is posted against. Everything but // the workflow id is captured now, like the thread; the id here is only diff --git a/src/workbench/extensions/agent/stores/agent/agentPanelStore.test.ts b/src/workbench/extensions/agent/stores/agent/agentPanelStore.test.ts index d90dcc2856d..188efbc3415 100644 --- a/src/workbench/extensions/agent/stores/agent/agentPanelStore.test.ts +++ b/src/workbench/extensions/agent/stores/agent/agentPanelStore.test.ts @@ -69,7 +69,7 @@ describe('agentPanelStore engagement telemetry', () => { }) }) - it('starts a new visible interval after consent hides and restores the panel', async () => { + it('keeps the panel visible while consent changes', async () => { const store = useConsentedAgentPanelStore() store.enabled = true store.open() @@ -79,6 +79,7 @@ describe('agentPanelStore engagement telemetry', () => { store.consentAccepted = false await nextTick() expect(store.isOpen).toBe(true) + expect(store.isVisible).toBe(true) vi.advanceTimersByTime(10000) store.consentAccepted = true await nextTick() @@ -87,12 +88,9 @@ describe('agentPanelStore engagement telemetry', () => { expect(telemetry.trackAgentPanelClosed).toHaveBeenCalledWith({ source: 'close_button', - open_duration_ms: 3000 - }) - expect(telemetry.trackAgentPanelOpened).toHaveBeenCalledTimes(2) - expect(telemetry.trackAgentPanelOpened).toHaveBeenLastCalledWith({ - source: 'restored' + open_duration_ms: 15000 }) + expect(telemetry.trackAgentPanelOpened).toHaveBeenCalledOnce() }) it('attributes automatic consent to its own source without duplicate opens', async () => { @@ -117,18 +115,20 @@ describe('agentPanelStore engagement telemetry', () => { expect(telemetry.trackAgentPanelOpened).not.toHaveBeenCalled() }) - it('suppresses a restored open intent that has no consent', async () => { + it('shows a restored open intent before consent', async () => { localStorage.setItem(OPEN_STORAGE_KEY, 'true') const store = useAgentPanelStore() store.enabled = true await nextTick() expect(store.isOpen).toBe(true) - expect(store.isVisible).toBe(false) - expect(telemetry.trackAgentPanelOpened).not.toHaveBeenCalled() + expect(store.isVisible).toBe(true) + expect(telemetry.trackAgentPanelOpened).toHaveBeenCalledWith({ + source: 'restored' + }) store.suppressRestoredOpen() - expect(store.isOpen).toBe(false) + expect(store.isOpen).toBe(true) }) it('emits opened on toggle-open and closed with the open duration', () => { @@ -297,14 +297,17 @@ describe('agentPanelStore pagehide teardown', () => { expect(telemetry.trackAgentPanelClosed).not.toHaveBeenCalled() }) - it('does not report a pagehide close for an open panel gated behind consent', () => { + it('reports a pagehide close for an open pre-consent panel', () => { const store = useAgentPanelStore() store.enabled = true store.open() window.dispatchEvent(new Event('pagehide')) - expect(telemetry.trackAgentPanelClosed).not.toHaveBeenCalled() + expect(telemetry.trackAgentPanelClosed).toHaveBeenCalledWith({ + source: 'pagehide', + open_duration_ms: 0 + }) }) it('can report again for a fresh open session after a prior pagehide report', () => { diff --git a/src/workbench/extensions/agent/stores/agent/agentPanelStore.ts b/src/workbench/extensions/agent/stores/agent/agentPanelStore.ts index fee4e4bd466..fa0a28cea45 100644 --- a/src/workbench/extensions/agent/stores/agent/agentPanelStore.ts +++ b/src/workbench/extensions/agent/stores/agent/agentPanelStore.ts @@ -106,9 +106,7 @@ export const useAgentPanelStore = defineStore('agentPanel', () => { // the same openedAt. A fresh epoch (open(), or the watcher below) resets it. let teardownReported = false - const isVisible = computed( - () => enabled.value && isOpen.value && consentAccepted.value - ) + const isVisible = computed(() => enabled.value && isOpen.value) watch(isVisible, (visible) => { if (!visible) {