Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions browser_tests/tests/agent/agentDebugPanel.spec.ts
Original file line number Diff line number Diff line change
@@ -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('')
}
)
})
31 changes: 30 additions & 1 deletion src/workbench/extensions/agent/crdt/CrdtDevPanel.test.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -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<HTMLOptionElement>('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) => {
Expand Down
27 changes: 7 additions & 20 deletions src/workbench/extensions/agent/crdt/CrdtDevPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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<string, string> = {
applied: 'text-success-background border-success-background',
'lww-dropped': 'text-muted-foreground border-border-default',
Expand Down Expand Up @@ -836,7 +823,7 @@ function fmtTime(at: number): string {
data-testid="crdt-dev-panel-filter"
>
<option value="">{{ S.allKinds }}</option>
<option v-for="kind in EVENT_KINDS" :key="kind" :value="kind">
<option v-for="kind in DEV_EVENT_KINDS" :key="kind" :value="kind">
{{ kind }}
</option>
</select>
Expand Down
37 changes: 20 additions & 17 deletions src/workbench/extensions/agent/crdt/devPanelLog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading