fix: align teleported dropdown right edge to trigger right edge

Amp-Thread-ID: https://ampcode.com/threads/T-019d6fd8-61fd-76ed-975a-71e146c1dd5e
Co-authored-by: Amp <amp@ampcode.com>

.claude/skills/hardening-flaky-e2e-tests/SKILL.md

@@ -1,246 +0,0 @@
----
-name: hardening-flaky-e2e-tests
-description: 'Diagnoses and fixes flaky Playwright e2e tests by replacing race-prone patterns with retry-safe alternatives. Use when triaging CI flakes, hardening spec files, fixing timing races, or asked to stabilize browser tests. Triggers on: flaky, flake, harden, stabilize, race condition in e2e, intermittent failure.'
----
-
-# Hardening Flaky E2E Tests
-
-Fix flaky Playwright specs by identifying race-prone patterns and replacing them with retry-safe alternatives. This skill covers diagnosis, pattern matching, and mechanical transforms — not writing new tests (see `writing-playwright-tests` for that).
-
-## Workflow
-
-### 1. Gather CI Evidence
-
-```bash
-gh run list --workflow=ci-test.yaml --limit=5
-gh run download <run-id> -n playwright-report
-```
-
-- Open `report.json` and search for `"status": "flaky"` entries.
-- Collect file paths, test titles, and error messages.
-- Do NOT trust green checks alone — flaky tests that passed on retry still need fixing.
-- Use `error-context.md`, traces, and page snapshots before editing code.
-- Pull the newest run after each push instead of assuming the flaky set is unchanged.
-
-### 2. Classify the Flake
-
-Read the failing assertion and match it against the pattern table. Most flakes fall into one of these categories:
-
-| #   | Pattern                               | Signature in Code                                         | Fix                                                              |
-| --- | ------------------------------------- | --------------------------------------------------------- | ---------------------------------------------------------------- |
-| 1   | **Snapshot-then-assert**              | `expect(await evaluate()).toBe(x)`                        | `await expect.poll(() => evaluate()).toBe(x)`                    |
-| 2   | **Immediate count**                   | `const n = await loc.count(); expect(n).toBe(3)`          | `await expect(loc).toHaveCount(3)`                               |
-| 3   | **nextFrame after menu click**        | `clickMenuItem(x); nextFrame()`                           | `clickMenuItem(x); contextMenu.waitForHidden()`                  |
-| 4   | **Tight poll timeout**                | `expect.poll(..., { timeout: 250 })`                      | ≥2000 ms; prefer default 5000 ms                                 |
-| 5   | **Immediate evaluate after mutation** | `setSetting(k, v); expect(await evaluate()).toBe(x)`      | `await expect.poll(() => evaluate()).toBe(x)`                    |
-| 6   | **Screenshot without readiness**      | `loadWorkflow(); nextFrame(); toHaveScreenshot()`         | `waitForNodes()` or poll state first                             |
-| 7   | **Non-deterministic node order**      | `getNodeRefsByType('X')[0]` with >1 match                 | `getNodeRefById(id)` or guard `toHaveLength(1)`                  |
-| 8   | **Fake readiness helper**             | Helper clicks but doesn't assert state                    | Remove; poll the actual value                                    |
-| 9   | **Immediate graph state after drop**  | `expect(await getLinkCount()).toBe(1)`                    | `await expect.poll(() => getLinkCount()).toBe(1)`                |
-| 10  | **Immediate boundingBox/layout read** | `const box = await loc.boundingBox(); expect(box!.width)` | `await expect.poll(() => loc.boundingBox().then(b => b?.width))` |
-
-### 3. Apply the Transform
-
-#### Rule: Choose the Smallest Correct Assertion
-
-- **Locator state** → use built-in retrying assertions: `toBeVisible()`, `toHaveText()`, `toHaveCount()`, `toHaveClass()`
-- **Single async value** → `expect.poll(() => asyncFn()).toBe(expected)`
-- **Multiple assertions that must settle together** → `expect(async () => { ... }).toPass()`
-- **Never** use `waitForTimeout()` to hide a race.
-
-```typescript
-// ✅ Single value — use expect.poll
-await expect
-  .poll(() => comfyPage.page.evaluate(() => window.app!.graph.links.length))
-  .toBe(3)
-
-// ✅ Locator count — use toHaveCount
-await expect(comfyPage.page.locator('.dom-widget')).toHaveCount(2)
-
-// ✅ Multiple conditions — use toPass
-await expect(async () => {
-  expect(await node1.getValue()).toBe('foo')
-  expect(await node2.getValue()).toBe('bar')
-}).toPass({ timeout: 5000 })
-```
-
-#### Rule: Wait for the Real Readiness Boundary
-
-Visible is not always ready. Prefer user-facing assertions when possible; poll internal state only when there is no UI surface to assert on.
-
-Common readiness boundaries:
-
-| After this action...                   | Wait for...                                                  |
-| -------------------------------------- | ------------------------------------------------------------ |
-| Canvas interaction (drag, click node)  | `await comfyPage.nextFrame()`                                |
-| Menu item click                        | `await contextMenu.waitForHidden()`                          |
-| Workflow load                          | `await comfyPage.workflow.loadWorkflow(...)` (built-in wait) |
-| Settings write                         | Poll the setting value with `expect.poll()`                  |
-| Node pin/bypass/collapse toggle        | `await expect.poll(() => nodeRef.isPinned()).toBe(true)`     |
-| Graph mutation (add/remove node, link) | Poll link/node count                                         |
-| Clipboard write                        | Poll pasted value                                            |
-| Screenshot                             | Ensure nodes are rendered: `waitForNodes()` or poll state    |
-
-#### Rule: Expose Locators for Retrying Assertions
-
-When a helper returns a count via `await loc.count()`, callers can't use `toHaveCount()`. Expose the underlying `Locator` as a getter so callers choose between:
-
-```typescript
-// Helper exposes locator
-get domWidgets(): Locator {
-  return this.page.locator('.dom-widget')
-}
-
-// Caller uses retrying assertion
-await expect(comfyPage.domWidgets).toHaveCount(2)
-```
-
-Replace count methods with locator getters so callers can use retrying assertions directly.
-
-#### Rule: Fix Check-then-Act Races in Helpers
-
-```typescript
-// ❌ Race: count can change between check and waitFor
-const count = await locator.count()
-if (count > 0) {
-  await locator.waitFor({ state: 'hidden' })
-}
-
-// ✅ Direct: waitFor handles both cases
-await locator.waitFor({ state: 'hidden' })
-```
-
-#### Rule: Remove force:true from Clicks
-
-`force: true` bypasses actionability checks, hiding real animation/visibility races. Remove it and fix the underlying timing issue.
-
-```typescript
-// ❌ Hides the race
-await closeButton.click({ force: true })
-
-// ✅ Surfaces the real issue — fix with proper wait
-await closeButton.click()
-await dialog.waitForHidden()
-```
-
-#### Rule: Handle Non-deterministic Element Order
-
-When `getNodeRefsByType` returns multiple nodes, the order is not guaranteed. Don't use index `[0]` blindly.
-
-```typescript
-// ❌ Assumes order
-const node = (await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode'))[0]
-
-// ✅ Find by ID or proximity
-const nodes = await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
-let target = nodes[0]
-for (const n of nodes) {
-  const pos = await n.getPosition()
-  if (Math.abs(pos.y - expectedY) < minDist) target = n
-}
-```
-
-Or guard the assumption:
-
-```typescript
-const nodes = await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
-expect(nodes).toHaveLength(1)
-const node = nodes[0]
-```
-
-#### Rule: Use toPass for Timing-sensitive Dismiss Guards
-
-Some UI elements (e.g. LiteGraph's graphdialog) have built-in dismiss delays. Retry the entire dismiss action:
-
-```typescript
-// ✅ Retry click+assert together
-await expect(async () => {
-  await comfyPage.canvas.click({ position: { x: 10, y: 10 } })
-  await expect(dialog).toBeHidden({ timeout: 500 })
-}).toPass({ timeout: 5000 })
-```
-
-### 4. Keep Changes Narrow
-
-- Shared helpers should drive setup to a stable boundary.
-- Do not encode one-spec timing assumptions into generic helpers.
-- If a race only matters to one spec, prefer a local wait in that spec.
-- If a helper fails before the real test begins, remove or relax the brittle precondition and let downstream UI interaction prove readiness.
-
-### 5. Verify Narrowly
-
-```bash
-# Targeted rerun with repetition
-pnpm test:browser:local -- browser_tests/tests/myFile.spec.ts --repeat-each 10
-
-# Single test by line number (avoids grep quoting issues on Windows)
-pnpm test:browser:local -- browser_tests/tests/myFile.spec.ts:42
-```
-
-- Use `--repeat-each 10` for targeted flake verification (use 20 for single test cases).
-- Verify with the smallest command that exercises the flaky path.
-
-### 6. Watch CI E2E Runs
-
-After pushing, use `gh` to monitor the E2E workflow:
-
-```bash
-# Find the run for the current branch
-gh run list --workflow="CI: Tests E2E" --branch=$(git branch --show-current) --limit=1
-
-# Watch it live (blocks until complete, streams logs)
-gh run watch <run-id>
-
-# One-liner: find and watch the latest E2E run for the current branch
-gh run list --workflow="CI: Tests E2E" --branch=$(git branch --show-current) --limit=1 --json databaseId --jq ".[0].databaseId" | xargs gh run watch
-```
-
-On Windows (PowerShell):
-
-```powershell
-# One-liner equivalent
-gh run watch (gh run list --workflow="CI: Tests E2E" --branch=$(git branch --show-current) --limit=1 --json databaseId --jq ".[0].databaseId")
-```
-
-After the run completes:
-
-```bash
-# Download the Playwright report artifact
-gh run download <run-id> -n playwright-report
-
-# View the run summary in browser
-gh run view <run-id> --web
-```
-
-Also watch the unit test workflow in parallel if you changed helpers:
-
-```bash
-gh run list --workflow="CI: Tests Unit" --branch=$(git branch --show-current) --limit=1
-```
-
-### 7. Pre-merge Checklist
-
-Before merging a flaky-test fix, confirm:
-
-- [ ] The latest CI artifact was inspected directly
-- [ ] The root cause is stated as a race or readiness mismatch
-- [ ] The fix waits on the real readiness boundary
-- [ ] The assertion primitive matches the job (poll vs toHaveCount vs toPass)
-- [ ] The fix stays local unless a shared helper truly owns the race
-- [ ] Local verification uses a targeted rerun
-- [ ] No behavioral changes to the test — only timing/retry strategy updated
-
-## Local Noise — Do Not Fix
-
-These are local distractions, not CI root causes:
-
-- Missing local input fixture files required by the test path
-- Missing local models directory
-- Teardown `EPERM` while restoring the local browser-test user data directory
-- Local screenshot baseline differences on Windows
-
-Rules:
-
-- First confirm whether it blocks the exact flaky path under investigation.
-- Do not commit temporary local assets used only for verification.
-- Do not commit local screenshot baselines.

.claude/skills/ticket-intake/SKILL.md

@@ -0,0 +1,361 @@
+---
+name: ticket-intake
+description: 'Parse ticket URL (Notion or GitHub), extract all data, initialize pipeline run. Use when starting work on a new ticket or when asked to pick up a ticket.'
+---
+
+# Ticket Intake
+
+Parses a ticket URL from supported sources (Notion or GitHub), extracts all relevant information, and creates a ticket in the pipeline API.
+
+> **🚨 CRITICAL REQUIREMENT**: This skill MUST register the ticket in the Pipeline API and update the source (Notion/GitHub). If these steps are skipped, the entire pipeline breaks. See [Mandatory API Calls](#mandatory-api-calls-execute-all-three) below.
+
+## Supported Sources
+
+| Source | URL Pattern                                         | Provider File         |
+| ------ | --------------------------------------------------- | --------------------- |
+| Notion | `https://notion.so/...` `https://www.notion.so/...` | `providers/notion.md` |
+| GitHub | `https://github.com/{owner}/{repo}/issues/{n}`      | `providers/github.md` |
+
+## Quick Start
+
+When given a ticket URL:
+
+1. **Detect source type** from URL pattern
+2. **Load provider-specific logic** from `providers/` directory
+3. Fetch ticket content via appropriate API
+4. Extract and normalize properties to common schema
+5. **Register ticket in pipeline API** ← MANDATORY
+6. **Update source** (Notion status / GitHub comment) ← MANDATORY
+7. **Run verification script** to confirm API registration
+8. Output summary and handoff to `research-orchestrator`
+
+## Configuration
+
+Uses the **production API** by default. No configuration needed for read operations.
+
+**Defaults (no setup required):**
+
+- API URL: `https://api-gateway-856475788601.us-central1.run.app`
+- Read-only endpoints at `/public/*` require no authentication
+
+**For write operations** (transitions, creating tickets), set:
+
+```bash
+export PIPELINE_API_KEY="..."  # Get from GCP Secret Manager or ask admin
+```
+
+**Optional (for local working artifacts):**
+
+```bash
+PIPELINE_DIR="${PIPELINE_DIR:-$HOME/repos/ticket-to-pr-pipeline}"
+```
+
+## Mandatory API Calls (Execute ALL Three)
+
+**⚠️ These three API calls are the ENTIRE POINT of this skill. Without them, the ticket is invisible to the pipeline, downstream skills will fail, and Notion status won't update.**
+
+**You MUST make these HTTP requests.** Use `curl` from bash — do not just read this as documentation.
+
+### Call 1: Create Ticket
+
+```bash
+API_URL="${PIPELINE_API_URL:-https://api-gateway-856475788601.us-central1.run.app}"
+API_KEY="${PIPELINE_API_KEY}"
+
+curl -s -X POST "${API_URL}/v1/tickets" \
+  -H "Authorization: Bearer ${API_KEY}" \
+  -H "Content-Type: application/json" \
+  -H "X-Agent-ID: ${AGENT_ID:-amp-agent}" \
+  -d '{
+    "notion_page_id": "NOTION_PAGE_UUID_HERE",
+    "title": "TICKET_TITLE_HERE",
+    "source": "notion",
+    "metadata": {
+      "description": "DESCRIPTION_HERE",
+      "priority": "High",
+      "labels": [],
+      "acceptanceCriteria": []
+    }
+  }'
+```
+
+Save the returned `id` — you need it for the next two calls.
+
+### Call 2: Transition to RESEARCH
+
+```bash
+TICKET_ID="id-from-step-1"
+
+curl -s -X POST "${API_URL}/v1/tickets/${TICKET_ID}/transition" \
+  -H "Authorization: Bearer ${API_KEY}" \
+  -H "Content-Type: application/json" \
+  -H "X-Agent-ID: ${AGENT_ID:-amp-agent}" \
+  -d '{
+    "to_state": "RESEARCH",
+    "reason": "Intake complete, starting research"
+  }'
+```
+
+### Call 3: Queue Source Update
+
+```bash
+curl -s -X POST "${API_URL}/v1/sync/queue" \
+  -H "Authorization: Bearer ${API_KEY}" \
+  -H "Content-Type: application/json" \
+  -H "X-Agent-ID: ${AGENT_ID:-amp-agent}" \
+  -d '{
+    "ticket_id": "TICKET_ID_HERE",
+    "action": "update_status",
+    "payload": { "status": "In Progress" },
+    "priority": "normal"
+  }'
+```
+
+> **Note:** The action MUST be `"update_status"` (not `"UPDATE_NOTION_STATUS"`). Valid actions: `update_status`, `update_pr_url`, `mark_done`.
+
+### TypeScript Equivalent (if using pipeline client)
+
+```typescript
+import { PipelineClient } from '@pipeline/client'
+
+const client = new PipelineClient({
+  apiUrl:
+    process.env.PIPELINE_API_URL ||
+    'https://api-gateway-856475788601.us-central1.run.app',
+  agentId: process.env.AGENT_ID!
+})
+
+const ticket = await client.createTicket({
+  notion_page_id: pageId,
+  title: ticketTitle,
+  source: 'notion',
+  metadata: { description, priority, labels, acceptanceCriteria }
+})
+
+await client.transitionState(
+  ticket.id,
+  'RESEARCH',
+  'Intake complete, starting research'
+)
+
+await client.queueSync(ticket.id, 'update_status', { status: 'In Progress' })
+```
+
+## Workflow
+
+### Step 1: Detect Source Type
+
+Parse the URL to determine source:
+
+```javascript
+if (url.includes('notion.so')) {
+  source = 'notion'
+  // Load providers/notion.md
+} else if (url.match(/github\.com\/[^\/]+\/[^\/]+\/issues\/\d+/)) {
+  source = 'github'
+  // Load providers/github.md
+} else {
+  // Error: Unsupported URL format
+}
+```
+
+### Step 2: Load Provider and Fetch Data
+
+Read the appropriate provider file for source-specific instructions:
+
+- **Notion**: `providers/notion.md` - Uses Notion MCP, handles Slack links
+- **GitHub**: `providers/github.md` - Uses `gh` CLI, handles Dosu comments
+
+Follow the provider's instructions for:
+
+- Fetching content
+- Extracting properties
+- **Updating the source** (Notion status → "In Progress", Assignee → pipeline owner)
+
+### Step 3: Normalize to Common Schema
+
+All providers must extract normalized ticket data following `schema.md`:
+
+```json
+{
+  "id": "abc12345",
+  "url": "https://...",
+  "source": "notion | github",
+  "title": "Ticket title",
+  "description": "Full description",
+  "status": "Not Started",
+  "assignee": "username",
+  "priority": "High",
+  "area": "UI",
+  "labels": ["bug", "frontend"],
+  "acceptanceCriteria": ["Criterion 1", "Criterion 2"],
+  "fetchedAt": "2024-01-15T10:30:00Z"
+}
+```
+
+### Step 4: Register Ticket in Pipeline API (MANDATORY — DO NOT SKIP)
+
+**Execute all three API calls from [Mandatory API Calls](#mandatory-api-calls-execute-all-three) above.**
+
+This is not optional. This is not documentation. You MUST make these HTTP requests right now.
+
+1. `createTicket()` → save the returned ticket ID
+2. `transitionState(id, 'RESEARCH')` → confirm state changed
+3. `queueSync(id, 'update_status', { status: 'In Progress' })` → confirm queued
+
+**If any call fails**, retry once. If it still fails, report the error prominently — do NOT silently continue.
+
+### Step 5: Run Verification Script
+
+After making the API calls, run the verification script to confirm everything worked:
+
+```bash
+bash scripts/verify-intake.sh TICKET_ID_OR_NOTION_PAGE_ID
+```
+
+**If the script is not available locally**, verify manually via the public API:
+
+```bash
+curl -s "${API_URL}/public/tickets/${TICKET_ID}" | jq '{id, state, title, notion_page_id}'
+```
+
+Expected output:
+
+```json
+{
+  "id": "...",
+  "state": "RESEARCH",
+  "title": "...",
+  "notion_page_id": "..."
+}
+```
+
+**If `state` is not `RESEARCH`, go back to Step 4 and complete the missing calls.**
+
+### Step 6: Output Summary and Handoff
+
+Print a clear summary:
+
+```markdown
+## Ticket Intake Complete
+
+**Source:** Notion | GitHub
+**Title:** [Ticket title]
+**ID:** abc12345
+**Status:** In Progress (queued)
+**Priority:** High
+**Area:** UI
+
+### Description
+
+[Brief description or first 200 chars]
+
+### Acceptance Criteria
+
+- [ ] Criterion 1
+- [ ] Criterion 2
+
+### Links
+
+- **Ticket:** [Original URL]
+- **Slack:** [Slack thread content fetched via slackdump] (Notion only)
+
+### Pipeline
+
+- **API Ticket ID:** abc12345
+- **State:** RESEARCH
+- **Verified:** ✅ (via verify-intake.sh or public API)
+```
+
+**After printing the summary, immediately handoff** to continue the pipeline. Use the `handoff` tool with all necessary context (ticket ID, source, title, description, slack context if any):
+
+> **Handoff goal:** "Continue pipeline for ticket {ID} ({title}). Ticket is in RESEARCH state. Load skill: `research-orchestrator` to begin research phase. Ticket data: source={source}, notion_page_id={pageId}, priority={priority}. {slack context summary if available}"
+
+**Do NOT wait for human approval to proceed.** The intake phase is complete — handoff immediately.
+
+## Error Handling
+
+### Unsupported URL
+
+```
+❌ Unsupported ticket URL format.
+
+Supported formats:
+- Notion: https://notion.so/... or https://www.notion.so/...
+- GitHub: https://github.com/{owner}/{repo}/issues/{number}
+
+Received: [provided URL]
+```
+
+### Provider-Specific Errors
+
+See individual provider files for source-specific error handling:
+
+- `providers/notion.md` - Authentication, page not found
+- `providers/github.md` - Auth, rate limits, issue not found
+
+### Missing Properties
+
+Continue with available data and note what's missing:
+
+```
+⚠️ Some properties unavailable:
+- Priority: not found (using default: Medium)
+- Area: not found
+
+Proceeding with available data...
+```
+
+### API Call Failures
+
+```
+❌ Pipeline API call failed: {method} {endpoint}
+   Status: {status}
+   Error: {message}
+
+Retrying once...
+
+❌ Retry also failed. INTAKE IS INCOMPLETE.
+   The ticket was NOT registered in the pipeline.
+   Downstream skills will not work until this is fixed.
+```
+
+## Notes
+
+- This skill focuses ONLY on intake — it does not do research
+- Slack thread content is fetched automatically via the `slackdump` skill — no manual copy-paste needed
+- ALL API calls (createTicket, transitionState, queueSync) are MANDATORY — never skip them
+- The `queueSync` action must be `"update_status"`, NOT `"UPDATE_NOTION_STATUS"`
+- Pipeline state is tracked via the API, not local files
+- Working artifacts (research-report.md, plan.md) can be saved locally to `$PIPELINE_DIR/runs/{ticket-id}/`
+- The `source` field in the ticket determines which research strategies to use
+
+## API Client Reference
+
+### Available Methods
+
+| Method                                                      | Description                                                         |
+| ----------------------------------------------------------- | ------------------------------------------------------------------- |
+| `createTicket({ notion_page_id, title, source, metadata })` | Create a new ticket in the API                                      |
+| `getTicket(id)`                                             | Retrieve a ticket by ID                                             |
+| `findByNotionId(notionPageId)`                              | Look up a ticket by its Notion page ID                              |
+| `listTickets({ state, agent_id, limit, offset })`           | List tickets with optional filters                                  |
+| `transitionState(id, state, reason)`                        | Move ticket to a new state (e.g., `'RESEARCH'`)                     |
+| `setPRCreated(id, prUrl)`                                   | Mark ticket as having a PR created                                  |
+| `queueSync(id, action, payload)`                            | Queue a sync action (`update_status`, `update_pr_url`, `mark_done`) |
+| `registerBranch(id, branch, repo)`                          | Register working branch for automatic PR detection                  |
+
+### Error Handling
+
+```typescript
+import { PipelineClient, PipelineAPIError } from '@pipeline/client';
+
+try {
+  await client.createTicket({ ... });
+} catch (error) {
+  if (error instanceof PipelineAPIError) {
+    console.error(`API Error ${error.status}: ${error.message}`);
+  }
+  throw error;
+}
+```

.claude/skills/ticket-intake/providers/github.md

@@ -0,0 +1,194 @@
+# GitHub Provider - Ticket Intake
+
+Provider-specific logic for ingesting tickets from GitHub Issues.
+
+## URL Pattern
+
+```
+https://github.com/{owner}/{repo}/issues/{number}
+https://www.github.com/{owner}/{repo}/issues/{number}
+```
+
+Extract: `owner`, `repo`, `issue_number` from URL.
+
+## Prerequisites
+
+- `gh` CLI authenticated (`gh auth status`)
+- Access to the repository
+
+## Fetch Issue Content
+
+Use `gh` CLI to fetch issue details:
+
+```bash
+# Get issue details in JSON
+gh issue view {number} --repo {owner}/{repo} --json title,body,state,labels,assignees,milestone,author,createdAt,comments,linkedPRs
+
+# Get comments separately if needed
+gh issue view {number} --repo {owner}/{repo} --comments
+```
+
+## Extract Ticket Data
+
+Map GitHub issue fields to normalized ticket data (stored via API):
+
+| GitHub Field | ticket.json Field | Notes                      |
+| ------------ | ----------------- | -------------------------- |
+| title        | title             | Direct mapping             |
+| body         | description       | Issue body/description     |
+| state        | status            | Map: open → "Not Started"  |
+| labels       | labels            | Array of label names       |
+| assignees    | assignee          | First assignee login       |
+| author       | author            | Issue author login         |
+| milestone    | milestone         | Milestone title if present |
+| comments     | comments          | Array of comment objects   |
+| linkedPRs    | linkedPRs         | PRs linked to this issue   |
+
+### Priority Mapping
+
+Infer priority from labels:
+
+- `priority:critical`, `P0` → "Critical"
+- `priority:high`, `P1` → "High"
+- `priority:medium`, `P2` → "Medium"
+- `priority:low`, `P3` → "Low"
+- No priority label → "Medium" (default)
+
+### Area Mapping
+
+Infer area from labels:
+
+- `area:ui`, `frontend`, `component:*` → "UI"
+- `area:api`, `backend` → "API"
+- `area:docs`, `documentation` → "Docs"
+- `bug`, `fix` → "Bug"
+- `enhancement`, `feature` → "Feature"
+
+## Update Source
+
+**For GitHub issues, update is optional but recommended.**
+
+Add a comment to indicate work has started:
+
+```bash
+gh issue comment {number} --repo {owner}/{repo} --body "🤖 Pipeline started processing this issue."
+```
+
+Optionally assign to self:
+
+```bash
+gh issue edit {number} --repo {owner}/{repo} --add-assignee @me
+```
+
+Log any updates via the Pipeline API:
+
+```typescript
+await client.updateTicket(ticketId, {
+  metadata: {
+    ...ticket.metadata,
+    githubWrites: [
+      ...(ticket.metadata?.githubWrites || []),
+      {
+        action: 'comment',
+        issueNumber: 123,
+        at: new Date().toISOString(),
+        skill: 'ticket-intake',
+        success: true
+      }
+    ]
+  }
+})
+```
+
+## GitHub-Specific Ticket Fields
+
+Store via API using `client.createTicket()`:
+
+```json
+{
+  "source": "github",
+  "githubOwner": "Comfy-Org",
+  "githubRepo": "ComfyUI_frontend",
+  "githubIssueNumber": 123,
+  "githubIssueUrl": "https://github.com/Comfy-Org/ComfyUI_frontend/issues/123",
+  "labels": ["bug", "area:ui", "priority:high"],
+  "linkedPRs": [456, 789],
+  "dosuComment": "..." // Extracted Dosu bot analysis if present
+}
+```
+
+## Dosu Bot Detection
+
+Many repositories use Dosu bot for automated issue analysis. Check comments for Dosu:
+
+```bash
+gh issue view {number} --repo {owner}/{repo} --comments | grep -A 100 "dosu"
+```
+
+Look for comments from:
+
+- `dosu[bot]`
+- `dosu-bot`
+
+Extract Dosu analysis which typically includes:
+
+- Root cause analysis
+- Suggested files to modify
+- Related issues/PRs
+- Potential solutions
+
+Store in ticket data via API:
+
+```json
+{
+  "dosuComment": {
+    "found": true,
+    "analysis": "...",
+    "suggestedFiles": ["src/file1.ts", "src/file2.ts"],
+    "relatedIssues": [100, 101]
+  }
+}
+```
+
+## Extract Linked Issues/PRs
+
+Parse issue body and comments for references:
+
+- `#123` → Issue or PR reference
+- `fixes #123`, `closes #123` → Linked issue
+- `https://github.com/.../issues/123` → Full URL reference
+
+Store in ticket data via API for research phase:
+
+```json
+{
+  "referencedIssues": [100, 101, 102],
+  "referencedPRs": [200, 201]
+}
+```
+
+## Error Handling
+
+### Authentication Error
+
+```
+⚠️ GitHub CLI not authenticated.
+Run: gh auth login
+```
+
+### Issue Not Found
+
+```
+❌ GitHub issue not found or inaccessible.
+- Check the URL is correct
+- Ensure you have access to this repository
+- Run: gh auth status
+```
+
+### Rate Limiting
+
+```
+⚠️ GitHub API rate limited.
+Wait a few minutes and try again.
+Check status: gh api rate_limit
+```

.claude/skills/ticket-intake/providers/notion.md

@@ -0,0 +1,202 @@
+# Notion Provider - Ticket Intake
+
+Provider-specific logic for ingesting tickets from Notion.
+
+## URL Pattern
+
+```
+https://www.notion.so/workspace/Page-Title-abc123def456...
+https://notion.so/Page-Title-abc123def456...
+https://www.notion.so/abc123def456...
+```
+
+Page ID is the 32-character hex string (with or without hyphens).
+
+## Prerequisites
+
+- Notion MCP connected and authenticated
+- If not setup: `claude mcp add --transport http notion https://mcp.notion.com/mcp`
+- Authenticate via `/mcp` command if prompted
+
+## Fetch Ticket Content
+
+Use `Notion:notion-fetch` with the page URL or ID:
+
+```
+Fetch the full page content including all properties
+```
+
+## Extract Ticket Data
+
+Extract these properties (names may vary):
+
+| Property      | Expected Name             | Type         |
+| ------------- | ------------------------- | ------------ |
+| Title         | Name / Title              | Title        |
+| Status        | Status                    | Select       |
+| Assignee      | Assignee / Assigned To    | Person       |
+| Description   | -                         | Page content |
+| Slack Link    | Slack Link / Slack Thread | URL          |
+| GitHub PR     | GitHub PR / PR Link       | URL          |
+| Priority      | Priority                  | Select       |
+| Area          | Area / Category           | Select       |
+| Related Tasks | Related Tasks             | Relation     |
+
+**If properties are missing**: Note what's unavailable and continue with available data.
+
+## Update Source (REQUIRED)
+
+**⚠️ DO NOT SKIP THIS STEP. This is a required action, not optional.**
+
+**⚠️ Notion Write Safety rules apply (see `$PIPELINE_DIR/docs/notion-write-safety.md` for full reference):**
+
+- **Whitelist**: Only `Status`, `GitHub PR`, and `Assignee` fields may be written
+- **Valid transitions**: Not Started → In Progress, In Progress → In Review, In Review → Done
+- **Logging**: Every write attempt MUST be logged with timestamp, field, value, previous value, skill name, and success status
+
+Use `Notion:notion-update-page` to update the ticket:
+
+1. **Status**: Set to "In Progress" (only valid from "Not Started")
+2. **Assignee**: Assign to pipeline owner (Notion ID: `175d872b-594c-81d4-ba5a-0002911c5966`)
+
+```json
+{
+  "page_id": "{page_id_from_ticket}",
+  "command": "update_properties",
+  "properties": {
+    "Status": "In Progress",
+    "Assignee": "175d872b-594c-81d4-ba5a-0002911c5966"
+  }
+}
+```
+
+**After the update succeeds**, log the write via the Pipeline API:
+
+```typescript
+await client.updateTicket(ticketId, {
+  metadata: {
+    ...ticket.metadata,
+    notionWrites: [
+      ...(ticket.metadata?.notionWrites || []),
+      {
+        field: 'Status',
+        value: 'In Progress',
+        previousValue: 'Not Started',
+        at: new Date().toISOString(),
+        skill: 'ticket-intake',
+        success: true
+      }
+    ]
+  }
+})
+```
+
+If update fails, log with `success: false` and continue.
+
+## Notion-Specific Ticket Fields
+
+Store via API using `client.createTicket()`:
+
+```json
+{
+  "source": "notion",
+  "notionPageId": "abc123def456...",
+  "slackLink": "https://slack.com/...",
+  "relatedTasks": ["page-id-1", "page-id-2"]
+}
+```
+
+## Slack Thread Handling
+
+If a Slack link exists, use the `slackdump` skill to fetch the thread content programmatically.
+
+### Slack URL Conversion
+
+Notion stores Slack links in `slackMessage://` format:
+
+```
+slackMessage://comfy-organization.slack.com/CHANNEL_ID/THREAD_TS/MESSAGE_TS
+```
+
+Convert to browser-clickable format:
+
+```
+https://comfy-organization.slack.com/archives/CHANNEL_ID/pMESSAGE_TS_NO_DOT
+```
+
+**Example:**
+
+- Input: `slackMessage://comfy-organization.slack.com/C075ANWQ8KS/1766022478.450909/1764772881.854829`
+- Output: `https://comfy-organization.slack.com/archives/C075ANWQ8KS/p1764772881854829`
+
+(Remove the dot from the last timestamp and prefix with `p`)
+
+### Fetching Thread Content
+
+Load the `slackdump` skill and use the **export-thread** workflow:
+
+```bash
+# Export thread by URL
+slackdump dump "https://comfy-organization.slack.com/archives/CHANNEL_ID/pMESSAGE_TS"
+
+# Or by colon notation (channel_id:thread_ts)
+slackdump dump CHANNEL_ID:THREAD_TS
+```
+
+Save the thread content to `$RUN_DIR/slack-context.md` and include it in the ticket metadata.
+
+> **No manual action required.** The slackdump CLI handles authentication via stored credentials at `~/.cache/slackdump/comfy-organization.bin`.
+
+## Database Reference: Comfy Tasks
+
+The "Comfy Tasks" database has these properties (verify via `notion-search`):
+
+- **Status values**: Not Started, In Progress, In Review, Done
+- **Team assignment**: "Frontend Team" for unassigned tickets
+- **Filtering note**: Team filtering in Notion may have quirks - handle gracefully
+
+### Pipeline Owner Details
+
+When assigning tickets, use these identifiers:
+
+| Platform        | Identifier                             |
+| --------------- | -------------------------------------- |
+| Notion User ID  | `175d872b-594c-81d4-ba5a-0002911c5966` |
+| Notion Name     | Christian Byrne                        |
+| Notion Email    | cbyrne@comfy.org                       |
+| Slack User ID   | U087MJCDHHC                            |
+| GitHub Username | christian-byrne                        |
+
+**To update Assignee**, use the Notion User ID (not name):
+
+```
+properties: {"Assignee": "175d872b-594c-81d4-ba5a-0002911c5966"}
+```
+
+### Finding Active Tickets
+
+To list your active tickets:
+
+```
+Use Notion:notion-search for "Comfy Tasks"
+Filter by Assignee = current user OR Team = "Frontend Team"
+```
+
+## Error Handling
+
+### Authentication Error
+
+```
+⚠️ Notion authentication required.
+Run: claude mcp add --transport http notion https://mcp.notion.com/mcp
+Then authenticate via /mcp command.
+```
+
+### Page Not Found
+
+```
+❌ Notion page not found or inaccessible.
+- Check the URL is correct
+- Ensure you have access to this page
+- Try re-authenticating via /mcp
+```

.claude/skills/ticket-intake/schema.md

@@ -0,0 +1,81 @@
+# Ticket Schema
+
+Common schema for normalized ticket data across all sources. This data is stored and retrieved via the Pipeline API, not local files.
+
+## Ticket Data Schema
+
+```json
+{
+  // Required fields (all sources)
+  "id": "string", // Unique identifier (short form)
+  "url": "string", // Original URL
+  "source": "notion | github", // Source type
+  "title": "string", // Ticket title
+  "description": "string", // Full description/body
+  "fetchedAt": "ISO8601", // When ticket was fetched
+
+  // Common optional fields
+  "status": "string", // Current status
+  "assignee": "string", // Assigned user
+  "priority": "string", // Priority level
+  "area": "string", // Category/area
+  "labels": ["string"], // Tags/labels
+  "acceptanceCriteria": ["string"] // List of AC items
+
+  // Source-specific fields (see providers)
+  // Notion: notionPageId, slackLink, relatedTasks, notionWrites
+  // GitHub: githubOwner, githubRepo, githubIssueNumber, linkedPRs, dosuComment, referencedIssues
+}
+```
+
+## Ticket State Schema (via API)
+
+State is managed via the Pipeline API using `client.transitionState()`:
+
+```json
+{
+  "ticketId": "string",
+  "state": "intake | research | planning | implementation | pr_created | done | failed",
+  "stateChangedAt": "ISO8601",
+
+  // Timestamps tracked by API
+  "createdAt": "ISO8601",
+  "updatedAt": "ISO8601"
+}
+```
+
+## Priority Normalization
+
+All sources should normalize to these values:
+
+| Normalized | Description               |
+| ---------- | ------------------------- |
+| Critical   | Production down, security |
+| High       | Blocking work, urgent     |
+| Medium     | Normal priority (default) |
+| Low        | Nice to have, backlog     |
+
+## Status Normalization
+
+Pipeline tracks these statuses internally:
+
+| Status         | Description                  |
+| -------------- | ---------------------------- |
+| research       | Gathering context            |
+| planning       | Creating implementation plan |
+| implementation | Writing code                 |
+| review         | Code review in progress      |
+| qa             | Quality assurance            |
+| done           | PR merged or completed       |
+
+## ID Generation
+
+IDs are generated by the API when creating tickets. For reference:
+
+- **Notion**: First 8 characters of page ID
+- **GitHub**: `gh-{owner}-{repo}-{issue_number}` (sanitized)
+
+Examples:
+
+- Notion: `abc12345`
+- GitHub: `gh-comfy-org-frontend-123`

.github/actions/lint-format-verify/action.yml

@@ -1,31 +0,0 @@
-name: 'Lint and format verify'
-description: >
-  Runs the lint/format/knip verification suite plus a conditional
-  browser-tests typecheck. Shared by ci-lint-format.yaml (PR) and
-  ci-lint-format-queue.yaml (merge queue) so both paths run the exact
-  same checks. The caller is responsible for checkout and frontend setup
-  before invoking this action.
-
-runs:
-  using: composite
-  steps:
-    - name: Detect browser_tests changes
-      id: changed-paths
-      uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-      with:
-        filters: |
-          browser_tests:
-            - 'browser_tests/**'
-
-    - name: Verify lint and format
-      shell: bash
-      run: |
-        pnpm lint
-        pnpm stylelint
-        pnpm format:check
-        pnpm knip
-
-    - name: Typecheck browser tests
-      if: steps.changed-paths.outputs.browser_tests == 'true'
-      shell: bash
-      run: pnpm typecheck:browser

.github/workflows/ci-lint-format-queue.yaml

@@ -1,29 +0,0 @@
-# Description: Lint and format verification for GitHub merge queue runs.
-# Paired with ci-lint-format.yaml — workflow name and job name must match
-# so branch protection resolves a single required check in both the
-# pull_request and merge_group contexts. This file runs verify-only steps
-# with a read-only token; auto-fix and PR comments live in the PR workflow.
-name: 'CI: Lint Format'
-
-on:
-  merge_group:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  lint-and-format:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout merge group ref
-        uses: actions/checkout@v6
-
-      - name: Setup frontend
-        uses: ./.github/actions/setup-frontend
-
-      - name: Verify lint and format
-        uses: ./.github/actions/lint-format-verify

.github/workflows/ci-lint-format.yaml

@@ -1,7 +1,4 @@
-# Description: Linting and code formatting validation for pull requests.
-# Paired with ci-lint-format-queue.yaml - workflow name and job name must
-# match so branch protection resolves a single required check in both the
-# pull_request and merge_group contexts.
+# Description: Linting and code formatting validation for pull requests
 name: 'CI: Lint Format'
 
 on:
@@ -29,6 +26,14 @@ jobs:
       - name: Setup frontend
         uses: ./.github/actions/setup-frontend
 
+      - name: Detect browser_tests changes
+        id: changed-paths
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        with:
+          filters: |
+            browser_tests:
+              - 'browser_tests/**'
+
       - name: Run ESLint with auto-fix
         run: pnpm lint:fix
 
@@ -72,8 +77,16 @@ jobs:
           echo "See CONTRIBUTING.md for more details."
           exit 1
 
-      - name: Verify lint and format
-        uses: ./.github/actions/lint-format-verify
+      - name: Final validation
+        run: |
+          pnpm lint
+          pnpm stylelint
+          pnpm format:check
+          pnpm knip
+
+      - name: Typecheck browser tests
+        if: steps.changed-paths.outputs.browser_tests == 'true'
+        run: pnpm typecheck:browser
 
       - name: Comment on PR about auto-fix
         if: steps.verify-changed-files.outputs.changed == 'true' && github.event.pull_request.head.repo.full_name == github.repository

.github/workflows/ci-tests-e2e.yaml

@@ -8,7 +8,6 @@ on:
   pull_request:
     branches-ignore: [wip/*, draft/*, temp/*]
     paths-ignore: ['**/*.md']
-  merge_group:
   workflow_dispatch:
 
 concurrency:

.github/workflows/ci-tests-unit.yaml

@@ -8,7 +8,6 @@ on:
   pull_request:
     branches-ignore: [wip/*, draft/*, temp/*]
     paths-ignore: ['**/*.md']
-  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

browser_tests/AGENTS.md

@@ -40,39 +40,6 @@ browser_tests/
 - **`fixtures/helpers/`** — Focused helper classes. Domain-specific actions that coordinate multiple page objects (e.g. canvas operations, workflow loading).
 - **`fixtures/utils/`** — Pure utility functions. No `Page` dependency; stateless helpers that can be used anywhere.
 
-## Page Object Locator Style
-
-Define UI element locators as `public readonly` properties assigned in the constructor — not as getter methods. Getters that simply return a locator add unnecessary indirection and hide the object shape from IDE auto-complete.
-
-```typescript
-// ✅ Correct — public readonly, assigned in constructor
-export class MyDialog extends BaseDialog {
-  public readonly submitButton: Locator
-  public readonly cancelButton: Locator
-
-  constructor(page: Page) {
-    super(page)
-    this.submitButton = this.root.getByRole('button', { name: 'Submit' })
-    this.cancelButton = this.root.getByRole('button', { name: 'Cancel' })
-  }
-}
-
-// ❌ Avoid — getter-based locators
-export class MyDialog extends BaseDialog {
-  get submitButton() {
-    return this.root.getByRole('button', { name: 'Submit' })
-  }
-}
-```
-
-**Keep as getters only when:**
-
-- Lazy initialization is needed (`this._tab ??= new Tab(this.page)`)
-- The value is computed from runtime state (e.g. `get id() { return this.userIds[index] }`)
-- It's a private convenience accessor (e.g. `private get page() { return this.comfyPage.page }`)
-
-When a class has cached locator properties, prefer reusing them in methods rather than rebuilding locators from scratch.
-
 ## Polling Assertions
 
 Prefer `expect.poll()` over `expect(async () => { ... }).toPass()` when the block contains a single async call with a single assertion. `expect.poll()` is more readable and gives better error messages (shows actual vs expected on failure).

browser_tests/FLAKE_PREVENTION_RULES.md

@@ -83,21 +83,6 @@ await expect
   a different reproduction pattern.
 - Verify with the smallest command that exercises the flaky path.
 
-## 7. Common Flake Patterns
-
-| Pattern                               | Bad                                                               | Fix                                                                      |
-| ------------------------------------- | ----------------------------------------------------------------- | ------------------------------------------------------------------------ |
-| **Snapshot-then-assert**              | `expect(await evaluate()).toBe(x)`                                | `await expect.poll(() => evaluate()).toBe(x)`                            |
-| **Immediate boundingBox/layout read** | `const box = await loc.boundingBox(); expect(box!.width).toBe(w)` | `await expect.poll(() => loc.boundingBox().then(b => b?.width)).toBe(w)` |
-| **Immediate graph state after drop**  | `expect(await getLinkCount()).toBe(1)`                            | `await expect.poll(() => getLinkCount()).toBe(1)`                        |
-| **Fake readiness helper**             | Helper that clicks but doesn't assert state                       | Remove; poll the actual value                                            |
-| **nextFrame after menu click**        | `clickMenuItem(x); nextFrame()`                                   | `clickMenuItem(x); contextMenu.waitForHidden()`                          |
-| **Tight poll timeout**                | `expect.poll(..., { timeout: 250 })`                              | ≥2000ms; prefer default (5000ms)                                         |
-| **Immediate count()**                 | `const n = await loc.count(); expect(n).toBe(3)`                  | `await expect(loc).toHaveCount(3)`                                       |
-| **Immediate evaluate after mutation** | `setSetting(); expect(await evaluate()).toBe(x)`                  | `await expect.poll(() => evaluate()).toBe(x)`                            |
-| **Screenshot without readiness**      | `loadWorkflow(); nextFrame(); toHaveScreenshot()`                 | `waitForNodes()` or poll state first                                     |
-| **Non-deterministic node order**      | `getNodeRefsByType('X')[0]` with >1 match                         | `getNodeRefById(id)` or guard `toHaveLength(1)`                          |
-
 ## Current Local Noise
 
 These are local distractions, not automatic CI root causes:

browser_tests/README.md

@@ -210,8 +210,8 @@ Most common testing needs are already addressed by these helpers, which will mak
 
    ```typescript
    // Prefer this:
-   await expect.poll(() => node.isPinned()).toBe(true)
-   await expect.poll(() => node.getProperty('title')).toBe('Expected Title')
+   expect(await node.isPinned()).toBe(true)
+   expect(await node.getProperty('title')).toBe('Expected Title')
 
    // Over this - only use when needed:
    await expect(comfyPage.canvas).toHaveScreenshot('state.png')

browser_tests/assets/cube.obj

@@ -1,40 +0,0 @@
-# Blender 5.2.0 Alpha
-# www.blender.org
-mtllib Untitled.mtl
-o Cube
-v 2.857396 2.486626 -0.081892
-v 2.857396 0.486626 -0.081892
-v 2.857396 2.486626 1.918108
-v 2.857396 0.486626 1.918108
-v 0.857396 2.486626 -0.081892
-v 0.857396 0.486626 -0.081892
-v 0.857396 2.486626 1.918108
-v 0.857396 0.486626 1.918108
-vn -0.0000 1.0000 -0.0000
-vn -0.0000 -0.0000 1.0000
-vn -1.0000 -0.0000 -0.0000
-vn -0.0000 -1.0000 -0.0000
-vn 1.0000 -0.0000 -0.0000
-vn -0.0000 -0.0000 -1.0000
-vt 0.625000 0.500000
-vt 0.875000 0.500000
-vt 0.875000 0.750000
-vt 0.625000 0.750000
-vt 0.375000 0.750000
-vt 0.625000 1.000000
-vt 0.375000 1.000000
-vt 0.375000 0.000000
-vt 0.625000 0.000000
-vt 0.625000 0.250000
-vt 0.375000 0.250000
-vt 0.125000 0.500000
-vt 0.375000 0.500000
-vt 0.125000 0.750000
-s 0
-usemtl Material
-f 1/1/1 5/2/1 7/3/1 3/4/1
-f 4/5/2 3/4/2 7/6/2 8/7/2
-f 8/8/3 7/9/3 5/10/3 6/11/3
-f 6/12/4 2/13/4 4/5/4 8/14/4
-f 2/13/5 1/1/5 3/4/5 4/5/5
-f 6/11/6 5/10/6 1/1/6 2/13/6

browser_tests/fixtures/ComfyMouse.ts

@@ -26,10 +26,11 @@ export class ComfyMouse implements Omit<Mouse, 'move'> {
   static defaultSteps = 5
   static defaultOptions: DragOptions = { steps: ComfyMouse.defaultSteps }
 
-  readonly mouse: Mouse
+  constructor(readonly comfyPage: ComfyPage) {}
 
-  constructor(readonly comfyPage: ComfyPage) {
-    this.mouse = comfyPage.page.mouse
+  /** The normal Playwright {@link Mouse} property from {@link ComfyPage.page}. */
+  get mouse() {
+    return this.comfyPage.page.mouse
   }
 
   async nextFrame() {

browser_tests/fixtures/ComfyPage.ts

@@ -73,13 +73,15 @@ class ComfyMenu {
   public readonly sideToolbar: Locator
   public readonly propertiesPanel: ComfyPropertiesPanel
   public readonly modeToggleButton: Locator
-  public readonly buttons: Locator
 
   constructor(public readonly page: Page) {
     this.sideToolbar = page.getByTestId(TestIds.sidebar.toolbar)
     this.modeToggleButton = page.getByTestId(TestIds.sidebar.modeToggle)
     this.propertiesPanel = new ComfyPropertiesPanel(page)
-    this.buttons = this.sideToolbar.locator('.side-bar-button')
+  }
+
+  get buttons() {
+    return this.sideToolbar.locator('.side-bar-button')
   }
 
   get modelLibraryTab() {
@@ -181,7 +183,6 @@ export class ComfyPage {
   public readonly assetApi: AssetHelper
   public readonly modelLibrary: ModelLibraryHelper
   public readonly cloudAuth: CloudAuthHelper
-  public readonly visibleToasts: Locator
 
   /** Worker index to test user ID */
   public readonly userIds: string[] = []
@@ -224,7 +225,6 @@ export class ComfyPage {
     this.workflow = new WorkflowHelper(this)
     this.contextMenu = new ContextMenu(page)
     this.toast = new ToastHelper(page)
-    this.visibleToasts = this.toast.visibleToasts
     this.dragDrop = new DragDropHelper(page)
     this.featureFlags = new FeatureFlagHelper(page)
     this.command = new CommandHelper(page)
@@ -237,6 +237,10 @@ export class ComfyPage {
     this.cloudAuth = new CloudAuthHelper(page)
   }
 
+  get visibleToasts() {
+    return this.toast.visibleToasts
+  }
+
   async setupUser(username: string) {
     const res = await this.request.get(`${this.url}/api/users`)
     if (res.status() !== 200)
@@ -388,8 +392,9 @@ export class ComfyPage {
     await modal.waitFor({ state: 'hidden' })
   }
 
-  get domWidgets(): Locator {
-    return this.page.locator('.dom-widget')
+  /** Get number of DOM widgets on the canvas. */
+  async getDOMWidgetCount() {
+    return await this.page.locator('.dom-widget').count()
   }
 
   async setFocusMode(focusMode: boolean) {

browser_tests/fixtures/UserSelectPage.ts

@@ -1,22 +1,30 @@
-import type { Locator, Page } from '@playwright/test'
+import type { Page } from '@playwright/test'
 import { test as base } from '@playwright/test'
 
 export class UserSelectPage {
-  public readonly selectionUrl: string
-  public readonly container: Locator
-  public readonly newUserInput: Locator
-  public readonly existingUserSelect: Locator
-  public readonly nextButton: Locator
-
   constructor(
     public readonly url: string,
     public readonly page: Page
-  ) {
-    this.selectionUrl = url + '/user-select'
-    this.container = page.locator('#comfy-user-selection')
-    this.newUserInput = this.container.locator('#new-user-input')
-    this.existingUserSelect = this.container.locator('#existing-user-select')
-    this.nextButton = this.container.getByText('Next')
+  ) {}
+
+  get selectionUrl() {
+    return this.url + '/user-select'
+  }
+
+  get container() {
+    return this.page.locator('#comfy-user-selection')
+  }
+
+  get newUserInput() {
+    return this.container.locator('#new-user-input')
+  }
+
+  get existingUserSelect() {
+    return this.container.locator('#existing-user-select')
+  }
+
+  get nextButton() {
+    return this.container.getByText('Next')
   }
 }
 

browser_tests/fixtures/VueNodeHelpers.ts

@@ -7,20 +7,13 @@ import { TestIds } from '@e2e/fixtures/selectors'
 import { VueNodeFixture } from '@e2e/fixtures/utils/vueNodeFixtures'
 
 export class VueNodeHelpers {
+  constructor(private page: Page) {}
+
   /**
    * Get locator for all Vue node components in the DOM
    */
-  public readonly nodes: Locator
-  /**
-   * Get locator for selected Vue node components (using visual selection indicators)
-   */
-  public readonly selectedNodes: Locator
-
-  constructor(private page: Page) {
-    this.nodes = page.locator('[data-node-id]')
-    this.selectedNodes = page.locator(
-      '[data-node-id].outline-node-component-outline'
-    )
+  get nodes(): Locator {
+    return this.page.locator('[data-node-id]')
   }
 
   /**
@@ -30,6 +23,13 @@ export class VueNodeHelpers {
     return this.page.locator(`[data-node-id="${nodeId}"]`)
   }
 
+  /**
+   * Get locator for selected Vue node components (using visual selection indicators)
+   */
+  get selectedNodes(): Locator {
+    return this.page.locator('[data-node-id].outline-node-component-outline')
+  }
+
   /**
    * Get locator for Vue nodes by the node's title (displayed name in the header).
    * Matches against the actual title element, not the full node body.
@@ -48,6 +48,13 @@ export class VueNodeHelpers {
     return await this.nodes.count()
   }
 
+  /**
+   * Get count of selected Vue nodes
+   */
+  async getSelectedNodeCount(): Promise<number> {
+    return await this.selectedNodes.count()
+  }
+
   /**
    * Get all Vue node IDs currently in the DOM
    */

browser_tests/fixtures/components/BaseDialog.ts

@@ -25,7 +25,7 @@ export class BaseDialog {
   }
 
   async close(): Promise<void> {
-    await this.closeButton.click()
+    await this.closeButton.click({ force: true })
     await this.waitForHidden()
   }
 }

browser_tests/fixtures/components/ComfyNodeSearchBox.ts

@@ -3,11 +3,13 @@ import type { Locator, Page } from '@playwright/test'
 
 export class ComfyNodeSearchFilterSelectionPanel {
   readonly root: Locator
-  readonly header: Locator
 
   constructor(public readonly page: Page) {
     this.root = page.getByRole('dialog')
-    this.header = this.root
+  }
+
+  get header() {
+    return this.root
       .locator('div')
       .filter({ hasText: 'Add node filter condition' })
   }
@@ -39,8 +41,6 @@ export class ComfyNodeSearchFilterSelectionPanel {
 export class ComfyNodeSearchBox {
   public readonly input: Locator
   public readonly dropdown: Locator
-  public readonly filterButton: Locator
-  public readonly filterChips: Locator
   public readonly filterSelectionPanel: ComfyNodeSearchFilterSelectionPanel
 
   constructor(public readonly page: Page) {
@@ -50,15 +50,13 @@ export class ComfyNodeSearchBox {
     this.dropdown = page.locator(
       '.comfy-vue-node-search-container .p-autocomplete-list'
     )
-    this.filterButton = page.locator(
-      '.comfy-vue-node-search-container .filter-button'
-    )
-    this.filterChips = page.locator(
-      '.comfy-vue-node-search-container .p-autocomplete-chip-item'
-    )
     this.filterSelectionPanel = new ComfyNodeSearchFilterSelectionPanel(page)
   }
 
+  get filterButton() {
+    return this.page.locator('.comfy-vue-node-search-container .filter-button')
+  }
+
   async fillAndSelectFirstNode(
     nodeName: string,
     options?: { suggestionIndex?: number; exact?: boolean }
@@ -80,6 +78,12 @@ export class ComfyNodeSearchBox {
     await this.filterSelectionPanel.addFilter(filterValue, filterType)
   }
 
+  get filterChips() {
+    return this.page.locator(
+      '.comfy-vue-node-search-container .p-autocomplete-chip-item'
+    )
+  }
+
   async removeFilter(index: number) {
     await this.filterChips.nth(index).locator('.p-chip-remove-icon').click()
   }

browser_tests/fixtures/components/ContextMenu.ts

@@ -2,14 +2,18 @@ import { expect } from '@playwright/test'
 import type { Locator, Page } from '@playwright/test'
 
 export class ContextMenu {
-  public readonly primeVueMenu: Locator
-  public readonly litegraphMenu: Locator
-  public readonly menuItems: Locator
+  constructor(public readonly page: Page) {}
 
-  constructor(public readonly page: Page) {
-    this.primeVueMenu = page.locator('.p-contextmenu, .p-menu')
-    this.litegraphMenu = page.locator('.litemenu')
-    this.menuItems = page.locator('.p-menuitem, .litemenu-entry')
+  get primeVueMenu() {
+    return this.page.locator('.p-contextmenu, .p-menu')
+  }
+
+  get litegraphMenu() {
+    return this.page.locator('.litemenu')
+  }
+
+  get menuItems() {
+    return this.page.locator('.p-menuitem, .litemenu-entry')
   }
 
   async clickMenuItem(name: string): Promise<void> {
@@ -61,9 +65,21 @@ export class ContextMenu {
   }
 
   async waitForHidden(): Promise<void> {
+    const waitIfExists = async (locator: Locator, menuName: string) => {
+      const count = await locator.count()
+      if (count > 0) {
+        await locator.waitFor({ state: 'hidden' }).catch((error: Error) => {
+          console.warn(
+            `[waitForHidden] ${menuName} waitFor failed:`,
+            error.message
+          )
+        })
+      }
+    }
+
     await Promise.all([
-      this.primeVueMenu.waitFor({ state: 'hidden' }),
-      this.litegraphMenu.waitFor({ state: 'hidden' })
+      waitIfExists(this.primeVueMenu, 'primeVueMenu'),
+      waitIfExists(this.litegraphMenu, 'litegraphMenu')
     ])
   }
 }

browser_tests/fixtures/components/SettingDialog.ts

@@ -1,22 +1,15 @@
-import type { Locator, Page } from '@playwright/test'
+import type { Page } from '@playwright/test'
 
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
 import { BaseDialog } from '@e2e/fixtures/components/BaseDialog'
 
 export class SettingDialog extends BaseDialog {
-  public readonly searchBox: Locator
-  public readonly categories: Locator
-  public readonly contentArea: Locator
-
   constructor(
     page: Page,
     public readonly comfyPage: ComfyPage
   ) {
     super(page, TestIds.dialogs.settings)
-    this.searchBox = this.root.getByPlaceholder(/Search/)
-    this.categories = this.root.locator('nav').getByRole('button')
-    this.contentArea = this.root.getByRole('main')
   }
 
   async open() {
@@ -43,10 +36,22 @@ export class SettingDialog extends BaseDialog {
     await settingInputDiv.locator('input').click()
   }
 
+  get searchBox() {
+    return this.root.getByPlaceholder(/Search/)
+  }
+
+  get categories() {
+    return this.root.locator('nav').getByRole('button')
+  }
+
   category(name: string) {
     return this.root.locator('nav').getByRole('button', { name })
   }
 
+  get contentArea() {
+    return this.root.getByRole('main')
+  }
+
   async goToAboutPanel() {
     const aboutButton = this.root.locator('nav').getByRole('button', {
       name: 'About'

browser_tests/fixtures/components/SidebarTab.ts

@@ -5,16 +5,18 @@ import type { WorkspaceStore } from '@e2e/types/globals'
 import { TestIds } from '@e2e/fixtures/selectors'
 
 class SidebarTab {
-  public readonly tabButton: Locator
-  public readonly selectedTabButton: Locator
-
   constructor(
     public readonly page: Page,
     public readonly tabId: string
-  ) {
-    this.tabButton = page.locator(`.${tabId}-tab-button`)
-    this.selectedTabButton = page.locator(
-      `.${tabId}-tab-button.side-bar-button-selected`
+  ) {}
+
+  get tabButton() {
+    return this.page.locator(`.${this.tabId}-tab-button`)
+  }
+
+  get selectedTabButton() {
+    return this.page.locator(
+      `.${this.tabId}-tab-button.side-bar-button-selected`
     )
   }
 
@@ -33,19 +35,28 @@ class SidebarTab {
 }
 
 export class NodeLibrarySidebarTab extends SidebarTab {
-  public readonly nodeLibrarySearchBoxInput: Locator
-  public readonly nodeLibraryTree: Locator
-  public readonly nodePreview: Locator
-  public readonly tabContainer: Locator
-  public readonly newFolderButton: Locator
-
   constructor(public override readonly page: Page) {
     super(page, 'node-library')
-    this.nodeLibrarySearchBoxInput = page.getByPlaceholder('Search Nodes...')
-    this.nodeLibraryTree = page.getByTestId(TestIds.sidebar.nodeLibrary)
-    this.nodePreview = page.locator('.node-lib-node-preview')
-    this.tabContainer = page.locator('.sidebar-content-container')
-    this.newFolderButton = this.tabContainer.locator('.new-folder-button')
+  }
+
+  get nodeLibrarySearchBoxInput() {
+    return this.page.getByPlaceholder('Search Nodes...')
+  }
+
+  get nodeLibraryTree() {
+    return this.page.getByTestId(TestIds.sidebar.nodeLibrary)
+  }
+
+  get nodePreview() {
+    return this.page.locator('.node-lib-node-preview')
+  }
+
+  get tabContainer() {
+    return this.page.locator('.sidebar-content-container')
+  }
+
+  get newFolderButton() {
+    return this.tabContainer.locator('.new-folder-button')
   }
 
   override async open() {
@@ -90,25 +101,34 @@ export class NodeLibrarySidebarTab extends SidebarTab {
 }
 
 export class NodeLibrarySidebarTabV2 extends SidebarTab {
-  public readonly searchInput: Locator
-  public readonly sidebarContent: Locator
-  public readonly allTab: Locator
-  public readonly blueprintsTab: Locator
-  public readonly sortButton: Locator
-
   constructor(public override readonly page: Page) {
     super(page, 'node-library')
-    this.searchInput = page.getByPlaceholder('Search...')
-    this.sidebarContent = page.locator('.sidebar-content-container')
-    this.allTab = this.getTab('All')
-    this.blueprintsTab = this.getTab('Blueprints')
-    this.sortButton = this.sidebarContent.getByRole('button', { name: 'Sort' })
+  }
+
+  get searchInput() {
+    return this.page.getByPlaceholder('Search...')
+  }
+
+  get sidebarContent() {
+    return this.page.locator('.sidebar-content-container')
   }
 
   getTab(name: string) {
     return this.sidebarContent.getByRole('tab', { name, exact: true })
   }
 
+  get allTab() {
+    return this.getTab('All')
+  }
+
+  get blueprintsTab() {
+    return this.getTab('Blueprints')
+  }
+
+  get sortButton() {
+    return this.sidebarContent.getByRole('button', { name: 'Sort' })
+  }
+
   getFolder(folderName: string) {
     return this.sidebarContent
       .getByRole('treeitem', { name: folderName })
@@ -134,15 +154,12 @@ export class NodeLibrarySidebarTabV2 extends SidebarTab {
 }
 
 export class WorkflowsSidebarTab extends SidebarTab {
-  public readonly root: Locator
-  public readonly activeWorkflowLabel: Locator
-
   constructor(public override readonly page: Page) {
     super(page, 'workflows')
-    this.root = page.getByTestId(TestIds.sidebar.workflows)
-    this.activeWorkflowLabel = this.root.locator(
-      '.comfyui-workflows-open .p-tree-node-selected .node-label'
-    )
+  }
+
+  get root() {
+    return this.page.getByTestId(TestIds.sidebar.workflows)
   }
 
   async getOpenedWorkflowNames() {
@@ -152,7 +169,9 @@ export class WorkflowsSidebarTab extends SidebarTab {
   }
 
   async getActiveWorkflowName() {
-    return await this.activeWorkflowLabel.innerText()
+    return await this.root
+      .locator('.comfyui-workflows-open .p-tree-node-selected .node-label')
+      .innerText()
   }
 
   async getTopLevelSavedWorkflowNames() {
@@ -205,27 +224,36 @@ export class WorkflowsSidebarTab extends SidebarTab {
 }
 
 export class ModelLibrarySidebarTab extends SidebarTab {
-  public readonly searchInput: Locator
-  public readonly modelTree: Locator
-  public readonly refreshButton: Locator
-  public readonly loadAllFoldersButton: Locator
-  public readonly folderNodes: Locator
-  public readonly leafNodes: Locator
-  public readonly modelPreview: Locator
-
   constructor(public override readonly page: Page) {
     super(page, 'model-library')
-    this.searchInput = page.getByPlaceholder('Search Models...')
-    this.modelTree = page.locator('.model-lib-tree-explorer')
-    this.refreshButton = page.getByRole('button', { name: 'Refresh' })
-    this.loadAllFoldersButton = page.getByRole('button', {
-      name: 'Load All Folders'
-    })
-    this.folderNodes = this.modelTree.locator(
-      '.p-tree-node:not(.p-tree-node-leaf)'
-    )
-    this.leafNodes = this.modelTree.locator('.p-tree-node-leaf')
-    this.modelPreview = page.locator('.model-lib-model-preview')
+  }
+
+  get searchInput() {
+    return this.page.getByPlaceholder('Search Models...')
+  }
+
+  get modelTree() {
+    return this.page.locator('.model-lib-tree-explorer')
+  }
+
+  get refreshButton() {
+    return this.page.getByRole('button', { name: 'Refresh' })
+  }
+
+  get loadAllFoldersButton() {
+    return this.page.getByRole('button', { name: 'Load All Folders' })
+  }
+
+  get folderNodes() {
+    return this.modelTree.locator('.p-tree-node:not(.p-tree-node-leaf)')
+  }
+
+  get leafNodes() {
+    return this.modelTree.locator('.p-tree-node-leaf')
+  }
+
+  get modelPreview() {
+    return this.page.locator('.model-lib-model-preview')
   }
 
   override async open() {
@@ -249,95 +277,137 @@ export class ModelLibrarySidebarTab extends SidebarTab {
 }
 
 export class AssetsSidebarTab extends SidebarTab {
-  // --- Tab navigation ---
-  public readonly generatedTab: Locator
-  public readonly importedTab: Locator
-
-  // --- Empty state ---
-  public readonly emptyStateMessage: Locator
-
-  // --- Search & filter ---
-  public readonly searchInput: Locator
-  public readonly settingsButton: Locator
-
-  // --- View mode ---
-  public readonly listViewOption: Locator
-  public readonly gridViewOption: Locator
-
-  // --- Sort options (cloud-only, shown inside settings popover) ---
-  public readonly sortNewestFirst: Locator
-  public readonly sortOldestFirst: Locator
-
-  // --- Asset cards ---
-  public readonly assetCards: Locator
-  public readonly selectedCards: Locator
-
-  // --- List view items ---
-  public readonly listViewItems: Locator
-
-  // --- Selection footer ---
-  public readonly selectionFooter: Locator
-  public readonly selectionCountButton: Locator
-  public readonly deselectAllButton: Locator
-  public readonly deleteSelectedButton: Locator
-  public readonly downloadSelectedButton: Locator
-
-  // --- Folder view ---
-  public readonly backToAssetsButton: Locator
-
-  // --- Loading ---
-  public readonly skeletonLoaders: Locator
-
   constructor(public override readonly page: Page) {
     super(page, 'assets')
-    this.generatedTab = page.getByRole('tab', { name: 'Generated' })
-    this.importedTab = page.getByRole('tab', { name: 'Imported' })
-    this.emptyStateMessage = page.getByText(
+  }
+
+  // --- Tab navigation ---
+
+  get generatedTab() {
+    return this.page.getByRole('tab', { name: 'Generated' })
+  }
+
+  get importedTab() {
+    return this.page.getByRole('tab', { name: 'Imported' })
+  }
+
+  // --- Empty state ---
+
+  get emptyStateMessage() {
+    return this.page.getByText(
       'Upload files or generate content to see them here'
     )
-    this.searchInput = page.getByPlaceholder('Search Assets...')
-    this.settingsButton = page.getByRole('button', { name: 'View settings' })
-    this.listViewOption = page.getByText('List view')
-    this.gridViewOption = page.getByText('Grid view')
-    this.sortNewestFirst = page.getByText('Newest first')
-    this.sortOldestFirst = page.getByText('Oldest first')
-    this.assetCards = page.locator('[role="button"][data-selected]')
-    this.selectedCards = page.locator('[data-selected="true"]')
-    this.listViewItems = page.locator(
-      '.sidebar-content-container [role="button"][tabindex="0"]'
-    )
-    this.selectionFooter = page
-      .locator('.sidebar-content-container')
-      .locator('..')
-      .locator('[class*="h-18"]')
-    this.selectionCountButton = page.getByText(/Assets Selected: \d+/)
-    this.deselectAllButton = page.getByText('Deselect all')
-    this.deleteSelectedButton = page
-      .getByTestId('assets-delete-selected')
-      .or(page.locator('button:has(.icon-\\[lucide--trash-2\\])').last())
-      .first()
-    this.downloadSelectedButton = page
-      .getByTestId('assets-download-selected')
-      .or(page.locator('button:has(.icon-\\[lucide--download\\])').last())
-      .first()
-    this.backToAssetsButton = page.getByText('Back to all assets')
-    this.skeletonLoaders = page.locator(
-      '.sidebar-content-container .animate-pulse'
-    )
   }
 
   emptyStateTitle(title: string) {
     return this.page.getByText(title)
   }
 
-  getAssetCardByName(name: string) {
-    return this.assetCards.filter({ hasText: name })
+  // --- Search & filter ---
+
+  get searchInput() {
+    return this.page.getByPlaceholder('Search Assets...')
   }
 
+  get settingsButton() {
+    return this.page.getByRole('button', { name: 'View settings' })
+  }
+
+  // --- View mode ---
+
+  get listViewOption() {
+    return this.page.getByText('List view')
+  }
+
+  get gridViewOption() {
+    return this.page.getByText('Grid view')
+  }
+
+  // --- Sort options (cloud-only, shown inside settings popover) ---
+
+  get sortNewestFirst() {
+    return this.page.getByText('Newest first')
+  }
+
+  get sortOldestFirst() {
+    return this.page.getByText('Oldest first')
+  }
+
+  // --- Asset cards ---
+
+  get assetCards() {
+    return this.page.locator('[role="button"][data-selected]')
+  }
+
+  getAssetCardByName(name: string) {
+    return this.page.locator('[role="button"][data-selected]', {
+      hasText: name
+    })
+  }
+
+  get selectedCards() {
+    return this.page.locator('[data-selected="true"]')
+  }
+
+  // --- List view items ---
+
+  get listViewItems() {
+    return this.page.locator(
+      '.sidebar-content-container [role="button"][tabindex="0"]'
+    )
+  }
+
+  // --- Selection footer ---
+
+  get selectionFooter() {
+    return this.page
+      .locator('.sidebar-content-container')
+      .locator('..')
+      .locator('[class*="h-18"]')
+  }
+
+  get selectionCountButton() {
+    return this.page.getByText(/Assets Selected: \d+/)
+  }
+
+  get deselectAllButton() {
+    return this.page.getByText('Deselect all')
+  }
+
+  get deleteSelectedButton() {
+    return this.page
+      .getByTestId('assets-delete-selected')
+      .or(this.page.locator('button:has(.icon-\\[lucide--trash-2\\])').last())
+      .first()
+  }
+
+  get downloadSelectedButton() {
+    return this.page
+      .getByTestId('assets-download-selected')
+      .or(this.page.locator('button:has(.icon-\\[lucide--download\\])').last())
+      .first()
+  }
+
+  // --- Context menu ---
+
   contextMenuItem(label: string) {
     return this.page.locator('.p-contextmenu').getByText(label)
   }
 
+  // --- Folder view ---
+
+  get backToAssetsButton() {
+    return this.page.getByText('Back to all assets')
+  }
+
+  // --- Loading ---
+
+  get skeletonLoaders() {
+    return this.page.locator('.sidebar-content-container .animate-pulse')
+  }
+
+  // --- Helpers ---
+
   override async open() {
     // Remove any toast notifications that may overlay the sidebar button
     await this.dismissToasts()
@@ -353,20 +423,24 @@ export class AssetsSidebarTab extends SidebarTab {
     }
     // Wait for all toast elements to fully animate out and detach from DOM
     await expect(this.page.locator('.p-toast-message'))
-      .toHaveCount(0)
+      .toHaveCount(0, { timeout: 5000 })
       .catch(() => {})
   }
 
   async switchToImported() {
     await this.dismissToasts()
     await this.importedTab.click()
-    await expect(this.importedTab).toHaveAttribute('aria-selected', 'true')
+    await expect(this.importedTab).toHaveAttribute('aria-selected', 'true', {
+      timeout: 3000
+    })
   }
 
   async switchToGenerated() {
     await this.dismissToasts()
     await this.generatedTab.click()
-    await expect(this.generatedTab).toHaveAttribute('aria-selected', 'true')
+    await expect(this.generatedTab).toHaveAttribute('aria-selected', 'true', {
+      timeout: 3000
+    })
   }
 
   async openSettingsMenu() {
@@ -389,7 +463,7 @@ export class AssetsSidebarTab extends SidebarTab {
 
   async waitForAssets(count?: number) {
     if (count !== undefined) {
-      await expect(this.assetCards).toHaveCount(count)
+      await expect(this.assetCards).toHaveCount(count, { timeout: 5000 })
     } else {
       await this.assetCards.first().waitFor({ state: 'visible', timeout: 5000 })
     }

browser_tests/fixtures/components/SignInDialog.ts

@@ -10,17 +10,6 @@ export class SignInDialog extends BaseDialog {
   readonly apiKeyButton: Locator
   readonly termsLink: Locator
   readonly privacyLink: Locator
-  readonly heading: Locator
-  readonly signUpLink: Locator
-  readonly signInLink: Locator
-  readonly signUpEmailInput: Locator
-  readonly signUpPasswordInput: Locator
-  readonly signUpConfirmPasswordInput: Locator
-  readonly signUpButton: Locator
-  readonly apiKeyHeading: Locator
-  readonly apiKeyInput: Locator
-  readonly backButton: Locator
-  readonly dividerText: Locator
 
   constructor(page: Page) {
     super(page)
@@ -33,22 +22,6 @@ export class SignInDialog extends BaseDialog {
     })
     this.termsLink = this.root.getByRole('link', { name: 'Terms of Use' })
     this.privacyLink = this.root.getByRole('link', { name: 'Privacy Policy' })
-    this.heading = this.root.getByRole('heading').first()
-    this.signUpLink = this.root.getByText('Sign up', { exact: true })
-    this.signInLink = this.root.getByText('Sign in', { exact: true })
-    this.signUpEmailInput = this.root.locator('#comfy-org-sign-up-email')
-    this.signUpPasswordInput = this.root.locator('#comfy-org-sign-up-password')
-    this.signUpConfirmPasswordInput = this.root.locator(
-      '#comfy-org-sign-up-confirm-password'
-    )
-    this.signUpButton = this.root.getByRole('button', {
-      name: 'Sign up',
-      exact: true
-    })
-    this.apiKeyHeading = this.root.getByRole('heading', { name: 'API Key' })
-    this.apiKeyInput = this.root.locator('#comfy-org-api-key')
-    this.backButton = this.root.getByRole('button', { name: 'Back' })
-    this.dividerText = this.root.getByText('Or continue with')
   }
 
   async open() {
@@ -57,4 +30,48 @@ export class SignInDialog extends BaseDialog {
     })
     await this.waitForVisible()
   }
+
+  get heading() {
+    return this.root.getByRole('heading').first()
+  }
+
+  get signUpLink() {
+    return this.root.getByText('Sign up', { exact: true })
+  }
+
+  get signInLink() {
+    return this.root.getByText('Sign in', { exact: true })
+  }
+
+  get signUpEmailInput() {
+    return this.root.locator('#comfy-org-sign-up-email')
+  }
+
+  get signUpPasswordInput() {
+    return this.root.locator('#comfy-org-sign-up-password')
+  }
+
+  get signUpConfirmPasswordInput() {
+    return this.root.locator('#comfy-org-sign-up-confirm-password')
+  }
+
+  get signUpButton() {
+    return this.root.getByRole('button', { name: 'Sign up', exact: true })
+  }
+
+  get apiKeyHeading() {
+    return this.root.getByRole('heading', { name: 'API Key' })
+  }
+
+  get apiKeyInput() {
+    return this.root.locator('#comfy-org-api-key')
+  }
+
+  get backButton() {
+    return this.root.getByRole('button', { name: 'Back' })
+  }
+
+  get dividerText() {
+    return this.root.getByText('Or continue with')
+  }
 }

browser_tests/fixtures/components/Topbar.ts

@@ -5,12 +5,10 @@ import type { WorkspaceStore } from '@e2e/types/globals'
 export class Topbar {
   private readonly menuLocator: Locator
   private readonly menuTrigger: Locator
-  readonly newWorkflowButton: Locator
 
   constructor(public readonly page: Page) {
     this.menuLocator = page.locator('.comfy-command-menu')
     this.menuTrigger = page.locator('.comfy-menu-button-wrapper')
-    this.newWorkflowButton = page.locator('.new-blank-workflow-button')
   }
 
   async getTabNames(): Promise<string[]> {
@@ -52,6 +50,10 @@ export class Topbar {
     return classes ? !classes.includes('invisible') : false
   }
 
+  get newWorkflowButton(): Locator {
+    return this.page.locator('.new-blank-workflow-button')
+  }
+
   getWorkflowTab(tabName: string): Locator {
     return this.page
       .locator(`.workflow-tabs .workflow-label:has-text("${tabName}")`)
@@ -105,7 +107,7 @@ export class Topbar {
       { timeout: 3000 }
     )
     // Wait for the dialog to close.
-    await this.getSaveDialog().waitFor({ state: 'hidden' })
+    await this.getSaveDialog().waitFor({ state: 'hidden', timeout: 500 })
 
     // Check if a confirmation dialog appeared (e.g., "Overwrite existing file?")
     // If so, return early to let the test handle the confirmation

browser_tests/fixtures/helpers/AppModeHelper.ts

@@ -15,26 +15,6 @@ export class AppModeHelper {
   readonly saveAs: BuilderSaveAsHelper
   readonly select: BuilderSelectHelper
   readonly widgets: AppModeWidgetHelper
-  /** The "Connect an output" popover shown when saving without outputs. */
-  public readonly connectOutputPopover: Locator
-  /** The empty-state placeholder shown when no outputs are selected. */
-  public readonly outputPlaceholder: Locator
-  /** The linear-mode widget list container (visible in app mode). */
-  public readonly linearWidgets: Locator
-  /** The PrimeVue Popover for the image picker (renders with role="dialog"). */
-  public readonly imagePickerPopover: Locator
-  /** The Run button in the app mode footer. */
-  public readonly runButton: Locator
-  /** The welcome screen shown when app mode has no outputs or no nodes. */
-  public readonly welcome: Locator
-  /** The empty workflow message shown when no nodes exist. */
-  public readonly emptyWorkflowText: Locator
-  /** The "Build app" button shown when nodes exist but no outputs. */
-  public readonly buildAppButton: Locator
-  /** The "Back to workflow" button on the welcome screen. */
-  public readonly backToWorkflowButton: Locator
-  /** The "Load template" button shown when no nodes exist. */
-  public readonly loadTemplateButton: Locator
 
   constructor(private readonly comfyPage: ComfyPage) {
     this.steps = new BuilderStepsHelper(comfyPage)
@@ -42,31 +22,6 @@ export class AppModeHelper {
     this.saveAs = new BuilderSaveAsHelper(comfyPage)
     this.select = new BuilderSelectHelper(comfyPage)
     this.widgets = new AppModeWidgetHelper(comfyPage)
-    this.connectOutputPopover = this.page.getByTestId(
-      TestIds.builder.connectOutputPopover
-    )
-    this.outputPlaceholder = this.page.getByTestId(
-      TestIds.builder.outputPlaceholder
-    )
-    this.linearWidgets = this.page.locator('[data-testid="linear-widgets"]')
-    this.imagePickerPopover = this.page
-      .getByRole('dialog')
-      .filter({ has: this.page.getByRole('button', { name: 'All' }) })
-      .first()
-    this.runButton = this.page
-      .getByTestId('linear-run-button')
-      .getByRole('button', { name: /run/i })
-    this.welcome = this.page.getByTestId(TestIds.appMode.welcome)
-    this.emptyWorkflowText = this.page.getByTestId(
-      TestIds.appMode.emptyWorkflow
-    )
-    this.buildAppButton = this.page.getByTestId(TestIds.appMode.buildApp)
-    this.backToWorkflowButton = this.page.getByTestId(
-      TestIds.appMode.backToWorkflow
-    )
-    this.loadTemplateButton = this.page.getByTestId(
-      TestIds.appMode.loadTemplate
-    )
   }
 
   private get page(): Page {
@@ -138,6 +93,61 @@ export class AppModeHelper {
     await this.toggleAppMode()
   }
 
+  /** The "Connect an output" popover shown when saving without outputs. */
+  get connectOutputPopover(): Locator {
+    return this.page.getByTestId(TestIds.builder.connectOutputPopover)
+  }
+
+  /** The empty-state placeholder shown when no outputs are selected. */
+  get outputPlaceholder(): Locator {
+    return this.page.getByTestId(TestIds.builder.outputPlaceholder)
+  }
+
+  /** The linear-mode widget list container (visible in app mode). */
+  get linearWidgets(): Locator {
+    return this.page.locator('[data-testid="linear-widgets"]')
+  }
+
+  /** The PrimeVue Popover for the image picker (renders with role="dialog"). */
+  get imagePickerPopover(): Locator {
+    return this.page
+      .getByRole('dialog')
+      .filter({ has: this.page.getByRole('button', { name: 'All' }) })
+      .first()
+  }
+
+  /** The Run button in the app mode footer. */
+  get runButton(): Locator {
+    return this.page
+      .getByTestId('linear-run-button')
+      .getByRole('button', { name: /run/i })
+  }
+
+  /** The welcome screen shown when app mode has no outputs or no nodes. */
+  get welcome(): Locator {
+    return this.page.getByTestId(TestIds.appMode.welcome)
+  }
+
+  /** The empty workflow message shown when no nodes exist. */
+  get emptyWorkflowText(): Locator {
+    return this.page.getByTestId(TestIds.appMode.emptyWorkflow)
+  }
+
+  /** The "Build app" button shown when nodes exist but no outputs. */
+  get buildAppButton(): Locator {
+    return this.page.getByTestId(TestIds.appMode.buildApp)
+  }
+
+  /** The "Back to workflow" button on the welcome screen. */
+  get backToWorkflowButton(): Locator {
+    return this.page.getByTestId(TestIds.appMode.backToWorkflow)
+  }
+
+  /** The "Load template" button shown when no nodes exist. */
+  get loadTemplateButton(): Locator {
+    return this.page.getByTestId(TestIds.appMode.loadTemplate)
+  }
+
   /**
    * Get the actions menu trigger for a widget in the app mode widget list.
    * @param widgetName Text shown in the widget label (e.g. "seed").

browser_tests/fixtures/helpers/BuilderFooterHelper.ts

@@ -4,32 +4,48 @@ import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
 
 export class BuilderFooterHelper {
-  public readonly nav: Locator
-  public readonly exitButton: Locator
-  public readonly nextButton: Locator
-  public readonly backButton: Locator
-  public readonly saveButton: Locator
-  public readonly saveGroup: Locator
-  public readonly saveAsButton: Locator
-  public readonly saveAsChevron: Locator
-  public readonly opensAsPopover: Locator
-
-  constructor(private readonly comfyPage: ComfyPage) {
-    this.nav = this.page.getByTestId(TestIds.builder.footerNav)
-    this.exitButton = this.buttonByName('Exit app builder')
-    this.nextButton = this.buttonByName('Next')
-    this.backButton = this.buttonByName('Back')
-    this.saveButton = this.page.getByTestId(TestIds.builder.saveButton)
-    this.saveGroup = this.page.getByTestId(TestIds.builder.saveGroup)
-    this.saveAsButton = this.page.getByTestId(TestIds.builder.saveAsButton)
-    this.saveAsChevron = this.page.getByTestId(TestIds.builder.saveAsChevron)
-    this.opensAsPopover = this.page.getByTestId(TestIds.builder.opensAs)
-  }
+  constructor(private readonly comfyPage: ComfyPage) {}
 
   private get page(): Page {
     return this.comfyPage.page
   }
 
+  get nav(): Locator {
+    return this.page.getByTestId(TestIds.builder.footerNav)
+  }
+
+  get exitButton(): Locator {
+    return this.buttonByName('Exit app builder')
+  }
+
+  get nextButton(): Locator {
+    return this.buttonByName('Next')
+  }
+
+  get backButton(): Locator {
+    return this.buttonByName('Back')
+  }
+
+  get saveButton(): Locator {
+    return this.page.getByTestId(TestIds.builder.saveButton)
+  }
+
+  get saveGroup(): Locator {
+    return this.page.getByTestId(TestIds.builder.saveGroup)
+  }
+
+  get saveAsButton(): Locator {
+    return this.page.getByTestId(TestIds.builder.saveAsButton)
+  }
+
+  get saveAsChevron(): Locator {
+    return this.page.getByTestId(TestIds.builder.saveAsChevron)
+  }
+
+  get opensAsPopover(): Locator {
+    return this.page.getByTestId(TestIds.builder.opensAs)
+  }
+
   private buttonByName(name: string): Locator {
     return this.nav.getByRole('button', { name })
   }

browser_tests/fixtures/helpers/BuilderSaveAsHelper.ts

@@ -3,61 +3,73 @@ import type { Locator, Page } from '@playwright/test'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 
 export class BuilderSaveAsHelper {
-  /** The save-as dialog (scoped by aria-labelledby). */
-  public readonly dialog: Locator
-  /** The post-save success dialog (scoped by aria-labelledby). */
-  public readonly successDialog: Locator
-  public readonly title: Locator
-  public readonly radioGroup: Locator
-  public readonly nameInput: Locator
-  public readonly saveButton: Locator
-  public readonly successMessage: Locator
-  public readonly viewAppButton: Locator
-  public readonly closeButton: Locator
-  /** The X button to dismiss the success dialog without any action. */
-  public readonly dismissButton: Locator
-  public readonly exitBuilderButton: Locator
-  public readonly overwriteDialog: Locator
-  public readonly overwriteButton: Locator
-
-  constructor(private readonly comfyPage: ComfyPage) {
-    this.dialog = this.page.locator('[aria-labelledby="builder-save"]')
-    this.successDialog = this.page.locator(
-      '[aria-labelledby="builder-save-success"]'
-    )
-    this.title = this.dialog.getByText('Save as')
-    this.radioGroup = this.dialog.getByRole('radiogroup')
-    this.nameInput = this.dialog.getByRole('textbox')
-    this.saveButton = this.dialog.getByRole('button', { name: 'Save' })
-    this.successMessage = this.successDialog.getByText('Successfully saved')
-    this.viewAppButton = this.successDialog.getByRole('button', {
-      name: 'View app'
-    })
-    this.closeButton = this.successDialog
-      .getByRole('button', { name: 'Close', exact: true })
-      .filter({ hasText: 'Close' })
-    this.dismissButton = this.successDialog.locator(
-      'button.p-dialog-close-button'
-    )
-    this.exitBuilderButton = this.successDialog.getByRole('button', {
-      name: 'Exit builder'
-    })
-    this.overwriteDialog = this.page.getByRole('dialog', {
-      name: 'Overwrite existing file?'
-    })
-    this.overwriteButton = this.overwriteDialog.getByRole('button', {
-      name: 'Overwrite'
-    })
-  }
+  constructor(private readonly comfyPage: ComfyPage) {}
 
   private get page(): Page {
     return this.comfyPage.page
   }
 
+  /** The save-as dialog (scoped by aria-labelledby). */
+  get dialog(): Locator {
+    return this.page.locator('[aria-labelledby="builder-save"]')
+  }
+
+  /** The post-save success dialog (scoped by aria-labelledby). */
+  get successDialog(): Locator {
+    return this.page.locator('[aria-labelledby="builder-save-success"]')
+  }
+
+  get title(): Locator {
+    return this.dialog.getByText('Save as')
+  }
+
+  get radioGroup(): Locator {
+    return this.dialog.getByRole('radiogroup')
+  }
+
+  get nameInput(): Locator {
+    return this.dialog.getByRole('textbox')
+  }
+
   viewTypeRadio(viewType: 'App' | 'Node graph'): Locator {
     return this.dialog.getByRole('radio', { name: viewType })
   }
 
+  get saveButton(): Locator {
+    return this.dialog.getByRole('button', { name: 'Save' })
+  }
+
+  get successMessage(): Locator {
+    return this.successDialog.getByText('Successfully saved')
+  }
+
+  get viewAppButton(): Locator {
+    return this.successDialog.getByRole('button', { name: 'View app' })
+  }
+
+  get closeButton(): Locator {
+    return this.successDialog
+      .getByRole('button', { name: 'Close', exact: true })
+      .filter({ hasText: 'Close' })
+  }
+
+  /** The X button to dismiss the success dialog without any action. */
+  get dismissButton(): Locator {
+    return this.successDialog.locator('button.p-dialog-close-button')
+  }
+
+  get exitBuilderButton(): Locator {
+    return this.successDialog.getByRole('button', { name: 'Exit builder' })
+  }
+
+  get overwriteDialog(): Locator {
+    return this.page.getByRole('dialog', { name: 'Overwrite existing file?' })
+  }
+
+  get overwriteButton(): Locator {
+    return this.overwriteDialog.getByRole('button', { name: 'Overwrite' })
+  }
+
   async fillAndSave(workflowName: string, viewType: 'App' | 'Node graph') {
     await this.nameInput.fill(workflowName)
     await this.viewTypeRadio(viewType).click()

browser_tests/fixtures/helpers/BuilderSelectHelper.ts

@@ -32,20 +32,7 @@ async function dragByIndex(items: Locator, fromIndex: number, toIndex: number) {
 }
 
 export class BuilderSelectHelper {
-  /** All IoItem locators in the current step sidebar. */
-  public readonly inputItems: Locator
-  /** All IoItem title locators in the inputs step sidebar. */
-  public readonly inputItemTitles: Locator
-  /** All widget label locators in the preview/arrange sidebar. */
-  public readonly previewWidgetLabels: Locator
-
-  constructor(private readonly comfyPage: ComfyPage) {
-    this.inputItems = this.page.getByTestId(TestIds.builder.ioItem)
-    this.inputItemTitles = this.page.getByTestId(TestIds.builder.ioItemTitle)
-    this.previewWidgetLabels = this.page.getByTestId(
-      TestIds.builder.widgetLabel
-    )
-  }
+  constructor(private readonly comfyPage: ComfyPage) {}
 
   private get page(): Page {
     return this.comfyPage.page
@@ -56,9 +43,12 @@ export class BuilderSelectHelper {
    * @param title The widget title shown in the IoItem.
    */
   getInputItemMenu(title: string): Locator {
-    return this.inputItems
+    return this.page
+      .getByTestId(TestIds.builder.ioItem)
       .filter({
-        has: this.inputItemTitles.getByText(title, { exact: true })
+        has: this.page
+          .getByTestId(TestIds.builder.ioItemTitle)
+          .getByText(title, { exact: true })
       })
       .getByTestId(TestIds.builder.widgetActionsMenu)
   }
@@ -160,19 +150,38 @@ export class BuilderSelectHelper {
    * Useful for asserting "Widget not visible" on disconnected inputs.
    */
   getInputItemSubtitle(title: string): Locator {
-    return this.inputItems
+    return this.page
+      .getByTestId(TestIds.builder.ioItem)
       .filter({
-        has: this.inputItemTitles.getByText(title, { exact: true })
+        has: this.page
+          .getByTestId(TestIds.builder.ioItemTitle)
+          .getByText(title, { exact: true })
       })
       .getByTestId(TestIds.builder.ioItemSubtitle)
   }
 
+  /** All IoItem locators in the current step sidebar. */
+  get inputItems(): Locator {
+    return this.page.getByTestId(TestIds.builder.ioItem)
+  }
+
+  /** All IoItem title locators in the inputs step sidebar. */
+  get inputItemTitles(): Locator {
+    return this.page.getByTestId(TestIds.builder.ioItemTitle)
+  }
+
+  /** All widget label locators in the preview/arrange sidebar. */
+  get previewWidgetLabels(): Locator {
+    return this.page.getByTestId(TestIds.builder.widgetLabel)
+  }
+
   /**
    * Drag an IoItem from one index to another in the inputs step.
    * Items are identified by their 0-based position among visible IoItems.
    */
   async dragInputItem(fromIndex: number, toIndex: number) {
-    await dragByIndex(this.inputItems, fromIndex, toIndex)
+    const items = this.page.getByTestId(TestIds.builder.ioItem)
+    await dragByIndex(items, fromIndex, toIndex)
     await this.comfyPage.nextFrame()
   }
 

browser_tests/fixtures/helpers/BuilderStepsHelper.ts

@@ -3,16 +3,16 @@ import type { Locator, Page } from '@playwright/test'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 
 export class BuilderStepsHelper {
-  public readonly toolbar: Locator
-
-  constructor(private readonly comfyPage: ComfyPage) {
-    this.toolbar = this.page.getByRole('navigation', { name: 'App Builder' })
-  }
+  constructor(private readonly comfyPage: ComfyPage) {}
 
   private get page(): Page {
     return this.comfyPage.page
   }
 
+  get toolbar(): Locator {
+    return this.page.getByRole('navigation', { name: 'App Builder' })
+  }
+
   async goToInputs() {
     await this.toolbar.getByRole('button', { name: 'Inputs' }).click()
     await this.comfyPage.nextFrame()

browser_tests/fixtures/helpers/Load3DFixtures.ts

@@ -1,25 +0,0 @@
-import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
-import { Load3DHelper } from '@e2e/tests/load3d/Load3DHelper'
-import { Load3DViewerHelper } from '@e2e/tests/load3d/Load3DViewerHelper'
-
-export const load3dTest = comfyPageFixture.extend<{
-  load3d: Load3DHelper
-}>({
-  load3d: async ({ comfyPage }, use) => {
-    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
-    await comfyPage.workflow.loadWorkflow('3d/load3d_node')
-    await comfyPage.vueNodes.waitForNodes()
-
-    const node = comfyPage.vueNodes.getNodeLocator('1')
-    await use(new Load3DHelper(node))
-  }
-})
-
-export const load3dViewerTest = load3dTest.extend<{
-  viewer: Load3DViewerHelper
-}>({
-  viewer: async ({ comfyPage }, use) => {
-    await comfyPage.settings.setSetting('Comfy.Load3D.3DViewerEnable', true)
-    await use(new Load3DViewerHelper(comfyPage.page))
-  }
-})

browser_tests/fixtures/helpers/NodeOperationsHelper.ts

@@ -8,13 +8,7 @@ import type { Position, Size } from '@e2e/fixtures/types'
 import { NodeReference } from '@e2e/fixtures/utils/litegraphUtils'
 
 export class NodeOperationsHelper {
-  public readonly promptDialogInput: Locator
-
-  constructor(private comfyPage: ComfyPage) {
-    this.promptDialogInput = this.page.locator(
-      '.p-dialog-content input[type="text"]'
-    )
-  }
+  constructor(private comfyPage: ComfyPage) {}
 
   private get page() {
     return this.comfyPage.page
@@ -161,6 +155,10 @@ export class NodeOperationsHelper {
     await this.comfyPage.nextFrame()
   }
 
+  get promptDialogInput(): Locator {
+    return this.page.locator('.p-dialog-content input[type="text"]')
+  }
+
   async fillPromptDialog(value: string): Promise<void> {
     await this.promptDialogInput.fill(value)
     await this.page.keyboard.press('Enter')

browser_tests/fixtures/helpers/SubgraphHelper.ts

@@ -445,7 +445,7 @@ export class SubgraphHelper {
       await this.rightClickOutputSlot(slotName)
     }
     await this.comfyPage.contextMenu.clickLitegraphMenuItem('Remove Slot')
-    await this.comfyPage.contextMenu.waitForHidden()
+    await this.comfyPage.nextFrame()
   }
 
   async findSubgraphNodeId(): Promise<string> {

browser_tests/fixtures/helpers/ToastHelper.ts

@@ -2,12 +2,20 @@ import { expect } from '@playwright/test'
 import type { Locator, Page } from '@playwright/test'
 
 export class ToastHelper {
-  public readonly visibleToasts: Locator
-  public readonly toastErrors: Locator
+  constructor(private readonly page: Page) {}
 
-  constructor(private readonly page: Page) {
-    this.visibleToasts = page.locator('.p-toast-message:visible')
-    this.toastErrors = page.locator('.p-toast-message.p-toast-message-error')
+  get visibleToasts(): Locator {
+    return this.page.locator('.p-toast-message:visible')
+  }
+
+  async getToastErrorCount(): Promise<number> {
+    return await this.page
+      .locator('.p-toast-message.p-toast-message-error')
+      .count()
+  }
+
+  async getVisibleToastCount(): Promise<number> {
+    return await this.visibleToasts.count()
   }
 
   async closeToasts(requireCount = 0): Promise<void> {
@@ -26,6 +34,6 @@ export class ToastHelper {
     }
 
     // Assert all toasts are closed
-    await expect(this.visibleToasts).toHaveCount(0)
+    await expect(this.visibleToasts).toHaveCount(0, { timeout: 1000 })
   }
 }

browser_tests/fixtures/selectors.ts

@@ -112,7 +112,9 @@ export const TestIds = {
     decrement: 'decrement',
     increment: 'increment',
     domWidgetTextarea: 'dom-widget-textarea',
-    subgraphEnterButton: 'subgraph-enter-button'
+    subgraphEnterButton: 'subgraph-enter-button',
+    formDropdownMenu: 'form-dropdown-menu',
+    formDropdownTrigger: 'form-dropdown-trigger'
   },
   builder: {
     footerNav: 'builder-footer-nav',
@@ -155,12 +157,6 @@ export const TestIds = {
   errors: {
     imageLoadError: 'error-loading-image',
     videoLoadError: 'error-loading-video'
-  },
-  loading: {
-    overlay: 'loading-overlay'
-  },
-  load3dViewer: {
-    sidebar: 'load3d-viewer-sidebar'
   }
 } as const
 
@@ -191,5 +187,3 @@ export type TestIdValue =
   | (typeof TestIds.subgraphEditor)[keyof typeof TestIds.subgraphEditor]
   | (typeof TestIds.queue)[keyof typeof TestIds.queue]
   | (typeof TestIds.errors)[keyof typeof TestIds.errors]
-  | (typeof TestIds.loading)[keyof typeof TestIds.loading]
-  | (typeof TestIds.load3dViewer)[keyof typeof TestIds.load3dViewer]

browser_tests/fixtures/utils/customMatchers.ts

@@ -18,7 +18,7 @@ function makeMatcher<T>(
         ? expect(value, 'Node is ' + type).not
         : expect(value, 'Node is not ' + type)
       assertion.toBeTruthy()
-    }).toPass({ timeout: 5000, ...options })
+    }).toPass({ timeout: 250, ...options })
     return {
       pass: !this.isNot,
       message: () => 'Node is ' + (this.isNot ? 'not ' : '') + type
@@ -30,7 +30,7 @@ export const comfyExpect = expect.extend({
   toBePinned: makeMatcher((n) => n.isPinned(), 'pinned'),
   toBeBypassed: makeMatcher((n) => n.isBypassed(), 'bypassed'),
   toBeCollapsed: makeMatcher((n) => n.isCollapsed(), 'collapsed'),
-  async toHaveFocus(locator: Locator, options = {}) {
+  async toHaveFocus(locator: Locator, options = { timeout: 256 }) {
     await expect
       .poll(
         () => locator.evaluate((el) => el === document.activeElement),

browser_tests/fixtures/utils/vueNodeFixtures.ts

@@ -4,26 +4,38 @@ import { TestIds } from '@e2e/fixtures/selectors'
 
 /** DOM-centric helper for a single Vue-rendered node on the canvas. */
 export class VueNodeFixture {
-  public readonly header: Locator
-  public readonly title: Locator
-  public readonly titleInput: Locator
-  public readonly body: Locator
-  public readonly pinIndicator: Locator
-  public readonly collapseButton: Locator
-  public readonly collapseIcon: Locator
-  public readonly root: Locator
+  constructor(private readonly locator: Locator) {}
 
-  constructor(private readonly locator: Locator) {
-    this.header = locator.locator('[data-testid^="node-header-"]')
-    this.title = locator.locator('[data-testid="node-title"]')
-    this.titleInput = locator.locator('[data-testid="node-title-input"]')
-    this.body = locator.locator('[data-testid^="node-body-"]')
-    this.pinIndicator = locator.getByTestId(TestIds.node.pinIndicator)
-    this.collapseButton = locator.locator(
-      '[data-testid="node-collapse-button"]'
-    )
-    this.collapseIcon = this.collapseButton.locator('i')
-    this.root = locator
+  get header(): Locator {
+    return this.locator.locator('[data-testid^="node-header-"]')
+  }
+
+  get title(): Locator {
+    return this.locator.locator('[data-testid="node-title"]')
+  }
+
+  get titleInput(): Locator {
+    return this.locator.locator('[data-testid="node-title-input"]')
+  }
+
+  get body(): Locator {
+    return this.locator.locator('[data-testid^="node-body-"]')
+  }
+
+  get pinIndicator(): Locator {
+    return this.locator.getByTestId(TestIds.node.pinIndicator)
+  }
+
+  get collapseButton(): Locator {
+    return this.locator.locator('[data-testid="node-collapse-button"]')
+  }
+
+  get collapseIcon(): Locator {
+    return this.collapseButton.locator('i')
+  }
+
+  get root(): Locator {
+    return this.locator
   }
 
   async getTitle(): Promise<string> {

browser_tests/helpers/builderTestUtils.ts

@@ -82,9 +82,11 @@ export async function builderSaveAs(
   viewType: 'App' | 'Node graph' = 'App'
 ) {
   await appMode.footer.saveAsButton.click()
-  await comfyExpect(appMode.saveAs.nameInput).toBeVisible()
+  await comfyExpect(appMode.saveAs.nameInput).toBeVisible({ timeout: 5000 })
   await appMode.saveAs.fillAndSave(workflowName, viewType)
-  await comfyExpect(appMode.saveAs.successMessage).toBeVisible()
+  await comfyExpect(appMode.saveAs.successMessage).toBeVisible({
+    timeout: 5000
+  })
 }
 
 /**
@@ -122,21 +124,3 @@ export async function saveAndReopenInAppMode(
 
   await comfyPage.appMode.toggleAppMode()
 }
-
-/**
- * Enter builder, select the given widgets as inputs + SaveImage as output,
- * save as an app, and close the success dialog.
- *
- * Returns on the builder arrange/preview step.
- */
-export async function createAndSaveApp(
-  comfyPage: ComfyPage,
-  appName: string,
-  widgetNames: string[] = ['seed']
-): Promise<void> {
-  await setupBuilder(comfyPage, undefined, widgetNames)
-  await comfyPage.appMode.steps.goToPreview()
-  await builderSaveAs(comfyPage.appMode, appName)
-  await comfyPage.appMode.saveAs.closeButton.click()
-  await comfyPage.nextFrame()
-}

browser_tests/helpers/manageGroupNode.ts

@@ -26,12 +26,9 @@ export class ManageGroupNode {
     await this.footer.getByText('Close').click()
   }
 
-  get selectedNodeTypeSelect(): Locator {
-    return this.header.locator('select').first()
-  }
-
   async getSelectedNodeType() {
-    return await this.selectedNodeTypeSelect.inputValue()
+    const select = this.header.locator('select').first()
+    return await select.inputValue()
   }
 
   async selectNode(name: string) {

browser_tests/helpers/promotedWidgets.ts

@@ -22,24 +22,7 @@ export async function getPromotedWidgets(
 ): Promise<PromotedWidgetEntry[]> {
   const raw = await comfyPage.page.evaluate((id) => {
     const node = window.app!.canvas.graph!.getNodeById(id)
-    const widgets = node?.widgets ?? []
-
-    // Read the live promoted widget views from the host node instead of the
-    // serialized proxyWidgets snapshot, which can lag behind the current graph
-    // state during promotion and cleanup flows.
-    return widgets.flatMap((widget) => {
-      if (
-        widget &&
-        typeof widget === 'object' &&
-        'sourceNodeId' in widget &&
-        typeof widget.sourceNodeId === 'string' &&
-        'sourceWidgetName' in widget &&
-        typeof widget.sourceWidgetName === 'string'
-      ) {
-        return [[widget.sourceNodeId, widget.sourceWidgetName]]
-      }
-      return []
-    })
+    return node?.properties?.proxyWidgets ?? []
   }, nodeId)
 
   return normalizePromotedWidgets(raw)

browser_tests/tests/actionbar.spec.ts

@@ -22,10 +22,10 @@ test.describe('Actionbar', { tag: '@ui' }, () => {
   }) => {
     // Enable change auto-queue mode
     const queueOpts = await comfyPage.actionbar.queueButton.toggleOptions()
-    await expect.poll(() => queueOpts.getMode()).toBe('disabled')
+    expect(await queueOpts.getMode()).toBe('disabled')
     await queueOpts.setMode('change')
     await comfyPage.nextFrame()
-    await expect.poll(() => queueOpts.getMode()).toBe('change')
+    expect(await queueOpts.getMode()).toBe('change')
     await comfyPage.actionbar.queueButton.toggleOptions()
 
     // Intercept the prompt queue endpoint
@@ -124,8 +124,6 @@ test.describe('Actionbar', { tag: '@ui' }, () => {
         force: true
       }
     )
-    await expect(comfyPage.actionbar.root.locator('.actionbar')).toHaveClass(
-      /static/
-    )
+    expect(await comfyPage.actionbar.isDocked()).toBe(true)
   })
 })

browser_tests/tests/appModeDropdownClipping.spec.ts

@@ -4,6 +4,7 @@ import {
   comfyPageFixture as test,
   comfyExpect as expect
 } from '@e2e/fixtures/ComfyPage'
+import { TestIds } from '@e2e/fixtures/selectors'
 
 /**
  * Default workflow widget inputs as [nodeId, widgetName] tuples.
@@ -75,7 +76,9 @@ test.describe('App mode dropdown clipping', { tag: '@ui' }, () => {
     ]
     await comfyPage.appMode.enterAppModeWithInputs(inputs)
 
-    await expect(comfyPage.appMode.linearWidgets).toBeVisible()
+    await expect(comfyPage.appMode.linearWidgets).toBeVisible({
+      timeout: 5000
+    })
 
     // Scroll to bottom so the codec widget is at the clipping edge
     const widgetList = comfyPage.appMode.linearWidgets
@@ -88,25 +91,21 @@ test.describe('App mode dropdown clipping', { tag: '@ui' }, () => {
     await codecSelect.click()
 
     const overlay = comfyPage.page.locator('.p-select-overlay').first()
-    await expect(overlay).toBeVisible()
+    await expect(overlay).toBeVisible({ timeout: 5000 })
 
-    await expect
-      .poll(() =>
-        overlay.evaluate((el) => {
-          const rect = el.getBoundingClientRect()
-          return (
-            rect.top >= 0 &&
-            rect.left >= 0 &&
-            rect.bottom <= window.innerHeight &&
-            rect.right <= window.innerWidth
-          )
-        })
+    const isInViewport = await overlay.evaluate((el) => {
+      const rect = el.getBoundingClientRect()
+      return (
+        rect.top >= 0 &&
+        rect.left >= 0 &&
+        rect.bottom <= window.innerHeight &&
+        rect.right <= window.innerWidth
       )
-      .toBe(true)
+    })
+    expect(isInViewport).toBe(true)
 
-    await expect
-      .poll(() => overlay.evaluate(isClippedByAnyAncestor))
-      .toBe(false)
+    const isClipped = await overlay.evaluate(isClippedByAnyAncestor)
+    expect(isClipped).toBe(false)
   })
 
   test('FormDropdown popup is not clipped in app mode panel', async ({
@@ -121,7 +120,9 @@ test.describe('App mode dropdown clipping', { tag: '@ui' }, () => {
     ]
     await comfyPage.appMode.enterAppModeWithInputs(inputs)
 
-    await expect(comfyPage.appMode.linearWidgets).toBeVisible()
+    await expect(comfyPage.appMode.linearWidgets).toBeVisible({
+      timeout: 5000
+    })
 
     // Scroll to bottom so the image widget is at the clipping edge
     const widgetList = comfyPage.appMode.linearWidgets
@@ -137,27 +138,23 @@ test.describe('App mode dropdown clipping', { tag: '@ui' }, () => {
     const dropdownButton = imageRow.locator('button:has(> span)').first()
     await dropdownButton.click()
 
-    // The unstyled PrimeVue Popover renders with role="dialog".
-    // Locate the one containing the image grid (filter buttons like "All", "Inputs").
-    const popover = comfyPage.appMode.imagePickerPopover
-    await expect(popover).toBeVisible()
+    const menu = comfyPage.page
+      .getByTestId(TestIds.widgets.formDropdownMenu)
+      .first()
+    await expect(menu).toBeVisible({ timeout: 5000 })
 
-    await expect
-      .poll(() =>
-        popover.evaluate((el) => {
-          const rect = el.getBoundingClientRect()
-          return (
-            rect.top >= 0 &&
-            rect.left >= 0 &&
-            rect.bottom <= window.innerHeight &&
-            rect.right <= window.innerWidth
-          )
-        })
+    const isInViewport = await menu.evaluate((el) => {
+      const rect = el.getBoundingClientRect()
+      return (
+        rect.top >= 0 &&
+        rect.left >= 0 &&
+        rect.bottom <= window.innerHeight &&
+        rect.right <= window.innerWidth
       )
-      .toBe(true)
+    })
+    expect(isInViewport).toBe(true)
 
-    await expect
-      .poll(() => popover.evaluate(isClippedByAnyAncestor))
-      .toBe(false)
+    const isClipped = await menu.evaluate(isClippedByAnyAncestor)
+    expect(isClipped).toBe(false)
   })
 })

browser_tests/tests/appModeWelcome.spec.ts

@@ -1,7 +1,7 @@
 import {
   comfyPageFixture as test,
   comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
+} from '../fixtures/ComfyPage'
 
 test.describe('App mode welcome states', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {

browser_tests/tests/appModeWidgetRename.spec.ts

@@ -26,7 +26,7 @@ test.describe('App mode widget rename', { tag: ['@ui', '@subgraph'] }, () => {
     await appMode.steps.goToInputs()
 
     const menu = appMode.select.getInputItemMenu('seed')
-    await expect(menu).toBeVisible()
+    await expect(menu).toBeVisible({ timeout: 5000 })
     await appMode.select.renameInputViaMenu('seed', 'Builder Input Seed')
 
     // Verify in app mode after save/reload
@@ -34,7 +34,7 @@ test.describe('App mode widget rename', { tag: ['@ui', '@subgraph'] }, () => {
     const workflowName = `${new Date().getTime()} builder-input-menu`
     await saveAndReopenInAppMode(comfyPage, workflowName)
 
-    await expect(appMode.linearWidgets).toBeVisible()
+    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
     await expect(
       appMode.linearWidgets.getByText('Builder Input Seed')
     ).toBeVisible()
@@ -54,7 +54,7 @@ test.describe('App mode widget rename', { tag: ['@ui', '@subgraph'] }, () => {
     const workflowName = `${new Date().getTime()} builder-input-dblclick`
     await saveAndReopenInAppMode(comfyPage, workflowName)
 
-    await expect(appMode.linearWidgets).toBeVisible()
+    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
     await expect(appMode.linearWidgets.getByText('Dblclick Seed')).toBeVisible()
   })
 
@@ -65,7 +65,7 @@ test.describe('App mode widget rename', { tag: ['@ui', '@subgraph'] }, () => {
     await appMode.steps.goToPreview()
 
     const menu = appMode.select.getPreviewWidgetMenu('seed — New Subgraph')
-    await expect(menu).toBeVisible()
+    await expect(menu).toBeVisible({ timeout: 5000 })
     await appMode.select.renameWidget(menu, 'Preview Seed')
 
     // Verify in app mode after save/reload
@@ -73,7 +73,7 @@ test.describe('App mode widget rename', { tag: ['@ui', '@subgraph'] }, () => {
     const workflowName = `${new Date().getTime()} builder-preview`
     await saveAndReopenInAppMode(comfyPage, workflowName)
 
-    await expect(appMode.linearWidgets).toBeVisible()
+    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
     await expect(appMode.linearWidgets.getByText('Preview Seed')).toBeVisible()
   })
 
@@ -85,7 +85,7 @@ test.describe('App mode widget rename', { tag: ['@ui', '@subgraph'] }, () => {
     await appMode.footer.exitBuilder()
     await appMode.toggleAppMode()
 
-    await expect(appMode.linearWidgets).toBeVisible()
+    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
 
     const menu = appMode.getAppModeWidgetMenu('seed')
     await appMode.select.renameWidget(menu, 'App Mode Seed')
@@ -97,7 +97,7 @@ test.describe('App mode widget rename', { tag: ['@ui', '@subgraph'] }, () => {
     const workflowName = `${new Date().getTime()} app-mode`
     await saveAndReopenInAppMode(comfyPage, workflowName)
 
-    await expect(appMode.linearWidgets).toBeVisible()
+    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
     await expect(appMode.linearWidgets.getByText('App Mode Seed')).toBeVisible()
   })
 })

browser_tests/tests/appModeWidgetValues.spec.ts

@@ -63,7 +63,7 @@ test.describe('App mode widget values in prompt', { tag: '@ui' }, () => {
       ({ nodeId, widgetName }) => [nodeId, widgetName]
     )
     await appMode.enterAppModeWithInputs(inputs)
-    await expect(appMode.linearWidgets).toBeVisible()
+    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
 
     for (const { nodeId, widgetName, type, fill } of WIDGET_TEST_DATA) {
       const key = `${nodeId}:${widgetName}`

browser_tests/tests/bottomPanelShortcuts.spec.ts

@@ -103,15 +103,14 @@ test.describe('Bottom Panel Shortcuts', { tag: '@ui' }, () => {
 
     const keyBadges = bottomPanel.shortcuts.keyBadges
     await keyBadges.first().waitFor({ state: 'visible' })
-    await expect.poll(() => keyBadges.count()).toBeGreaterThanOrEqual(1)
+    const count = await keyBadges.count()
+    expect(count).toBeGreaterThanOrEqual(1)
 
-    await expect
-      .poll(() => keyBadges.allTextContents())
-      .toEqual(
-        expect.arrayContaining([
-          expect.stringMatching(/^(Ctrl|Cmd|Shift|Alt)$/)
-        ])
-      )
+    const badgeText = await keyBadges.allTextContents()
+    const hasModifiers = badgeText.some((text) =>
+      ['Ctrl', 'Cmd', 'Shift', 'Alt'].includes(text)
+    )
+    expect(hasModifiers).toBeTruthy()
   })
 
   test('should maintain panel state when switching between panels', async ({
@@ -197,7 +196,8 @@ test.describe('Bottom Panel Shortcuts', { tag: '@ui' }, () => {
     ).toBeVisible()
 
     const subcategoryTitles = bottomPanel.shortcuts.subcategoryTitles
-    await expect.poll(() => subcategoryTitles.count()).toBeGreaterThanOrEqual(2)
+    const titleCount = await subcategoryTitles.count()
+    expect(titleCount).toBeGreaterThanOrEqual(2)
   })
 
   test('should open shortcuts panel with Ctrl+Shift+K', async ({

browser_tests/tests/builderReorder.spec.ts

@@ -6,7 +6,6 @@ import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
 import {
   builderSaveAs,
-  createAndSaveApp,
   openWorkflowFromSidebar,
   setupBuilder
 } from '@e2e/helpers/builderTestUtils'
@@ -22,7 +21,7 @@ async function saveCloseAndReopenAsApp(
   await appMode.steps.goToPreview()
   await builderSaveAs(appMode, workflowName)
   await appMode.saveAs.closeButton.click()
-  await expect(appMode.saveAs.successDialog).not.toBeVisible()
+  await comfyPage.nextFrame()
 
   await appMode.footer.exitBuilder()
   await openWorkflowFromSidebar(comfyPage, workflowName)
@@ -123,7 +122,7 @@ test.describe('Builder input reordering', { tag: '@ui' }, () => {
     const workflowName = `${Date.now()} reorder-preview`
     await saveCloseAndReopenAsApp(comfyPage, appMode, workflowName)
 
-    await expect(appMode.linearWidgets).toBeVisible()
+    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
     await expect(appMode.select.previewWidgetLabels).toHaveText([
       'steps',
       'cfg',
@@ -148,58 +147,11 @@ test.describe('Builder input reordering', { tag: '@ui' }, () => {
     const workflowName = `${Date.now()} reorder-persist`
     await saveCloseAndReopenAsApp(comfyPage, appMode, workflowName)
 
-    await expect(appMode.linearWidgets).toBeVisible()
+    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
     await expect(appMode.select.previewWidgetLabels).toHaveText([
       'steps',
       'cfg',
       'seed'
     ])
   })
-
-  test('Reordering inputs in one app does not corrupt another app', async ({
-    comfyPage
-  }) => {
-    const { appMode } = comfyPage
-    const suffix = String(Date.now())
-    const app1Name = `app1-${suffix}`
-    const app2Name = `app2-${suffix}`
-    const app2Widgets = ['seed', 'steps']
-
-    // Create and save app1 with [seed, steps, cfg]
-    await createAndSaveApp(comfyPage, app1Name, WIDGETS)
-    await appMode.footer.exitBuilder()
-
-    // Create app2 in a new tab so both apps are open simultaneously
-    await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
-    await createAndSaveApp(comfyPage, app2Name, app2Widgets)
-    await appMode.footer.exitBuilder()
-
-    // Switch to app1 tab and enter builder
-    await comfyPage.menu.topbar.getWorkflowTab(app1Name).click()
-    await appMode.enterBuilder()
-    await appMode.steps.goToInputs()
-    await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
-
-    // Reorder app1 inputs: drag 'seed' from first to last
-    await appMode.select.dragInputItem(0, 2)
-    const app1Reordered = ['steps', 'cfg', 'seed']
-    await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
-
-    // Switch to app2 tab and enter builder
-    await appMode.footer.exitBuilder()
-    await comfyPage.menu.topbar.getWorkflowTab(app2Name).click()
-    await appMode.enterBuilder()
-    await appMode.steps.goToInputs()
-
-    // Verify app2 inputs are not corrupted — still [seed, steps]
-    await expect(appMode.select.inputItemTitles).toHaveText(app2Widgets)
-
-    // Switch back to app1 and verify reorder persisted
-    await appMode.footer.exitBuilder()
-    await comfyPage.menu.topbar.getWorkflowTab(app1Name).click()
-    await appMode.enterBuilder()
-    await appMode.steps.goToInputs()
-
-    await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
-  })
 })

browser_tests/tests/builderSaveFlow.spec.ts

@@ -3,7 +3,6 @@ import {
   comfyExpect as expect
 } from '@e2e/fixtures/ComfyPage'
 import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
-import type { BuilderSaveAsHelper } from '@e2e/fixtures/helpers/BuilderSaveAsHelper'
 import {
   builderSaveAs,
   openWorkflowFromSidebar,
@@ -21,19 +20,10 @@ async function reSaveAs(
   viewType: 'App' | 'Node graph'
 ) {
   await appMode.footer.openSaveAsFromChevron()
-  await expect(appMode.saveAs.nameInput).toBeVisible()
+  await expect(appMode.saveAs.nameInput).toBeVisible({ timeout: 5000 })
   await appMode.saveAs.fillAndSave(workflowName, viewType)
 }
 
-async function dismissSuccessDialog(
-  saveAs: BuilderSaveAsHelper,
-  button: 'close' | 'dismiss' = 'close'
-) {
-  const btn = button === 'close' ? saveAs.closeButton : saveAs.dismissButton
-  await btn.click()
-  await expect(saveAs.successDialog).not.toBeVisible()
-}
-
 test.describe('Builder save flow', { tag: ['@ui'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     await comfyPage.appMode.enableLinearMode()
@@ -48,7 +38,7 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await setupBuilder(comfyPage)
     await comfyPage.appMode.footer.saveAsButton.click()
 
-    await expect(saveAs.dialog).toBeVisible()
+    await expect(saveAs.dialog).toBeVisible({ timeout: 5000 })
     await expect(saveAs.nameInput).toBeVisible()
     await expect(saveAs.title).toBeVisible()
     await expect(saveAs.radioGroup).toBeVisible()
@@ -68,7 +58,7 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await setupBuilder(comfyPage)
     await comfyPage.appMode.footer.saveAsButton.click()
 
-    await expect(saveAs.dialog).toBeVisible()
+    await expect(saveAs.dialog).toBeVisible({ timeout: 5000 })
     await saveAs.nameInput.fill('')
     await expect(saveAs.saveButton).toBeDisabled()
   })
@@ -78,7 +68,7 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await setupBuilder(comfyPage)
     await comfyPage.appMode.footer.saveAsButton.click()
 
-    await expect(saveAs.dialog).toBeVisible()
+    await expect(saveAs.dialog).toBeVisible({ timeout: 5000 })
 
     const appRadio = saveAs.viewTypeRadio('App')
     await expect(appRadio).toHaveAttribute('aria-checked', 'true')
@@ -131,17 +121,18 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await setupBuilder(comfyPage)
 
     await builderSaveAs(comfyPage.appMode, `${Date.now()} direct-save`, 'App')
-    await dismissSuccessDialog(saveAs)
+    await saveAs.closeButton.click()
+    await comfyPage.nextFrame()
 
     // Modify the workflow so the save button becomes enabled
     await comfyPage.appMode.steps.goToInputs()
     await comfyPage.appMode.select.deleteInput('seed')
-    await expect(footer.saveButton).toBeEnabled()
+    await expect(footer.saveButton).toBeEnabled({ timeout: 5000 })
 
     await footer.saveButton.click()
     await comfyPage.nextFrame()
 
-    await expect(saveAs.dialog).not.toBeVisible()
+    await expect(saveAs.dialog).not.toBeVisible({ timeout: 2000 })
     await expect(footer.saveButton).toBeDisabled()
   })
 
@@ -152,11 +143,12 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await setupBuilder(comfyPage)
 
     await builderSaveAs(comfyPage.appMode, `${Date.now()} split-btn`, 'App')
-    await dismissSuccessDialog(saveAs)
+    await saveAs.closeButton.click()
+    await comfyPage.nextFrame()
 
     await footer.openSaveAsFromChevron()
 
-    await expect(saveAs.title).toBeVisible()
+    await expect(saveAs.title).toBeVisible({ timeout: 5000 })
     await expect(saveAs.nameInput).toBeVisible()
   })
 
@@ -169,11 +161,8 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await appMode.enterBuilder()
 
     // State 1: Disabled "Save as" (no outputs selected)
-    await expect(appMode.footer.saveAsButton).toBeVisible()
     const disabledBox = await appMode.footer.saveAsButton.boundingBox()
-    if (!disabledBox)
-      throw new Error('saveAsButton boundingBox returned null while visible')
-    const disabledWidth = disabledBox.width
+    expect(disabledBox).toBeTruthy()
 
     // Select I/O to enable the button
     await appMode.steps.goToInputs()
@@ -182,20 +171,19 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await appMode.select.selectOutputNode('Save Image')
 
     // State 2: Enabled "Save as" (unsaved, has outputs)
-    await expect
-      .poll(
-        async () => (await appMode.footer.saveAsButton.boundingBox())?.width
-      )
-      .toBe(disabledWidth)
+    const enabledBox = await appMode.footer.saveAsButton.boundingBox()
+    expect(enabledBox).toBeTruthy()
+    expect(enabledBox!.width).toBe(disabledBox!.width)
 
     // Save the workflow to transition to the Save + chevron state
     await builderSaveAs(appMode, `${Date.now()} width-test`, 'App')
-    await dismissSuccessDialog(appMode.saveAs)
+    await appMode.saveAs.closeButton.click()
+    await comfyPage.nextFrame()
 
     // State 3: Save + chevron button group (saved workflow)
-    await expect
-      .poll(async () => (await appMode.footer.saveGroup.boundingBox())?.width)
-      .toBe(disabledWidth)
+    const saveButtonGroupBox = await appMode.footer.saveGroup.boundingBox()
+    expect(saveButtonGroupBox).toBeTruthy()
+    expect(saveButtonGroupBox!.width).toBe(disabledBox!.width)
   })
 
   test('Connect output popover appears when no outputs selected', async ({
@@ -209,7 +197,7 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
 
     await expect(
       comfyPage.page.getByText('Connect an output', { exact: false })
-    ).toBeVisible()
+    ).toBeVisible({ timeout: 5000 })
   })
 
   test('save as app produces correct extension and linearMode', async ({
@@ -218,13 +206,11 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await setupBuilder(comfyPage)
     await builderSaveAs(comfyPage.appMode, `${Date.now()} app-ext`, 'App')
 
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .toContain('.app.json')
+    const path = await comfyPage.workflow.getActiveWorkflowPath()
+    expect(path).toContain('.app.json')
 
-    await expect
-      .poll(() => comfyPage.workflow.getLinearModeFromGraph())
-      .toBe(true)
+    const linearMode = await comfyPage.workflow.getLinearModeFromGraph()
+    expect(linearMode).toBe(true)
   })
 
   test('save as node graph produces correct extension and linearMode', async ({
@@ -237,15 +223,12 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
       'Node graph'
     )
 
-    await expect(async () => {
-      const path = await comfyPage.workflow.getActiveWorkflowPath()
-      expect(path).toMatch(/\.json$/)
-      expect(path).not.toContain('.app.json')
-    }).toPass({ timeout: 5000 })
+    const path = await comfyPage.workflow.getActiveWorkflowPath()
+    expect(path).toMatch(/\.json$/)
+    expect(path).not.toContain('.app.json')
 
-    await expect
-      .poll(() => comfyPage.workflow.getLinearModeFromGraph())
-      .toBe(false)
+    const linearMode = await comfyPage.workflow.getLinearModeFromGraph()
+    expect(linearMode).toBe(false)
   })
 
   test('save as app View App button enters app mode', async ({ comfyPage }) => {
@@ -253,11 +236,11 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await builderSaveAs(comfyPage.appMode, `${Date.now()} app-view`, 'App')
 
     await comfyPage.appMode.saveAs.viewAppButton.click()
-    await expect(comfyPage.appMode.saveAs.successDialog).not.toBeVisible()
+    await comfyPage.nextFrame()
 
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowActiveAppMode())
-      .toBe('app')
+    expect(await comfyPage.workflow.getActiveWorkflowActiveAppMode()).toBe(
+      'app'
+    )
   })
 
   test('save as node graph Exit builder exits builder mode', async ({
@@ -271,7 +254,7 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     )
 
     await comfyPage.appMode.saveAs.exitBuilderButton.click()
-    await expect(comfyPage.appMode.saveAs.successDialog).not.toBeVisible()
+    await comfyPage.nextFrame()
 
     await expect(comfyPage.appMode.steps.toolbar).not.toBeVisible()
   })
@@ -284,27 +267,27 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
 
     const originalName = `${Date.now()} original`
     await builderSaveAs(appMode, originalName, 'App')
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .toContain('.app.json')
-    await dismissSuccessDialog(appMode.saveAs)
+    const originalPath = await comfyPage.workflow.getActiveWorkflowPath()
+    expect(originalPath).toContain('.app.json')
+    await appMode.saveAs.closeButton.click()
+    await comfyPage.nextFrame()
 
     // Re-save as node graph — creates a copy
     await reSaveAs(appMode, `${Date.now()} copy`, 'Node graph')
-    await expect(appMode.saveAs.successMessage).toBeVisible()
+    await expect(appMode.saveAs.successMessage).toBeVisible({ timeout: 5000 })
 
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .not.toContain('.app.json')
+    const newPath = await comfyPage.workflow.getActiveWorkflowPath()
+    expect(newPath).not.toBe(originalPath)
+    expect(newPath).not.toContain('.app.json')
 
     // Dismiss success dialog, exit app mode, reopen the original
-    await dismissSuccessDialog(appMode.saveAs, 'dismiss')
+    await appMode.saveAs.dismissButton.click()
+    await comfyPage.nextFrame()
     await appMode.toggleAppMode()
     await openWorkflowFromSidebar(comfyPage, originalName)
 
-    await expect
-      .poll(() => comfyPage.workflow.getLinearModeFromGraph())
-      .toBe(true)
+    const linearMode = await comfyPage.workflow.getLinearModeFromGraph()
+    expect(linearMode).toBe(true)
   })
 
   test('save as with same name and same mode overwrites in place', async ({
@@ -315,25 +298,20 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await setupBuilder(comfyPage)
 
     await builderSaveAs(appMode, name, 'App')
-    await dismissSuccessDialog(appMode.saveAs)
+    await appMode.saveAs.closeButton.click()
     await comfyPage.nextFrame()
 
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .toContain('.app.json')
     const pathAfterFirst = await comfyPage.workflow.getActiveWorkflowPath()
 
     await reSaveAs(appMode, name, 'App')
 
-    await expect(appMode.saveAs.overwriteDialog).toBeVisible()
+    await expect(appMode.saveAs.overwriteDialog).toBeVisible({ timeout: 5000 })
     await appMode.saveAs.overwriteButton.click()
-    await expect(appMode.saveAs.overwriteDialog).not.toBeVisible()
 
-    await expect(appMode.saveAs.successMessage).toBeVisible()
+    await expect(appMode.saveAs.successMessage).toBeVisible({ timeout: 5000 })
 
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .toBe(pathAfterFirst)
+    const pathAfterSecond = await comfyPage.workflow.getActiveWorkflowPath()
+    expect(pathAfterSecond).toBe(pathAfterFirst)
   })
 
   test('save as with same name but different mode creates a new file', async ({
@@ -344,38 +322,32 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     await setupBuilder(comfyPage)
 
     await builderSaveAs(appMode, name, 'App')
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .toContain('.app.json')
     const pathAfterFirst = await comfyPage.workflow.getActiveWorkflowPath()
-    await dismissSuccessDialog(appMode.saveAs)
+    expect(pathAfterFirst).toContain('.app.json')
+    await appMode.saveAs.closeButton.click()
+    await comfyPage.nextFrame()
 
     await reSaveAs(appMode, name, 'Node graph')
-    await expect(appMode.saveAs.successMessage).toBeVisible()
+    await expect(appMode.saveAs.successMessage).toBeVisible({ timeout: 5000 })
 
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .not.toBe(pathAfterFirst)
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .toMatch(/\.json$/)
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-      .not.toContain('.app.json')
+    const pathAfterSecond = await comfyPage.workflow.getActiveWorkflowPath()
+    expect(pathAfterSecond).not.toBe(pathAfterFirst)
+    expect(pathAfterSecond).toMatch(/\.json$/)
+    expect(pathAfterSecond).not.toContain('.app.json')
   })
 
   test('save as app workflow reloads in app mode', async ({ comfyPage }) => {
     const name = `${Date.now()} reload-app`
     await setupBuilder(comfyPage)
     await builderSaveAs(comfyPage.appMode, name, 'App')
-    await dismissSuccessDialog(comfyPage.appMode.saveAs, 'dismiss')
+    await comfyPage.appMode.saveAs.dismissButton.click()
+    await comfyPage.nextFrame()
     await comfyPage.appMode.footer.exitBuilder()
 
     await openWorkflowFromSidebar(comfyPage, name)
 
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowInitialMode())
-      .toBe('app')
+    const mode = await comfyPage.workflow.getActiveWorkflowInitialMode()
+    expect(mode).toBe('app')
   })
 
   test('save as node graph workflow reloads in node graph mode', async ({
@@ -384,13 +356,13 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
     const name = `${Date.now()} reload-graph`
     await setupBuilder(comfyPage)
     await builderSaveAs(comfyPage.appMode, name, 'Node graph')
-    await dismissSuccessDialog(comfyPage.appMode.saveAs, 'dismiss')
+    await comfyPage.appMode.saveAs.dismissButton.click()
+    await comfyPage.nextFrame()
     await comfyPage.appMode.toggleAppMode()
 
     await openWorkflowFromSidebar(comfyPage, name)
 
-    await expect
-      .poll(() => comfyPage.workflow.getActiveWorkflowInitialMode())
-      .toBe('graph')
+    const mode = await comfyPage.workflow.getActiveWorkflowInitialMode()
+    expect(mode).toBe('graph')
   })
 })

browser_tests/tests/canvasModeSelector.spec.ts

@@ -1,275 +0,0 @@
-import type { Page } from '@playwright/test'
-import { expect } from '@playwright/test'
-
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-
-const getLocators = (page: Page) => ({
-  trigger: page.getByRole('button', { name: 'Canvas Mode' }),
-  menu: page.getByRole('menu', { name: 'Canvas Mode' }),
-  selectItem: page.getByRole('menuitemradio', { name: 'Select' }),
-  handItem: page.getByRole('menuitemradio', { name: 'Hand' })
-})
-
-const MODES = [
-  {
-    label: 'Select',
-    activateCommand: 'Comfy.Canvas.Unlock',
-    isReadOnly: false,
-    iconPattern: /lucide--mouse-pointer-2/
-  },
-  {
-    label: 'Hand',
-    activateCommand: 'Comfy.Canvas.Lock',
-    isReadOnly: true,
-    iconPattern: /lucide--hand/
-  }
-]
-
-test.describe('CanvasModeSelector', { tag: '@canvas' }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
-    await comfyPage.command.executeCommand('Comfy.Canvas.Unlock')
-    await comfyPage.nextFrame()
-  })
-
-  test.describe('Trigger button', () => {
-    test('visible in canvas toolbar with ARIA markup', async ({
-      comfyPage
-    }) => {
-      const { trigger } = getLocators(comfyPage.page)
-      await expect(trigger).toBeVisible()
-      await expect(trigger).toHaveAttribute('aria-expanded', 'false')
-    })
-
-    for (const mode of MODES) {
-      test(`shows ${mode.label}-mode icon on trigger button`, async ({
-        comfyPage
-      }) => {
-        await comfyPage.command.executeCommand(mode.activateCommand)
-        await comfyPage.nextFrame()
-        const { trigger } = getLocators(comfyPage.page)
-        const modeIcon = trigger.locator('i[aria-hidden="true"]').first()
-        await expect(modeIcon).toHaveClass(mode.iconPattern)
-      })
-    }
-  })
-
-  test.describe('Popover lifecycle', () => {
-    test('opens when trigger is clicked', async ({ comfyPage }) => {
-      const { trigger, menu } = getLocators(comfyPage.page)
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      await expect(trigger).toHaveAttribute('aria-expanded', 'true')
-    })
-
-    test('closes when trigger is clicked again', async ({ comfyPage }) => {
-      const { trigger, menu } = getLocators(comfyPage.page)
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).not.toBeVisible()
-      await expect(trigger).toHaveAttribute('aria-expanded', 'false')
-    })
-
-    test('closes after a mode item is selected', async ({ comfyPage }) => {
-      const { trigger, menu, handItem } = getLocators(comfyPage.page)
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      await handItem.click()
-      await comfyPage.nextFrame()
-      await expect(menu).not.toBeVisible()
-    })
-
-    test('closes when Escape is pressed', async ({ comfyPage }) => {
-      const { trigger, menu, selectItem } = getLocators(comfyPage.page)
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      await selectItem.press('Escape')
-      await comfyPage.nextFrame()
-      await expect(menu).not.toBeVisible()
-      await expect(trigger).toHaveAttribute('aria-expanded', 'false')
-    })
-  })
-
-  test.describe('Mode switching', () => {
-    for (const mode of MODES) {
-      test(`clicking "${mode.label}" sets canvas readOnly=${mode.isReadOnly}`, async ({
-        comfyPage
-      }) => {
-        if (!mode.isReadOnly) {
-          await comfyPage.command.executeCommand('Comfy.Canvas.Lock')
-          await comfyPage.nextFrame()
-        }
-        const { trigger, menu, selectItem, handItem } = getLocators(
-          comfyPage.page
-        )
-        const item = mode.isReadOnly ? handItem : selectItem
-        await trigger.click()
-        await comfyPage.nextFrame()
-        await expect(menu).toBeVisible()
-        await item.click()
-        await comfyPage.nextFrame()
-        await expect
-          .poll(() => comfyPage.canvasOps.isReadOnly())
-          .toBe(mode.isReadOnly)
-      })
-    }
-
-    test('clicking the currently active item is a no-op', async ({
-      comfyPage
-    }) => {
-      expect(
-        await comfyPage.canvasOps.isReadOnly(),
-        'Precondition: canvas starts in Select mode'
-      ).toBe(false)
-      const { trigger, menu, selectItem } = getLocators(comfyPage.page)
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      await selectItem.click()
-      await comfyPage.nextFrame()
-      await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(false)
-    })
-  })
-
-  test.describe('ARIA state', () => {
-    test('aria-checked marks Select active on default load', async ({
-      comfyPage
-    }) => {
-      const { trigger, menu, selectItem, handItem } = getLocators(
-        comfyPage.page
-      )
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      await expect(selectItem).toHaveAttribute('aria-checked', 'true')
-      await expect(handItem).toHaveAttribute('aria-checked', 'false')
-    })
-
-    for (const mode of MODES) {
-      test(`tabindex=0 is on the active "${mode.label}" item`, async ({
-        comfyPage
-      }) => {
-        await comfyPage.command.executeCommand(mode.activateCommand)
-        await comfyPage.nextFrame()
-        const { trigger, menu, selectItem, handItem } = getLocators(
-          comfyPage.page
-        )
-        await trigger.click()
-        await comfyPage.nextFrame()
-        await expect(menu).toBeVisible()
-
-        const activeItem = mode.isReadOnly ? handItem : selectItem
-        const inactiveItem = mode.isReadOnly ? selectItem : handItem
-
-        await expect(activeItem).toHaveAttribute('tabindex', '0')
-        await expect(inactiveItem).toHaveAttribute('tabindex', '-1')
-      })
-    }
-  })
-
-  test.describe('Keyboard navigation', () => {
-    test('ArrowDown moves focus from Select to Hand', async ({ comfyPage }) => {
-      const { trigger, menu, selectItem, handItem } = getLocators(
-        comfyPage.page
-      )
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      await selectItem.press('ArrowDown')
-      await expect(handItem).toBeFocused()
-    })
-
-    test('Escape closes popover and restores focus to trigger', async ({
-      comfyPage
-    }) => {
-      const { trigger, menu, selectItem, handItem } = getLocators(
-        comfyPage.page
-      )
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      await selectItem.press('ArrowDown')
-      await handItem.press('Escape')
-      await comfyPage.nextFrame()
-      await expect(menu).not.toBeVisible()
-      await expect(trigger).toBeFocused()
-    })
-  })
-
-  test.describe('Focus management on open', () => {
-    for (const mode of MODES) {
-      test(`auto-focuses the checked "${mode.label}" item on open`, async ({
-        comfyPage
-      }) => {
-        await comfyPage.command.executeCommand(mode.activateCommand)
-        await comfyPage.nextFrame()
-        const { trigger, menu, selectItem, handItem } = getLocators(
-          comfyPage.page
-        )
-        const item = mode.isReadOnly ? handItem : selectItem
-        await trigger.click()
-        await comfyPage.nextFrame()
-        await expect(menu).toBeVisible()
-        await expect(item).toBeFocused()
-      })
-    }
-  })
-
-  test.describe('Keybinding integration', { tag: '@keyboard' }, () => {
-    test("'H' locks canvas and updates trigger icon to Hand", async ({
-      comfyPage
-    }) => {
-      expect(
-        await comfyPage.canvasOps.isReadOnly(),
-        'Precondition: canvas starts unlocked'
-      ).toBe(false)
-      await comfyPage.canvas.press('KeyH')
-      await comfyPage.nextFrame()
-      expect(await comfyPage.canvasOps.isReadOnly()).toBe(true)
-      const { trigger } = getLocators(comfyPage.page)
-      const modeIcon = trigger.locator('i[aria-hidden="true"]').first()
-      await expect(modeIcon).toHaveClass(/lucide--hand/)
-    })
-
-    test("'V' unlocks canvas and updates trigger icon to Select", async ({
-      comfyPage
-    }) => {
-      await comfyPage.command.executeCommand('Comfy.Canvas.Lock')
-      await comfyPage.nextFrame()
-      expect(
-        await comfyPage.canvasOps.isReadOnly(),
-        'Precondition: canvas starts locked'
-      ).toBe(true)
-      await comfyPage.canvas.press('KeyV')
-      await comfyPage.nextFrame()
-      expect(await comfyPage.canvasOps.isReadOnly()).toBe(false)
-      const { trigger } = getLocators(comfyPage.page)
-      const modeIcon = trigger.locator('i[aria-hidden="true"]').first()
-      await expect(modeIcon).toHaveClass(/lucide--mouse-pointer-2/)
-    })
-  })
-
-  test.describe('Shortcut hint display', () => {
-    test('menu items show non-empty keyboard shortcut text', async ({
-      comfyPage
-    }) => {
-      const { trigger, menu, selectItem, handItem } = getLocators(
-        comfyPage.page
-      )
-      await trigger.click()
-      await comfyPage.nextFrame()
-      await expect(menu).toBeVisible()
-      const selectHint = selectItem.getByTestId('shortcut-hint')
-      const handHint = handItem.getByTestId('shortcut-hint')
-
-      await expect(selectHint).not.toBeEmpty()
-      await expect(handHint).not.toBeEmpty()
-    })
-  })
-})

browser_tests/tests/changeTracker.spec.ts

@@ -1,94 +1,14 @@
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import type { WorkspaceStore } from '@e2e/types/globals'
 import {
   comfyExpect as expect,
   comfyPageFixture as test
 } from '@e2e/fixtures/ComfyPage'
 
-type ChangeTrackerDebugState = {
-  changeCount: number
-  graphMatchesActiveState: boolean
-  isLoadingGraph: boolean
-  isModified: boolean | undefined
-  redoQueueSize: number
-  restoringState: boolean
-  undoQueueSize: number
-}
-
-async function getChangeTrackerDebugState(comfyPage: ComfyPage) {
-  return await comfyPage.page.evaluate(() => {
-    type ChangeTrackerClassLike = {
-      graphEqual: (left: unknown, right: unknown) => boolean
-      isLoadingGraph: boolean
-    }
-
-    type ChangeTrackerLike = {
-      _restoringState: boolean
-      activeState: unknown
-      changeCount: number
-      constructor: ChangeTrackerClassLike
-      redoQueue: unknown[]
-      undoQueue: unknown[]
-    }
-
-    type ActiveWorkflowLike = {
-      changeTracker?: ChangeTrackerLike
-      isModified?: boolean
-    }
-
-    const workflowStore = window.app!.extensionManager as WorkspaceStore
-    const workflow = workflowStore.workflow
-      .activeWorkflow as ActiveWorkflowLike | null
-    const tracker = workflow?.changeTracker
-    if (!workflow || !tracker) {
-      throw new Error('Active workflow change tracker is not available')
-    }
-
-    const currentState = JSON.parse(
-      JSON.stringify(window.app!.rootGraph.serialize())
-    )
-    return {
-      changeCount: tracker.changeCount,
-      graphMatchesActiveState: tracker.constructor.graphEqual(
-        tracker.activeState,
-        currentState
-      ),
-      isLoadingGraph: tracker.constructor.isLoadingGraph,
-      isModified: workflow.isModified,
-      redoQueueSize: tracker.redoQueue.length,
-      restoringState: tracker._restoringState,
-      undoQueueSize: tracker.undoQueue.length
-    } satisfies ChangeTrackerDebugState
-  })
-}
-
-async function waitForChangeTrackerSettled(
-  comfyPage: ComfyPage,
-  expected: Pick<
-    ChangeTrackerDebugState,
-    'isModified' | 'redoQueueSize' | 'undoQueueSize'
-  >
-) {
-  // Visible node flags can flip before undo finishes loadGraphData() and
-  // updates the tracker. Poll the tracker's own settled state so we do not
-  // start the next transaction while checkState() is still gated.
-  await expect
-    .poll(() => getChangeTrackerDebugState(comfyPage))
-    .toMatchObject({
-      changeCount: 0,
-      graphMatchesActiveState: true,
-      isLoadingGraph: false,
-      restoringState: false,
-      ...expected
-    })
-}
-
 async function beforeChange(comfyPage: ComfyPage) {
   await comfyPage.page.evaluate(() => {
     window.app!.canvas!.emitBeforeChange()
   })
 }
-
 async function afterChange(comfyPage: ComfyPage) {
   await comfyPage.page.evaluate(() => {
     window.app!.canvas!.emitAfterChange()
@@ -112,7 +32,7 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
 
       // Save, confirm no errors & workflow modified flag removed
       await comfyPage.menu.topbar.saveWorkflow('undo-redo-test')
-      await expect(comfyPage.toast.toastErrors).toHaveCount(0)
+      await expect.poll(() => comfyPage.toast.getToastErrorCount()).toBe(0)
       await expect
         .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
         .toBe(false)
@@ -139,19 +59,19 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
 
       await comfyPage.keyboard.undo()
       await expect(node).not.toBeBypassed()
-      await waitForChangeTrackerSettled(comfyPage, {
-        isModified: true,
-        redoQueueSize: 1,
-        undoQueueSize: 1
-      })
+      await expect
+        .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
+        .toBe(true)
+      await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(1)
+      await expect.poll(() => comfyPage.workflow.getRedoQueueSize()).toBe(1)
 
       await comfyPage.keyboard.undo()
       await expect(node).not.toBeCollapsed()
-      await waitForChangeTrackerSettled(comfyPage, {
-        isModified: false,
-        redoQueueSize: 2,
-        undoQueueSize: 0
-      })
+      await expect
+        .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
+        .toBe(false)
+      await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(0)
+      await expect.poll(() => comfyPage.workflow.getRedoQueueSize()).toBe(2)
     })
   })
 
@@ -178,11 +98,6 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
     await comfyPage.keyboard.undo()
     await expect(node).not.toBeBypassed()
     await expect(node).not.toBeCollapsed()
-    await waitForChangeTrackerSettled(comfyPage, {
-      isModified: false,
-      redoQueueSize: 2,
-      undoQueueSize: 0
-    })
 
     // Prevent clicks registering a double-click
     await comfyPage.canvasOps.clickEmptySpace()
@@ -198,21 +113,11 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
 
     // End transaction
     await afterChange(comfyPage)
-    await waitForChangeTrackerSettled(comfyPage, {
-      isModified: true,
-      redoQueueSize: 0,
-      undoQueueSize: 1
-    })
 
     // Ensure undo reverts both changes
     await comfyPage.keyboard.undo()
     await expect(node).not.toBeBypassed()
     await expect(node).not.toBeCollapsed()
-    await waitForChangeTrackerSettled(comfyPage, {
-      isModified: false,
-      redoQueueSize: 1,
-      undoQueueSize: 0
-    })
   })
 
   test('Can nest multiple change transactions without adding undo steps', async ({

browser_tests/tests/changeTrackerLoadGuard.spec.ts

@@ -16,7 +16,7 @@ test.describe(
       comfyPage
     }) => {
       // Tab 0: default workflow (7 nodes)
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(7)
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(7)
 
       // Save tab 0 so it has a unique name for tab switching
       await comfyPage.menu.topbar.saveWorkflow('workflow-a')
@@ -42,21 +42,25 @@ test.describe(
 
       // Create tab 1: blank workflow (0 nodes)
       await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
+      await comfyPage.nextFrame()
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
 
       // Switch back to tab 0 (workflow-a).
       const tab0 = comfyPage.menu.topbar.getWorkflowTab('workflow-a')
       await tab0.click()
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(7)
+      await comfyPage.nextFrame()
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(7)
 
       // switch to blank tab and back to verify no corruption
       const tab1 = comfyPage.menu.topbar.getWorkflowTab('Unsaved Workflow')
       await tab1.click()
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
+      await comfyPage.nextFrame()
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
 
       // switch again and verify no corruption
       await tab0.click()
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(7)
+      await comfyPage.nextFrame()
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(7)
     })
   }
 )

browser_tests/tests/cloud-asset-default.spec.ts

@@ -65,28 +65,18 @@ test.describe('Asset-supported node default value', { tag: '@cloud' }, () => {
 
     // Add a new CheckpointLoaderSimple — should use first cloud asset,
     // not the server's object_info default.
+    const widgetValue = await comfyPage.page.evaluate(() => {
+      const node = window.LiteGraph!.createNode('CheckpointLoaderSimple')
+      window.app!.graph.add(node!)
+      const widget = node!.widgets?.find(
+        (w: { name: string }) => w.name === 'ckpt_name'
+      )
+      return String(widget?.value ?? '')
+    })
+
     // Production resolves via getAssetFilename (user_metadata.filename →
     // metadata.filename → asset.name). Test fixtures have no metadata
     // filename, so asset.name is the resolved value.
-    const nodeId = await comfyPage.page.evaluate(() => {
-      const node = window.LiteGraph!.createNode('CheckpointLoaderSimple')
-      window.app!.graph.add(node!)
-      return node!.id
-    })
-
-    await expect
-      .poll(
-        async () => {
-          return await comfyPage.page.evaluate((id) => {
-            const node = window.app!.graph.getNodeById(id)
-            const widget = node?.widgets?.find(
-              (w: { name: string }) => w.name === 'ckpt_name'
-            )
-            return String(widget?.value ?? '')
-          }, nodeId)
-        },
-        { timeout: 10_000 }
-      )
-      .toBe(CLOUD_ASSETS[0].name)
+    expect(widgetValue).toBe(CLOUD_ASSETS[0].name)
   })
 })

browser_tests/tests/collapsedNodeLinks.spec.ts

@@ -35,8 +35,8 @@ test.describe(
       await node.toggleCollapse()
       await comfyPage.nextFrame()
 
-      await expect.poll(async () => await node.boundingBox()).not.toBeNull()
       const box = await node.boundingBox()
+      expect(box).not.toBeNull()
       await comfyPage.page.mouse.move(
         box!.x + box!.width / 2,
         box!.y + box!.height / 2

browser_tests/tests/colorPalette.spec.ts

@@ -157,7 +157,6 @@ test.describe('Color Palette', { tag: ['@screenshot', '@settings'] }, () => {
 
     await comfyPage.workflow.loadWorkflow('nodes/every_node_color')
     await comfyPage.settings.setSetting('Comfy.ColorPalette', 'obsidian_dark')
-    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot(
       'custom-color-palette-obsidian-dark-all-colors.png'
     )
@@ -178,7 +177,7 @@ test.describe('Color Palette', { tag: ['@screenshot', '@settings'] }, () => {
         window.app!.extensionManager as WorkspaceStore
       ).colorPalette.addCustomColorPalette(p)
     }, customColorPalettes.obsidian_dark)
-    await expect(comfyPage.toast.toastErrors).toHaveCount(0)
+    expect(await comfyPage.toast.getToastErrorCount()).toBe(0)
 
     await comfyPage.settings.setSetting('Comfy.ColorPalette', 'obsidian_dark')
     await comfyPage.nextFrame()
@@ -212,14 +211,12 @@ test.describe(
 
       // Drag mouse to force canvas to redraw
       await comfyPage.page.mouse.move(0, 0)
-      await comfyPage.nextFrame()
 
       await expect(comfyPage.canvas).toHaveScreenshot('node-opacity-0.5.png')
 
       await comfyPage.settings.setSetting('Comfy.Node.Opacity', 1.0)
 
       await comfyPage.page.mouse.move(8, 8)
-      await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot('node-opacity-1.png')
     })
 
@@ -228,8 +225,8 @@ test.describe(
     }) => {
       await comfyPage.settings.setSetting('Comfy.Node.Opacity', 0.2)
       await comfyPage.settings.setSetting('Comfy.ColorPalette', 'arc')
-      await comfyPage.page.mouse.move(0, 0)
       await comfyPage.nextFrame()
+      await comfyPage.page.mouse.move(0, 0)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'node-opacity-0.2-arc-theme.png'
       )
@@ -241,38 +238,22 @@ test.describe(
       await comfyPage.settings.setSetting('Comfy.Node.Opacity', 0.5)
       await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light')
       await comfyPage.nextFrame()
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(() => {
-            const graph = window.app!.graph!
-            if (typeof graph.serialize !== 'function') return undefined
-            const parsed = graph.serialize() as {
-              nodes: Array<{ bgcolor?: string; color?: string }>
-            }
-            return parsed.nodes
-          })
-        )
-        .toBeDefined()
-
-      await expect
-        .poll(async () => {
-          const nodes = await comfyPage.page.evaluate(() => {
-            return (
-              window.app!.graph!.serialize() as {
-                nodes: Array<{ bgcolor?: string; color?: string }>
-              }
-            ).nodes
-          })
-          if (!Array.isArray(nodes)) return 'not an array'
-          for (const node of nodes) {
-            if (node.bgcolor && /hsla/.test(node.bgcolor))
-              return `bgcolor contains hsla: ${node.bgcolor}`
-            if (node.color && /hsla/.test(node.color))
-              return `color contains hsla: ${node.color}`
-          }
-          return 'ok'
-        })
-        .toBe('ok')
+      const parsed = await comfyPage.page.evaluate(() => {
+        const graph = window.app!.graph!
+        if (typeof graph.serialize !== 'function') {
+          throw new Error('app.graph.serialize is not available')
+        }
+        return graph.serialize() as {
+          nodes: Array<{ bgcolor?: string; color?: string }>
+        }
+      })
+      expect(parsed.nodes).toBeDefined()
+      expect(Array.isArray(parsed.nodes)).toBe(true)
+      const nodes = parsed.nodes
+      for (const node of nodes) {
+        if (node.bgcolor) expect(node.bgcolor).not.toMatch(/hsla/)
+        if (node.color) expect(node.color).not.toMatch(/hsla/)
+      }
     })
 
     test('should lighten node colors when switching to light theme', async ({

browser_tests/tests/commands.spec.ts

@@ -13,9 +13,7 @@ test.describe('Keybindings', { tag: '@keyboard' }, () => {
     })
 
     await comfyPage.command.executeCommand('TestCommand')
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.foo))
-      .toBe(true)
+    expect(await comfyPage.page.evaluate(() => window.foo)).toBe(true)
   })
 
   test('Should execute async command', async ({ comfyPage }) => {
@@ -29,9 +27,7 @@ test.describe('Keybindings', { tag: '@keyboard' }, () => {
     })
 
     await comfyPage.command.executeCommand('TestCommand')
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.foo))
-      .toBe(true)
+    expect(await comfyPage.page.evaluate(() => window.foo)).toBe(true)
   })
 
   test('Should handle command errors', async ({ comfyPage }) => {
@@ -40,7 +36,7 @@ test.describe('Keybindings', { tag: '@keyboard' }, () => {
     })
 
     await comfyPage.command.executeCommand('TestCommand')
-    await expect(comfyPage.toast.toastErrors).toHaveCount(1)
+    expect(await comfyPage.toast.getToastErrorCount()).toBe(1)
   })
 
   test('Should handle async command errors', async ({ comfyPage }) => {
@@ -53,6 +49,6 @@ test.describe('Keybindings', { tag: '@keyboard' }, () => {
     })
 
     await comfyPage.command.executeCommand('TestCommand')
-    await expect(comfyPage.toast.toastErrors).toHaveCount(1)
+    expect(await comfyPage.toast.getToastErrorCount()).toBe(1)
   })
 })

browser_tests/tests/copyPaste.spec.ts

@@ -149,7 +149,11 @@ test.describe('Copy Paste', { tag: ['@screenshot', '@workflow'] }, () => {
       await comfyPage.canvas.click({ position: { x: 50, y: 500 } })
       await comfyPage.nextFrame()
       await comfyPage.clipboard.paste()
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(3)
+      await expect
+        .poll(() => comfyPage.nodeOps.getGraphNodesCount(), {
+          timeout: 5_000
+        })
+        .toBe(3)
 
       // Step 2: Paste image onto selected LoadImage node
       const loadImageNodes =
@@ -167,10 +171,13 @@ test.describe('Copy Paste', { tag: ['@screenshot', '@workflow'] }, () => {
       await uploadPromise
 
       await expect
-        .poll(async () => {
-          const fileWidget = await loadImageNodes[0].getWidget(0)
-          return fileWidget.getValue()
-        })
+        .poll(
+          async () => {
+            const fileWidget = await loadImageNodes[0].getWidget(0)
+            return fileWidget.getValue()
+          },
+          { timeout: 5_000 }
+        )
         .toContain('image32x32')
       await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(3)
 
@@ -187,7 +194,11 @@ test.describe('Copy Paste', { tag: ['@screenshot', '@workflow'] }, () => {
       )
       await uploadPromise2
 
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(4)
+      await expect
+        .poll(() => comfyPage.nodeOps.getGraphNodesCount(), {
+          timeout: 5_000
+        })
+        .toBe(4)
       const allLoadImageNodes =
         await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
       expect(allLoadImageNodes).toHaveLength(2)

browser_tests/tests/customIcons.spec.ts

@@ -4,19 +4,22 @@ import type { Locator } from '@playwright/test'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
 async function verifyCustomIconSvg(iconElement: Locator) {
-  await expect
-    .poll(async () => {
-      const svgVariable = await iconElement.evaluate((element) =>
-        getComputedStyle(element).getPropertyValue('--svg')
-      )
-      if (!svgVariable) return null
-      const dataUrlMatch = svgVariable.match(
-        /url\("data:image\/svg\+xml,([^"]+)"\)/
-      )
-      if (!dataUrlMatch) return null
-      return decodeURIComponent(dataUrlMatch[1])
-    })
-    .toContain("<svg xmlns='http://www.w3.org/2000/svg'")
+  const svgVariable = await iconElement.evaluate((element) => {
+    const styles = getComputedStyle(element)
+    return styles.getPropertyValue('--svg')
+  })
+
+  expect(svgVariable).toBeTruthy()
+  const dataUrlMatch = svgVariable.match(
+    /url\("data:image\/svg\+xml,([^"]+)"\)/
+  )
+  expect(dataUrlMatch).toBeTruthy()
+
+  const encodedSvg = dataUrlMatch![1]
+  const decodedSvg = decodeURIComponent(encodedSvg)
+
+  // Check for SVG header to confirm it's a valid SVG
+  expect(decodedSvg).toContain("<svg xmlns='http://www.w3.org/2000/svg'")
 }
 
 test.describe('Custom Icons', { tag: '@settings' }, () => {

browser_tests/tests/defaultKeybindings.spec.ts

@@ -41,9 +41,11 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
         await expect(selectedButton).not.toBeVisible()
 
         await comfyPage.canvas.press(key)
+        await comfyPage.nextFrame()
         await expect(selectedButton).toBeVisible()
 
         await comfyPage.canvas.press(key)
+        await comfyPage.nextFrame()
         await expect(selectedButton).not.toBeVisible()
       })
     }
@@ -56,9 +58,8 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       await comfyPage.canvas.press('Alt+Equal')
       await comfyPage.nextFrame()
 
-      await expect
-        .poll(() => comfyPage.canvasOps.getScale())
-        .toBeGreaterThan(initialScale)
+      const newScale = await comfyPage.canvasOps.getScale()
+      expect(newScale).toBeGreaterThan(initialScale)
     })
 
     test("'Alt+-' zooms out", async ({ comfyPage }) => {
@@ -67,17 +68,15 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       await comfyPage.canvas.press('Alt+Minus')
       await comfyPage.nextFrame()
 
-      await expect
-        .poll(() => comfyPage.canvasOps.getScale())
-        .toBeLessThan(initialScale)
+      const newScale = await comfyPage.canvasOps.getScale()
+      expect(newScale).toBeLessThan(initialScale)
     })
 
     test("'.' fits view to nodes", async ({ comfyPage }) => {
       // Set scale very small so fit-view will zoom back to fit nodes
       await comfyPage.canvasOps.setScale(0.1)
-      await expect
-        .poll(() => comfyPage.canvasOps.getScale())
-        .toBeCloseTo(0.1, 1)
+      const scaleBefore = await comfyPage.canvasOps.getScale()
+      expect(scaleBefore).toBeCloseTo(0.1, 1)
 
       // Click canvas to ensure focus is within graph-canvas-container
       await comfyPage.canvas.click({ position: { x: 400, y: 400 } })
@@ -86,30 +85,29 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       await comfyPage.canvas.press('Period')
       await comfyPage.nextFrame()
 
-      await expect
-        .poll(() => comfyPage.canvasOps.getScale())
-        .toBeGreaterThan(0.1)
+      const scaleAfter = await comfyPage.canvasOps.getScale()
+      expect(scaleAfter).toBeGreaterThan(scaleBefore)
     })
 
     test("'h' locks canvas", async ({ comfyPage }) => {
-      await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(false)
+      expect(await comfyPage.canvasOps.isReadOnly()).toBe(false)
 
       await comfyPage.canvas.press('KeyH')
       await comfyPage.nextFrame()
 
-      await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(true)
+      expect(await comfyPage.canvasOps.isReadOnly()).toBe(true)
     })
 
     test("'v' unlocks canvas", async ({ comfyPage }) => {
       // Lock first
       await comfyPage.command.executeCommand('Comfy.Canvas.Lock')
       await comfyPage.nextFrame()
-      await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(true)
+      expect(await comfyPage.canvasOps.isReadOnly()).toBe(true)
 
       await comfyPage.canvas.press('KeyV')
       await comfyPage.nextFrame()
 
-      await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(false)
+      expect(await comfyPage.canvasOps.isReadOnly()).toBe(false)
     })
   })
 
@@ -124,15 +122,15 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       await node.click('title')
       await comfyPage.nextFrame()
 
-      await expect.poll(() => node.isCollapsed()).toBe(false)
+      expect(await node.isCollapsed()).toBe(false)
 
       await comfyPage.canvas.press('Alt+KeyC')
       await comfyPage.nextFrame()
-      await expect.poll(() => node.isCollapsed()).toBe(true)
+      expect(await node.isCollapsed()).toBe(true)
 
       await comfyPage.canvas.press('Alt+KeyC')
       await comfyPage.nextFrame()
-      await expect.poll(() => node.isCollapsed()).toBe(false)
+      expect(await node.isCollapsed()).toBe(false)
     })
 
     test("'Ctrl+m' mutes and unmutes selected nodes", async ({ comfyPage }) => {
@@ -149,16 +147,16 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
           return window.app!.canvas.graph!.getNodeById(nodeId)!.mode
         }, node.id)
 
-      await expect.poll(() => getMode()).toBe(0)
+      expect(await getMode()).toBe(0)
 
       await comfyPage.canvas.press('Control+KeyM')
       await comfyPage.nextFrame()
       // NEVER (2) = muted
-      await expect.poll(() => getMode()).toBe(2)
+      expect(await getMode()).toBe(2)
 
       await comfyPage.canvas.press('Control+KeyM')
       await comfyPage.nextFrame()
-      await expect.poll(() => getMode()).toBe(0)
+      expect(await getMode()).toBe(0)
     })
   })
 
@@ -172,10 +170,12 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
 
       // Toggle off with Alt+m
       await comfyPage.page.keyboard.press('Alt+KeyM')
+      await comfyPage.nextFrame()
       await expect(comfyPage.appMode.linearWidgets).not.toBeVisible()
 
       // Toggle on again
       await comfyPage.page.keyboard.press('Alt+KeyM')
+      await comfyPage.nextFrame()
       await expect(comfyPage.appMode.linearWidgets).toBeVisible()
     })
 
@@ -189,9 +189,11 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       await expect(minimap).toBeVisible()
 
       await comfyPage.page.keyboard.press('Alt+Shift+KeyM')
+      await comfyPage.nextFrame()
       await expect(minimap).not.toBeVisible()
 
       await comfyPage.page.keyboard.press('Alt+Shift+KeyM')
+      await comfyPage.nextFrame()
       await expect(minimap).toBeVisible()
     })
 
@@ -201,9 +203,11 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       await expect(comfyPage.bottomPanel.root).not.toBeVisible()
 
       await comfyPage.page.keyboard.press('Control+Backquote')
+      await comfyPage.nextFrame()
       await expect(comfyPage.bottomPanel.root).toBeVisible()
 
       await comfyPage.page.keyboard.press('Control+Backquote')
+      await comfyPage.nextFrame()
       await expect(comfyPage.bottomPanel.root).not.toBeVisible()
     })
   })
@@ -250,7 +254,7 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
 
       // The Save As dialog should appear (p-dialog overlay)
       const dialogOverlay = comfyPage.page.locator('.p-dialog-mask')
-      await expect(dialogOverlay).toBeVisible()
+      await expect(dialogOverlay).toBeVisible({ timeout: 3000 })
 
       // Dismiss the dialog
       await comfyPage.page.keyboard.press('Escape')
@@ -274,9 +278,7 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       await comfyPage.page.keyboard.press('Control+o')
       await comfyPage.nextFrame()
 
-      await expect
-        .poll(() => comfyPage.page.evaluate(() => window.TestCommand))
-        .toBe(true)
+      expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(true)
     })
   })
 
@@ -284,14 +286,8 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
     test("'Ctrl+Shift+e' converts selection to subgraph", async ({
       comfyPage
     }) => {
-      await expect
-        .poll(
-          () => comfyPage.nodeOps.getGraphNodesCount(),
-          'Default workflow should have multiple nodes'
-        )
-        .toBeGreaterThan(1)
-
       const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
+      expect(initialCount).toBeGreaterThan(1)
 
       // Select all nodes
       await comfyPage.canvas.press('Control+a')
@@ -303,7 +299,9 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
       // After conversion, node count should decrease
       // (multiple nodes replaced by single subgraph node)
       await expect
-        .poll(() => comfyPage.nodeOps.getGraphNodesCount())
+        .poll(() => comfyPage.nodeOps.getGraphNodesCount(), {
+          timeout: 5000
+        })
         .toBeLessThan(initialCount)
     })
 

browser_tests/tests/dialog.spec.ts

@@ -17,9 +17,10 @@ test.describe('Settings', () => {
     await expect(settingsDialog).toBeVisible()
     const contentArea = settingsDialog.locator('main')
     await expect(contentArea).toBeVisible()
-    await expect
-      .poll(() => contentArea.evaluate((el) => el.clientHeight))
-      .toBeGreaterThan(30)
+    const isUsableHeight = await contentArea.evaluate(
+      (el) => el.clientHeight > 30
+    )
+    expect(isUsableHeight).toBeTruthy()
   })
 
   test('Can open settings with hotkey', async ({ comfyPage }) => {
@@ -38,27 +39,27 @@ test.describe('Settings', () => {
     const maxSpeed = 2.5
     await comfyPage.settings.setSetting('Comfy.Graph.ZoomSpeed', maxSpeed)
     await test.step('Setting should persist', async () => {
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.Graph.ZoomSpeed'))
-        .toBe(maxSpeed)
+      expect(await comfyPage.settings.getSetting('Comfy.Graph.ZoomSpeed')).toBe(
+        maxSpeed
+      )
     })
   })
 
   test('Should persist keybinding setting', async ({ comfyPage }) => {
     // Open the settings dialog
     await comfyPage.page.keyboard.press('Control+,')
+    await comfyPage.page.waitForSelector('[data-testid="settings-dialog"]')
 
     // Open the keybinding tab
     const settingsDialog = comfyPage.page.locator(
       '[data-testid="settings-dialog"]'
     )
-    await expect(settingsDialog).toBeVisible()
     await settingsDialog
       .locator('nav [role="button"]', { hasText: 'Keybinding' })
       .click()
-    await expect(
-      comfyPage.page.getByPlaceholder('Search Keybindings...')
-    ).toBeVisible()
+    await comfyPage.page.waitForSelector(
+      '[placeholder="Search Keybindings..."]'
+    )
 
     // Focus the 'New Blank Workflow' row
     const newBlankWorkflowRow = comfyPage.page.locator('tr', {
@@ -155,6 +156,6 @@ test.describe('Signin dialog', () => {
     await input.press('Control+v')
     await expect(input).toHaveValue('test_password')
 
-    await expect.poll(() => comfyPage.nodeOps.getNodeCount()).toBe(nodeNum)
+    expect(await comfyPage.nodeOps.getNodeCount()).toBe(nodeNum)
   })
 })

browser_tests/tests/dialogs/managerDialog.spec.ts

@@ -1,417 +0,0 @@
-import { expect } from '@playwright/test'
-
-import type { AlgoliaNodePack } from '@/types/algoliaTypes'
-import type { components as ManagerComponents } from '@/workbench/extensions/manager/types/generatedManagerTypes'
-import type { components as RegistryComponents } from '@comfyorg/registry-types'
-
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { mockSystemStats } from '@e2e/fixtures/data/systemStats'
-
-type InstalledPacksResponse =
-  ManagerComponents['schemas']['InstalledPacksResponse']
-type RegistryNodePack = RegistryComponents['schemas']['Node']
-
-interface AlgoliaSearchResult {
-  hits: Partial<AlgoliaNodePack>[]
-  nbHits: number
-  page: number
-  nbPages: number
-  hitsPerPage: number
-}
-
-interface AlgoliaSearchResponse {
-  results: AlgoliaSearchResult[]
-}
-
-const MOCK_PACK_A: RegistryNodePack = {
-  id: 'test-pack-a',
-  name: 'Test Pack A',
-  description: 'A test custom node pack',
-  downloads: 5000,
-  status: 'NodeStatusActive',
-  publisher: { id: 'test-publisher', name: 'Test Publisher' },
-  latest_version: { version: '1.0.0', status: 'NodeVersionStatusActive' },
-  repository: 'https://github.com/test/pack-a',
-  tags: ['image', 'processing']
-}
-
-const MOCK_PACK_B: RegistryNodePack = {
-  id: 'test-pack-b',
-  name: 'Test Pack B',
-  description: 'Another test custom node pack for testing search',
-  downloads: 3000,
-  status: 'NodeStatusActive',
-  publisher: { id: 'another-publisher', name: 'Another Publisher' },
-  latest_version: { version: '2.1.0', status: 'NodeVersionStatusActive' },
-  repository: 'https://github.com/test/pack-b',
-  tags: ['video', 'generation']
-}
-
-const MOCK_PACK_C: RegistryNodePack = {
-  id: 'test-pack-c',
-  name: 'Test Pack C',
-  description: 'Third test pack',
-  downloads: 100,
-  status: 'NodeStatusActive',
-  publisher: { id: 'test-publisher', name: 'Test Publisher' },
-  latest_version: { version: '0.5.0', status: 'NodeVersionStatusActive' },
-  repository: 'https://github.com/test/pack-c'
-}
-
-const MOCK_INSTALLED_PACKS: InstalledPacksResponse = {
-  'test-pack-a': {
-    ver: '1.0.0',
-    cnr_id: 'test-pack-a',
-    enabled: true
-  },
-  'test-pack-c': {
-    ver: '0.5.0',
-    cnr_id: 'test-pack-c',
-    enabled: false
-  }
-}
-
-const MOCK_HIT_A: Partial<AlgoliaNodePack> = {
-  objectID: 'test-pack-a',
-  id: 'test-pack-a',
-  name: 'Test Pack A',
-  description: 'A test custom node pack',
-  total_install: 5000,
-  status: 'NodeStatusActive',
-  publisher_id: 'test-publisher',
-  latest_version: '1.0.0',
-  latest_version_status: 'NodeVersionStatusActive',
-  repository_url: 'https://github.com/test/pack-a',
-  comfy_nodes: ['TestNodeA1', 'TestNodeA2'],
-  create_time: '2024-01-01T00:00:00Z',
-  update_time: '2024-06-01T00:00:00Z',
-  license: 'MIT',
-  tags: ['image', 'processing']
-}
-
-const MOCK_HIT_B: Partial<AlgoliaNodePack> = {
-  objectID: 'test-pack-b',
-  id: 'test-pack-b',
-  name: 'Test Pack B',
-  description: 'Another test custom node pack for testing search',
-  total_install: 3000,
-  status: 'NodeStatusActive',
-  publisher_id: 'another-publisher',
-  latest_version: '2.1.0',
-  latest_version_status: 'NodeVersionStatusActive',
-  repository_url: 'https://github.com/test/pack-b',
-  comfy_nodes: ['TestNodeB1'],
-  create_time: '2024-02-01T00:00:00Z',
-  update_time: '2024-07-01T00:00:00Z',
-  license: 'Apache-2.0',
-  tags: ['video', 'generation']
-}
-
-const MOCK_HIT_C: Partial<AlgoliaNodePack> = {
-  objectID: 'test-pack-c',
-  id: 'test-pack-c',
-  name: 'Test Pack C',
-  description: 'Third test pack',
-  total_install: 100,
-  status: 'NodeStatusActive',
-  publisher_id: 'test-publisher',
-  latest_version: '0.5.0',
-  latest_version_status: 'NodeVersionStatusActive',
-  repository_url: 'https://github.com/test/pack-c',
-  comfy_nodes: ['TestNodeC1'],
-  create_time: '2024-03-01T00:00:00Z',
-  update_time: '2024-05-01T00:00:00Z',
-  license: 'MIT'
-}
-
-const MOCK_ALGOLIA_RESPONSE: AlgoliaSearchResponse = {
-  results: [
-    {
-      hits: [MOCK_HIT_A, MOCK_HIT_B, MOCK_HIT_C],
-      nbHits: 3,
-      page: 0,
-      nbPages: 1,
-      hitsPerPage: 20
-    }
-  ]
-}
-
-const MOCK_ALGOLIA_PACK_B_ONLY: AlgoliaSearchResponse = {
-  results: [
-    {
-      hits: [MOCK_HIT_B],
-      nbHits: 1,
-      page: 0,
-      nbPages: 1,
-      hitsPerPage: 20
-    }
-  ]
-}
-
-const MOCK_ALGOLIA_EMPTY: AlgoliaSearchResponse = {
-  results: [
-    {
-      hits: [],
-      nbHits: 0,
-      page: 0,
-      nbPages: 0,
-      hitsPerPage: 20
-    }
-  ]
-}
-
-test.describe('ManagerDialog', { tag: '@ui' }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    const statsWithManager = {
-      ...mockSystemStats,
-      system: {
-        ...mockSystemStats.system,
-        argv: ['main.py', '--listen', '0.0.0.0', '--enable-manager']
-      }
-    }
-    await comfyPage.page.route('**/system_stats**', async (route) => {
-      await route.fulfill({ json: statsWithManager })
-    })
-
-    await comfyPage.featureFlags.mockServerFeatures({
-      'extension.manager.supports_v4': true
-    })
-
-    await comfyPage.page.route(
-      '**/v2/customnode/installed**',
-      async (route) => {
-        await route.fulfill({ json: MOCK_INSTALLED_PACKS })
-      }
-    )
-
-    await comfyPage.page.route(
-      '**/v2/manager/queue/status**',
-      async (route) => {
-        await route.fulfill({
-          json: {
-            history: {},
-            running_queue: [],
-            pending_queue: [],
-            installed_packs: {}
-          }
-        })
-      }
-    )
-
-    await comfyPage.page.route(
-      '**/v2/manager/queue/history**',
-      async (route) => {
-        await route.fulfill({ json: {} })
-      }
-    )
-
-    await comfyPage.page.route('**/*.algolia.net/**', async (route) => {
-      await route.fulfill({ json: MOCK_ALGOLIA_RESPONSE })
-    })
-
-    await comfyPage.page.route('**/*.algolianet.com/**', async (route) => {
-      await route.fulfill({ json: MOCK_ALGOLIA_RESPONSE })
-    })
-
-    // Mock Comfy Registry API (fallback when Algolia credentials are unavailable)
-    const registryListResponse = {
-      total: 3,
-      nodes: [MOCK_PACK_A, MOCK_PACK_B, MOCK_PACK_C],
-      page: 1,
-      limit: 64,
-      totalPages: 1
-    }
-
-    await comfyPage.page.route(
-      '**/api.comfy.org/nodes/search**',
-      async (route) => {
-        await route.fulfill({ json: registryListResponse })
-      }
-    )
-
-    await comfyPage.page.route(
-      (url) => url.hostname === 'api.comfy.org' && url.pathname === '/nodes',
-      async (route) => {
-        await route.fulfill({ json: registryListResponse })
-      }
-    )
-
-    await comfyPage.page.route(
-      '**/v2/customnode/getmappings**',
-      async (route) => {
-        await route.fulfill({ json: {} })
-      }
-    )
-
-    await comfyPage.page.route(
-      '**/v2/customnode/import_fail_info**',
-      async (route) => {
-        await route.fulfill({ json: {} })
-      }
-    )
-
-    await comfyPage.setup()
-  })
-
-  async function openManagerDialog(comfyPage: ComfyPage) {
-    await comfyPage.command.executeCommand('Comfy.OpenManagerDialog')
-  }
-
-  test('Opens the manager dialog via command', async ({ comfyPage }) => {
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-  })
-
-  test('Displays pack cards from search results', async ({ comfyPage }) => {
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-
-    await expect(dialog.getByText('Test Pack A')).toBeVisible()
-    await expect(dialog.getByText('Test Pack B')).toBeVisible()
-    await expect(dialog.getByText('Test Pack C')).toBeVisible()
-  })
-
-  test('Search filters displayed packs', async ({ comfyPage }) => {
-    await comfyPage.page.route('**/*.algolia.net/**', async (route) => {
-      await route.fulfill({ json: MOCK_ALGOLIA_PACK_B_ONLY })
-    })
-    await comfyPage.page.route('**/*.algolianet.com/**', async (route) => {
-      await route.fulfill({ json: MOCK_ALGOLIA_PACK_B_ONLY })
-    })
-    await comfyPage.page.route(
-      '**/api.comfy.org/nodes/search**',
-      async (route) => {
-        await route.fulfill({
-          json: {
-            total: 1,
-            nodes: [MOCK_PACK_B],
-            page: 1,
-            limit: 64,
-            totalPages: 1
-          }
-        })
-      }
-    )
-
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-
-    const searchInput = dialog.getByPlaceholder(/search/i)
-    await searchInput.fill('Test Pack B')
-
-    await expect(dialog.getByText('Test Pack B')).toBeVisible()
-    await expect(dialog.getByText('Test Pack A')).not.toBeVisible()
-  })
-
-  test('Clicking a pack card opens the info panel', async ({ comfyPage }) => {
-    await comfyPage.page.route(
-      '**/api.comfy.org/nodes/test-pack-a',
-      async (route) => {
-        await route.fulfill({ json: MOCK_PACK_A })
-      }
-    )
-
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-
-    await dialog.getByText('Test Pack A').first().click()
-
-    await expect(dialog.getByText('Test Publisher').first()).toBeVisible()
-  })
-
-  test('Left side panel navigation tabs exist', async ({ comfyPage }) => {
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-
-    const nav = dialog.locator('nav')
-    await expect(nav.getByText('All Extensions')).toBeVisible()
-    await expect(nav.getByText('Not Installed')).toBeVisible()
-    await expect(nav.getByText('All Installed')).toBeVisible()
-    await expect(nav.getByText('Updates Available')).toBeVisible()
-  })
-
-  test('Switching tabs changes the content view', async ({ comfyPage }) => {
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-
-    const nav = dialog.locator('nav')
-    await nav.getByText('All Installed').click()
-
-    await expect(dialog.getByText('Test Pack A')).toBeVisible()
-  })
-
-  test('Closes via Escape key', async ({ comfyPage }) => {
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-
-    await comfyPage.page.keyboard.press('Escape')
-    await expect(dialog).not.toBeVisible()
-  })
-
-  test('Empty search shows no results message', async ({ comfyPage }) => {
-    await comfyPage.page.route('**/*.algolia.net/**', async (route) => {
-      await route.fulfill({ json: MOCK_ALGOLIA_EMPTY })
-    })
-    await comfyPage.page.route('**/*.algolianet.com/**', async (route) => {
-      await route.fulfill({ json: MOCK_ALGOLIA_EMPTY })
-    })
-    await comfyPage.page.route(
-      '**/api.comfy.org/nodes/search**',
-      async (route) => {
-        await route.fulfill({
-          json: {
-            total: 0,
-            nodes: [],
-            page: 1,
-            limit: 64,
-            totalPages: 0
-          }
-        })
-      }
-    )
-
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-
-    const searchInput = dialog.getByPlaceholder(/search/i)
-    await searchInput.fill('nonexistent-pack-xyz-999')
-
-    await expect(
-      dialog.getByText(/no results found|try a different search/i).first()
-    ).toBeVisible()
-  })
-
-  test('Search mode can be switched between packs and nodes', async ({
-    comfyPage
-  }) => {
-    await openManagerDialog(comfyPage)
-
-    const dialog = comfyPage.page.getByRole('dialog')
-    await expect(dialog).toBeVisible()
-
-    const modeSelector = dialog.getByText('Node Pack').first()
-    await expect(modeSelector).toBeVisible()
-
-    await modeSelector.click()
-    const nodesOption = comfyPage.page.getByRole('option', { name: 'Nodes' })
-    await expect(nodesOption).toBeVisible()
-    await nodesOption.click()
-  })
-})

browser_tests/tests/dialogs/settingsDialog.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { mockSystemStats } from '@e2e/fixtures/data/systemStats'
+import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
+import { mockSystemStats } from '../../fixtures/data/systemStats'
 
 const MOCK_COMFYUI_VERSION = '9.99.0-e2e-test'
 
@@ -145,20 +145,15 @@ test.describe('Settings dialog', { tag: '@ui' }, () => {
       const settingRow = dialog.root.locator(`[data-setting-id="${settingId}"]`)
       await expect(settingRow).toBeVisible()
 
-      // Open the dropdown via its combobox role and verify it expanded.
-      // Retry because the PrimeVue Select may re-render during search
-      // filtering, causing the first click to land on a stale element.
-      const select = settingRow.getByRole('combobox')
-      await expect(async () => {
-        const expanded = await select.getAttribute('aria-expanded')
-        if (expanded !== 'true') await select.click()
-        await expect(select).toHaveAttribute('aria-expanded', 'true')
-      }).toPass({ timeout: 5000 })
+      // Click the PrimeVue Select to open the dropdown
+      await settingRow.locator('.p-select').click()
+      const overlay = comfyPage.page.locator('.p-select-overlay')
+      await expect(overlay).toBeVisible()
 
       // Pick the option that is not the current value
       const targetValue = initialValue === 'Top' ? 'Disabled' : 'Top'
-      await comfyPage.page
-        .getByRole('option', { name: targetValue, exact: true })
+      await overlay
+        .locator(`.p-select-option-label:text-is("${targetValue}")`)
         .click()
 
       await expect

browser_tests/tests/dialogs/shareWorkflowDialog.spec.ts

@@ -1,9 +1,9 @@
 import type { Page } from '@playwright/test'
 import { expect } from '@playwright/test'
 
-import type { AssetInfo } from '@/schemas/apiSchema'
-import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
+import type { AssetInfo } from '../../../src/schemas/apiSchema'
+import { comfyPageFixture } from '../../fixtures/ComfyPage'
+import { TestIds } from '../../fixtures/selectors'
 
 interface PublishRecord {
   workflow_id: string

browser_tests/tests/domWidget.spec.ts

@@ -35,14 +35,14 @@ test.describe('DOM Widget', { tag: '@widget' }, () => {
     async ({ comfyPage }) => {
       await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
       await comfyPage.command.executeCommand('Workspace.ToggleFocusMode')
-      await expect(comfyPage.menu.sideToolbar).not.toBeVisible()
+      await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot('focus-mode-on.png')
     }
   )
 
   // No DOM widget should be created by creation of interim LGraphNode objects.
   test('Copy node with DOM widget by dragging + alt', async ({ comfyPage }) => {
-    const initialCount = await comfyPage.domWidgets.count()
+    const initialCount = await comfyPage.getDOMWidgetCount()
 
     // TextEncodeNode1
     await comfyPage.page.mouse.move(618, 191)
@@ -52,6 +52,7 @@ test.describe('DOM Widget', { tag: '@widget' }, () => {
     await comfyPage.page.mouse.up()
     await comfyPage.page.keyboard.up('Alt')
 
-    await expect(comfyPage.domWidgets).toHaveCount(initialCount + 1)
+    const finalCount = await comfyPage.getDOMWidgetCount()
+    expect(finalCount).toBe(initialCount + 1)
   })
 })

browser_tests/tests/errorDialog.spec.ts

@@ -100,9 +100,8 @@ test.describe('Error dialog', () => {
     await errorDialog.getByTestId(TestIds.dialogs.errorDialogCopyReport).click()
 
     const reportText = await errorDialog.locator('pre').textContent()
-    await expect
-      .poll(async () => await getClipboardText(comfyPage.page))
-      .toBe(reportText)
+    const copiedText = await getClipboardText(comfyPage.page)
+    expect(copiedText).toBe(reportText)
   })
 
   test('Should open GitHub issues search when "Find Issues" is clicked', async ({

browser_tests/tests/errorOverlay.spec.ts

@@ -47,16 +47,11 @@ test.describe('Error overlay', { tag: '@ui' }, () => {
     test('Should display "Show missing models" button for missing model errors', async ({
       comfyPage
     }) => {
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(async (url: string) => {
-            const response = await fetch(
-              `${url}/api/devtools/cleanup_fake_model`
-            )
-            return response.ok
-          }, comfyPage.url)
-        )
-        .toBeTruthy()
+      const cleanupOk = await comfyPage.page.evaluate(async (url: string) => {
+        const response = await fetch(`${url}/api/devtools/cleanup_fake_model`)
+        return response.ok
+      }, comfyPage.url)
+      expect(cleanupOk).toBeTruthy()
 
       await comfyPage.workflow.loadWorkflow('missing/missing_models')
 
@@ -112,10 +107,10 @@ test.describe('Error overlay', { tag: '@ui' }, () => {
       await comfyPage.nextFrame()
 
       await comfyPage.keyboard.undo()
-      await expect(errorOverlay).not.toBeVisible()
+      await expect(errorOverlay).not.toBeVisible({ timeout: 5000 })
 
       await comfyPage.keyboard.redo()
-      await expect(errorOverlay).not.toBeVisible()
+      await expect(errorOverlay).not.toBeVisible({ timeout: 5000 })
     })
   })
 
@@ -156,7 +151,6 @@ test.describe('Error overlay', { tag: '@ui' }, () => {
 
       await overlay.getByTestId(TestIds.dialogs.errorOverlaySeeErrors).click()
 
-      await expect(overlay).not.toBeVisible()
       await expect(comfyPage.page.getByTestId('properties-panel')).toBeVisible()
     })
 

browser_tests/tests/execution.spec.ts

@@ -49,28 +49,18 @@ test.describe(
       const input = await comfyPage.nodeOps.getNodeRefById(3)
       const output1 = await comfyPage.nodeOps.getNodeRefById(1)
       const output2 = await comfyPage.nodeOps.getNodeRefById(4)
-      await expect
-        .poll(async () => (await input.getWidget(0)).getValue())
-        .toBe('foo')
-      await expect
-        .poll(async () => (await output1.getWidget(0)).getValue())
-        .toBe('')
-      await expect
-        .poll(async () => (await output2.getWidget(0)).getValue())
-        .toBe('')
+      expect(await (await input.getWidget(0)).getValue()).toBe('foo')
+      expect(await (await output1.getWidget(0)).getValue()).toBe('')
+      expect(await (await output2.getWidget(0)).getValue()).toBe('')
 
       await output1.click('title')
 
       await comfyPage.command.executeCommand('Comfy.QueueSelectedOutputNodes')
-      await expect
-        .poll(async () => (await input.getWidget(0)).getValue())
-        .toBe('foo')
-      await expect
-        .poll(async () => (await output1.getWidget(0)).getValue())
-        .toBe('foo')
-      await expect
-        .poll(async () => (await output2.getWidget(0)).getValue())
-        .toBe('')
+      await expect(async () => {
+        expect(await (await input.getWidget(0)).getValue()).toBe('foo')
+        expect(await (await output1.getWidget(0)).getValue()).toBe('foo')
+        expect(await (await output2.getWidget(0)).getValue()).toBe('')
+      }).toPass({ timeout: 2_000 })
     })
   }
 )

browser_tests/tests/extensionAPI.spec.ts

@@ -40,9 +40,7 @@ test.describe('Topbar commands', () => {
     })
 
     await comfyPage.menu.topbar.triggerTopbarCommand(['ext', 'foo-command'])
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.foo))
-      .toBe(true)
+    expect(await comfyPage.page.evaluate(() => window.foo)).toBe(true)
   })
 
   test('Should not allow register command defined in other extension', async ({
@@ -62,7 +60,7 @@ test.describe('Topbar commands', () => {
     })
 
     const menuItem = comfyPage.menu.topbar.getMenuItem('ext')
-    await expect(menuItem).toHaveCount(0)
+    expect(await menuItem.count()).toBe(0)
   })
 
   test('Should allow registering keybindings', async ({ comfyPage }) => {
@@ -88,9 +86,7 @@ test.describe('Topbar commands', () => {
     })
 
     await comfyPage.page.keyboard.press('k')
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.TestCommand))
-      .toBe(true)
+    expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(true)
   })
 
   test.describe('Settings', () => {
@@ -113,20 +109,16 @@ test.describe('Topbar commands', () => {
         })
       })
       // onChange is called when the setting is first added
-      await expect
-        .poll(() => comfyPage.page.evaluate(() => window.changeCount))
-        .toBe(1)
-      await expect
-        .poll(() => comfyPage.settings.getSetting('TestSetting'))
-        .toBe('Hello, world!')
+      expect(await comfyPage.page.evaluate(() => window.changeCount)).toBe(1)
+      expect(await comfyPage.settings.getSetting('TestSetting')).toBe(
+        'Hello, world!'
+      )
 
       await comfyPage.settings.setSetting('TestSetting', 'Hello, universe!')
-      await expect
-        .poll(() => comfyPage.settings.getSetting('TestSetting'))
-        .toBe('Hello, universe!')
-      await expect
-        .poll(() => comfyPage.page.evaluate(() => window.changeCount))
-        .toBe(2)
+      expect(await comfyPage.settings.getSetting('TestSetting')).toBe(
+        'Hello, universe!'
+      )
+      expect(await comfyPage.page.evaluate(() => window.changeCount)).toBe(2)
     })
 
     test('Should allow setting boolean settings', async ({ comfyPage }) => {
@@ -148,21 +140,17 @@ test.describe('Topbar commands', () => {
         })
       })
 
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.TestSetting'))
-        .toBe(false)
-      await expect
-        .poll(() => comfyPage.page.evaluate(() => window.changeCount))
-        .toBe(1)
+      expect(await comfyPage.settings.getSetting('Comfy.TestSetting')).toBe(
+        false
+      )
+      expect(await comfyPage.page.evaluate(() => window.changeCount)).toBe(1)
 
       await comfyPage.settingDialog.open()
       await comfyPage.settingDialog.toggleBooleanSetting('Comfy.TestSetting')
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.TestSetting'))
-        .toBe(true)
-      await expect
-        .poll(() => comfyPage.page.evaluate(() => window.changeCount))
-        .toBe(2)
+      expect(await comfyPage.settings.getSetting('Comfy.TestSetting')).toBe(
+        true
+      )
+      expect(await comfyPage.page.evaluate(() => window.changeCount)).toBe(2)
     })
 
     test.describe('Passing through attrs to setting components', () => {
@@ -240,15 +228,12 @@ test.describe('Topbar commands', () => {
             .getByText('TestSetting Test')
             .locator(selector)
 
-          await expect
-            .poll(() =>
-              component.evaluate((el) =>
-                el.tagName === 'INPUT'
-                  ? (el as HTMLInputElement).disabled
-                  : el.classList.contains('p-disabled')
-              )
-            )
-            .toBe(true)
+          const isDisabled = await component.evaluate((el) =>
+            el.tagName === 'INPUT'
+              ? (el as HTMLInputElement).disabled
+              : el.classList.contains('p-disabled')
+          )
+          expect(isDisabled).toBe(true)
         })
       }
     })
@@ -273,7 +258,7 @@ test.describe('Topbar commands', () => {
       await comfyPage.settingDialog.goToAboutPanel()
       const badge = comfyPage.page.locator('.about-badge').last()
       expect(badge).toBeDefined()
-      await expect(badge).toContainText('Test Badge')
+      expect(await badge.textContent()).toContain('Test Badge')
     })
   })
 
@@ -291,13 +276,11 @@ test.describe('Topbar commands', () => {
       })
 
       await comfyPage.nodeOps.fillPromptDialog('Hello, world!')
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(
-            () => (window as unknown as Record<string, unknown>)['value']
-          )
+      expect(
+        await comfyPage.page.evaluate(
+          () => (window as unknown as Record<string, unknown>)['value']
         )
-        .toBe('Hello, world!')
+      ).toBe('Hello, world!')
     })
 
     test('Should allow showing a confirmation dialog', async ({
@@ -315,13 +298,11 @@ test.describe('Topbar commands', () => {
       })
 
       await comfyPage.confirmDialog.click('confirm')
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(
-            () => (window as unknown as Record<string, unknown>)['value']
-          )
+      expect(
+        await comfyPage.page.evaluate(
+          () => (window as unknown as Record<string, unknown>)['value']
         )
-        .toBe(true)
+      ).toBe(true)
     })
 
     test('Should allow dismissing a dialog', async ({ comfyPage }) => {
@@ -338,13 +319,11 @@ test.describe('Topbar commands', () => {
       })
 
       await comfyPage.confirmDialog.click('reject')
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(
-            () => (window as unknown as Record<string, unknown>)['value']
-          )
+      expect(
+        await comfyPage.page.evaluate(
+          () => (window as unknown as Record<string, unknown>)['value']
         )
-        .toBeNull()
+      ).toBeNull()
     })
   })
 
@@ -384,16 +363,14 @@ test.describe('Topbar commands', () => {
       )
       await toolboxButton.click()
 
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(
-            () =>
-              (window as unknown as Record<string, unknown>)[
-                'selectionCommandExecuted'
-              ]
-          )
+      expect(
+        await comfyPage.page.evaluate(
+          () =>
+            (window as unknown as Record<string, unknown>)[
+              'selectionCommandExecuted'
+            ]
         )
-        .toBe(true)
+      ).toBe(true)
     })
   })
 })

browser_tests/tests/featureFlags.spec.ts

@@ -59,30 +59,31 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
       { timeout: 10000 }
     )
 
+    // Get the captured messages
+    const messages = await newPage.evaluate(() => window.__capturedMessages)
+
     // Verify client sent feature flags
-    await expect(async () => {
-      const flags = await newPage.evaluate(
-        () => window.__capturedMessages?.clientFeatureFlags
-      )
-      expect(flags).not.toBeNull()
-      expect(flags?.type).toBe('feature_flags')
-      expect(flags?.data).not.toBeNull()
-      expect(flags?.data).toHaveProperty('supports_preview_metadata')
-      expect(typeof flags?.data?.supports_preview_metadata).toBe('boolean')
-    }).toPass()
+    expect(messages!.clientFeatureFlags).toBeTruthy()
+    expect(messages!.clientFeatureFlags).toHaveProperty('type', 'feature_flags')
+    expect(messages!.clientFeatureFlags).toHaveProperty('data')
+    expect(messages!.clientFeatureFlags!.data).toHaveProperty(
+      'supports_preview_metadata'
+    )
+    expect(
+      typeof messages!.clientFeatureFlags!.data.supports_preview_metadata
+    ).toBe('boolean')
 
     // Verify server sent feature flags back
-    await expect(async () => {
-      const flags = await newPage.evaluate(
-        () => window.__capturedMessages?.serverFeatureFlags
-      )
-      expect(flags).not.toBeNull()
-      expect(flags).toHaveProperty('supports_preview_metadata')
-      expect(typeof flags?.supports_preview_metadata).toBe('boolean')
-      expect(flags).toHaveProperty('max_upload_size')
-      expect(typeof flags?.max_upload_size).toBe('number')
-      expect(Object.keys(flags ?? {}).length).toBeGreaterThan(0)
-    }).toPass()
+    expect(messages!.serverFeatureFlags).toBeTruthy()
+    expect(messages!.serverFeatureFlags).toHaveProperty(
+      'supports_preview_metadata'
+    )
+    expect(typeof messages!.serverFeatureFlags!.supports_preview_metadata).toBe(
+      'boolean'
+    )
+    expect(messages!.serverFeatureFlags).toHaveProperty('max_upload_size')
+    expect(typeof messages!.serverFeatureFlags!.max_upload_size).toBe('number')
+    expect(Object.keys(messages!.serverFeatureFlags!).length).toBeGreaterThan(0)
 
     await newPage.close()
   })
@@ -90,44 +91,37 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
   test('Server feature flags are received and accessible', async ({
     comfyPage
   }) => {
+    // Get the actual server feature flags from the backend
+    const serverFlags = await comfyPage.page.evaluate(() => {
+      return window.app!.api.serverFeatureFlags.value
+    })
+
     // Verify we received real feature flags from the backend
-    await expect(async () => {
-      const flags = await comfyPage.page.evaluate(
-        () => window.app!.api.serverFeatureFlags.value
-      )
-      expect(flags).not.toBeNull()
-      expect(Object.keys(flags).length).toBeGreaterThan(0)
-      // The backend should send feature flags
-      expect(flags).toHaveProperty('supports_preview_metadata')
-      expect(typeof flags.supports_preview_metadata).toBe('boolean')
-      expect(flags).toHaveProperty('max_upload_size')
-      expect(typeof flags.max_upload_size).toBe('number')
-    }).toPass()
+    expect(serverFlags).toBeTruthy()
+    expect(Object.keys(serverFlags).length).toBeGreaterThan(0)
+
+    // The backend should send feature flags
+    expect(serverFlags).toHaveProperty('supports_preview_metadata')
+    expect(typeof serverFlags.supports_preview_metadata).toBe('boolean')
+    expect(serverFlags).toHaveProperty('max_upload_size')
+    expect(typeof serverFlags.max_upload_size).toBe('number')
   })
 
   test('serverSupportsFeature method works with real backend flags', async ({
     comfyPage
   }) => {
     // Test serverSupportsFeature with real backend flags
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(
-          () =>
-            typeof window.app!.api.serverSupportsFeature(
-              'supports_preview_metadata'
-            )
-        )
-      )
-      .toBe('boolean')
+    const supportsPreviewMetadata = await comfyPage.page.evaluate(() => {
+      return window.app!.api.serverSupportsFeature('supports_preview_metadata')
+    })
+    // The method should return a boolean based on the backend's value
+    expect(typeof supportsPreviewMetadata).toBe('boolean')
 
     // Test non-existent feature - should always return false
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() =>
-          window.app!.api.serverSupportsFeature('non_existent_feature_xyz')
-        )
-      )
-      .toBe(false)
+    const supportsNonExistent = await comfyPage.page.evaluate(() => {
+      return window.app!.api.serverSupportsFeature('non_existent_feature_xyz')
+    })
+    expect(supportsNonExistent).toBe(false)
 
     // Test that the method only returns true for boolean true values
     const testResults = await comfyPage.page.evaluate(() => {
@@ -166,51 +160,41 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
     comfyPage
   }) => {
     // Test getServerFeature method
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(
-          () =>
-            typeof window.app!.api.getServerFeature('supports_preview_metadata')
-        )
-      )
-      .toBe('boolean')
+    const previewMetadataValue = await comfyPage.page.evaluate(() => {
+      return window.app!.api.getServerFeature('supports_preview_metadata')
+    })
+    expect(typeof previewMetadataValue).toBe('boolean')
 
     // Test getting max_upload_size
-    await expect(async () => {
-      const maxUpload = await comfyPage.page.evaluate(() =>
-        window.app!.api.getServerFeature('max_upload_size')
-      )
-      expect(typeof maxUpload).toBe('number')
-      expect(maxUpload as number).toBeGreaterThan(0)
-    }).toPass()
+    const maxUploadSize = await comfyPage.page.evaluate(() => {
+      return window.app!.api.getServerFeature('max_upload_size')
+    })
+    expect(typeof maxUploadSize).toBe('number')
+    expect(maxUploadSize).toBeGreaterThan(0)
 
     // Test getServerFeature with default value for non-existent feature
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() =>
-          window.app!.api.getServerFeature(
-            'non_existent_feature_xyz',
-            'default'
-          )
-        )
+    const defaultValue = await comfyPage.page.evaluate(() => {
+      return window.app!.api.getServerFeature(
+        'non_existent_feature_xyz',
+        'default'
       )
-      .toBe('default')
+    })
+    expect(defaultValue).toBe('default')
   })
 
   test('getServerFeatures returns all backend feature flags', async ({
     comfyPage
   }) => {
     // Test getServerFeatures returns all flags
-    await expect(async () => {
-      const features = await comfyPage.page.evaluate(() =>
-        window.app!.api.getServerFeatures()
-      )
-      expect(features).not.toBeNull()
-      expect(features).toHaveProperty('supports_preview_metadata')
-      expect(typeof features.supports_preview_metadata).toBe('boolean')
-      expect(features).toHaveProperty('max_upload_size')
-      expect(Object.keys(features).length).toBeGreaterThan(0)
-    }).toPass()
+    const allFeatures = await comfyPage.page.evaluate(() => {
+      return window.app!.api.getServerFeatures()
+    })
+
+    expect(allFeatures).toBeTruthy()
+    expect(allFeatures).toHaveProperty('supports_preview_metadata')
+    expect(typeof allFeatures.supports_preview_metadata).toBe('boolean')
+    expect(allFeatures).toHaveProperty('max_upload_size')
+    expect(Object.keys(allFeatures).length).toBeGreaterThan(0)
   })
 
   test('Client feature flags are immutable', async ({ comfyPage }) => {
@@ -340,22 +324,26 @@ test.describe('Feature Flags', { tag: ['@slow', '@settings'] }, () => {
       }
     )
 
-    // Verify feature flags are available
-    await expect(async () => {
-      const flags = await newPage.evaluate(
-        () => window.app!.api.serverFeatureFlags.value
-      )
-      expect(flags).toHaveProperty('supports_preview_metadata')
-      expect(typeof flags?.supports_preview_metadata).toBe('boolean')
-      expect(flags).toHaveProperty('max_upload_size')
-    }).toPass()
+    // Get readiness state
+    const readiness = await newPage.evaluate(() => {
+      return {
+        ...window.__appReadiness,
+        currentFlags: window.app!.api.serverFeatureFlags.value
+      }
+    })
 
-    // Verify feature flags were received and API was initialized
-    await expect(async () => {
-      const readiness = await newPage.evaluate(() => window.__appReadiness)
-      expect(readiness?.featureFlagsReceived).toBe(true)
-      expect(readiness?.apiInitialized).toBe(true)
-    }).toPass()
+    // Verify feature flags are available
+    expect(readiness.currentFlags).toHaveProperty('supports_preview_metadata')
+    expect(typeof readiness.currentFlags.supports_preview_metadata).toBe(
+      'boolean'
+    )
+    expect(readiness.currentFlags).toHaveProperty('max_upload_size')
+
+    // Verify feature flags were received (we detected them via polling)
+    expect(readiness.featureFlagsReceived).toBe(true)
+
+    // Verify API was initialized (feature flags require API)
+    expect(readiness.apiInitialized).toBe(true)
 
     await newPage.close()
   })

browser_tests/tests/focusMode.spec.ts

@@ -29,9 +29,11 @@ test.describe('Focus Mode', { tag: '@ui' }, () => {
     await expect(comfyPage.menu.sideToolbar).toBeVisible()
 
     await comfyPage.command.executeCommand('Workspace.ToggleFocusMode')
+    await comfyPage.nextFrame()
     await expect(comfyPage.menu.sideToolbar).not.toBeVisible()
 
     await comfyPage.command.executeCommand('Workspace.ToggleFocusMode')
+    await comfyPage.nextFrame()
     await expect(comfyPage.menu.sideToolbar).toBeVisible()
   })
 

browser_tests/tests/graph.spec.ts

@@ -11,19 +11,17 @@ test.describe('Graph', { tag: ['@smoke', '@canvas'] }, () => {
   // Ref: https://github.com/Comfy-Org/ComfyUI_frontend/issues/3348
   test('Fix link input slots', async ({ comfyPage }) => {
     await comfyPage.workflow.loadWorkflow('inputs/input_order_swap')
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() => {
-          return window.app!.graph!.links.get(1)?.target_slot
-        })
-      )
-      .toBe(1)
+    expect(
+      await comfyPage.page.evaluate(() => {
+        return window.app!.graph!.links.get(1)?.target_slot
+      })
+    ).toBe(1)
   })
 
   test('Validate workflow links', async ({ comfyPage }) => {
     await comfyPage.settings.setSetting('Comfy.Validation.Workflows', true)
     await comfyPage.workflow.loadWorkflow('links/bad_link')
-    await expect(comfyPage.toast.visibleToasts).toHaveCount(2)
+    await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(2)
   })
 
   // Regression: duplicate links with shifted target_slot (widget-to-input
@@ -38,77 +36,72 @@ test.describe('Graph', { tag: ['@smoke', '@canvas'] }, () => {
   }) => {
     await comfyPage.workflow.loadWorkflow('links/duplicate_links_slot_drift')
 
-    function evaluateGraph() {
-      return comfyPage.page.evaluate(() => {
-        const graph = window.app!.graph!
+    const result = await comfyPage.page.evaluate(() => {
+      const graph = window.app!.graph!
 
-        const subgraph = graph.subgraphs.values().next().value
-        if (!subgraph) return { error: 'No subgraph found' }
+      const subgraph = graph.subgraphs.values().next().value
+      if (!subgraph) return { error: 'No subgraph found' }
 
-        // Node 120 = Switch (CFG), connects to both KSamplerAdvanced 85 and 86
-        const switchCfg = subgraph.getNodeById(120)
-        const ksampler85 = subgraph.getNodeById(85)
-        const ksampler86 = subgraph.getNodeById(86)
-        if (!switchCfg || !ksampler85 || !ksampler86)
-          return { error: 'Required nodes not found' }
+      // Node 120 = Switch (CFG), connects to both KSamplerAdvanced 85 and 86
+      const switchCfg = subgraph.getNodeById(120)
+      const ksampler85 = subgraph.getNodeById(85)
+      const ksampler86 = subgraph.getNodeById(86)
+      if (!switchCfg || !ksampler85 || !ksampler86)
+        return { error: 'Required nodes not found' }
 
-        // Find cfg inputs by name (slot indices shift due to widget-to-input)
-        const cfgInput85 = ksampler85.inputs.find(
-          (i: { name: string }) => i.name === 'cfg'
-        )
-        const cfgInput86 = ksampler86.inputs.find(
-          (i: { name: string }) => i.name === 'cfg'
-        )
-        const cfg85Linked = cfgInput85?.link != null
-        const cfg86Linked = cfgInput86?.link != null
-
-        // Verify the surviving links exist in the subgraph link map
-        const cfg85LinkValid =
-          cfg85Linked && subgraph.links.has(cfgInput85!.link!)
-        const cfg86LinkValid =
-          cfg86Linked && subgraph.links.has(cfgInput86!.link!)
-
-        // Switch(CFG) output should have exactly 2 links (one to each KSampler)
-        const switchOutputLinkCount = switchCfg.outputs[0]?.links?.length ?? 0
-
-        // Count links from Switch(CFG) to node 85 cfg (should be 1, not 2)
-        let cfgLinkToNode85Count = 0
-        for (const link of subgraph.links.values()) {
-          if (link.origin_id === 120 && link.target_id === 85)
-            cfgLinkToNode85Count++
-        }
-
-        return {
-          cfg85Linked,
-          cfg86Linked,
-          cfg85LinkValid,
-          cfg86LinkValid,
-          cfg85LinkId: cfgInput85?.link ?? null,
-          cfg86LinkId: cfgInput86?.link ?? null,
-          switchOutputLinkIds: [...(switchCfg.outputs[0]?.links ?? [])],
-          switchOutputLinkCount,
-          cfgLinkToNode85Count
-        }
-      })
-    }
-
-    // Poll graph state once, then assert all properties
-    await expect(async () => {
-      const r = await evaluateGraph()
-      // Both KSamplerAdvanced nodes must have their cfg input connected
-      expect(r.cfg85Linked).toBe(true)
-      expect(r.cfg86Linked).toBe(true)
-      // Links must exist in the subgraph link map
-      expect(r.cfg85LinkValid).toBe(true)
-      expect(r.cfg86LinkValid).toBe(true)
-      // Switch(CFG) output has exactly 2 links (one per KSamplerAdvanced)
-      expect(r.switchOutputLinkCount).toBe(2)
-      // Only 1 link from Switch(CFG) to node 85 (duplicate removed)
-      expect(r.cfgLinkToNode85Count).toBe(1)
-      // Output link IDs must match the input link IDs (source/target integrity)
-      expect(r.switchOutputLinkIds).toEqual(
-        expect.arrayContaining([r.cfg85LinkId, r.cfg86LinkId])
+      // Find cfg inputs by name (slot indices shift due to widget-to-input)
+      const cfgInput85 = ksampler85.inputs.find(
+        (i: { name: string }) => i.name === 'cfg'
       )
-    }).toPass()
+      const cfgInput86 = ksampler86.inputs.find(
+        (i: { name: string }) => i.name === 'cfg'
+      )
+      const cfg85Linked = cfgInput85?.link != null
+      const cfg86Linked = cfgInput86?.link != null
+
+      // Verify the surviving links exist in the subgraph link map
+      const cfg85LinkValid =
+        cfg85Linked && subgraph.links.has(cfgInput85!.link!)
+      const cfg86LinkValid =
+        cfg86Linked && subgraph.links.has(cfgInput86!.link!)
+
+      // Switch(CFG) output should have exactly 2 links (one to each KSampler)
+      const switchOutputLinkCount = switchCfg.outputs[0]?.links?.length ?? 0
+
+      // Count links from Switch(CFG) to node 85 cfg (should be 1, not 2)
+      let cfgLinkToNode85Count = 0
+      for (const link of subgraph.links.values()) {
+        if (link.origin_id === 120 && link.target_id === 85)
+          cfgLinkToNode85Count++
+      }
+
+      return {
+        cfg85Linked,
+        cfg86Linked,
+        cfg85LinkValid,
+        cfg86LinkValid,
+        cfg85LinkId: cfgInput85?.link ?? null,
+        cfg86LinkId: cfgInput86?.link ?? null,
+        switchOutputLinkIds: [...(switchCfg.outputs[0]?.links ?? [])],
+        switchOutputLinkCount,
+        cfgLinkToNode85Count
+      }
+    })
+
+    expect(result).not.toHaveProperty('error')
+    // Both KSamplerAdvanced nodes must have their cfg input connected
+    expect(result.cfg85Linked).toBe(true)
+    expect(result.cfg86Linked).toBe(true)
+    // Links must exist in the subgraph link map
+    expect(result.cfg85LinkValid).toBe(true)
+    expect(result.cfg86LinkValid).toBe(true)
+    // Switch(CFG) output has exactly 2 links (one per KSamplerAdvanced)
+    expect(result.switchOutputLinkCount).toBe(2)
+    // Only 1 link from Switch(CFG) to node 85 (duplicate removed)
+    expect(result.cfgLinkToNode85Count).toBe(1)
+    // Output link IDs must match the input link IDs (source/target integrity)
+    expect(result.switchOutputLinkIds).toEqual(
+      expect.arrayContaining([result.cfg85LinkId, result.cfg86LinkId])
+    )
   })
 })

browser_tests/tests/graphCanvasMenu.spec.ts

@@ -31,18 +31,18 @@ test.describe('Graph Canvas Menu', { tag: ['@screenshot', '@canvas'] }, () => {
       const hiddenLinkRenderMode = await comfyPage.page.evaluate(() => {
         return window.LiteGraph!.HIDDEN_LINK
       })
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.LinkRenderMode'))
-        .toBe(hiddenLinkRenderMode)
+      expect(await comfyPage.settings.getSetting('Comfy.LinkRenderMode')).toBe(
+        hiddenLinkRenderMode
+      )
 
       await button.click()
       await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot(
         'canvas-with-visible-links.png'
       )
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.LinkRenderMode'))
-        .not.toBe(hiddenLinkRenderMode)
+      expect(
+        await comfyPage.settings.getSetting('Comfy.LinkRenderMode')
+      ).not.toBe(hiddenLinkRenderMode)
     }
   )
 
@@ -92,6 +92,7 @@ test.describe('Graph Canvas Menu', { tag: ['@screenshot', '@canvas'] }, () => {
     // Click backdrop to close
     const backdrop = comfyPage.page.locator('.fixed.inset-0').first()
     await backdrop.click()
+    await comfyPage.nextFrame()
 
     // Modal should be hidden
     await expect(zoomModal).not.toBeVisible()

browser_tests/tests/groupCopyPaste.spec.ts

@@ -28,20 +28,17 @@ test.describe('Group Copy Paste', { tag: ['@canvas'] }, () => {
     await comfyPage.clipboard.paste()
     await comfyPage.nextFrame()
 
-    const getGroupPositions = () =>
-      comfyPage.page.evaluate(() =>
-        window.app!.graph.groups.map((g: { pos: number[] }) => ({
-          x: g.pos[0],
-          y: g.pos[1]
-        }))
-      )
+    const positions = await comfyPage.page.evaluate(() =>
+      window.app!.graph.groups.map((g: { pos: number[] }) => ({
+        x: g.pos[0],
+        y: g.pos[1]
+      }))
+    )
 
-    await expect.poll(getGroupPositions).toHaveLength(2)
-
-    await expect(async () => {
-      const positions = await getGroupPositions()
-      expect(Math.abs(positions[0].x - positions[1].x)).toBeCloseTo(50, 0)
-      expect(Math.abs(positions[0].y - positions[1].y)).toBeCloseTo(15, 0)
-    }).toPass({ timeout: 5000 })
+    expect(positions).toHaveLength(2)
+    const dx = Math.abs(positions[0].x - positions[1].x)
+    const dy = Math.abs(positions[0].y - positions[1].y)
+    expect(dx).toBeCloseTo(50, 0)
+    expect(dy).toBeCloseTo(15, 0)
   })
 })

browser_tests/tests/groupNode.spec.ts

@@ -1,10 +1,9 @@
+import { expect } from '@playwright/test'
+
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
 
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import {
-  comfyExpect as expect,
-  comfyPageFixture as test
-} from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import type { NodeLibrarySidebarTab } from '@e2e/fixtures/components/SidebarTab'
 import { TestIds } from '@e2e/fixtures/selectors'
 import { DefaultGraphPositions } from '@e2e/fixtures/constants/defaultGraphPositions'
@@ -33,7 +32,7 @@ test.describe('Group Node', { tag: '@node' }, () => {
     test('Is added to node library sidebar', async ({
       comfyPage: _comfyPage
     }) => {
-      await expect(libraryTab.getFolder(groupNodeCategory)).toHaveCount(1)
+      expect(await libraryTab.getFolder(groupNodeCategory).count()).toBe(1)
     })
 
     test('Can be added to canvas using node library sidebar', async ({
@@ -46,9 +45,9 @@ test.describe('Group Node', { tag: '@node' }, () => {
       await libraryTab.getNode(groupNodeName).click()
 
       // Verify the node is added to the canvas
-      await expect
-        .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-        .toBe(initialNodeCount + 1)
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(
+        initialNodeCount + 1
+      )
     })
 
     test('Can be bookmarked and unbookmarked', async ({ comfyPage }) => {
@@ -59,13 +58,11 @@ test.describe('Group Node', { tag: '@node' }, () => {
         .click()
 
       // Verify the node is added to the bookmarks tab
-      await expect
-        .poll(() =>
-          comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
-        )
-        .toEqual([groupNodeBookmarkName])
+      expect(
+        await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      ).toEqual([groupNodeBookmarkName])
       // Verify the bookmark node with the same name is added to the tree
-      await expect(libraryTab.getNode(groupNodeName)).not.toHaveCount(0)
+      expect(await libraryTab.getNode(groupNodeName).count()).not.toBe(0)
 
       // Unbookmark the node
       await libraryTab
@@ -75,11 +72,9 @@ test.describe('Group Node', { tag: '@node' }, () => {
         .click()
 
       // Verify the node is removed from the bookmarks tab
-      await expect
-        .poll(() =>
-          comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
-        )
-        .toHaveLength(0)
+      expect(
+        await comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2')
+      ).toHaveLength(0)
     })
 
     test('Displays preview on bookmark hover', async ({ comfyPage }) => {
@@ -89,9 +84,9 @@ test.describe('Group Node', { tag: '@node' }, () => {
         .locator('.bookmark-button')
         .click()
       await comfyPage.page.hover('.p-tree-node-label.tree-explorer-node-label')
-      await expect(
-        comfyPage.page.locator('.node-lib-node-preview')
-      ).toBeVisible()
+      expect(await comfyPage.page.isVisible('.node-lib-node-preview')).toBe(
+        true
+      )
       await libraryTab
         .getNode(groupNodeName)
         .locator('.bookmark-button')
@@ -152,12 +147,12 @@ test.describe('Group Node', { tag: '@node' }, () => {
 
     const manage1 = await group1.manageGroupNode()
     await comfyPage.nextFrame()
-    await expect(manage1.selectedNodeTypeSelect).toHaveValue('g1')
+    expect(await manage1.getSelectedNodeType()).toBe('g1')
     await manage1.close()
     await expect(manage1.root).not.toBeVisible()
 
     const manage2 = await group2.manageGroupNode()
-    await expect(manage2.selectedNodeTypeSelect).toHaveValue('g2')
+    expect(await manage2.getSelectedNodeType()).toBe('g2')
   })
 
   test('Preserves hidden input configuration when containing duplicate node types', async ({
@@ -171,31 +166,24 @@ test.describe('Group Node', { tag: '@node' }, () => {
     const groupNodeId = 19
     const groupNodeName = 'two_VAE_decode'
 
+    const totalInputCount = await comfyPage.page.evaluate((nodeName) => {
+      const {
+        extra: { groupNodes }
+      } = window.app!.graph!
+      const { nodes } = groupNodes![nodeName]
+      return nodes.reduce((acc, node) => acc + (node.inputs?.length ?? 0), 0)
+    }, groupNodeName)
+
+    const visibleInputCount = await comfyPage.page.evaluate((id) => {
+      const node = window.app!.graph!.getNodeById(id)
+      return node!.inputs.length
+    }, groupNodeId)
+
     // Verify there are 4 total inputs (2 VAE decode nodes with 2 inputs each)
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate((nodeName) => {
-          const {
-            extra: { groupNodes }
-          } = window.app!.graph!
-          const { nodes } = groupNodes![nodeName]
-          return nodes.reduce(
-            (acc, node) => acc + (node.inputs?.length ?? 0),
-            0
-          )
-        }, groupNodeName)
-      )
-      .toBe(4)
+    expect(totalInputCount).toBe(4)
 
     // Verify there are 2 visible inputs (2 have been hidden in config)
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate((id) => {
-          const node = window.app!.graph!.getNodeById(id)
-          return node!.inputs.length
-        }, groupNodeId)
-      )
-      .toBe(2)
+    expect(visibleInputCount).toBe(2)
   })
 
   test('Reconnects inputs after configuration changed via manage dialog save', async ({
@@ -222,7 +210,7 @@ test.describe('Group Node', { tag: '@node' }, () => {
     // Connect node to group
     const ckpt = await expectSingleNode('CheckpointLoaderSimple')
     const input = await ckpt.connectOutput(0, groupNode, 0)
-    await expect.poll(() => input.getLinkCount()).toBe(1)
+    expect(await input.getLinkCount()).toBe(1)
     // Modify the group node via manage dialog
     const manage = await groupNode.manageGroupNode()
     await manage.selectNode('KSampler')
@@ -231,14 +219,14 @@ test.describe('Group Node', { tag: '@node' }, () => {
     await manage.save()
     await manage.close()
     // Ensure the link is still present
-    await expect.poll(() => input.getLinkCount()).toBe(1)
+    expect(await input.getLinkCount()).toBe(1)
   })
 
   test('Loads from a workflow using the legacy path separator ("/")', async ({
     comfyPage
   }) => {
     await comfyPage.workflow.loadWorkflow('groupnodes/legacy_group_node')
-    await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
+    expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
     await expect(
       comfyPage.page.getByTestId(TestIds.dialogs.errorOverlay)
     ).not.toBeVisible()
@@ -273,8 +261,8 @@ test.describe('Group Node', { tag: '@node' }, () => {
       expect(
         await comfyPage.nodeOps.getNodeRefsByType(GROUP_NODE_TYPE)
       ).toHaveLength(expectedCount)
-      await expect.poll(() => isRegisteredLitegraph(comfyPage)).toBe(true)
-      await expect.poll(() => isRegisteredNodeDefStore(comfyPage)).toBe(true)
+      expect(await isRegisteredLitegraph(comfyPage)).toBe(true)
+      expect(await isRegisteredNodeDefStore(comfyPage)).toBe(true)
     }
 
     test.beforeEach(async ({ comfyPage }) => {
@@ -345,18 +333,18 @@ test.describe('Group Node', { tag: '@node' }, () => {
 
   test.describe('Keybindings', () => {
     test('Convert to group node, no selection', async ({ comfyPage }) => {
-      await expect(comfyPage.toast.visibleToasts).toHaveCount(0)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(0)
       await comfyPage.page.keyboard.press('Alt+g')
-      await expect(comfyPage.toast.visibleToasts).toHaveCount(1)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(1)
     })
     test('Convert to group node, selected 1 node', async ({ comfyPage }) => {
-      await expect(comfyPage.toast.visibleToasts).toHaveCount(0)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(0)
       await comfyPage.canvas.click({
         position: DefaultGraphPositions.textEncodeNode1
       })
       await comfyPage.nextFrame()
       await comfyPage.page.keyboard.press('Alt+g')
-      await expect(comfyPage.toast.visibleToasts).toHaveCount(1)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(1)
     })
   })
 })

browser_tests/tests/groupSelectChildren.spec.ts

@@ -66,14 +66,11 @@ test.describe('Group Select Children', { tag: ['@canvas', '@node'] }, () => {
     await comfyPage.canvas.click({ position: outerPos })
     await comfyPage.nextFrame()
 
+    const counts = await getSelectionCounts(comfyPage)
     // Outer Group + Inner Group + 1 node = 3 items
-    await expect
-      .poll(() => getSelectionCounts(comfyPage))
-      .toMatchObject({
-        selectedItemCount: 3,
-        selectedGroupCount: 2,
-        selectedNodeCount: 1
-      })
+    expect(counts.selectedItemCount).toBe(3)
+    expect(counts.selectedGroupCount).toBe(2)
+    expect(counts.selectedNodeCount).toBe(1)
   })
 
   test('Setting disabled: clicking outer group selects only the group', async ({
@@ -90,13 +87,10 @@ test.describe('Group Select Children', { tag: ['@canvas', '@node'] }, () => {
     await comfyPage.canvas.click({ position: outerPos })
     await comfyPage.nextFrame()
 
-    await expect
-      .poll(() => getSelectionCounts(comfyPage))
-      .toMatchObject({
-        selectedItemCount: 1,
-        selectedGroupCount: 1,
-        selectedNodeCount: 0
-      })
+    const counts = await getSelectionCounts(comfyPage)
+    expect(counts.selectedItemCount).toBe(1)
+    expect(counts.selectedGroupCount).toBe(1)
+    expect(counts.selectedNodeCount).toBe(0)
   })
 
   test('Deselecting outer group deselects all children', async ({
@@ -114,9 +108,8 @@ test.describe('Group Select Children', { tag: ['@canvas', '@node'] }, () => {
     await comfyPage.canvas.click({ position: outerPos })
     await comfyPage.nextFrame()
 
-    await expect
-      .poll(() => getSelectionCounts(comfyPage))
-      .toMatchObject({ selectedItemCount: 3 })
+    let counts = await getSelectionCounts(comfyPage)
+    expect(counts.selectedItemCount).toBe(3)
 
     // Deselect all via page.evaluate to avoid UI overlay interception
     await comfyPage.page.evaluate(() => {
@@ -124,8 +117,7 @@ test.describe('Group Select Children', { tag: ['@canvas', '@node'] }, () => {
     })
     await comfyPage.nextFrame()
 
-    await expect
-      .poll(() => getSelectionCounts(comfyPage))
-      .toMatchObject({ selectedItemCount: 0 })
+    counts = await getSelectionCounts(comfyPage)
+    expect(counts.selectedItemCount).toBe(0)
   })
 })

browser_tests/tests/imagePastePriority.spec.ts

@@ -11,8 +11,8 @@ test.describe(
     }) => {
       await comfyPage.workflow.loadWorkflow('nodes/load_image_with_ksampler')
 
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(2)
       const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
+      expect(initialCount).toBe(2)
 
       // Copy the KSampler node (puts data-metadata in clipboard)
       const ksamplerNodes =
@@ -51,9 +51,8 @@ test.describe(
 
       // Node count should remain the same — stale node metadata should NOT
       // be deserialized when a media node is selected.
-      await expect
-        .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-        .toBe(initialCount)
+      const finalCount = await comfyPage.nodeOps.getGraphNodesCount()
+      expect(finalCount).toBe(initialCount)
     })
   }
 )

browser_tests/tests/interaction.spec.ts

@@ -62,9 +62,9 @@ test.describe('Node Interaction', () => {
         for (const node of clipNodes) {
           await node.click('title', { modifiers: [modifier] })
         }
-        await expect
-          .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-          .toBe(clipNodes.length)
+        const selectedNodeCount =
+          await comfyPage.nodeOps.getSelectedGraphNodesCount()
+        expect(selectedNodeCount).toBe(clipNodes.length)
       })
     })
 
@@ -111,9 +111,9 @@ test.describe('Node Interaction', () => {
       const clipNodes =
         await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
       await dragSelectNodes(comfyPage, clipNodes)
-      await expect
-        .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-        .toBe(clipNodes.length)
+      expect(await comfyPage.nodeOps.getSelectedGraphNodesCount()).toBe(
+        clipNodes.length
+      )
     })
 
     test('Can move selected nodes using the Comfy.Canvas.MoveSelectedNodes.{Up|Down|Left|Right} commands', async ({
@@ -243,7 +243,6 @@ test.describe('Node Interaction', () => {
     }) => {
       await comfyPage.settings.setSetting('Comfy.Node.AutoSnapLinkToSlot', true)
       await comfyPage.settings.setSetting('Comfy.Node.SnapHighlightsNode', true)
-      await comfyPage.nextFrame()
 
       await comfyMouse.move(DefaultGraphPositions.clipTextEncodeNode1InputSlot)
       await comfyMouse.drag(DefaultGraphPositions.clipTextEncodeNode2InputSlot)
@@ -328,46 +327,18 @@ test.describe('Node Interaction', () => {
     'Can toggle dom widget node open/closed',
     { tag: '@screenshot' },
     async ({ comfyPage }) => {
-      // Find the node whose collapse toggler matches the hardcoded position.
-      // getNodeRefsByType order is non-deterministic, so identify by proximity.
-      const nodes = await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
-      const togglerPos = DefaultGraphPositions.textEncodeNodeToggler
-      let targetNode = nodes[0]
-      let minDist = Infinity
-      for (const n of nodes) {
-        const pos = await n.getPosition()
-        const dist = Math.hypot(pos.x - togglerPos.x, pos.y - togglerPos.y)
-        if (dist < minDist) {
-          minDist = dist
-          targetNode = n
-        }
-      }
-
       await expect(comfyPage.canvas).toHaveScreenshot('default.png')
       await comfyPage.canvas.click({
-        position: togglerPos
+        position: DefaultGraphPositions.textEncodeNodeToggler
       })
-      await expect.poll(() => targetNode.isCollapsed()).toBe(true)
+      await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot(
         'text-encode-toggled-off.png'
       )
-      // Wait for the double-click window (300ms) to expire so the next
-      // click at the same position isn't interpreted as a double-click.
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(() => {
-            const pointer = window.app!.canvas.pointer
-            if (!pointer.eLastDown) return true
-            return performance.now() - pointer.eLastDown.timeStamp > 300
-          })
-        )
-        .toBe(true)
+      await comfyPage.delay(1000)
       await comfyPage.canvas.click({
-        position: togglerPos
+        position: DefaultGraphPositions.textEncodeNodeToggler
       })
-      await expect.poll(() => targetNode.isCollapsed()).toBe(false)
-      // Move mouse away to avoid hover highlight differences.
-      await comfyPage.canvasOps.moveMouseToEmptyArea()
       await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot(
         'text-encode-toggled-back-open.png'
@@ -387,17 +358,14 @@ test.describe('Node Interaction', () => {
     })
     const legacyPrompt = comfyPage.page.locator('.graphdialog')
     await expect(legacyPrompt).toBeVisible()
-    // LiteGraph's graphdialog has a 256ms dismiss guard (Date.now() - clickTime > 256).
-    // Retry the canvas click until the dialog actually closes.
-    await expect(async () => {
-      await comfyPage.canvas.click({
-        position: {
-          x: 10,
-          y: 10
-        }
-      })
-      await expect(legacyPrompt).toBeHidden({ timeout: 500 })
-    }).toPass({ timeout: 5000 })
+    await comfyPage.delay(300)
+    await comfyPage.canvas.click({
+      position: {
+        x: 10,
+        y: 10
+      }
+    })
+    await expect(legacyPrompt).toBeHidden()
   })
 
   test('Can close prompt dialog with canvas click (text widget)', async ({
@@ -413,17 +381,14 @@ test.describe('Node Interaction', () => {
     })
     const legacyPrompt = comfyPage.page.locator('.graphdialog')
     await expect(legacyPrompt).toBeVisible()
-    // LiteGraph's graphdialog has a 256ms dismiss guard (Date.now() - clickTime > 256).
-    // Retry the canvas click until the dialog actually closes.
-    await expect(async () => {
-      await comfyPage.canvas.click({
-        position: {
-          x: 10,
-          y: 10
-        }
-      })
-      await expect(legacyPrompt).toBeHidden({ timeout: 500 })
-    }).toPass({ timeout: 5000 })
+    await comfyPage.delay(300)
+    await comfyPage.canvas.click({
+      position: {
+        x: 10,
+        y: 10
+      }
+    })
+    await expect(legacyPrompt).toBeHidden()
   })
 
   test(
@@ -455,7 +420,7 @@ test.describe('Node Interaction', () => {
       },
       delay: 5
     })
-    await expect(comfyPage.page.locator('.node-title-editor')).toHaveCount(0)
+    expect(await comfyPage.page.locator('.node-title-editor').count()).toBe(0)
   })
 
   test(
@@ -485,31 +450,10 @@ test.describe('Node Interaction', () => {
     { tag: '@screenshot' },
     async ({ comfyPage }) => {
       await comfyPage.workflow.loadWorkflow('groups/oversized_group')
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(() => {
-            const group = window.app!.graph.groups[0]
-            return group ? [group.size[0], group.size[1]] : null
-          })
-        )
-        .not.toBeNull()
-
-      const initialGroupSize = await comfyPage.page.evaluate(() => {
-        const group = window.app!.graph.groups[0]
-        return group ? [group.size[0], group.size[1]] : null
-      })
-
       await comfyPage.keyboard.selectAll()
       await comfyPage.nextFrame()
       await comfyPage.command.executeCommand('Comfy.Graph.FitGroupToContents')
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(() => {
-            const group = window.app!.graph.groups[0]
-            return group ? [group.size[0], group.size[1]] : null
-          })
-        )
-        .not.toEqual(initialGroupSize)
+      await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot(
         'group-fit-to-contents.png'
       )
@@ -518,19 +462,15 @@ test.describe('Node Interaction', () => {
 
   test('Can pin/unpin nodes', { tag: '@screenshot' }, async ({ comfyPage }) => {
     await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
-    const nodeRef = (
-      await comfyPage.nodeOps.getNodeRefsByTitle('CLIP Text Encode (Prompt)')
-    )[0]
-
     await comfyPage.command.executeCommand(
       'Comfy.Canvas.ToggleSelectedNodes.Pin'
     )
-    await expect.poll(() => nodeRef.isPinned()).toBe(true)
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('nodes-pinned.png')
     await comfyPage.command.executeCommand(
       'Comfy.Canvas.ToggleSelectedNodes.Pin'
     )
-    await expect.poll(() => nodeRef.isPinned()).toBe(false)
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('nodes-unpinned.png')
   })
 
@@ -539,15 +479,11 @@ test.describe('Node Interaction', () => {
     { tag: '@screenshot' },
     async ({ comfyPage }) => {
       await comfyPage.nodeOps.selectNodes(['CLIP Text Encode (Prompt)'])
-      const nodeRef = (
-        await comfyPage.nodeOps.getNodeRefsByTitle('CLIP Text Encode (Prompt)')
-      )[0]
-
       await comfyPage.canvas.press('Control+b')
-      await expect.poll(() => nodeRef.isBypassed()).toBe(true)
+      await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot('nodes-bypassed.png')
       await comfyPage.canvas.press('Control+b')
-      await expect.poll(() => nodeRef.isBypassed()).toBe(false)
+      await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot('nodes-unbypassed.png')
     }
   )
@@ -646,23 +582,23 @@ test.describe('Canvas Interaction', { tag: '@screenshot' }, () => {
     }
 
     await comfyPage.page.mouse.move(10, 10)
-    await expect.poll(() => getCursorStyle()).toBe('default')
+    expect(await getCursorStyle()).toBe('default')
     await comfyPage.page.mouse.down()
-    await expect.poll(() => getCursorStyle()).toBe('grabbing')
+    expect(await getCursorStyle()).toBe('grabbing')
     // Move mouse should not alter cursor style.
     await comfyPage.page.mouse.move(10, 20)
-    await expect.poll(() => getCursorStyle()).toBe('grabbing')
+    expect(await getCursorStyle()).toBe('grabbing')
     await comfyPage.page.mouse.up()
-    await expect.poll(() => getCursorStyle()).toBe('default')
+    expect(await getCursorStyle()).toBe('default')
 
     await comfyPage.page.keyboard.down('Space')
-    await expect.poll(() => getCursorStyle()).toBe('grab')
+    expect(await getCursorStyle()).toBe('grab')
     await comfyPage.page.mouse.down()
-    await expect.poll(() => getCursorStyle()).toBe('grabbing')
+    expect(await getCursorStyle()).toBe('grabbing')
     await comfyPage.page.mouse.up()
-    await expect.poll(() => getCursorStyle()).toBe('grab')
+    expect(await getCursorStyle()).toBe('grab')
     await comfyPage.page.keyboard.up('Space')
-    await expect.poll(() => getCursorStyle()).toBe('default')
+    expect(await getCursorStyle()).toBe('default')
   })
 
   // https://github.com/Comfy-Org/litegraph.js/pull/424
@@ -679,27 +615,27 @@ test.describe('Canvas Interaction', { tag: '@screenshot' }, () => {
 
     // Initial state check
     await comfyPage.page.mouse.move(10, 10)
-    await expect.poll(() => getCursorStyle()).toBe('default')
+    expect(await getCursorStyle()).toBe('default')
 
     // Click and hold
     await comfyPage.page.mouse.down()
-    await expect.poll(() => getCursorStyle()).toBe('grabbing')
+    expect(await getCursorStyle()).toBe('grabbing')
 
     // Press space while holding click
     await comfyPage.page.keyboard.down('Space')
-    await expect.poll(() => getCursorStyle()).toBe('grabbing')
+    expect(await getCursorStyle()).toBe('grabbing')
 
     // Release click while space is still down
     await comfyPage.page.mouse.up()
-    await expect.poll(() => getCursorStyle()).toBe('grab')
+    expect(await getCursorStyle()).toBe('grab')
 
     // Release space
     await comfyPage.page.keyboard.up('Space')
-    await expect.poll(() => getCursorStyle()).toBe('default')
+    expect(await getCursorStyle()).toBe('default')
 
     // Move mouse - cursor should remain default
     await comfyPage.page.mouse.move(20, 20)
-    await expect.poll(() => getCursorStyle()).toBe('default')
+    expect(await getCursorStyle()).toBe('default')
   })
 
   test('Can pan when dragging a link', async ({ comfyPage, comfyMouse }) => {
@@ -790,14 +726,11 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
     await comfyPage.settings.setSetting('Comfy.Workflow.Persist', false)
     await comfyPage.setup()
 
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() => {
-          return (window.app!.extensionManager as WorkspaceStore).workflow
-            .openWorkflows.length
-        })
-      )
-      .toBeGreaterThanOrEqual(1)
+    const openCount = await comfyPage.page.evaluate(() => {
+      return (window.app!.extensionManager as WorkspaceStore).workflow
+        .openWorkflows.length
+    })
+    expect(openCount).toBeGreaterThanOrEqual(1)
   })
 
   test('Restore workflow on reload (switch workflow)', async ({
@@ -883,22 +816,14 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
       )
 
       await expect
-        .poll(() => comfyPage.menu.topbar.getTabNames())
+        .poll(() => comfyPage.menu.topbar.getTabNames(), { timeout: 5000 })
         .toEqual(expect.arrayContaining([workflowA, workflowB]))
 
-      await expect
-        .poll(async () => {
-          const tabs = await comfyPage.menu.topbar.getTabNames()
-          return (
-            tabs.indexOf(workflowA) < tabs.indexOf(workflowB) &&
-            tabs.indexOf(workflowA) >= 0
-          )
-        })
-        .toBe(true)
+      const tabs = await comfyPage.menu.topbar.getTabNames()
+      expect(tabs.indexOf(workflowA)).toBeLessThan(tabs.indexOf(workflowB))
 
-      await expect(comfyPage.menu.topbar.getActiveTab()).toContainText(
-        workflowB
-      )
+      const activeWorkflowName = await comfyPage.menu.topbar.getActiveTabName()
+      expect(activeWorkflowName).toEqual(workflowB)
     })
 
     test('Restores sidebar workflows after reload', async ({ comfyPage }) => {
@@ -907,18 +832,17 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
         'Sidebar'
       )
       await comfyPage.menu.workflowsTab.open()
-      await expect
-        .poll(() => comfyPage.menu.workflowsTab.getOpenedWorkflowNames())
-        .toEqual(expect.arrayContaining([workflowA, workflowB]))
-      await expect
-        .poll(async () => {
-          const ws = await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()
-          return ws.indexOf(workflowA) < ws.indexOf(workflowB)
-        })
-        .toBe(true)
-      await expect(comfyPage.menu.workflowsTab.activeWorkflowLabel).toHaveText(
-        workflowB
+      const openWorkflows =
+        await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()
+      const activeWorkflowName =
+        await comfyPage.menu.workflowsTab.getActiveWorkflowName()
+      expect(openWorkflows).toEqual(
+        expect.arrayContaining([workflowA, workflowB])
       )
+      expect(openWorkflows.indexOf(workflowA)).toBeLessThan(
+        openWorkflows.indexOf(workflowB)
+      )
+      expect(activeWorkflowName).toEqual(workflowB)
     })
   })
 
@@ -968,20 +892,12 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
         })
       ).toBeVisible()
 
-      await expect
-        .poll(async () => {
-          const tabs = await comfyPage.menu.topbar.getTabNames()
-          return (
-            tabs.includes(workflowA) &&
-            tabs.includes(workflowB) &&
-            tabs.indexOf(workflowA) < tabs.indexOf(workflowB)
-          )
-        })
-        .toBe(true)
+      const tabs = await comfyPage.menu.topbar.getTabNames()
+      const activeWorkflowName = await comfyPage.menu.topbar.getActiveTabName()
 
-      await expect(comfyPage.menu.topbar.getActiveTab()).toContainText(
-        workflowB
-      )
+      expect(tabs).toEqual(expect.arrayContaining([workflowA, workflowB]))
+      expect(tabs.indexOf(workflowA)).toBeLessThan(tabs.indexOf(workflowB))
+      expect(activeWorkflowName).toEqual(workflowB)
     })
 
     test('Restores sidebar workflows after browser restart', async ({
@@ -992,18 +908,17 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
         'Sidebar'
       )
       await comfyPage.menu.workflowsTab.open()
-      await expect
-        .poll(() => comfyPage.menu.workflowsTab.getOpenedWorkflowNames())
-        .toEqual(expect.arrayContaining([workflowA, workflowB]))
-      await expect
-        .poll(async () => {
-          const ws = await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()
-          return ws.indexOf(workflowA) < ws.indexOf(workflowB)
-        })
-        .toBe(true)
-      await expect(comfyPage.menu.workflowsTab.activeWorkflowLabel).toHaveText(
-        workflowB
+      const openWorkflows =
+        await comfyPage.menu.workflowsTab.getOpenedWorkflowNames()
+      const activeWorkflowName =
+        await comfyPage.menu.workflowsTab.getActiveWorkflowName()
+      expect(openWorkflows).toEqual(
+        expect.arrayContaining([workflowA, workflowB])
       )
+      expect(openWorkflows.indexOf(workflowA)).toBeLessThan(
+        openWorkflows.indexOf(workflowB)
+      )
+      expect(activeWorkflowName).toEqual(workflowB)
     })
   })
 
@@ -1029,7 +944,7 @@ test.describe('Load duplicate workflow', () => {
     await comfyPage.menu.workflowsTab.open()
     await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
     await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
-    await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
+    expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
   })
 })
 
@@ -1160,9 +1075,8 @@ test.describe('Canvas Navigation', { tag: '@screenshot' }, () => {
         position: DefaultGraphPositions.textEncodeNode1
       })
       await comfyPage.nextFrame()
-      await expect
-        .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-        .toBe(1)
+      const selectedCount = await comfyPage.nodeOps.getSelectedGraphNodesCount()
+      expect(selectedCount).toBe(1)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'legacy-click-node-select.png'
       )
@@ -1197,9 +1111,8 @@ test.describe('Canvas Navigation', { tag: '@screenshot' }, () => {
         }
       )
 
-      await expect
-        .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-        .toBe(clipNodes.length)
+      const selectedCount = await comfyPage.nodeOps.getSelectedGraphNodesCount()
+      expect(selectedCount).toBe(clipNodes.length)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'standard-left-drag-select.png'
       )
@@ -1242,9 +1155,8 @@ test.describe('Canvas Navigation', { tag: '@screenshot' }, () => {
         position: DefaultGraphPositions.textEncodeNode1
       })
       await comfyPage.nextFrame()
-      await expect
-        .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-        .toBe(1)
+      const selectedCount = await comfyPage.nodeOps.getSelectedGraphNodesCount()
+      expect(selectedCount).toBe(1)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'standard-click-node-select.png'
       )
@@ -1285,14 +1197,14 @@ test.describe('Canvas Navigation', { tag: '@screenshot' }, () => {
         }
       )
 
-      await expect
-        .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-        .toBeGreaterThan(0)
+      const selectedCountAfterDrag =
+        await comfyPage.nodeOps.getSelectedGraphNodesCount()
+      expect(selectedCountAfterDrag).toBeGreaterThan(0)
 
       await comfyPage.canvasOps.clickEmptySpace()
-      await expect
-        .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-        .toBe(0)
+      const selectedCountAfterClear =
+        await comfyPage.nodeOps.getSelectedGraphNodesCount()
+      expect(selectedCountAfterClear).toBe(0)
 
       await comfyPage.page.keyboard.down('Space')
       await comfyPage.canvasOps.dragAndDrop(
@@ -1307,9 +1219,9 @@ test.describe('Canvas Navigation', { tag: '@screenshot' }, () => {
       )
       await comfyPage.page.keyboard.up('Space')
 
-      await expect
-        .poll(() => comfyPage.nodeOps.getSelectedGraphNodesCount())
-        .toBe(0)
+      const selectedCountAfterSpaceDrag =
+        await comfyPage.nodeOps.getSelectedGraphNodesCount()
+      expect(selectedCountAfterSpaceDrag).toBe(0)
     })
   })
 
@@ -1393,7 +1305,7 @@ test.describe('Canvas Navigation', { tag: '@screenshot' }, () => {
       )
       await comfyPage.page.mouse.move(50, 50)
       await comfyPage.page.mouse.down()
-      await expect.poll(() => getCursorStyle()).toBe('grabbing')
+      expect(await getCursorStyle()).toBe('grabbing')
       await comfyPage.page.mouse.up()
     })
   })

browser_tests/tests/jobHistoryActions.spec.ts

@@ -83,10 +83,9 @@ test.describe('Job History Actions', { tag: '@ui' }, () => {
     )
     await action.click()
 
-    await expect
-      .poll(() =>
-        comfyPage.settings.getSetting<boolean>('Comfy.Queue.ShowRunProgressBar')
-      )
-      .toBe(!settingBefore)
+    const settingAfter = await comfyPage.settings.getSetting<boolean>(
+      'Comfy.Queue.ShowRunProgressBar'
+    )
+    expect(settingAfter).toBe(!settingBefore)
   })
 })

browser_tests/tests/keybindingPresets.spec.ts

@@ -79,7 +79,9 @@ test.describe('Keybinding Presets', { tag: '@keyboard' }, () => {
     await expect(presetTrigger).toContainText('test-preset')
 
     // Wait for toast to auto-dismiss, then close settings via Escape
-    await expect(comfyPage.toast.visibleToasts).toHaveCount(0)
+    await expect(comfyPage.toast.visibleToasts).toHaveCount(0, {
+      timeout: 5000
+    })
     await page.keyboard.press('Escape')
     await comfyPage.settingDialog.waitForHidden()
 
@@ -131,7 +133,9 @@ test.describe('Keybinding Presets', { tag: '@keyboard' }, () => {
     await expect(presetTrigger).toContainText('test-preset')
 
     // Wait for toast to auto-dismiss
-    await expect(comfyPage.toast.visibleToasts).toHaveCount(0)
+    await expect(comfyPage.toast.visibleToasts).toHaveCount(0, {
+      timeout: 5000
+    })
 
     // Export via ellipsis menu
     await menuButton.click()
@@ -179,7 +183,9 @@ test.describe('Keybinding Presets', { tag: '@keyboard' }, () => {
     await expect(presetTrigger).toContainText('test-preset')
 
     // Wait for toast to auto-dismiss
-    await expect(comfyPage.toast.visibleToasts).toHaveCount(0)
+    await expect(comfyPage.toast.visibleToasts).toHaveCount(0, {
+      timeout: 5000
+    })
 
     // Delete via ellipsis menu
     await menuButton.click()
@@ -217,7 +223,9 @@ test.describe('Keybinding Presets', { tag: '@keyboard' }, () => {
     await expect(presetTrigger).toContainText('test-preset')
 
     // Wait for toast to auto-dismiss
-    await expect(comfyPage.toast.visibleToasts).toHaveCount(0)
+    await expect(comfyPage.toast.visibleToasts).toHaveCount(0, {
+      timeout: 5000
+    })
 
     // Save as new preset via ellipsis menu
     await menuButton.click()
@@ -229,7 +237,9 @@ test.describe('Keybinding Presets', { tag: '@keyboard' }, () => {
     await promptInput.press('Enter')
 
     // Wait for toast to auto-dismiss
-    await expect(comfyPage.toast.visibleToasts).toHaveCount(0)
+    await expect(comfyPage.toast.visibleToasts).toHaveCount(0, {
+      timeout: 5000
+    })
 
     // Verify preset trigger shows my-custom-preset
     await expect(presetTrigger).toContainText('my-custom-preset')

browser_tests/tests/keybindings.spec.ts

@@ -18,9 +18,9 @@ test.describe('Keybindings', { tag: '@keyboard' }, () => {
     await textBox.click()
     await textBox.fill('k')
     await expect(textBox).toHaveValue('k')
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.TestCommand))
-      .toBe(undefined)
+    expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(
+      undefined
+    )
   })
 
   test('Should not trigger modifier keybinding when typing in input fields', async ({
@@ -35,9 +35,7 @@ test.describe('Keybindings', { tag: '@keyboard' }, () => {
     await textBox.fill('q')
     await textBox.press('Control+k')
     await expect(textBox).toHaveValue('q')
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.TestCommand))
-      .toBe(true)
+    expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(true)
   })
 
   test('Should not trigger keybinding reserved by text input when typing in input fields', async ({
@@ -51,8 +49,8 @@ test.describe('Keybindings', { tag: '@keyboard' }, () => {
     await textBox.click()
     await textBox.press('Control+v')
     await expect(textBox).toBeFocused()
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.TestCommand))
-      .toBe(undefined)
+    expect(await comfyPage.page.evaluate(() => window.TestCommand)).toBe(
+      undefined
+    )
   })
 })

browser_tests/tests/linearMode.spec.ts

@@ -16,7 +16,7 @@ test.describe('Linear Mode', { tag: '@ui' }, () => {
 
     await expect(
       comfyPage.page.locator('[data-testid="linear-widgets"]')
-    ).toBeVisible()
+    ).toBeVisible({ timeout: 5000 })
   })
 
   test('Run button visible in linear mode', async ({ comfyPage }) => {
@@ -24,7 +24,7 @@ test.describe('Linear Mode', { tag: '@ui' }, () => {
 
     await expect(
       comfyPage.page.locator('[data-testid="linear-run-button"]')
-    ).toBeVisible()
+    ).toBeVisible({ timeout: 5000 })
   })
 
   test('Workflow info section visible', async ({ comfyPage }) => {
@@ -32,7 +32,7 @@ test.describe('Linear Mode', { tag: '@ui' }, () => {
 
     await expect(
       comfyPage.page.locator('[data-testid="linear-workflow-info"]')
-    ).toBeVisible()
+    ).toBeVisible({ timeout: 5000 })
   })
 
   test('Returns to graph mode', async ({ comfyPage }) => {
@@ -40,11 +40,11 @@ test.describe('Linear Mode', { tag: '@ui' }, () => {
 
     await expect(
       comfyPage.page.locator('[data-testid="linear-widgets"]')
-    ).toBeVisible()
+    ).toBeVisible({ timeout: 5000 })
 
     await comfyPage.appMode.toggleAppMode()
 
-    await expect(comfyPage.canvas).toBeVisible()
+    await expect(comfyPage.canvas).toBeVisible({ timeout: 5000 })
     await expect(
       comfyPage.page.locator('[data-testid="linear-widgets"]')
     ).not.toBeVisible()
@@ -55,7 +55,7 @@ test.describe('Linear Mode', { tag: '@ui' }, () => {
 
     await expect(
       comfyPage.page.locator('[data-testid="linear-widgets"]')
-    ).toBeVisible()
+    ).toBeVisible({ timeout: 5000 })
     await expect(comfyPage.canvas).not.toBeVisible()
   })
 })

browser_tests/tests/load3d/Load3DHelper.ts

@@ -1,8 +1,5 @@
-import { expect } from '@playwright/test'
 import type { Locator } from '@playwright/test'
 
-import { TestIds } from '@e2e/fixtures/selectors'
-
 export class Load3DHelper {
   constructor(readonly node: Locator) {}
 
@@ -22,10 +19,6 @@ export class Load3DHelper {
     return this.node.locator('input[type="color"]')
   }
 
-  get openViewerButton(): Locator {
-    return this.node.getByRole('button', { name: /open in 3d viewer/i })
-  }
-
   getUploadButton(label: string): Locator {
     return this.node.getByText(label)
   }
@@ -44,10 +37,4 @@ export class Load3DHelper {
       el.dispatchEvent(new Event('input', { bubbles: true }))
     }, hex)
   }
-
-  async waitForModelLoaded(): Promise<void> {
-    await expect(this.node.getByTestId(TestIds.loading.overlay)).toBeHidden({
-      timeout: 30000
-    })
-  }
 }

browser_tests/tests/load3d/Load3DViewerHelper.ts

@@ -1,30 +0,0 @@
-import { expect } from '@playwright/test'
-import type { Locator, Page } from '@playwright/test'
-
-export class Load3DViewerHelper {
-  readonly dialog: Locator
-
-  constructor(readonly page: Page) {
-    this.dialog = page.locator('[aria-labelledby="global-load3d-viewer"]')
-  }
-
-  get canvas(): Locator {
-    return this.dialog.locator('canvas')
-  }
-
-  get sidebar(): Locator {
-    return this.dialog.getByTestId('load3d-viewer-sidebar')
-  }
-
-  get cancelButton(): Locator {
-    return this.dialog.getByRole('button', { name: /cancel/i })
-  }
-
-  async waitForOpen(): Promise<void> {
-    await expect(this.dialog).toBeVisible({ timeout: 10000 })
-  }
-
-  async waitForClosed(): Promise<void> {
-    await expect(this.dialog).toBeHidden()
-  }
-}

browser_tests/tests/load3d/load3d.spec.ts

@@ -1,29 +1,31 @@
 import { expect } from '@playwright/test'
 
-import { assetPath } from '@e2e/fixtures/utils/paths'
-import { load3dTest as test } from '@e2e/fixtures/helpers/Load3DFixtures'
+import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
+import { Load3DHelper } from './Load3DHelper'
 
 test.describe('Load3D', () => {
+  let load3d: Load3DHelper
+
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.workflow.loadWorkflow('3d/load3d_node')
+    await comfyPage.vueNodes.waitForNodes()
+
+    const node = comfyPage.vueNodes.getNodeLocator('1')
+    load3d = new Load3DHelper(node)
+  })
+
   test(
     'Renders canvas with upload buttons and controls menu',
     { tag: ['@smoke', '@screenshot'] },
-    async ({ load3d }) => {
+    async () => {
       await expect(load3d.node).toBeVisible()
 
       await expect(load3d.canvas).toBeVisible()
 
-      await expect
-        .poll(async () => {
-          const b = await load3d.canvas.boundingBox()
-          return b?.width ?? 0
-        })
-        .toBeGreaterThan(0)
-      await expect
-        .poll(async () => {
-          const b = await load3d.canvas.boundingBox()
-          return b?.height ?? 0
-        })
-        .toBeGreaterThan(0)
+      const canvasBox = await load3d.canvas.boundingBox()
+      expect(canvasBox!.width).toBeGreaterThan(0)
+      expect(canvasBox!.height).toBeGreaterThan(0)
 
       await expect(load3d.getUploadButton('upload 3d model')).toBeVisible()
       await expect(
@@ -42,7 +44,7 @@ test.describe('Load3D', () => {
   test(
     'Controls menu opens and shows all categories',
     { tag: ['@smoke', '@screenshot'] },
-    async ({ load3d }) => {
+    async () => {
       await load3d.openMenu()
 
       await expect(load3d.getMenuCategory('Scene')).toBeVisible()
@@ -61,19 +63,21 @@ test.describe('Load3D', () => {
   test(
     'Changing background color updates the scene',
     { tag: ['@smoke', '@screenshot'] },
-    async ({ comfyPage, load3d }) => {
+    async ({ comfyPage }) => {
       await load3d.setBackgroundColor('#cc3333')
       await comfyPage.nextFrame()
 
       await expect
-        .poll(() =>
-          comfyPage.page.evaluate(() => {
-            const n = window.app!.graph.getNodeById(1)
-            const config = n?.properties?.['Scene Config'] as
-              | Record<string, string>
-              | undefined
-            return config?.backgroundColor
-          })
+        .poll(
+          () =>
+            comfyPage.page.evaluate(() => {
+              const n = window.app!.graph.getNodeById(1)
+              const config = n?.properties?.['Scene Config'] as
+                | Record<string, string>
+                | undefined
+              return config?.backgroundColor
+            }),
+          { timeout: 3000 }
         )
         .toBe('#cc3333')
 
@@ -86,68 +90,8 @@ test.describe('Load3D', () => {
   test(
     'Recording controls are visible for Load3D',
     { tag: '@smoke' },
-    async ({ load3d }) => {
+    async () => {
       await expect(load3d.recordingButton).toBeVisible()
     }
   )
-
-  test(
-    'Uploads a 3D model via button and renders it',
-    { tag: ['@screenshot'] },
-    async ({ comfyPage, load3d }) => {
-      const uploadResponsePromise = comfyPage.page.waitForResponse(
-        (resp) => resp.url().includes('/upload/') && resp.status() === 200,
-        { timeout: 15000 }
-      )
-
-      const fileChooserPromise = comfyPage.page.waitForEvent('filechooser')
-      await load3d.getUploadButton('upload 3d model').click()
-      const fileChooser = await fileChooserPromise
-      await fileChooser.setFiles(assetPath('cube.obj'))
-
-      await uploadResponsePromise
-
-      const node = await comfyPage.nodeOps.getNodeRefById(1)
-      const modelFileWidget = await node.getWidget(0)
-      await expect.poll(() => modelFileWidget.getValue()).toContain('cube.obj')
-
-      await load3d.waitForModelLoaded()
-      await comfyPage.nextFrame()
-
-      await expect(load3d.node).toHaveScreenshot(
-        'load3d-uploaded-cube-obj.png',
-        { maxDiffPixelRatio: 0.1 }
-      )
-    }
-  )
-
-  test(
-    'Drag-and-drops a 3D model onto the canvas',
-    { tag: ['@screenshot'] },
-    async ({ comfyPage, load3d }) => {
-      const canvasBox = await load3d.canvas.boundingBox()
-      expect(canvasBox, 'Canvas bounding box should exist').not.toBeNull()
-      const dropPosition = {
-        x: canvasBox!.x + canvasBox!.width / 2,
-        y: canvasBox!.y + canvasBox!.height / 2
-      }
-
-      await comfyPage.dragDrop.dragAndDropFile('cube.obj', {
-        dropPosition,
-        waitForUpload: true
-      })
-
-      const node = await comfyPage.nodeOps.getNodeRefById(1)
-      const modelFileWidget = await node.getWidget(0)
-      await expect.poll(() => modelFileWidget.getValue()).toContain('cube.obj')
-
-      await load3d.waitForModelLoaded()
-      await comfyPage.nextFrame()
-
-      await expect(load3d.node).toHaveScreenshot(
-        'load3d-dropped-cube-obj.png',
-        { maxDiffPixelRatio: 0.1 }
-      )
-    }
-  )
 })

browser_tests/tests/load3d/load3dViewer.spec.ts

@@ -1,54 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { assetPath } from '@e2e/fixtures/utils/paths'
-import { load3dViewerTest as test } from '@e2e/fixtures/helpers/Load3DFixtures'
-
-test.describe('Load3D Viewer', () => {
-  test.beforeEach(async ({ comfyPage, load3d }) => {
-    // Upload cube.obj so the node has a model loaded
-    const uploadResponsePromise = comfyPage.page.waitForResponse(
-      (resp) => resp.url().includes('/upload/') && resp.status() === 200,
-      { timeout: 15000 }
-    )
-    const fileChooserPromise = comfyPage.page.waitForEvent('filechooser')
-    await load3d.getUploadButton('upload 3d model').click()
-    const fileChooser = await fileChooserPromise
-    await fileChooser.setFiles(assetPath('cube.obj'))
-    await uploadResponsePromise
-
-    const nodeRef = await comfyPage.nodeOps.getNodeRefById(1)
-    const modelFileWidget = await nodeRef.getWidget(0)
-    await expect.poll(() => modelFileWidget.getValue()).toContain('cube.obj')
-
-    await load3d.waitForModelLoaded()
-  })
-
-  test(
-    'Opens viewer dialog with canvas and controls sidebar',
-    { tag: '@smoke' },
-    async ({ load3d, viewer }) => {
-      await load3d.openViewerButton.click()
-      await viewer.waitForOpen()
-
-      await expect(viewer.canvas).toBeVisible()
-      const canvasBox = await viewer.canvas.boundingBox()
-      expect(canvasBox!.width).toBeGreaterThan(0)
-      expect(canvasBox!.height).toBeGreaterThan(0)
-
-      await expect(viewer.sidebar).toBeVisible()
-      await expect(viewer.cancelButton).toBeVisible()
-    }
-  )
-
-  test(
-    'Cancel button closes the viewer dialog',
-    { tag: '@smoke' },
-    async ({ load3d, viewer }) => {
-      await load3d.openViewerButton.click()
-      await viewer.waitForOpen()
-
-      await viewer.cancelButton.click()
-      await viewer.waitForClosed()
-    }
-  )
-})

browser_tests/tests/loadWorkflowInMedia.spec.ts

@@ -60,17 +60,11 @@ test.describe(
       test(`Load workflow from URL ${url} (drop from different browser tabs)`, async ({
         comfyPage
       }) => {
-        const initialNodeCount = await comfyPage.nodeOps.getGraphNodesCount()
-
         await comfyPage.dragDrop.dragAndDropURL(url)
-
-        // The drop triggers an async fetch → parse → loadGraphData chain.
-        // Poll until the graph settles with the loaded workflow's nodes.
-        await expect
-          .poll(() => comfyPage.nodeOps.getGraphNodesCount(), {
-            timeout: 15000
-          })
-          .toBeGreaterThan(initialNodeCount)
+        const readableName = url.split('/').pop()
+        await expect(comfyPage.canvas).toHaveScreenshot(
+          `dropped_workflow_url_${readableName}.png`
+        )
       })
     })
 
@@ -90,12 +84,12 @@ test.describe(
       const initialNodeCount = await comfyPage.nodeOps.getGraphNodesCount()
 
       const node = comfyPage.vueNodes.getNodeByTitle('KSampler')
-      await expect.poll(() => node.boundingBox()).toBeTruthy()
-      const box = (await node.boundingBox())!
+      const box = await node.boundingBox()
+      expect(box).not.toBeNull()
 
       const dropPosition = {
-        x: box.x + box.width / 2,
-        y: box.y + box.height / 2
+        x: box!.x + box!.width / 2,
+        y: box!.y + box!.height / 2
       }
 
       await comfyPage.dragDrop.dragAndDropURL(fakeUrl, {
@@ -109,9 +103,8 @@ test.describe(
         { timeout: 10000 }
       )
 
-      await expect
-        .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-        .not.toBe(initialNodeCount)
+      const newNodeCount = await comfyPage.nodeOps.getGraphNodesCount()
+      expect(newNodeCount).not.toBe(initialNodeCount)
     })
   }
 )

browser_tests/tests/lodThreshold.spec.ts

@@ -13,14 +13,6 @@ test.describe('LOD Threshold', { tag: ['@screenshot', '@canvas'] }, () => {
     // Load a workflow with some nodes to render
     await comfyPage.workflow.loadWorkflow('default')
 
-    // Should start at normal zoom (not low quality)
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.low_quality))
-      .toBe(false)
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.ds.scale))
-      .toBeCloseTo(1, 1)
-
     // Get initial LOD state and settings
     const initialState = await comfyPage.page.evaluate(() => {
       const canvas = window.app!.canvas
@@ -31,55 +23,62 @@ test.describe('LOD Threshold', { tag: ['@screenshot', '@canvas'] }, () => {
       }
     })
 
+    // Should start at normal zoom (not low quality)
+    expect(initialState.lowQuality).toBe(false)
+    expect(initialState.scale).toBeCloseTo(1, 1)
+
     // Calculate expected threshold (8px / 14px ≈ 0.571)
     const expectedThreshold = initialState.minFontSize / 14
+    // Can't access private _lowQualityZoomThreshold directly
 
     // Zoom out just above threshold (should still be high quality)
     await comfyPage.canvasOps.zoom(120, 5) // Zoom out 5 steps
     await comfyPage.nextFrame()
 
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() => {
-          const canvas = window.app!.canvas
-          return { lowQuality: canvas.low_quality, scale: canvas.ds.scale }
-        })
-      )
-      .toMatchObject({ lowQuality: false })
+    const aboveThresholdState = await comfyPage.page.evaluate(() => {
+      const canvas = window.app!.canvas
+      return {
+        lowQuality: canvas.low_quality,
+        scale: canvas.ds.scale
+      }
+    })
+
+    // If still above threshold, should be high quality
+    if (aboveThresholdState.scale > expectedThreshold) {
+      expect(aboveThresholdState.lowQuality).toBe(false)
+    }
 
     // Zoom out more to trigger LOD (below threshold)
     await comfyPage.canvasOps.zoom(120, 5) // Zoom out 5 more steps
     await comfyPage.nextFrame()
 
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() => {
-          const canvas = window.app!.canvas
-          return { lowQuality: canvas.low_quality, scale: canvas.ds.scale }
-        })
-      )
-      .toMatchObject({ lowQuality: true })
+    // Check that LOD is now active
+    const zoomedOutState = await comfyPage.page.evaluate(() => {
+      const canvas = window.app!.canvas
+      return {
+        lowQuality: canvas.low_quality,
+        scale: canvas.ds.scale
+      }
+    })
 
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.ds.scale))
-      .toBeLessThan(expectedThreshold)
+    expect(zoomedOutState.scale).toBeLessThan(expectedThreshold)
+    expect(zoomedOutState.lowQuality).toBe(true)
 
     // Zoom back in to disable LOD (above threshold)
     await comfyPage.canvasOps.zoom(-120, 15) // Zoom in 15 steps
     await comfyPage.nextFrame()
 
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() => {
-          const canvas = window.app!.canvas
-          return { lowQuality: canvas.low_quality, scale: canvas.ds.scale }
-        })
-      )
-      .toMatchObject({ lowQuality: false })
+    // Check that LOD is now inactive
+    const zoomedInState = await comfyPage.page.evaluate(() => {
+      const canvas = window.app!.canvas
+      return {
+        lowQuality: canvas.low_quality,
+        scale: canvas.ds.scale
+      }
+    })
 
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.ds.scale))
-      .toBeGreaterThan(expectedThreshold)
+    expect(zoomedInState.scale).toBeGreaterThan(expectedThreshold)
+    expect(zoomedInState.lowQuality).toBe(false)
   })
 
   test('Should update threshold when font size setting changes', async ({
@@ -94,28 +93,36 @@ test.describe('LOD Threshold', { tag: ['@screenshot', '@canvas'] }, () => {
     )
 
     // Check that font size updated
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() => window.app!.canvas.min_font_size_for_lod)
-      )
-      .toBe(14)
+    const newState = await comfyPage.page.evaluate(() => {
+      const canvas = window.app!.canvas
+      return {
+        minFontSize: canvas.min_font_size_for_lod
+      }
+    })
+
+    expect(newState.minFontSize).toBe(14)
+    // Expected threshold would be 14px / 14px = 1.0
 
     // At default zoom, LOD should still be inactive (scale is exactly 1.0, not less than)
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.low_quality))
-      .toBe(false)
+    const lodState = await comfyPage.page.evaluate(() => {
+      return window.app!.canvas.low_quality
+    })
+    expect(lodState).toBe(false)
 
     // Zoom out slightly to trigger LOD
     await comfyPage.canvasOps.zoom(120, 1) // Zoom out 1 step
     await comfyPage.nextFrame()
 
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.low_quality))
-      .toBe(true)
+    const afterZoom = await comfyPage.page.evaluate(() => {
+      const canvas = window.app!.canvas
+      return {
+        lowQuality: canvas.low_quality,
+        scale: canvas.ds.scale
+      }
+    })
 
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.ds.scale))
-      .toBeLessThan(1.0)
+    expect(afterZoom.scale).toBeLessThan(1.0)
+    expect(afterZoom.lowQuality).toBe(true)
   })
 
   test('Should disable LOD when font size is set to 0', async ({
@@ -131,19 +138,18 @@ test.describe('LOD Threshold', { tag: ['@screenshot', '@canvas'] }, () => {
     await comfyPage.nextFrame()
 
     // LOD should remain disabled even at very low zoom
-    await expect
-      .poll(() =>
-        comfyPage.page.evaluate(() => window.app!.canvas.min_font_size_for_lod)
-      )
-      .toBe(0)
+    const state = await comfyPage.page.evaluate(() => {
+      const canvas = window.app!.canvas
+      return {
+        lowQuality: canvas.low_quality,
+        scale: canvas.ds.scale,
+        minFontSize: canvas.min_font_size_for_lod
+      }
+    })
 
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.low_quality))
-      .toBe(false)
-
-    await expect
-      .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.ds.scale))
-      .toBeLessThan(0.2) // Very zoomed out
+    expect(state.minFontSize).toBe(0) // LOD disabled
+    expect(state.lowQuality).toBe(false)
+    expect(state.scale).toBeLessThan(0.2) // Very zoomed out
   })
 
   test(
@@ -163,39 +169,41 @@ test.describe('LOD Threshold', { tag: ['@screenshot', '@canvas'] }, () => {
       }, targetZoom)
       await comfyPage.nextFrame()
 
-      // Wait for LOD to activate before taking screenshot
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(() => window.app!.canvas.low_quality)
-        )
-        .toBe(true)
-
       // Take snapshot with LOD active (default 8px setting)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'lod-comparison-low-quality.png'
       )
 
+      const lowQualityState = await comfyPage.page.evaluate(() => {
+        const canvas = window.app!.canvas
+        return {
+          lowQuality: canvas.low_quality,
+          scale: canvas.ds.scale
+        }
+      })
+      expect(lowQualityState.lowQuality).toBe(true)
+
       // Disable LOD to see high quality at same zoom
       await comfyPage.settings.setSetting(
         'LiteGraph.Canvas.MinFontSizeForLOD',
         0
       )
-
-      // Wait for LOD to deactivate after setting change
-      await expect
-        .poll(() =>
-          comfyPage.page.evaluate(() => window.app!.canvas.low_quality)
-        )
-        .toBe(false)
+      await comfyPage.nextFrame()
 
       // Take snapshot with LOD disabled (full quality at same zoom)
       await expect(comfyPage.canvas).toHaveScreenshot(
         'lod-comparison-high-quality.png'
       )
 
-      await expect
-        .poll(() => comfyPage.page.evaluate(() => window.app!.canvas.ds.scale))
-        .toBeCloseTo(targetZoom, 2)
+      const highQualityState = await comfyPage.page.evaluate(() => {
+        const canvas = window.app!.canvas
+        return {
+          lowQuality: canvas.low_quality,
+          scale: canvas.ds.scale
+        }
+      })
+      expect(highQualityState.lowQuality).toBe(false)
+      expect(highQualityState.scale).toBeCloseTo(targetZoom, 2)
     }
   )
 })

browser_tests/tests/menu.spec.ts

@@ -22,7 +22,10 @@ test.describe('Menu', { tag: '@ui' }, () => {
         }
       })
     })
-    await expect(comfyPage.menu.buttons).toHaveCount(initialChildrenCount + 1)
+    await comfyPage.nextFrame()
+
+    const newChildrenCount = await comfyPage.menu.buttons.count()
+    expect(newChildrenCount).toBe(initialChildrenCount + 1)
   })
 
   test.describe('Workflows topbar tabs', () => {
@@ -35,17 +38,15 @@ test.describe('Menu', { tag: '@ui' }, () => {
     })
 
     test('Can show opened workflows', async ({ comfyPage }) => {
-      await expect
-        .poll(() => comfyPage.menu.topbar.getTabNames())
-        .toEqual(['Unsaved Workflow'])
+      expect(await comfyPage.menu.topbar.getTabNames()).toEqual([
+        'Unsaved Workflow'
+      ])
     })
 
     test('Can close saved-workflow tabs', async ({ comfyPage }) => {
       const workflowName = `tempWorkflow-${test.info().title}`
       await comfyPage.menu.topbar.saveWorkflow(workflowName)
-      await expect
-        .poll(() => comfyPage.menu.topbar.getTabNames())
-        .toEqual([workflowName])
+      expect(await comfyPage.menu.topbar.getTabNames()).toEqual([workflowName])
       await comfyPage.menu.topbar.closeWorkflowTab(workflowName)
       await expect
         .poll(() => comfyPage.menu.topbar.getTabNames())
@@ -61,11 +62,10 @@ test.describe('Menu', { tag: '@ui' }, () => {
       const topLevelMenuItem = comfyPage.page
         .locator('a.p-menubar-item-link')
         .first()
-      await expect
-        .poll(() =>
-          topLevelMenuItem.evaluate((el) => el.scrollWidth > el.clientWidth)
-        )
-        .toBe(false)
+      const isTextCutoff = await topLevelMenuItem.evaluate((el) => {
+        return el.scrollWidth > el.clientWidth
+      })
+      expect(isTextCutoff).toBe(false)
     })
 
     test('Clicking on active state items does not close menu', async ({
@@ -148,7 +148,7 @@ test.describe('Menu', { tag: '@ui' }, () => {
       const exportTag = comfyPage.page.locator('.keybinding-tag', {
         hasText: 'Ctrl + s'
       })
-      await expect(exportTag).toHaveCount(1)
+      expect(await exportTag.count()).toBe(1)
     })
 
     test('Can catch error when executing command', async ({ comfyPage }) => {
@@ -173,7 +173,7 @@ test.describe('Menu', { tag: '@ui' }, () => {
         })
       })
       await comfyPage.menu.topbar.triggerTopbarCommand(['ext', 'foo-command'])
-      await expect(comfyPage.toast.visibleToasts).toHaveCount(1)
+      await expect.poll(() => comfyPage.toast.getVisibleToastCount()).toBe(1)
     })
 
     test('Can navigate Theme menu and switch between Dark and Light themes', async ({
@@ -205,9 +205,7 @@ test.describe('Menu', { tag: '@ui' }, () => {
       await expect(async () => {
         await expect(menu).toBeVisible()
         await expect(themeSubmenu).toBeVisible()
-        await expect(lightThemeItem.locator('.pi-check')).not.toHaveClass(
-          /invisible/
-        )
+        expect(await topbar.isMenuItemActive(lightThemeItem)).toBe(true)
       }).toPass({ timeout: 5000 })
 
       // Screenshot with light theme active
@@ -232,11 +230,9 @@ test.describe('Menu', { tag: '@ui' }, () => {
       await expect(async () => {
         await expect(menu).toBeVisible()
         await expect(themeItems2.submenu).toBeVisible()
-        await expect(
-          themeItems2.darkTheme.locator('.pi-check')
-        ).not.toHaveClass(/invisible/)
-        await expect(themeItems2.lightTheme.locator('.pi-check')).toHaveClass(
-          /invisible/
+        expect(await topbar.isMenuItemActive(themeItems2.darkTheme)).toBe(true)
+        expect(await topbar.isMenuItemActive(themeItems2.lightTheme)).toBe(
+          false
         )
       }).toPass({ timeout: 5000 })
 
@@ -260,9 +256,9 @@ test.describe('Menu', { tag: '@ui' }, () => {
       comfyPage
     }) => {
       await comfyPage.settings.setSetting('Comfy.UseNewMenu', position)
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.UseNewMenu'))
-        .toBe('Top')
+      expect(await comfyPage.settings.getSetting('Comfy.UseNewMenu')).toBe(
+        'Top'
+      )
     })
 
     test(`Can migrate deprecated menu positions on initial load (${position})`, async ({
@@ -270,9 +266,9 @@ test.describe('Menu', { tag: '@ui' }, () => {
     }) => {
       await comfyPage.settings.setSetting('Comfy.UseNewMenu', position)
       await comfyPage.setup()
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.UseNewMenu'))
-        .toBe('Top')
+      expect(await comfyPage.settings.getSetting('Comfy.UseNewMenu')).toBe(
+        'Top'
+      )
     })
   })
 })

browser_tests/tests/minimap.spec.ts

@@ -53,9 +53,13 @@ test.describe('Minimap', { tag: '@canvas' }, () => {
     await expect(minimapContainer).toBeVisible()
 
     await toggleButton.click()
+    await comfyPage.nextFrame()
+
     await expect(minimapContainer).not.toBeVisible()
 
     await toggleButton.click()
+    await comfyPage.nextFrame()
+
     await expect(minimapContainer).toBeVisible()
   })
 
@@ -65,9 +69,13 @@ test.describe('Minimap', { tag: '@canvas' }, () => {
     await expect(minimapContainer).toBeVisible()
 
     await comfyPage.page.keyboard.press('Alt+KeyM')
+    await comfyPage.nextFrame()
+
     await expect(minimapContainer).not.toBeVisible()
 
     await comfyPage.page.keyboard.press('Alt+KeyM')
+    await comfyPage.nextFrame()
+
     await expect(minimapContainer).toBeVisible()
   })
 
@@ -100,7 +108,6 @@ test.describe('Minimap', { tag: '@canvas' }, () => {
         canvas.ds.offset[1] = -600
         canvas.setDirty(true, true)
       })
-      await comfyPage.nextFrame()
       await expect(minimap).toHaveScreenshot('minimap-after-pan.png')
     }
   )
@@ -115,18 +122,20 @@ test.describe('Minimap', { tag: '@canvas' }, () => {
       const viewport = minimap.locator('.minimap-viewport')
       await expect(viewport).toBeVisible()
 
-      await expect(async () => {
-        const vb = await viewport.boundingBox()
-        const mb = await minimap.boundingBox()
-        expect(vb).toBeTruthy()
-        expect(mb).toBeTruthy()
-        expect(vb!.width).toBeGreaterThan(0)
-        expect(vb!.height).toBeGreaterThan(0)
-        expect(vb!.x).toBeGreaterThanOrEqual(mb!.x)
-        expect(vb!.y).toBeGreaterThanOrEqual(mb!.y)
-        expect(vb!.x + vb!.width).toBeLessThanOrEqual(mb!.x + mb!.width)
-        expect(vb!.y + vb!.height).toBeLessThanOrEqual(mb!.y + mb!.height)
-      }).toPass({ timeout: 5000 })
+      const minimapBox = await minimap.boundingBox()
+      const viewportBox = await viewport.boundingBox()
+
+      expect(minimapBox).toBeTruthy()
+      expect(viewportBox).toBeTruthy()
+      expect(viewportBox!.width).toBeGreaterThan(0)
+      expect(viewportBox!.height).toBeGreaterThan(0)
+
+      expect(viewportBox!.x + viewportBox!.width).toBeGreaterThan(minimapBox!.x)
+      expect(viewportBox!.y + viewportBox!.height).toBeGreaterThan(
+        minimapBox!.y
+      )
+      expect(viewportBox!.x).toBeLessThan(minimapBox!.x + minimapBox!.width)
+      expect(viewportBox!.y).toBeLessThan(minimapBox!.y + minimapBox!.height)
 
       await expect(minimap).toHaveScreenshot('minimap-with-viewport.png')
     }

browser_tests/tests/mobileBaseline.spec.ts

@@ -10,7 +10,9 @@ test.describe(
     test('@mobile empty canvas', async ({ comfyPage }) => {
       await comfyPage.settings.setSetting('Comfy.ConfirmClear', false)
       await comfyPage.command.executeCommand('Comfy.ClearWorkflow')
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
+      await expect(async () => {
+        expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
+      }).toPass({ timeout: 5000 })
       await comfyPage.nextFrame()
       await expect(comfyPage.canvas).toHaveScreenshot('mobile-empty-canvas.png')
     })

browser_tests/tests/nodeBadge.spec.ts

@@ -82,13 +82,7 @@ test.describe(
           'Comfy.NodeBadge.NodeIdBadgeMode',
           mode
         )
-        await expect
-          .poll(
-            () =>
-              comfyPage.settings.getSetting('Comfy.NodeBadge.NodeIdBadgeMode'),
-            { message: 'NodeIdBadgeMode setting should be applied' }
-          )
-          .toBe(mode)
+        await comfyPage.nextFrame()
         await comfyPage.canvasOps.resetView()
         await expect(comfyPage.canvas).toHaveScreenshot(
           `node-badge-${mode}.png`
@@ -110,11 +104,8 @@ test.describe(
         NodeBadgeMode.ShowAll
       )
       await comfyPage.settings.setSetting('Comfy.ColorPalette', 'unknown')
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.ColorPalette'), {
-          message: 'ColorPalette setting should be applied'
-        })
-        .toBe('unknown')
+      await comfyPage.nextFrame()
+      // Click empty space to trigger canvas re-render.
       await comfyPage.canvasOps.clickEmptySpace()
       await expect(comfyPage.canvas).toHaveScreenshot(
         'node-badge-unknown-color-palette.png'
@@ -129,11 +120,8 @@ test.describe(
         NodeBadgeMode.ShowAll
       )
       await comfyPage.settings.setSetting('Comfy.ColorPalette', 'light')
-      await expect
-        .poll(() => comfyPage.settings.getSetting('Comfy.ColorPalette'), {
-          message: 'ColorPalette setting should be applied'
-        })
-        .toBe('light')
+      await comfyPage.nextFrame()
+      // Click empty space to trigger canvas re-render.
       await comfyPage.canvasOps.clickEmptySpace()
       await expect(comfyPage.canvas).toHaveScreenshot(
         'node-badge-light-color-palette.png'

browser_tests/tests/nodeContextMenuOverflow.spec.ts

@@ -1,100 +0,0 @@
-import { expect } from '@playwright/test'
-
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-
-test.describe(
-  'Node context menu viewport overflow (#10824)',
-  { tag: '@ui' },
-  () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      // Keep the viewport well below the menu content height so overflow is guaranteed.
-      await comfyPage.page.setViewportSize({ width: 1280, height: 520 })
-      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
-      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
-      await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
-      await comfyPage.nextFrame()
-    })
-
-    async function openMoreOptions(comfyPage: ComfyPage) {
-      const ksamplerNodes =
-        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
-      if (ksamplerNodes.length === 0) {
-        throw new Error('No KSampler nodes found')
-      }
-
-      // Drag the KSampler toward the lower-left so the menu has limited space below it.
-      const nodePos = await ksamplerNodes[0].getPosition()
-      const viewportSize = comfyPage.page.viewportSize()!
-      const centerX = viewportSize.width / 3
-      const centerY = viewportSize.height * 0.75
-      await comfyPage.canvasOps.dragAndDrop(
-        { x: nodePos.x, y: nodePos.y },
-        { x: centerX, y: centerY }
-      )
-      await comfyPage.nextFrame()
-
-      await ksamplerNodes[0].click('title')
-      await comfyPage.nextFrame()
-
-      await expect(comfyPage.page.locator('.selection-toolbox')).toBeVisible()
-
-      const moreOptionsBtn = comfyPage.page.locator(
-        '[data-testid="more-options-button"]'
-      )
-      await expect(moreOptionsBtn).toBeVisible()
-      await moreOptionsBtn.click()
-      await comfyPage.nextFrame()
-
-      const menu = comfyPage.page.locator('.p-contextmenu')
-      await expect(menu).toBeVisible()
-
-      // Wait for constrainMenuHeight (runs via requestAnimationFrame in onMenuShow)
-      await comfyPage.nextFrame()
-
-      return menu
-    }
-
-    test('last menu item "Remove" is reachable via scroll', async ({
-      comfyPage
-    }) => {
-      const menu = await openMoreOptions(comfyPage)
-      const rootList = menu.locator(':scope > ul')
-
-      await expect
-        .poll(
-          () => rootList.evaluate((el) => el.scrollHeight > el.clientHeight),
-          {
-            message:
-              'Menu should overflow vertically so this test exercises the viewport clamp'
-          }
-        )
-        .toBe(true)
-
-      // "Remove" is the last item in the More Options menu.
-      // It must become reachable by scrolling the bounded menu list.
-      const removeItem = menu.getByText('Remove', { exact: true })
-      const didScroll = await rootList.evaluate((el) => {
-        const previousScrollTop = el.scrollTop
-        el.scrollTo({ top: el.scrollHeight })
-        return el.scrollTop > previousScrollTop
-      })
-      expect(didScroll).toBe(true)
-      await expect(removeItem).toBeVisible()
-    })
-
-    test('last menu item "Remove" is clickable and removes the node', async ({
-      comfyPage
-    }) => {
-      const menu = await openMoreOptions(comfyPage)
-
-      const removeItem = menu.getByText('Remove', { exact: true })
-      await removeItem.scrollIntoViewIfNeeded()
-      await removeItem.click()
-      await comfyPage.nextFrame()
-
-      // The node should be removed from the graph
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(0)
-    })
-  }
-)

browser_tests/tests/nodeDisplay.spec.ts

@@ -37,7 +37,7 @@ test.describe('Optional input', { tag: ['@screenshot', '@node'] }, () => {
 
   test('Only optional inputs', async ({ comfyPage }) => {
     await comfyPage.workflow.loadWorkflow('inputs/only_optional_inputs')
-    await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
+    expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(1)
     await expect(
       comfyPage.page.getByTestId(TestIds.dialogs.errorOverlay)
     ).not.toBeVisible()

browser_tests/tests/nodeHelp.spec.ts

@@ -433,7 +433,8 @@ This is documentation for a custom node.
       const imageCount = await images.count()
       for (let i = 0; i < imageCount; i++) {
         const img = images.nth(i)
-        await expect(img).not.toHaveAttribute('onerror')
+        const onError = await img.getAttribute('onerror')
+        expect(onError).toBeNull()
       }
 
       // Check that javascript: links are sanitized
@@ -441,7 +442,10 @@ This is documentation for a custom node.
       const linkCount = await links.count()
       for (let i = 0; i < linkCount; i++) {
         const link = links.nth(i)
-        await expect(link).not.toHaveAttribute('href', /^javascript:/i)
+        const href = await link.getAttribute('href')
+        if (href !== null) {
+          expect(href).not.toContain('javascript:')
+        }
       }
 
       // Safe content should remain
@@ -508,7 +512,8 @@ This is English documentation.
       await expect(helpPage.locator('.p-progressspinner')).not.toBeVisible()
 
       // Should show some content even on error
-      await expect(helpPage).not.toHaveText('')
+      const content = await helpPage.textContent()
+      expect(content).toBeTruthy()
     })
 
     test('Should update help content when switching between nodes', async ({

browser_tests/tests/nodeLibraryEssentials.spec.ts

@@ -82,7 +82,9 @@ test.describe('Node Library Essentials Tab', { tag: '@ui' }, () => {
     const firstCard = comfyPage.page.locator('[data-node-name]').first()
     await expect(firstCard).toBeVisible()
 
-    await expect(firstCard).toHaveAttribute('data-node-name', /.+/)
+    const nodeName = await firstCard.getAttribute('data-node-name')
+    expect(nodeName).toBeTruthy()
+    expect(nodeName!.length).toBeGreaterThan(0)
   })
 
   test('Node library can switch between all and essentials tabs', async ({

browser_tests/tests/nodeSearchBoxV2.spec.ts

@@ -31,9 +31,8 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
     await comfyPage.page.keyboard.press('Enter')
     await expect(searchBoxV2.input).not.toBeVisible()
 
-    await expect
-      .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-      .toBe(initialCount + 1)
+    const newCount = await comfyPage.nodeOps.getGraphNodesCount()
+    expect(newCount).toBe(initialCount + 1)
   })
 
   test('Can add first default result with Enter', async ({ comfyPage }) => {
@@ -50,9 +49,8 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
     await comfyPage.page.keyboard.press('Enter')
     await expect(searchBoxV2.input).not.toBeVisible()
 
-    await expect
-      .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-      .toBe(initialCount + 1)
+    const newCount = await comfyPage.nodeOps.getGraphNodesCount()
+    expect(newCount).toBe(initialCount + 1)
   })
 
   test.describe('Category navigation', () => {
@@ -83,7 +81,8 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
       await searchBoxV2.categoryButton('sampling').click()
 
       await expect(searchBoxV2.results.first()).toBeVisible()
-      await expect.poll(() => searchBoxV2.results.count()).toBeGreaterThan(0)
+      const count = await searchBoxV2.results.count()
+      expect(count).toBeGreaterThan(0)
     })
   })
 
@@ -143,9 +142,8 @@ test.describe('Node search box V2', { tag: '@node' }, () => {
       await comfyPage.page.keyboard.press('Enter')
       await expect(searchBoxV2.input).not.toBeVisible()
 
-      await expect
-        .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-        .toBe(initialCount + 1)
+      const newCount = await comfyPage.nodeOps.getGraphNodesCount()
+      expect(newCount).toBe(initialCount + 1)
     })
   })
 })

browser_tests/tests/nodeSearchBoxV2Extended.spec.ts

@@ -41,9 +41,8 @@ test.describe('Node search box V2 extended', { tag: '@node' }, () => {
     await comfyPage.page.keyboard.press('Escape')
     await expect(searchBoxV2.input).not.toBeVisible()
 
-    await expect
-      .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-      .toBe(initialCount)
+    const newCount = await comfyPage.nodeOps.getGraphNodesCount()
+    expect(newCount).toBe(initialCount)
   })
 
   test('Search clears when reopening', async ({ comfyPage }) => {
@@ -76,10 +75,9 @@ test.describe('Node search box V2 extended', { tag: '@node' }, () => {
 
       await searchBoxV2.categoryButton('loaders').click()
       await expect(searchBoxV2.results.first()).toBeVisible()
+      const loaderResults = await searchBoxV2.results.allTextContents()
 
-      await expect
-        .poll(() => searchBoxV2.results.allTextContents())
-        .not.toEqual(samplingResults)
+      expect(samplingResults).not.toEqual(loaderResults)
     })
   })
 
@@ -109,9 +107,8 @@ test.describe('Node search box V2 extended', { tag: '@node' }, () => {
       )
       await expect(filterChip).toBeVisible()
       await expect(searchBoxV2.results.first()).toBeVisible()
-      await expect
-        .poll(() => searchBoxV2.results.allTextContents())
-        .not.toEqual(unfilteredResults)
+      const filteredResults = await searchBoxV2.results.allTextContents()
+      expect(filteredResults).not.toEqual(unfilteredResults)
 
       // Remove filter by clicking the chip delete button
       await filterChip.getByTestId('chip-delete').click()