diff --git a/browser_tests/tests/agent/agentDebugPanel.spec.ts b/browser_tests/tests/agent/agentDebugPanel.spec.ts new file mode 100644 index 00000000000..5ba74dc072c --- /dev/null +++ b/browser_tests/tests/agent/agentDebugPanel.spec.ts @@ -0,0 +1,41 @@ +import { expect } from '@playwright/test' + +import enMessages from '@/locales/en/main.json' with { type: 'json' } + +import { + agentTest as test, + bootAgentApp +} from '@e2e/fixtures/agentPanelFixture' + +test.describe('Agent debug log', { tag: ['@cloud', '@agent', '@ui'] }, () => { + test.beforeEach(async ({ page }) => { + await page.addInitScript(() => { + localStorage.setItem('Comfy.Agent.CrdtDebug.enabled', 'true') + localStorage.setItem('Comfy.Agent.CrdtDevPanel.open', 'true') + }) + await bootAgentApp(page, true) + }) + + test( + 'lets a tester select and clear the node materialization filter', + { + annotation: { + type: 'regression', + description: 'https://github.com/Comfy-Org/ComfyUI_frontend/pull/17519' + } + }, + async ({ page }) => { + await page + .getByRole('button', { name: enMessages.agent.askComfyAgent }) + .click() + await page.getByTestId('crdt-dev-panel-tab-log').click() + + const filter = page.getByTestId('crdt-dev-panel-filter') + await filter.selectOption('agent_node_adapters_materialized') + await expect(filter).toHaveValue('agent_node_adapters_materialized') + + await filter.selectOption('') + await expect(filter).toHaveValue('') + } + ) +}) diff --git a/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts b/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts index 1d5ebb5aca7..e3be40d0633 100644 --- a/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts +++ b/src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts @@ -1,5 +1,5 @@ import userEvent from '@testing-library/user-event' -import { render, screen } from '@testing-library/vue' +import { render, screen, within } from '@testing-library/vue' import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick } from 'vue' @@ -204,6 +204,35 @@ describe('CrdtDevPanel', () => { expect(log).not.toContain('ws_out') }) + it('lists the materialization event in the kind filter and filters by it', async () => { + const user = userEvent.setup() + recordDevEvent('doc_update', { seq: 1 }, { scope: 'doc' }) + recordDevEvent( + 'agent_node_adapters_materialized', + { nodeCount: 2 }, + { scope: 'doc' } + ) + renderPanel() + + await user.click(chip()!) + await user.click(screen.getByTestId('crdt-dev-panel-tab-log')) + + const kindFilter = screen.getByTestId('crdt-dev-panel-filter') + expect( + within(kindFilter) + .getAllByRole('option') + .map((option) => option.value) + ).toContain('agent_node_adapters_materialized') + + await user.selectOptions(kindFilter, 'agent_node_adapters_materialized') + + const log = screen.getByTestId('crdt-dev-panel-log') + expect( + within(log).getByText('agent_node_adapters_materialized') + ).toBeInTheDocument() + expect(within(log).queryByText('doc_update')).not.toBeInTheDocument() + }) + it.for(['Server logs', 'Settings', 'Workflow JSON'])( 'includes %s by default and lets it be turned off', async (name) => { diff --git a/src/workbench/extensions/agent/crdt/CrdtDevPanel.vue b/src/workbench/extensions/agent/crdt/CrdtDevPanel.vue index b81b0f5a003..c057dfb555b 100644 --- a/src/workbench/extensions/agent/crdt/CrdtDevPanel.vue +++ b/src/workbench/extensions/agent/crdt/CrdtDevPanel.vue @@ -37,7 +37,12 @@ import { collectCrdtDebugReport } from './crdtDebugReport' import type { CrdtLogScope, DevEvent, DevEventKind } from './devPanelLog' -import { clearDevEvents, devEvents, stringifyDevEvents } from './devPanelLog' +import { + DEV_EVENT_KINDS, + clearDevEvents, + devEvents, + stringifyDevEvents +} from './devPanelLog' import type { MergeScenario, MergeSimulation } from './mergeScenarios' import { getMergeScenarios, runScenario } from './mergeScenarios' import type { MergeTraceEntry, NodeLifecycleRow } from './mergeTrace' @@ -160,24 +165,6 @@ const STATUS_ROWS = [ const SCOPES: readonly CrdtLogScope[] = ['wire', 'doc'] -const EVENT_KINDS: readonly DevEventKind[] = [ - 'ws_out', - 'doc_subscribed', - 'doc_update', - 'doc_ops_result', - 'human_ops_settled', - 'doc_reset', - 'doc_nodes_changed', - 'schema_error', - 'reconnected', - 'subscribe_retry', - 'stale_probe', - 'rebind', - 'doc_gap', - 'doc_stale', - 'frame_send_failed' -] - const VERDICT_TONE: Record = { applied: 'text-success-background border-success-background', 'lww-dropped': 'text-muted-foreground border-border-default', @@ -836,7 +823,7 @@ function fmtTime(at: number): string { data-testid="crdt-dev-panel-filter" > - diff --git a/src/workbench/extensions/agent/crdt/devPanelLog.ts b/src/workbench/extensions/agent/crdt/devPanelLog.ts index 5b919fcaef2..04316733c1b 100644 --- a/src/workbench/extensions/agent/crdt/devPanelLog.ts +++ b/src/workbench/extensions/agent/crdt/devPanelLog.ts @@ -21,23 +21,26 @@ import type { CrdtLogLevel } from './crdtDebugGate' */ export type CrdtLogScope = 'wire' | 'doc' -export type DevEventKind = - | 'ws_out' - | 'doc_subscribed' - | 'doc_update' - | 'doc_ops_result' - | 'human_ops_settled' - | 'doc_reset' - | 'schema_error' - | 'reconnected' - | 'subscribe_retry' - | 'doc_nodes_changed' - | 'rebind' - | 'stale_probe' - | 'doc_gap' - | 'doc_stale' - | 'frame_send_failed' - | 'agent_node_adapters_materialized' +export const DEV_EVENT_KINDS = [ + 'ws_out', + 'doc_subscribed', + 'doc_update', + 'doc_ops_result', + 'human_ops_settled', + 'doc_reset', + 'doc_nodes_changed', + 'schema_error', + 'reconnected', + 'subscribe_retry', + 'stale_probe', + 'rebind', + 'doc_gap', + 'doc_stale', + 'frame_send_failed', + 'agent_node_adapters_materialized' +] as const + +export type DevEventKind = (typeof DEV_EVENT_KINDS)[number] export interface DevEvent { seq: number