fix: prevent subgraph node positions from corrupting on page refresh

.claude/skills/backport-management/SKILL.md

@@ -11,11 +11,10 @@ Cherry-pick backport management for Comfy-Org/ComfyUI_frontend stable release br
 
 1. **Discover** — Collect candidates from Slack bot + git log gap (`reference/discovery.md`)
 2. **Analyze** — Categorize MUST/SHOULD/SKIP, check deps (`reference/analysis.md`)
-3. **Human Review** — Present candidates in batches for interactive approval (see Interactive Approval Flow)
-4. **Plan** — Order by dependency (leaf fixes first), group into waves per branch
-5. **Execute** — Label-driven automation → worktree fallback for conflicts (`reference/execution.md`)
-6. **Verify** — After each wave, verify branch integrity before proceeding
-7. **Log & Report** — Generate session report (`reference/logging.md`)
+3. **Plan** — Order by dependency (leaf fixes first), group into waves per branch
+4. **Execute** — Label-driven automation → worktree fallback for conflicts (`reference/execution.md`)
+5. **Verify** — After each wave, verify branch integrity before proceeding
+6. **Log & Report** — Generate session report with mermaid diagram (`reference/logging.md`)
 
 ## System Context
 
@@ -38,29 +37,16 @@ Cherry-pick backport management for Comfy-Org/ComfyUI_frontend stable release br
 
 **Critical: Match PRs to the correct target branches.**
 
-| Branch prefix | Scope                          | Example                                           |
-| ------------- | ------------------------------ | ------------------------------------------------- |
-| `cloud/*`     | Cloud-hosted ComfyUI only      | Team workspaces, cloud queue, cloud-only login    |
-| `core/*`      | Local/self-hosted ComfyUI only | Core editor, local workflows, node system         |
-| Both          | Shared infrastructure          | App mode, Firebase auth (API nodes), payment URLs |
+| Branch prefix | Scope                          | Example                                   |
+| ------------- | ------------------------------ | ----------------------------------------- |
+| `cloud/*`     | Cloud-hosted ComfyUI only      | App mode, cloud auth, cloud-specific UI   |
+| `core/*`      | Local/self-hosted ComfyUI only | Core editor, local workflows, node system |
 
-### What Goes Where
+**⚠️ NEVER backport cloud-only PRs to `core/*` branches.** Cloud-only changes (app mode, cloud auth, cloud billing UI, cloud-specific API calls) are irrelevant to local users and waste effort. Before backporting any PR to a `core/*` branch, check:
 
-**Both core + cloud:**
-
-- **App mode** PRs — app mode is NOT cloud-only
-- **Firebase auth** PRs — Firebase auth is on core for API nodes
-- **Payment redirect** PRs — payment infrastructure shared
-- **Bug fixes** touching shared components
-
-**Cloud-only (skip for core):**
-
-- Team workspaces
-- Cloud queue virtualization
-- Hide API key login
-- Cloud-specific UI behind cloud feature flags
-
-**⚠️ NEVER backport cloud-only PRs to `core/*` branches.** But do NOT assume "app mode" or "Firebase" = cloud-only. Check the actual files changed.
+- Does the PR title/description mention "app mode", "cloud", or cloud-specific features?
+- Does the PR only touch files like `appModeStore.ts`, cloud auth, or cloud-specific components?
+- If yes → skip for `core/*` branches (may still apply to `cloud/*` branches)
 
 ## ⚠️ Gotchas (Learn from Past Sessions)
 
@@ -81,32 +67,6 @@ The `pr-backport.yaml` action reports more conflicts than reality. `git cherry-p
 
 12 or 27 conflicting files can be trivial (snapshots, new files). **Categorize conflicts first**, then decide. See Conflict Triage below.
 
-### Accept-Theirs Can Produce Broken Hybrids
-
-When a PR **rewrites a component** (e.g., PrimeVue → Reka UI), the accept-theirs regex produces a broken mix of old and new code. The template may reference new APIs while the script still has old imports, or vice versa.
-
-**Detection:** Content conflicts with 4+ conflict markers in a single `.vue` file, especially when imports change between component libraries.
-
-**Fix:** Instead of accept-theirs regex, use `git show MERGE_SHA:path/to/file > path/to/file` to get the complete correct version from the merge commit on main. This bypasses the conflict entirely.
-
-### Cherry-Picks Can Reference Missing Dependencies
-
-When PR A on main depends on code introduced by PR B (which was merged before A), cherry-picking A brings in code that references B's additions. The cherry-pick succeeds but the branch is broken.
-
-**Common pattern:** Composables, component files, or type definitions introduced by an earlier PR and used by the cherry-picked PR.
-
-**Detection:** `pnpm typecheck` fails with "Cannot find module" or "is not defined" errors after cherry-pick.
-
-**Fix:** Use `git show MERGE_SHA:path/to/missing/file > path/to/missing/file` to bring the missing files from main. Always verify with typecheck.
-
-### Use `--no-verify` for Worktree Pushes
-
-Husky hooks fail in worktrees (can't find lint-staged config). Always use `git push --no-verify` and `git commit --no-verify` when working in `/tmp/` worktrees.
-
-### Automation Success Varies Wildly by Branch
-
-In the 2026-04-06 session: core/1.42 got 18/26 auto-PRs, cloud/1.42 got only 1/25. The cloud branch has more divergence. **Always plan for manual fallback** — don't assume automation will handle most PRs.
-
 ## Conflict Triage
 
 **Always categorize before deciding to skip. High conflict count ≠ hard conflicts.**
@@ -117,8 +77,6 @@ In the 2026-04-06 session: core/1.42 got 18/26 auto-PRs, cloud/1.42 got only 1/2
 | **Modify/delete (new file)** | PR introduces files not on target    | `git add $FILE` — keep the new file                             |
 | **Modify/delete (removed)**  | Target removed files the PR modifies | `git rm $FILE` — file no longer relevant                        |
 | **Content conflicts**        | Marker-based (`<<<<<<<`)             | Accept theirs via python regex (see below)                      |
-| **Component rewrites**       | 4+ markers in `.vue`, library change | Use `git show SHA:path > path` — do NOT accept-theirs           |
-| **Import-only conflicts**    | Only import lines differ             | Keep both imports if both used; remove unused after             |
 | **Add/add**                  | Both sides added same file           | Accept theirs, verify no logic conflict                         |
 | **Locale/JSON files**        | i18n key additions                   | Accept theirs, validate JSON after                              |
 
@@ -145,7 +103,7 @@ Skip these without discussion:
 - **Test-only / lint rule changes** — Not user-facing
 - **Revert pairs** — If PR A reverted by PR B, skip both. If fixed version (PR C) exists, backport only C.
 - **Features not on target branch** — e.g., Painter, GLSLShader, appModeStore on core/1.40
-- **Cloud-only PRs on core/\* branches** — Team workspaces, cloud queue, cloud-only login. (Note: app mode and Firebase auth are NOT cloud-only — see Branch Scope Rules)
+- **Cloud-only PRs on core/\* branches** — App mode, cloud auth, cloud billing. These only affect cloud-hosted ComfyUI.
 
 ## Wave Verification
 
@@ -164,18 +122,6 @@ git worktree remove /tmp/verify-TARGET --force
 
 If typecheck or tests fail, stop and investigate before continuing. A broken branch after wave N means all subsequent waves will compound the problem.
 
-### Fix PRs Are Normal
-
-Expect to create 1 fix PR per branch after verification. Common issues:
-
-1. **Component rewrite hybrids** — accept-theirs produced broken `.vue` files. Fix: overwrite with correct version from merge commit via `git show SHA:path > path`
-2. **Missing dependency files** — cherry-pick brought in code referencing composables/components not on the branch. Fix: add missing files from merge commit
-3. **Missing type properties** — cherry-picked code uses interface properties not yet on the branch (e.g., `key` on `ConfirmDialogOptions`). Fix: add the property to the interface
-4. **Unused imports** — conflict resolution kept imports that the branch doesn't use. Fix: remove unused imports
-5. **Wrong types from conflict resolution** — e.g., `{ top: number; right: number }` vs `{ top: number; left: number }`. Fix: match the return type of the actual function
-
-Create a fix PR on a branch from the target, verify typecheck passes, then merge with `--squash --admin`.
-
 ### Never Admin-Merge Without CI
 
 In a previous bulk session, all 69 backport PRs were merged with `gh pr merge --squash --admin`, bypassing required CI checks. This shipped 3 test failures to a release branch. **Lesson: `--admin` skips all branch protection, including required status checks.** Only use `--admin` after confirming CI has passed (e.g., `gh pr checks $PR` shows all green), or rely on auto-merge (`--auto --squash`) which waits for CI by design.
@@ -189,43 +135,6 @@ Large backport sessions (50+ PRs) are expensive and error-prone. Prefer continuo
 - Reserve session-style bulk backporting for catching up after gaps
 - When a release branch is created, immediately start the continuous process
 
-## Interactive Approval Flow
-
-After analysis, present ALL candidates (MUST, SHOULD, and borderline) to the human for interactive review before execution. Do not write a static decisions.md — collect approvals in conversation.
-
-### Batch Presentation
-
-Present PRs in batches of 5-10, grouped by theme (visual bugs, interaction bugs, cloud/auth, data correctness, etc.). Use this table format:
-
-```
- #  | PR     | Title                                    | Target        | Rec  | Context
-----+--------+------------------------------------------+---------------+------+--------
- 1  | #12345 | fix: broken thing                        | core+cloud/42 | Y    | Description here. Why it matters. Agent reasoning.
- 2  | #12346 | fix: another issue                       | core/42       | N    | Only affects removed feature. Not on target branch.
-```
-
-Each row includes:
-
-- PR number and title
-- Target branches
-- Agent recommendation: `Rec: Y` or `Rec: N` with brief reasoning
-- 2-3 sentence context: what the PR does, why it matters (or doesn't)
-
-### Human Response Format
-
-- `Y` — approve for backport
-- `N` — skip
-- `?` — investigate (agent shows PR description, files changed, detailed take, then re-asks)
-- Any freeform question or comment triggers discussion before moving on
-- Bulk responses accepted (e.g. `1 Y, 2 Y, 3 N, 4 ?`)
-
-### Rules
-
-- ALL candidates are reviewed, not just MUST items
-- When human responds `?`, show the PR description, files changed, and agent's detailed analysis, then re-ask for their decision
-- When human asks a question about a PR, answer with context and recommendation, then wait for their decision
-- Do not proceed to execution until all batches are reviewed and every candidate has a Y or N
-
 ## Quick Reference
 
 ### Label-Driven Automation (default path)
@@ -241,96 +150,13 @@ gh api repos/Comfy-Org/ComfyUI_frontend/issues/$PR/labels \
 ```bash
 git worktree add /tmp/backport-$BRANCH origin/$BRANCH
 cd /tmp/backport-$BRANCH
-
-# For each PR:
-git fetch origin $BRANCH
 git checkout -b backport-$PR-to-$BRANCH origin/$BRANCH
 git cherry-pick -m 1 $MERGE_SHA
-# Resolve conflicts (see Conflict Triage)
-git push origin backport-$PR-to-$BRANCH --no-verify
-gh pr create --base $BRANCH --head backport-$PR-to-$BRANCH \
-  --title "[backport $BRANCH] $TITLE (#$PR)" \
-  --body "Backport of #$PR. [conflict notes]"
-gh pr merge $NEW_PR --squash --admin
-sleep 25
+# Resolve conflicts, push, create PR, merge
 ```
 
-### Efficient Batch: Test-Then-Resolve Pattern
-
-When many PRs need manual cherry-pick (e.g., cloud branches), test all first:
-
-```bash
-cd /tmp/backport-$BRANCH
-for pr in "${ORDER[@]}"; do
-  git checkout -b test-$pr origin/$BRANCH
-  if git cherry-pick -m 1 $SHA 2>/dev/null; then
-    echo "CLEAN: $pr"
-  else
-    echo "CONFLICT: $pr"
-    git cherry-pick --abort
-  fi
-  git checkout --detach HEAD
-  git branch -D test-$pr
-done
-```
-
-Then process clean PRs in a batch loop, conflicts individually.
-
 ### PR Title Convention
 
 ```
 [backport TARGET_BRANCH] Original Title (#ORIGINAL_PR)
 ```
-
-## Final Deliverables (Slack-Compatible)
-
-After execution completes, generate two files in `~/temp/backport-session/`. Both must be **Slack-compatible plain text** — no emojis, no markdown tables, no headers (`#`), no bold (`**`), no inline code. Use plain dashes, indentation, and line breaks only.
-
-### 1. Author Accountability Report
-
-File: `backport-author-accountability.md`
-
-Lists all backported PRs grouped by original author (via `gh pr view $PR --json author`). Surfaces who should be self-labeling.
-
-```
-Backport Session YYYY-MM-DD -- PRs that should have been labeled by authors
-
-- author-login
-    - #1234 fix: short title
-    - #5678 fix: another title
-- other-author
-    - #9012 fix: some other fix
-```
-
-Authors sorted alphabetically, 4-space indent for nested items.
-
-### 2. Slack Status Update
-
-File: `slack-status-update.md`
-
-A shareable summary of the session. Structure:
-
-```
-Backport session complete -- YYYY-MM-DD
-
-[1-sentence summary: N PRs backported to which branches. All pass typecheck.]
-
-Branches updated:
-- core/X.XX: N PRs + N fix PRs (N auto, N manual)
-- cloud/X.XX: N PRs + N fix PRs (N auto, N manual)
-- ...
-
-N total PRs created and merged (N backports + N fix PRs).
-
-Notable fixes included:
-- [category]: [list of fixes]
-- ...
-
-Conflict patterns encountered:
-- [pattern and how it was resolved]
-- ...
-
-N authors had PRs backported. See author accountability list for details.
-```
-
-No emojis, no tables, no bold, no headers. Plain text that pastes cleanly into Slack.

.claude/skills/backport-management/reference/analysis.md

@@ -23,10 +23,10 @@ For SHOULD items with conflicts: if conflict resolution requires more than trivi
 
 **Before categorizing, filter by branch scope:**
 
-| Target branch | Skip if PR is...                                                                                                  |
-| ------------- | ----------------------------------------------------------------------------------------------------------------- |
-| `core/*`      | Cloud-only (team workspaces, cloud queue, cloud-only login). Note: app mode and Firebase auth are NOT cloud-only. |
-| `cloud/*`     | Local-only features not present on cloud branch                                                                   |
+| Target branch | Skip if PR is...                                                    |
+| ------------- | ------------------------------------------------------------------- |
+| `core/*`      | Cloud-only (app mode, cloud auth, cloud billing, cloud-specific UI) |
+| `cloud/*`     | Local-only features not present on cloud branch                     |
 
 Cloud-only PRs backported to `core/*` are wasted effort — `core/*` branches serve local/self-hosted users who never see cloud features. Check PR titles, descriptions, and files changed for cloud-specific indicators.
 
@@ -61,6 +61,8 @@ done
 
 ## Human Review Checkpoint
 
-Use the Interactive Approval Flow (see SKILL.md) to review all candidates interactively. Do not write a static decisions.md for the human to edit — instead, present batches of 5-10 PRs with context and recommendations, and collect Y/N/? responses in conversation.
+Present decisions.md before execution. Include:
 
-All candidates must be reviewed (MUST, SHOULD, and borderline items), not just a subset.
+1. All MUST/SHOULD/SKIP categorizations with rationale
+2. Questions for human (feature existence, scope, deps)
+3. Estimated effort per branch

.claude/skills/backport-management/reference/execution.md

@@ -73,22 +73,14 @@ for PR in ${CONFLICT_PRS[@]}; do
   git cherry-pick -m 1 $MERGE_SHA
 
   # If conflict — NEVER skip based on file count alone!
-  # Categorize conflicts first: binary PNGs, modify/delete, content, add/add, component rewrites
+  # Categorize conflicts first: binary PNGs, modify/delete, content, add/add
   # See SKILL.md Conflict Triage table for resolution per type.
 
-  # For component rewrites (4+ markers in a .vue file, library migration):
-  # DO NOT use accept-theirs regex — it produces broken hybrids.
-  # Instead, use the complete file from the merge commit:
-  # git show $MERGE_SHA:path/to/file > path/to/file
-
-  # For simple content conflicts, accept theirs:
-  # python3 -c "import re; ..."
-
   # Resolve all conflicts, then:
   git add .
   GIT_EDITOR=true git cherry-pick --continue
 
-  git push origin backport-$PR-to-TARGET --no-verify
+  git push origin backport-$PR-to-TARGET
   NEW_PR=$(gh pr create --base TARGET_BRANCH --head backport-$PR-to-TARGET \
     --title "[backport TARGET] TITLE (#$PR)" \
     --body "Backport of #$PR..." | grep -oP '\d+$')
@@ -122,30 +114,7 @@ source ~/.nvm/nvm.sh && nvm use 24 && pnpm install && pnpm typecheck && pnpm tes
 git worktree remove /tmp/verify-TARGET --force
 ```
 
-If verification fails, **do not skip** — create a fix PR:
-
-```bash
-# Stay in the verify worktree
-git checkout -b fix-backport-TARGET origin/TARGET_BRANCH
-
-# Common fixes:
-# 1. Component rewrite hybrids: overwrite with merge commit version
-git show MERGE_SHA:path/to/Component.vue > path/to/Component.vue
-
-# 2. Missing dependency files
-git show MERGE_SHA:path/to/missing.ts > path/to/missing.ts
-
-# 3. Missing type properties: edit the interface
-# 4. Unused imports: delete the import lines
-
-git add -A
-git commit --no-verify -m "fix: resolve backport typecheck issues on TARGET"
-git push origin fix-backport-TARGET --no-verify
-gh pr create --base TARGET --head fix-backport-TARGET --title "fix: resolve backport typecheck issues on TARGET" --body "..."
-gh pr merge $PR --squash --admin
-```
-
-Do not proceed to the next branch until typecheck passes.
+If verification fails, stop and fix before proceeding to the next wave. Do not compound problems across waves.
 
 ## Conflict Resolution Patterns
 
@@ -173,35 +142,7 @@ git rm $FILE
 git checkout --theirs $FILE && git add $FILE
 ```
 
-### 4. Component Rewrites (DO NOT accept-theirs)
-
-When a PR completely rewrites a component (e.g., PrimeVue → Reka UI), accept-theirs produces
-a broken hybrid with mismatched template/script sections.
-
-```bash
-# Use the complete correct file from the merge commit instead:
-git show $MERGE_SHA:src/components/input/MultiSelect.vue > src/components/input/MultiSelect.vue
-git show $MERGE_SHA:src/components/input/SingleSelect.vue > src/components/input/SingleSelect.vue
-git add src/components/input/MultiSelect.vue src/components/input/SingleSelect.vue
-```
-
-**Detection:** 4+ conflict markers in a single `.vue` file, imports changing between component
-libraries (PrimeVue → Reka UI, etc.), template structure completely different on each side.
-
-### 5. Missing Dependencies After Cherry-Pick
-
-Cherry-picks can succeed but leave the branch broken because the PR's code on main
-references composables/components introduced by an earlier PR.
-
-```bash
-# Add the missing file from the merge commit:
-git show $MERGE_SHA:src/composables/queue/useJobDetailsHover.ts > src/composables/queue/useJobDetailsHover.ts
-git show $MERGE_SHA:src/components/builder/BuilderSaveDialogContent.vue > src/components/builder/BuilderSaveDialogContent.vue
-```
-
-**Detection:** `pnpm typecheck` fails with "Cannot find module" or "X is not defined" after cherry-pick succeeds cleanly.
-
-### 6. Locale Files
+### 4. Locale Files
 
 Usually adding new i18n keys — accept theirs, validate JSON:
 
@@ -235,14 +176,8 @@ gh pr checks $PR --watch --fail-fast && gh pr merge $PR --squash --admin
 8. **Always validate JSON** after resolving locale file conflicts
 9. **Dep refresh PRs** — skip on stable branches. Risk of transitive dep regressions outweighs audit cleanup. Cherry-pick individual CVE fixes instead.
 10. **Verify after each wave** — run `pnpm typecheck && pnpm test:unit` on the target branch after merging a batch. Catching breakage early prevents compounding errors.
-11. **App mode and Firebase auth are NOT cloud-only** — they go to both core and cloud branches. Only team workspaces, cloud queue, and cloud-specific login are cloud-only.
+11. **Cloud-only PRs don't belong on core/\* branches** — app mode, cloud auth, and cloud-specific UI changes are irrelevant to local users. Always check PR scope against branch scope before backporting.
 12. **Never admin-merge without CI** — `--admin` bypasses all branch protections including required status checks. A bulk session of 69 admin-merges shipped 3 test failures. Always wait for CI to pass first, or use `--auto --squash` which waits by design.
-13. **Accept-theirs regex breaks component rewrites** — when a PR migrates between component libraries (PrimeVue → Reka UI), the regex produces a broken hybrid. Use `git show SHA:path > path` to get the complete correct version instead.
-14. **Cherry-picks can silently bring in missing-dependency code** — if PR A references a composable introduced by PR B, cherry-picking A succeeds but typecheck fails. Always run typecheck after each wave and add missing files from the merge commit.
-15. **Fix PRs are expected** — plan for 1 fix PR per branch to resolve typecheck issues from conflict resolutions. This is normal, not a failure.
-16. **Use `--no-verify` in worktrees** — husky hooks fail in `/tmp/` worktrees. Always push/commit with `--no-verify`.
-17. **Automation success varies by branch** — core/1.42 got 18/26 auto-PRs (69%), cloud/1.42 got 1/25 (4%). Cloud branches diverge more. Plan for manual fallback.
-18. **Test-then-resolve pattern** — for branches with low automation success, run a dry-run loop to classify clean vs conflict PRs before processing. This is much faster than resolving conflicts serially.
 
 ## CI Failure Triage
 

.claude/skills/backport-management/reference/logging.md

@@ -2,25 +2,26 @@
 
 ## During Execution
 
-Maintain `execution-log.md` with per-branch tables (this is internal, markdown tables are fine here):
+Maintain `execution-log.md` with per-branch tables:
 
 ```markdown
-| PR#   | Title | Status | Backport PR | Notes   |
-| ----- | ----- | ------ | ----------- | ------- |
-| #XXXX | Title | merged | #YYYY       | Details |
+| PR#   | Title | CI Status                      | Status                            | Backport PR | Notes   |
+| ----- | ----- | ------------------------------ | --------------------------------- | ----------- | ------- |
+| #XXXX | Title | ✅ Pass / ❌ Fail / ⏳ Pending | ✅ Merged / ⏭️ Skip / ⏸️ Deferred | #YYYY       | Details |
 ```
 
 ## Wave Verification Log
 
-Track verification results per wave within execution-log.md:
+Track verification results per wave:
 
 ```markdown
-Wave N Verification -- TARGET_BRANCH
+## Wave N Verification — TARGET_BRANCH
 
 - PRs merged: #A, #B, #C
-- Typecheck: pass / fail
-- Fix PR: #YYYY (if needed)
+- Typecheck: ✅ Pass / ❌ Fail
+- Unit tests: ✅ Pass / ❌ Fail
 - Issues found: (if any)
+- Human review needed: (list any non-trivial conflict resolutions)
 ```
 
 ## Session Report Template
@@ -62,42 +63,40 @@ Wave N Verification -- TARGET_BRANCH
 - Feature branches that need tracking for future sessions?
 ```
 
-## Final Deliverables
+## Final Deliverable: Visual Summary
 
-After all branches are complete and verified, generate these files in `~/temp/backport-session/`:
+At session end, generate a **mermaid diagram** showing all backported PRs organized by target branch and category (MUST/SHOULD), plus a summary table. Present this to the user as the final output.
 
-### 1. execution-log.md (internal)
+```mermaid
+graph TD
+    subgraph branch1["☁️ cloud/X.XX — N PRs"]
+        C1["#XXXX title"]
+        C2["#XXXX title"]
+    end
 
-Per-branch tables with PR#, title, status, backport PR#, notes. Markdown tables are fine — this is for internal tracking, not Slack.
+    subgraph branch2must["🔴 core/X.XX MUST — N PRs"]
+        M1["#XXXX title"]
+    end
 
-### 2. backport-author-accountability.md (Slack-compatible)
+    subgraph branch2should["🟡 core/X.XX SHOULD — N PRs"]
+        S1["#XXXX-#XXXX N auto-merged"]
+        S2["#XXXX-#XXXX N manual picks"]
+    end
 
-See SKILL.md "Final Deliverables" section. Plain text, no emojis/tables/headers/bold. Authors sorted alphabetically with PRs nested under each.
+    classDef cloudStyle fill:#1a3a5c,stroke:#4da6ff,color:#e0f0ff
+    classDef coreStyle fill:#1a4a2e,stroke:#4dff88,color:#e0ffe8
+    classDef mustStyle fill:#5c1a1a,stroke:#ff4d4d,color:#ffe0e0
+    classDef shouldStyle fill:#4a3a1a,stroke:#ffcc4d,color:#fff5e0
+```
 
-### 3. slack-status-update.md (Slack-compatible)
-
-See SKILL.md "Final Deliverables" section. Plain text summary that pastes cleanly into Slack. Includes branch counts, notable fixes, conflict patterns, author count.
-
-## Slack Formatting Rules
-
-Both shareable files (author accountability + status update) must follow these rules:
-
-- No emojis (no checkmarks, no arrows, no icons)
-- No markdown tables (use plain lists with dashes)
-- No headers (no # or ##)
-- No bold (\*_) or italic (_)
-- No inline code backticks
-- Use -- instead of em dash
-- Use plain dashes (-) for lists with 4-space indent for nesting
-- Line breaks between sections for readability
-
-These files should paste directly into a Slack message and look clean.
+Use the `mermaid` tool to render this diagram and present it alongside the summary table as the session's final deliverable.
 
 ## Files to Track
 
-All in `~/temp/backport-session/`:
+- `candidate_list.md` — all candidates per branch
+- `decisions.md` — MUST/SHOULD/SKIP with rationale
+- `wave-plan.md` — execution order
+- `execution-log.md` — real-time status
+- `backport-session-report.md` — final summary
 
-- `execution-plan.md` -- approved PRs with merge SHAs (input)
-- `execution-log.md` -- real-time status with per-branch tables (internal)
-- `backport-author-accountability.md` -- PRs grouped by author (Slack-compatible)
-- `slack-status-update.md` -- session summary (Slack-compatible)
+All in `~/temp/backport-session/`.

.github/workflows/api-update-registry-api-types.yaml

@@ -0,0 +1,107 @@
+# Description: When upstream comfy-api is updated, click dispatch to update the TypeScript type definitions in this repo
+name: 'Api: Update Registry API Types'
+
+on:
+  # Manual trigger
+  workflow_dispatch:
+
+  # Triggered from comfy-api repo
+  repository_dispatch:
+    types: [comfy-api-updated]
+
+jobs:
+  update-registry-types:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Checkout comfy-api repository
+        uses: actions/checkout@v6
+        with:
+          repository: Comfy-Org/comfy-api
+          path: comfy-api
+          token: ${{ secrets.COMFY_API_PAT }}
+          clean: true
+
+      - name: Get API commit information
+        id: api-info
+        run: |
+          cd comfy-api
+          API_COMMIT=$(git rev-parse --short HEAD)
+          echo "commit=${API_COMMIT}" >> $GITHUB_OUTPUT
+          cd ..
+
+      - name: Generate API types
+        run: |
+          echo "Generating TypeScript types from comfy-api@${{ steps.api-info.outputs.commit }}..."
+          mkdir -p ./packages/registry-types/src
+          pnpm dlx openapi-typescript ./comfy-api/openapi.yml --output ./packages/registry-types/src/comfyRegistryTypes.ts
+
+      - name: Validate generated types
+        run: |
+          if [ ! -f ./packages/registry-types/src/comfyRegistryTypes.ts ]; then
+            echo "Error: Types file was not generated."
+            exit 1
+          fi
+
+          # Check if file is not empty
+          if [ ! -s ./packages/registry-types/src/comfyRegistryTypes.ts ]; then
+            echo "Error: Generated types file is empty."
+            exit 1
+          fi
+
+      - name: Lint generated types
+        run: |
+          echo "Linting generated Comfy Registry API types..."
+          pnpm lint:fix:no-cache -- ./packages/registry-types/src/comfyRegistryTypes.ts
+
+      - name: Check for changes
+        id: check-changes
+        run: |
+          if [[ -z $(git status --porcelain ./packages/registry-types/src/comfyRegistryTypes.ts) ]]; then
+            echo "No changes to Comfy Registry API types detected."
+            echo "changed=false" >> $GITHUB_OUTPUT
+            exit 0
+          else
+            echo "Changes detected in Comfy Registry API types."
+            echo "changed=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create Pull Request
+        if: steps.check-changes.outputs.changed == 'true'
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        with:
+          token: ${{ secrets.PR_GH_TOKEN }}
+          commit-message: '[chore] Update Comfy Registry API types from comfy-api@${{ steps.api-info.outputs.commit }}'
+          title: '[chore] Update Comfy Registry API types from comfy-api@${{ steps.api-info.outputs.commit }}'
+          body: |
+            ## Automated API Type Update
+
+            This PR updates the Comfy Registry API types from the latest comfy-api OpenAPI specification.
+
+            - API commit: ${{ steps.api-info.outputs.commit }}
+            - Generated on: ${{ github.event.repository.updated_at }}
+
+            These types are automatically generated using openapi-typescript.
+          branch: update-registry-types-${{ steps.api-info.outputs.commit }}
+          base: main
+          labels: CNR
+          delete-branch: true
+          add-paths: |
+            packages/registry-types/src/comfyRegistryTypes.ts

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

@@ -31,5 +31,4 @@ jobs:
         uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
         with:
           files: coverage/lcov.info
-          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: false

.github/workflows/ci-website-build.yaml

@@ -1,33 +0,0 @@
-# Description: Build and validate the marketing website (apps/website)
-name: 'CI: Website Build'
-
-on:
-  push:
-    branches: [main, master, website/*]
-    paths:
-      - 'apps/website/**'
-      - 'packages/design-system/**'
-      - 'pnpm-lock.yaml'
-  pull_request:
-    branches-ignore: [wip/*, draft/*, temp/*]
-    paths:
-      - 'apps/website/**'
-      - 'packages/design-system/**'
-      - 'pnpm-lock.yaml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Setup frontend
-        uses: ./.github/actions/setup-frontend
-
-      - name: Build website
-        run: pnpm --filter @comfyorg/website build

.github/workflows/release-version-bump.yaml

@@ -144,8 +144,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
-        with:
-          version: 10
 
       - name: Setup Node.js
         uses: actions/setup-node@v6

AGENTS.md

@@ -179,12 +179,6 @@ This project uses **pnpm**. Always prefer scripts defined in `package.json` (e.g
 24. Do not use function expressions if it's possible to use function declarations instead
 25. Watch out for [Code Smells](https://wiki.c2.com/?CodeSmell) and refactor to avoid them
 
-## Design Standards
-
-Before implementing any user-facing feature, consult the [Comfy Design Standards](https://www.figma.com/design/QreIv5htUaSICNuO2VBHw0/Comfy-Design-Standards) Figma file. Use the Figma MCP to fetch it live — the file is the single source of truth and may be updated by designers at any time.
-
-See `docs/guidance/design-standards.md` for Figma file keys, section node IDs, and component references.
-
 ## Testing Guidelines
 
 See @docs/testing/\*.md for detailed patterns.
@@ -232,7 +226,6 @@ See @docs/testing/\*.md for detailed patterns.
 - shadcn/vue: <https://www.shadcn-vue.com/>
 - Reka UI: <https://reka-ui.com/>
 - PrimeVue: <https://primevue.org>
-- Comfy Design Standards: <https://www.figma.com/design/QreIv5htUaSICNuO2VBHw0/Comfy-Design-Standards>
 - ComfyUI: <https://docs.comfy.org>
 - Electron: <https://www.electronjs.org/docs/latest/>
 - Wiki: <https://deepwiki.com/Comfy-Org/ComfyUI_frontend/1-overview>

CONTRIBUTING.md

@@ -62,37 +62,6 @@ python main.py --port 8188 --cpu
 - Run `pnpm dev:electron` to start the dev server with electron API mocked
 - Run `pnpm dev:cloud` to start the dev server against the cloud backend (instead of local ComfyUI server)
 
-#### Testing with Cloud & Staging Environments
-
-Some features — particularly **partner/API nodes** (e.g. BFL, OpenAI, Stability AI) — require a cloud backend for authentication and billing. Running these against a local ComfyUI instance will result in permission errors or logged-out states. There are two ways to connect to a cloud/staging backend:
-
-**Option 1: Frontend — `pnpm dev:cloud`**
-
-The simplest approach. This proxies all API requests to the test cloud environment:
-
-```bash
-pnpm dev:cloud
-```
-
-This sets `DEV_SERVER_COMFYUI_URL` to `https://testcloud.comfy.org/` automatically. You can also set this variable manually in your `.env` file to target a different environment:
-
-```bash
-# .env
-DEV_SERVER_COMFYUI_URL=https://stagingcloud.comfy.org/
-```
-
-Any `*.comfy.org` URL automatically enables cloud mode, which includes the GCS media proxy needed for viewing generated images and videos. See [.env_example](.env_example) for all available cloud URLs.
-
-**Option 2: Backend — `--comfy-api-base`**
-
-Alternatively, launch the ComfyUI backend pointed at the staging API:
-
-```bash
-python main.py --comfy-api-base https://stagingapi.comfy.org --verbose
-```
-
-Then run `pnpm dev` as usual. This keeps the frontend in local mode but routes backend API calls through staging.
-
 #### Access dev server on touch devices
 
 Enable remote access to the dev server by setting `VITE_REMOTE_DEV` in `.env` to `true`.

apps/website/astro.config.ts

@@ -1,12 +1,11 @@
 import { defineConfig } from 'astro/config'
-import sitemap from '@astrojs/sitemap'
 import vue from '@astrojs/vue'
 import tailwindcss from '@tailwindcss/vite'
 
 export default defineConfig({
   site: 'https://comfy.org',
   output: 'static',
-  integrations: [vue(), sitemap()],
+  integrations: [vue()],
   vite: {
     plugins: [tailwindcss()]
   },

apps/website/package.json

@@ -9,7 +9,6 @@
     "preview": "astro preview"
   },
   "dependencies": {
-    "@astrojs/sitemap": "catalog:",
     "@comfyorg/design-system": "workspace:*",
     "@vercel/analytics": "catalog:",
     "vue": "catalog:"

apps/website/public/robots.txt

@@ -1,4 +0,0 @@
-User-agent: *
-Allow: /
-
-Sitemap: https://comfy.org/sitemap-index.xml

apps/website/src/components/SiteFooter.vue

@@ -96,10 +96,6 @@ const socials = [
           v-for="link in column.links"
           :key="link.href"
           :href="link.href"
-          :target="link.href.startsWith('http') ? '_blank' : undefined"
-          :rel="
-            link.href.startsWith('http') ? 'noopener noreferrer' : undefined
-          "
           class="text-sm text-smoke-700 transition-colors hover:text-white"
         >
           {{ link.label }}

apps/website/src/layouts/BaseLayout.astro

@@ -7,14 +7,12 @@ interface Props {
   title: string
   description?: string
   ogImage?: string
-  noindex?: boolean
 }
 
 const {
   title,
   description = 'Comfy is the AI creation engine for visual professionals who demand control.',
   ogImage = '/og-default.png',
-  noindex = false,
 } = Astro.props
 
 const siteBase = Astro.site ?? 'https://comfy.org'
@@ -23,29 +21,6 @@ const ogImageURL = new URL(ogImage, siteBase)
 const locale = Astro.currentLocale ?? 'en'
 const gtmId = 'GTM-NP9JM6K7'
 const gtmEnabled = import.meta.env.PROD
-
-const organizationJsonLd = {
-  '@context': 'https://schema.org',
-  '@type': 'Organization',
-  name: 'Comfy Org',
-  url: 'https://comfy.org',
-  logo: 'https://comfy.org/favicon.svg',
-  sameAs: [
-    'https://github.com/comfyanonymous/ComfyUI',
-    'https://discord.gg/comfyorg',
-    'https://x.com/comaboratory',
-    'https://reddit.com/r/comfyui',
-    'https://linkedin.com/company/comfyorg',
-    'https://instagram.com/comfyorg',
-  ],
-}
-
-const websiteJsonLd = {
-  '@context': 'https://schema.org',
-  '@type': 'WebSite',
-  name: 'Comfy',
-  url: 'https://comfy.org',
-}
 ---
 
 <!doctype html>
@@ -54,36 +29,26 @@ const websiteJsonLd = {
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="description" content={description} />
-    {noindex && <meta name="robots" content="noindex, nofollow" />}
     <title>{title}</title>
 
     <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
     <link rel="canonical" href={canonicalURL.href} />
-    <link rel="preconnect" href="https://www.googletagmanager.com" />
-    <link rel="dns-prefetch" href="https://www.googletagmanager.com" />
 
     <!-- Open Graph -->
     <meta property="og:type" content="website" />
     <meta property="og:title" content={title} />
     <meta property="og:description" content={description} />
     <meta property="og:image" content={ogImageURL.href} />
-    <meta property="og:image:width" content="1200" />
-    <meta property="og:image:height" content="630" />
     <meta property="og:url" content={canonicalURL.href} />
     <meta property="og:locale" content={locale} />
     <meta property="og:site_name" content="Comfy" />
 
     <!-- Twitter -->
     <meta name="twitter:card" content="summary_large_image" />
-    <meta name="twitter:site" content="@comaboratory" />
     <meta name="twitter:title" content={title} />
     <meta name="twitter:description" content={description} />
     <meta name="twitter:image" content={ogImageURL.href} />
 
-    <!-- Structured Data -->
-    <script type="application/ld+json" set:html={JSON.stringify(organizationJsonLd)} />
-    <script type="application/ld+json" set:html={JSON.stringify(websiteJsonLd)} />
-
     <!-- Google Tag Manager -->
     {gtmEnabled && (
       <script is:inline define:vars={{ gtmId }}>

apps/website/src/pages/privacy-policy.astro

@@ -7,7 +7,6 @@ import SiteFooter from '../components/SiteFooter.vue'
 <BaseLayout
   title="Privacy Policy — Comfy"
   description="Comfy privacy policy. Learn how we collect, use, and protect your personal information."
-  noindex
 >
   <SiteNav client:load />
   <main class="mx-auto max-w-3xl px-6 py-24">

apps/website/src/pages/terms-of-service.astro

@@ -7,7 +7,6 @@ import SiteFooter from '../components/SiteFooter.vue'
 <BaseLayout
   title="Terms of Service — Comfy"
   description="Terms of Service for ComfyUI and related Comfy services."
-  noindex
 >
   <SiteNav client:load />
   <main class="mx-auto max-w-3xl px-6 py-24 sm:py-32">

apps/website/src/pages/zh-CN/privacy-policy.astro

@@ -7,7 +7,6 @@ import SiteFooter from '../../components/SiteFooter.vue'
 <BaseLayout
   title="隐私政策 — Comfy"
   description="Comfy 隐私政策。了解我们如何收集、使用和保护您的个人信息。"
-  noindex
 >
   <SiteNav client:load />
   <main class="mx-auto max-w-3xl px-6 py-24">

apps/website/src/pages/zh-CN/terms-of-service.astro

@@ -7,7 +7,6 @@ import SiteFooter from '../../components/SiteFooter.vue'
 <BaseLayout
   title="服务条款 — Comfy"
   description="ComfyUI 及相关 Comfy 服务的服务条款。"
-  noindex
 >
   <SiteNav client:load />
   <main class="mx-auto max-w-3xl px-6 py-24 sm:py-32">

apps/website/vercel.json

@@ -1,26 +0,0 @@
-{
-  "$schema": "https://openapi.vercel.sh/vercel.json",
-  "buildCommand": "pnpm --filter @comfyorg/website build",
-  "outputDirectory": "apps/website/dist",
-  "installCommand": "pnpm install --frozen-lockfile",
-  "framework": null,
-  "redirects": [
-    {
-      "source": "/pricing",
-      "destination": "/cloud/pricing",
-      "permanent": true
-    },
-    {
-      "source": "/enterprise",
-      "destination": "/cloud/enterprise",
-      "permanent": true
-    },
-    {
-      "source": "/blog",
-      "destination": "https://blog.comfy.org/",
-      "permanent": true
-    },
-    { "source": "/contact", "destination": "/about", "permanent": true },
-    { "source": "/press", "destination": "/about", "permanent": true }
-  ]
-}

browser_tests/AGENTS.md

@@ -1,8 +1,6 @@
 # E2E Testing Guidelines
 
 See `@docs/guidance/playwright.md` for Playwright best practices (auto-loaded for `*.spec.ts`).
-See `@browser_tests/FLAKE_PREVENTION_RULES.md` when triaging or editing
-flaky browser tests.
 
 ## Directory Structure
 

browser_tests/FLAKE_PREVENTION_RULES.md

@@ -1,99 +0,0 @@
-# Browser Test Flake Prevention Rules
-
-Reference this file as `@browser_tests/FLAKE_PREVENTION_RULES.md` when
-debugging or updating flaky Playwright tests.
-
-These rules are distilled from the PR 10817 stabilization thread chain. They
-exist to make flaky-test triage faster and more repeatable.
-
-## Quick Checklist
-
-Before merging a flaky-test fix, confirm all of these are true:
-
-- 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
-- the fix stays local unless a shared helper truly owns the race
-- local verification uses a targeted rerun
-
-## 1. Start With CI Evidence
-
-- Do not trust the top-level GitHub check result alone.
-- Inspect the latest Playwright `report.json` directly, even on a green run.
-- Treat tests marked `flaky` in `report.json` as real work.
-- 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. Wait For The Real Readiness Boundary
-
-- Visible is not always ready.
-- If the behavior depends on internal state, wait on that state.
-- After canvas interactions, call `await comfyPage.nextFrame()` unless the
-  helper already guarantees a settled frame.
-- After workflow reloads or node-definition refreshes, wait for the reload to
-  finish before continuing.
-
-Common readiness boundaries:
-
-- `node.imgs` populated before opening image context menus
-- settings cleanup finished before asserting persisted state
-- locale-triggered workflow reload finished before selecting nodes
-- real builder UI ready, not transient helper metadata
-
-## 3. Choose The Smallest Correct Assertion
-
-- Use built-in retrying locator assertions when locator state is the behavior.
-- Use `expect.poll()` for a single async value.
-- Use `expect(async () => { ... }).toPass()` only when multiple assertions must
-  settle together.
-- Do not make immediate assertions after async UI mutations, settings writes,
-  clipboard writes, or graph updates.
-- Never use `waitForTimeout()` to hide a race.
-
-```ts
-await expect
-  .poll(() => comfyPage.settings.getSetting('Comfy.NodeLibrary.Bookmarks.V2'))
-  .toEqual([])
-```
-
-## 4. Prefer Behavioral Assertions
-
-- Use screenshots only when appearance is the behavior under test.
-- If a screenshot only indirectly proves behavior, replace it with a direct
-  assertion.
-- Prefer assertions on link counts, positions, visible menu items, persisted
-  settings, and node state.
-
-## 5. Keep Helper 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.
-
-## 6. Verify Narrowly
-
-- Prefer targeted reruns through `pnpm test:browser:local`.
-- On Windows, prefer `file:line` or whole-spec arguments over `--grep` when the
-  wrapper has quoting issues.
-- Use `--repeat-each 5` for targeted flake verification unless the failure needs
-  a different reproduction pattern.
-- Verify with the smallest command that exercises the flaky path.
-
-## Current Local Noise
-
-These are local distractions, not automatic 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 for handling local noise:
-
-- 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

browser_tests/assets/3d/load3d_node.json

@@ -1,47 +0,0 @@
-{
-  "last_node_id": 1,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "Load3D",
-      "pos": [50, 50],
-      "size": [400, 650],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "IMAGE",
-          "type": "IMAGE",
-          "links": null
-        },
-        {
-          "name": "MASK",
-          "type": "MASK",
-          "links": null
-        },
-        {
-          "name": "MESH",
-          "type": "MESH",
-          "links": null
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "Load3D"
-      },
-      "widgets_values": ["", 1024, 1024, "#000000"]
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
-  "version": 0.4
-}

browser_tests/assets/inputs/dynamic_combo.json

@@ -1,39 +0,0 @@
-{
-  "last_node_id": 2,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "ResizeImageMaskNode",
-      "pos": [100, 100],
-      "size": [315, 200],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [{ "name": "result", "type": "IMAGE", "links": null }],
-      "properties": {
-        "Node name for S&R": "ResizeImageMaskNode"
-      },
-      "widgets_values": ["scale dimensions", 512, 512, "center", "area"]
-    },
-    {
-      "id": 2,
-      "type": "SaveImage",
-      "pos": [500, 100],
-      "size": [210, 58],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "inputs": [{ "name": "images", "type": "IMAGE", "link": null }],
-      "properties": {}
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": { "offset": [0, 0], "scale": 1 }
-  },
-  "version": 0.4
-}

browser_tests/assets/missing/missing_models_with_nodes.json

@@ -1,85 +0,0 @@
-{
-  "last_node_id": 2,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "CheckpointLoaderSimple",
-      "pos": [100, 100],
-      "size": [315, 98],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "MODEL",
-          "type": "MODEL",
-          "links": null
-        },
-        {
-          "name": "CLIP",
-          "type": "CLIP",
-          "links": null
-        },
-        {
-          "name": "VAE",
-          "type": "VAE",
-          "links": null
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "CheckpointLoaderSimple"
-      },
-      "widgets_values": ["fake_model.safetensors"]
-    },
-    {
-      "id": 2,
-      "type": "CheckpointLoaderSimple",
-      "pos": [500, 100],
-      "size": [315, 98],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "MODEL",
-          "type": "MODEL",
-          "links": null
-        },
-        {
-          "name": "CLIP",
-          "type": "CLIP",
-          "links": null
-        },
-        {
-          "name": "VAE",
-          "type": "VAE",
-          "links": null
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "CheckpointLoaderSimple"
-      },
-      "widgets_values": ["fake_model.safetensors"]
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": {
-      "scale": 1,
-      "offset": [0, 0]
-    }
-  },
-  "models": [
-    {
-      "name": "fake_model.safetensors",
-      "url": "http://localhost:8188/api/devtools/fake_model.safetensors",
-      "directory": "text_encoders"
-    }
-  ],
-  "version": 0.4
-}

browser_tests/assets/missing/missing_nodes_and_media.json

@@ -1,72 +0,0 @@
-{
-  "last_node_id": 10,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "UNKNOWN NODE",
-      "pos": [48, 86],
-      "size": [358, 314],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "image",
-          "type": "IMAGE",
-          "link": null,
-          "slot_index": 0
-        }
-      ],
-      "outputs": [
-        {
-          "name": "STRING",
-          "type": "STRING",
-          "links": [],
-          "slot_index": 0,
-          "shape": 6
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "UNKNOWN NODE"
-      },
-      "widgets_values": ["wd-v1-4-moat-tagger-v2", 0.35, 0.85, false, false, ""]
-    },
-    {
-      "id": 10,
-      "type": "LoadImage",
-      "pos": [450, 86],
-      "size": [315, 314],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "IMAGE",
-          "type": "IMAGE",
-          "links": null
-        },
-        {
-          "name": "MASK",
-          "type": "MASK",
-          "links": null
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "LoadImage"
-      },
-      "widgets_values": ["nonexistent_test_image_12345.png", "image"]
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    }
-  },
-  "version": 0.4
-}

browser_tests/assets/subgraphs/basic-subgraph-zero-uuid.json

@@ -1,197 +0,0 @@
-{
-  "id": "00000000-0000-0000-0000-000000000000",
-  "revision": 0,
-  "last_node_id": 2,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 2,
-      "type": "e5fb1765-9323-4548-801a-5aead34d879e",
-      "pos": [627.5973510742188, 423.0972900390625],
-      "size": [144.15234375, 46],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "positive",
-          "type": "CONDITIONING",
-          "link": null
-        }
-      ],
-      "outputs": [
-        {
-          "name": "LATENT",
-          "type": "LATENT",
-          "links": null
-        }
-      ],
-      "properties": {},
-      "widgets_values": []
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "definitions": {
-    "subgraphs": [
-      {
-        "id": "e5fb1765-9323-4548-801a-5aead34d879e",
-        "version": 1,
-        "state": {
-          "lastGroupId": 0,
-          "lastNodeId": 2,
-          "lastLinkId": 4,
-          "lastRerouteId": 0
-        },
-        "revision": 0,
-        "config": {},
-        "name": "New Subgraph",
-        "inputNode": {
-          "id": -10,
-          "bounding": [347.90441582814213, 417.3822440655296, 120, 60]
-        },
-        "outputNode": {
-          "id": -20,
-          "bounding": [892.5973510742188, 416.0972900390625, 120, 60]
-        },
-        "inputs": [
-          {
-            "id": "c5cc99d8-a2b6-4bf3-8be7-d4949ef736cd",
-            "name": "positive",
-            "type": "CONDITIONING",
-            "linkIds": [1],
-            "pos": {
-              "0": 447.9044189453125,
-              "1": 437.3822326660156
-            }
-          }
-        ],
-        "outputs": [
-          {
-            "id": "9bd488b9-e907-4c95-a7a4-85c5597a87af",
-            "name": "LATENT",
-            "type": "LATENT",
-            "linkIds": [2],
-            "pos": {
-              "0": 912.5973510742188,
-              "1": 436.0972900390625
-            }
-          }
-        ],
-        "widgets": [],
-        "nodes": [
-          {
-            "id": 1,
-            "type": "KSampler",
-            "pos": [554.8743286132812, 100.95539093017578],
-            "size": [270, 262],
-            "flags": {},
-            "order": 1,
-            "mode": 0,
-            "inputs": [
-              {
-                "localized_name": "model",
-                "name": "model",
-                "type": "MODEL",
-                "link": null
-              },
-              {
-                "localized_name": "positive",
-                "name": "positive",
-                "type": "CONDITIONING",
-                "link": 1
-              },
-              {
-                "localized_name": "negative",
-                "name": "negative",
-                "type": "CONDITIONING",
-                "link": null
-              },
-              {
-                "localized_name": "latent_image",
-                "name": "latent_image",
-                "type": "LATENT",
-                "link": null
-              }
-            ],
-            "outputs": [
-              {
-                "localized_name": "LATENT",
-                "name": "LATENT",
-                "type": "LATENT",
-                "links": [2]
-              }
-            ],
-            "properties": {
-              "Node name for S&R": "KSampler"
-            },
-            "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
-          },
-          {
-            "id": 2,
-            "type": "VAEEncode",
-            "pos": [685.1265869140625, 439.1734619140625],
-            "size": [140, 46],
-            "flags": {},
-            "order": 0,
-            "mode": 0,
-            "inputs": [
-              {
-                "localized_name": "pixels",
-                "name": "pixels",
-                "type": "IMAGE",
-                "link": null
-              },
-              {
-                "localized_name": "vae",
-                "name": "vae",
-                "type": "VAE",
-                "link": null
-              }
-            ],
-            "outputs": [
-              {
-                "localized_name": "LATENT",
-                "name": "LATENT",
-                "type": "LATENT",
-                "links": [4]
-              }
-            ],
-            "properties": {
-              "Node name for S&R": "VAEEncode"
-            }
-          }
-        ],
-        "groups": [],
-        "links": [
-          {
-            "id": 1,
-            "origin_id": -10,
-            "origin_slot": 0,
-            "target_id": 1,
-            "target_slot": 1,
-            "type": "CONDITIONING"
-          },
-          {
-            "id": 2,
-            "origin_id": 1,
-            "origin_slot": 0,
-            "target_id": -20,
-            "target_slot": 0,
-            "type": "LATENT"
-          }
-        ],
-        "extra": {}
-      }
-    ]
-  },
-  "config": {},
-  "extra": {
-    "ds": {
-      "scale": 0.8894351682943402,
-      "offset": [58.7671207025881, 137.7124650620126]
-    },
-    "frontendVersion": "1.24.1"
-  },
-  "version": 0.4
-}

browser_tests/fixtures/ComfyMouse.ts

@@ -1,7 +1,7 @@
 import type { Mouse } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import type { Position } from '@e2e/fixtures/types'
+import type { ComfyPage } from './ComfyPage'
+import type { Position } from './types'
 
 /**
  * Used for drag and drop ops

browser_tests/fixtures/ComfyPage.ts

@@ -2,7 +2,7 @@ import type { APIRequestContext, Locator, Page } from '@playwright/test'
 import { test as base } from '@playwright/test'
 import { config as dotenvConfig } from 'dotenv'
 
-import { NodeBadgeMode } from '@/types/nodeSource'
+import { NodeBadgeMode } from '../../src/types/nodeSource'
 import { ComfyActionbar } from '@e2e/helpers/actionbar'
 import { ComfyTemplates } from '@e2e/helpers/templates'
 import { ComfyMouse } from '@e2e/fixtures/ComfyMouse'
@@ -29,12 +29,9 @@ import {
 } from '@e2e/fixtures/components/SidebarTab'
 import { Topbar } from '@e2e/fixtures/components/Topbar'
 import { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
-import type { AssetHelper } from '@e2e/fixtures/helpers/AssetHelper'
-import { createAssetHelper } from '@e2e/fixtures/helpers/AssetHelper'
 import { AssetsHelper } from '@e2e/fixtures/helpers/AssetsHelper'
 import { CanvasHelper } from '@e2e/fixtures/helpers/CanvasHelper'
 import { ClipboardHelper } from '@e2e/fixtures/helpers/ClipboardHelper'
-import { CloudAuthHelper } from '@e2e/fixtures/helpers/CloudAuthHelper'
 import { CommandHelper } from '@e2e/fixtures/helpers/CommandHelper'
 import { DragDropHelper } from '@e2e/fixtures/helpers/DragDropHelper'
 import { FeatureFlagHelper } from '@e2e/fixtures/helpers/FeatureFlagHelper'
@@ -46,7 +43,7 @@ import { SettingsHelper } from '@e2e/fixtures/helpers/SettingsHelper'
 import { SubgraphHelper } from '@e2e/fixtures/helpers/SubgraphHelper'
 import { ToastHelper } from '@e2e/fixtures/helpers/ToastHelper'
 import { WorkflowHelper } from '@e2e/fixtures/helpers/WorkflowHelper'
-import type { WorkspaceStore } from '@e2e/types/globals'
+import type { WorkspaceStore } from '../types/globals'
 
 dotenvConfig()
 
@@ -180,9 +177,7 @@ export class ComfyPage {
   public readonly queuePanel: QueuePanel
   public readonly perf: PerformanceHelper
   public readonly assets: AssetsHelper
-  public readonly assetApi: AssetHelper
   public readonly modelLibrary: ModelLibraryHelper
-  public readonly cloudAuth: CloudAuthHelper
 
   /** Worker index to test user ID */
   public readonly userIds: string[] = []
@@ -232,9 +227,7 @@ export class ComfyPage {
     this.queuePanel = new QueuePanel(page)
     this.perf = new PerformanceHelper(page)
     this.assets = new AssetsHelper(page)
-    this.assetApi = createAssetHelper(page)
     this.modelLibrary = new ModelLibraryHelper(page)
-    this.cloudAuth = new CloudAuthHelper(page)
   }
 
   get visibleToasts() {
@@ -447,10 +440,6 @@ export const comfyPageFixture = base.extend<{
       console.error(e)
     }
 
-    if (testInfo.tags.includes('@cloud')) {
-      await comfyPage.cloudAuth.mockAuth()
-    }
-
     await comfyPage.setup()
 
     const needsPerf =
@@ -459,7 +448,6 @@ export const comfyPageFixture = base.extend<{
 
     await use(comfyPage)
 
-    await comfyPage.assetApi.clearMocks()
     if (needsPerf) await comfyPage.perf.dispose()
   },
   comfyMouse: async ({ comfyPage }, use) => {

browser_tests/fixtures/VueNodeHelpers.ts

@@ -3,8 +3,8 @@
  */
 import type { Locator, Page } from '@playwright/test'
 
-import { TestIds } from '@e2e/fixtures/selectors'
-import { VueNodeFixture } from '@e2e/fixtures/utils/vueNodeFixtures'
+import { TestIds } from './selectors'
+import { VueNodeFixture } from './utils/vueNodeFixtures'
 
 export class VueNodeHelpers {
   constructor(private page: Page) {}
@@ -109,14 +109,6 @@ export class VueNodeHelpers {
     await this.page.keyboard.press('Delete')
   }
 
-  /**
-   * Select a node by ID and delete it.
-   */
-  async deleteNode(nodeId: string): Promise<void> {
-    await this.selectNode(nodeId)
-    await this.deleteSelected()
-  }
-
   /**
    * Delete selected Vue nodes using Backspace key
    */
@@ -166,21 +158,6 @@ export class VueNodeHelpers {
     })
   }
 
-  /**
-   * Select an option from a combo widget on a node.
-   */
-  async selectComboOption(
-    nodeTitle: string,
-    widgetName: string,
-    optionName: string
-  ): Promise<void> {
-    const node = this.getNodeByTitle(nodeTitle)
-    await node.getByRole('combobox', { name: widgetName, exact: true }).click()
-    await this.page
-      .getByRole('option', { name: optionName, exact: true })
-      .click()
-  }
-
   /**
    * Get controls for input number widgets (increment/decrement buttons and input)
    */

browser_tests/fixtures/components/ComfyNodeSearchBox.ts

@@ -1,15 +1,11 @@
-import { expect } from '@playwright/test'
 import type { Locator, Page } from '@playwright/test'
 
 export class ComfyNodeSearchFilterSelectionPanel {
-  readonly root: Locator
-
-  constructor(public readonly page: Page) {
-    this.root = page.getByRole('dialog')
-  }
+  constructor(public readonly page: Page) {}
 
   get header() {
-    return this.root
+    return this.page
+      .getByRole('dialog')
       .locator('div')
       .filter({ hasText: 'Add node filter condition' })
   }
@@ -64,13 +60,17 @@ export class ComfyNodeSearchBox {
     await this.input.waitFor({ state: 'visible' })
     await this.input.fill(nodeName)
     await this.dropdown.waitFor({ state: 'visible' })
-
-    const nodeOption = options?.exact
-      ? this.dropdown.locator(`li[aria-label="${nodeName}"]`).first()
-      : this.dropdown.locator('li').nth(options?.suggestionIndex ?? 0)
-
-    await expect(nodeOption).toBeVisible()
-    await nodeOption.click()
+    if (options?.exact) {
+      await this.dropdown
+        .locator(`li[aria-label="${nodeName}"]`)
+        .first()
+        .click()
+    } else {
+      await this.dropdown
+        .locator('li')
+        .nth(options?.suggestionIndex || 0)
+        .click()
+    }
   }
 
   async addFilter(filterValue: string, filterType: string) {

browser_tests/fixtures/components/ComfyNodeSearchBoxV2.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '../ComfyPage'
 
 export class ComfyNodeSearchBoxV2 {
   readonly dialog: Locator

browser_tests/fixtures/components/ConfirmDialog.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { WorkspaceStore } from '@e2e/types/globals'
+import type { WorkspaceStore } from '../../types/globals'
 
 type KeysOfType<T, Match> = {
   [K in keyof T]: T[K] extends Match ? K : never

browser_tests/fixtures/components/ContextMenu.ts

@@ -20,10 +20,6 @@ export class ContextMenu {
     await this.page.getByRole('menuitem', { name }).click()
   }
 
-  async clickMenuItemExact(name: string): Promise<void> {
-    await this.page.getByRole('menuitem', { name, exact: true }).click()
-  }
-
   async clickLitegraphMenuItem(name: string): Promise<void> {
     await this.page.locator(`.litemenu-entry:has-text("${name}")`).click()
   }
@@ -52,18 +48,6 @@ export class ContextMenu {
     return this
   }
 
-  /**
-   * Select a Vue node by clicking its header, then right-click to open
-   * the context menu. Vue nodes require a selection click before the
-   * right-click so the correct per-node menu items appear.
-   */
-  async openForVueNode(header: Locator): Promise<this> {
-    await header.click()
-    await header.click({ button: 'right' })
-    await this.primeVueMenu.waitFor({ state: 'visible' })
-    return this
-  }
-
   async waitForHidden(): Promise<void> {
     const waitIfExists = async (locator: Locator, menuName: string) => {
       const count = await locator.count()

browser_tests/fixtures/components/QueuePanel.ts

@@ -1,7 +1,7 @@
 import type { Locator, Page } from '@playwright/test'
 
-import { comfyExpect as expect } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
+import { comfyExpect as expect } from '../ComfyPage'
+import { TestIds } from '../selectors'
 
 export class QueuePanel {
   readonly overlayToggle: Locator

browser_tests/fixtures/components/SettingDialog.ts

@@ -1,8 +1,8 @@
 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'
+import type { ComfyPage } from '../ComfyPage'
+import { TestIds } from '../selectors'
+import { BaseDialog } from './BaseDialog'
 
 export class SettingDialog extends BaseDialog {
   constructor(

browser_tests/fixtures/components/SidebarTab.ts

@@ -1,8 +1,8 @@
 import type { Locator, Page } from '@playwright/test'
 import { expect } from '@playwright/test'
 
-import type { WorkspaceStore } from '@e2e/types/globals'
-import { TestIds } from '@e2e/fixtures/selectors'
+import type { WorkspaceStore } from '../../types/globals'
+import { TestIds } from '../selectors'
 
 class SidebarTab {
   constructor(

browser_tests/fixtures/components/SignInDialog.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
 
-import { BaseDialog } from '@e2e/fixtures/components/BaseDialog'
+import { BaseDialog } from './BaseDialog'
 
 export class SignInDialog extends BaseDialog {
   readonly emailInput: Locator

browser_tests/fixtures/components/Topbar.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { WorkspaceStore } from '@e2e/types/globals'
+import type { WorkspaceStore } from '../../types/globals'
 
 export class Topbar {
   private readonly menuLocator: Locator

browser_tests/fixtures/constants/defaultGraphPositions.ts

@@ -1,4 +1,4 @@
-import type { Position } from '@e2e/fixtures/constants/types'
+import type { Position } from './types'
 
 /**
  * Hardcoded positions for the default graph loaded in tests.

browser_tests/fixtures/data/assetFixtures.ts

@@ -1,306 +0,0 @@
-import type { Asset } from '@comfyorg/ingest-types'
-function createModelAsset(overrides: Partial<Asset> = {}): Asset {
-  return {
-    id: 'test-model-001',
-    name: 'model.safetensors',
-    asset_hash:
-      'blake3:0000000000000000000000000000000000000000000000000000000000000000',
-    size: 2_147_483_648,
-    mime_type: 'application/octet-stream',
-    tags: ['models', 'checkpoints'],
-    created_at: '2025-01-15T10:00:00Z',
-    updated_at: '2025-01-15T10:00:00Z',
-    last_access_time: '2025-01-15T10:00:00Z',
-    user_metadata: { base_model: 'sd15' },
-    ...overrides
-  }
-}
-
-function createInputAsset(overrides: Partial<Asset> = {}): Asset {
-  return {
-    id: 'test-input-001',
-    name: 'input.png',
-    asset_hash:
-      'blake3:1111111111111111111111111111111111111111111111111111111111111111',
-    size: 2_048_576,
-    mime_type: 'image/png',
-    tags: ['input'],
-    created_at: '2025-03-01T09:00:00Z',
-    updated_at: '2025-03-01T09:00:00Z',
-    last_access_time: '2025-03-01T09:00:00Z',
-    ...overrides
-  }
-}
-
-function createOutputAsset(overrides: Partial<Asset> = {}): Asset {
-  return {
-    id: 'test-output-001',
-    name: 'output_00001.png',
-    asset_hash:
-      'blake3:2222222222222222222222222222222222222222222222222222222222222222',
-    size: 4_194_304,
-    mime_type: 'image/png',
-    tags: ['output'],
-    created_at: '2025-03-10T12:00:00Z',
-    updated_at: '2025-03-10T12:00:00Z',
-    last_access_time: '2025-03-10T12:00:00Z',
-    ...overrides
-  }
-}
-export const STABLE_CHECKPOINT: Asset = createModelAsset({
-  id: 'test-checkpoint-001',
-  name: 'sd_xl_base_1.0.safetensors',
-  size: 6_938_078_208,
-  tags: ['models', 'checkpoints'],
-  user_metadata: {
-    base_model: 'sdxl',
-    description: 'Stable Diffusion XL Base 1.0'
-  },
-  created_at: '2025-01-15T10:30:00Z',
-  updated_at: '2025-01-15T10:30:00Z'
-})
-
-export const STABLE_CHECKPOINT_2: Asset = createModelAsset({
-  id: 'test-checkpoint-002',
-  name: 'v1-5-pruned-emaonly.safetensors',
-  size: 4_265_146_304,
-  tags: ['models', 'checkpoints'],
-  user_metadata: {
-    base_model: 'sd15',
-    description: 'Stable Diffusion 1.5 Pruned EMA-Only'
-  },
-  created_at: '2025-01-20T08:00:00Z',
-  updated_at: '2025-01-20T08:00:00Z'
-})
-
-export const STABLE_LORA: Asset = createModelAsset({
-  id: 'test-lora-001',
-  name: 'detail_enhancer_v1.2.safetensors',
-  size: 184_549_376,
-  tags: ['models', 'loras'],
-  user_metadata: {
-    base_model: 'sdxl',
-    description: 'Detail Enhancement LoRA'
-  },
-  created_at: '2025-02-20T14:00:00Z',
-  updated_at: '2025-02-20T14:00:00Z'
-})
-
-export const STABLE_LORA_2: Asset = createModelAsset({
-  id: 'test-lora-002',
-  name: 'add_detail_v2.safetensors',
-  size: 226_492_416,
-  tags: ['models', 'loras'],
-  user_metadata: {
-    base_model: 'sd15',
-    description: 'Add Detail LoRA v2'
-  },
-  created_at: '2025-02-25T11:00:00Z',
-  updated_at: '2025-02-25T11:00:00Z'
-})
-
-export const STABLE_VAE: Asset = createModelAsset({
-  id: 'test-vae-001',
-  name: 'sdxl_vae.safetensors',
-  size: 334_641_152,
-  tags: ['models', 'vae'],
-  user_metadata: {
-    base_model: 'sdxl',
-    description: 'SDXL VAE'
-  },
-  created_at: '2025-01-18T16:00:00Z',
-  updated_at: '2025-01-18T16:00:00Z'
-})
-
-export const STABLE_EMBEDDING: Asset = createModelAsset({
-  id: 'test-embedding-001',
-  name: 'bad_prompt_v2.pt',
-  size: 32_768,
-  mime_type: 'application/x-pytorch',
-  tags: ['models', 'embeddings'],
-  user_metadata: {
-    base_model: 'sd15',
-    description: 'Negative Embedding: Bad Prompt v2'
-  },
-  created_at: '2025-02-01T09:30:00Z',
-  updated_at: '2025-02-01T09:30:00Z'
-})
-
-export const STABLE_INPUT_IMAGE: Asset = createInputAsset({
-  id: 'test-input-001',
-  name: 'reference_photo.png',
-  size: 2_048_576,
-  mime_type: 'image/png',
-  tags: ['input'],
-  created_at: '2025-03-01T09:00:00Z',
-  updated_at: '2025-03-01T09:00:00Z'
-})
-
-export const STABLE_INPUT_IMAGE_2: Asset = createInputAsset({
-  id: 'test-input-002',
-  name: 'mask_layer.png',
-  size: 1_048_576,
-  mime_type: 'image/png',
-  tags: ['input'],
-  created_at: '2025-03-05T10:00:00Z',
-  updated_at: '2025-03-05T10:00:00Z'
-})
-
-export const STABLE_INPUT_VIDEO: Asset = createInputAsset({
-  id: 'test-input-003',
-  name: 'clip_720p.mp4',
-  size: 15_728_640,
-  mime_type: 'video/mp4',
-  tags: ['input'],
-  created_at: '2025-03-08T14:30:00Z',
-  updated_at: '2025-03-08T14:30:00Z'
-})
-
-export const STABLE_OUTPUT: Asset = createOutputAsset({
-  id: 'test-output-001',
-  name: 'ComfyUI_00001_.png',
-  size: 4_194_304,
-  mime_type: 'image/png',
-  tags: ['output'],
-  created_at: '2025-03-10T12:00:00Z',
-  updated_at: '2025-03-10T12:00:00Z'
-})
-
-export const STABLE_OUTPUT_2: Asset = createOutputAsset({
-  id: 'test-output-002',
-  name: 'ComfyUI_00002_.png',
-  size: 3_670_016,
-  mime_type: 'image/png',
-  tags: ['output'],
-  created_at: '2025-03-10T12:05:00Z',
-  updated_at: '2025-03-10T12:05:00Z'
-})
-export const ALL_MODEL_FIXTURES: Asset[] = [
-  STABLE_CHECKPOINT,
-  STABLE_CHECKPOINT_2,
-  STABLE_LORA,
-  STABLE_LORA_2,
-  STABLE_VAE,
-  STABLE_EMBEDDING
-]
-
-export const ALL_INPUT_FIXTURES: Asset[] = [
-  STABLE_INPUT_IMAGE,
-  STABLE_INPUT_IMAGE_2,
-  STABLE_INPUT_VIDEO
-]
-
-export const ALL_OUTPUT_FIXTURES: Asset[] = [STABLE_OUTPUT, STABLE_OUTPUT_2]
-const CHECKPOINT_NAMES = [
-  'sd_xl_base_1.0.safetensors',
-  'v1-5-pruned-emaonly.safetensors',
-  'sd_xl_refiner_1.0.safetensors',
-  'dreamshaper_8.safetensors',
-  'realisticVision_v51.safetensors',
-  'deliberate_v3.safetensors',
-  'anything_v5.safetensors',
-  'counterfeit_v3.safetensors',
-  'revAnimated_v122.safetensors',
-  'majicmixRealistic_v7.safetensors'
-]
-
-const LORA_NAMES = [
-  'detail_enhancer_v1.2.safetensors',
-  'add_detail_v2.safetensors',
-  'epi_noiseoffset_v2.safetensors',
-  'lcm_lora_sdxl.safetensors',
-  'film_grain_v1.safetensors',
-  'sharpness_fix_v2.safetensors',
-  'better_hands_v1.safetensors',
-  'smooth_skin_v3.safetensors',
-  'color_pop_v1.safetensors',
-  'bokeh_effect_v2.safetensors'
-]
-
-const INPUT_NAMES = [
-  'reference_photo.png',
-  'mask_layer.png',
-  'clip_720p.mp4',
-  'depth_map.png',
-  'control_pose.png',
-  'sketch_input.jpg',
-  'inpainting_mask.png',
-  'style_reference.png',
-  'batch_001.png',
-  'batch_002.png'
-]
-
-const EXTENSION_MIME_MAP: Record<string, string> = {
-  png: 'image/png',
-  jpg: 'image/jpeg',
-  jpeg: 'image/jpeg',
-  mp4: 'video/mp4',
-  webm: 'video/webm',
-  mov: 'video/quicktime',
-  mp3: 'audio/mpeg',
-  wav: 'audio/wav',
-  ogg: 'audio/ogg',
-  flac: 'audio/flac'
-}
-
-function getMimeType(filename: string): string {
-  const ext = filename.split('.').pop()?.toLowerCase() ?? ''
-  return EXTENSION_MIME_MAP[ext] ?? 'application/octet-stream'
-}
-
-/**
- * Generate N deterministic model assets of a given category.
- * Uses sequential IDs and fixed names for screenshot stability.
- */
-export function generateModels(
-  count: number,
-  category: 'checkpoints' | 'loras' | 'vae' | 'embeddings' = 'checkpoints'
-): Asset[] {
-  const names = category === 'loras' ? LORA_NAMES : CHECKPOINT_NAMES
-  return Array.from({ length: Math.min(count, names.length) }, (_, i) =>
-    createModelAsset({
-      id: `gen-${category}-${String(i + 1).padStart(3, '0')}`,
-      name: names[i % names.length],
-      size: 2_000_000_000 + i * 500_000_000,
-      tags: ['models', category],
-      user_metadata: { base_model: i % 2 === 0 ? 'sdxl' : 'sd15' },
-      created_at: `2025-01-${String(15 + i).padStart(2, '0')}T10:00:00Z`,
-      updated_at: `2025-01-${String(15 + i).padStart(2, '0')}T10:00:00Z`
-    })
-  )
-}
-
-/**
- * Generate N deterministic input file assets.
- */
-export function generateInputFiles(count: number): Asset[] {
-  return Array.from({ length: Math.min(count, INPUT_NAMES.length) }, (_, i) => {
-    const name = INPUT_NAMES[i % INPUT_NAMES.length]
-    return createInputAsset({
-      id: `gen-input-${String(i + 1).padStart(3, '0')}`,
-      name,
-      size: 1_000_000 + i * 500_000,
-      mime_type: getMimeType(name),
-      tags: ['input'],
-      created_at: `2025-03-${String(1 + i).padStart(2, '0')}T09:00:00Z`,
-      updated_at: `2025-03-${String(1 + i).padStart(2, '0')}T09:00:00Z`
-    })
-  })
-}
-
-/**
- * Generate N deterministic output assets.
- */
-export function generateOutputAssets(count: number): Asset[] {
-  return Array.from({ length: count }, (_, i) =>
-    createOutputAsset({
-      id: `gen-output-${String(i + 1).padStart(3, '0')}`,
-      name: `ComfyUI_${String(i + 1).padStart(5, '0')}_.png`,
-      size: 3_000_000 + i * 200_000,
-      mime_type: 'image/png',
-      tags: ['output'],
-      created_at: `2025-03-10T${String((12 + Math.floor(i / 60)) % 24).padStart(2, '0')}:${String(i % 60).padStart(2, '0')}:00Z`,
-      updated_at: `2025-03-10T${String((12 + Math.floor(i / 60)) % 24).padStart(2, '0')}:${String(i % 60).padStart(2, '0')}:00Z`
-    })
-  )
-}

browser_tests/fixtures/helpers/AppModeHelper.ts

@@ -1,60 +1,45 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
+import type { ComfyPage } from '../ComfyPage'
+import { TestIds } from '../selectors'
 
-import { AppModeWidgetHelper } from '@e2e/fixtures/helpers/AppModeWidgetHelper'
-import { BuilderFooterHelper } from '@e2e/fixtures/helpers/BuilderFooterHelper'
-import { BuilderSaveAsHelper } from '@e2e/fixtures/helpers/BuilderSaveAsHelper'
-import { BuilderSelectHelper } from '@e2e/fixtures/helpers/BuilderSelectHelper'
-import { BuilderStepsHelper } from '@e2e/fixtures/helpers/BuilderStepsHelper'
+import { BuilderFooterHelper } from './BuilderFooterHelper'
+import { BuilderSaveAsHelper } from './BuilderSaveAsHelper'
+import { BuilderSelectHelper } from './BuilderSelectHelper'
+import { BuilderStepsHelper } from './BuilderStepsHelper'
 
 export class AppModeHelper {
   readonly steps: BuilderStepsHelper
   readonly footer: BuilderFooterHelper
   readonly saveAs: BuilderSaveAsHelper
   readonly select: BuilderSelectHelper
-  readonly widgets: AppModeWidgetHelper
 
   constructor(private readonly comfyPage: ComfyPage) {
     this.steps = new BuilderStepsHelper(comfyPage)
     this.footer = new BuilderFooterHelper(comfyPage)
     this.saveAs = new BuilderSaveAsHelper(comfyPage)
     this.select = new BuilderSelectHelper(comfyPage)
-    this.widgets = new AppModeWidgetHelper(comfyPage)
   }
 
   private get page(): Page {
     return this.comfyPage.page
   }
 
-  /** Enable the linear mode feature flag and top menu. */
-  async enableLinearMode() {
-    await this.page.evaluate(() => {
-      window.app!.api.serverFeatureFlags.value = {
-        ...window.app!.api.serverFeatureFlags.value,
-        linear_toggle_enabled: true
-      }
-    })
-    await this.comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
-  }
-
-  /** Enter builder mode via the "Workflow actions" dropdown. */
+  /** Enter builder mode via the "Workflow actions" dropdown → "Build app". */
   async enterBuilder() {
     await this.page
       .getByRole('button', { name: 'Workflow actions' })
       .first()
       .click()
-    await this.page
-      .getByRole('menuitem', { name: /Build app|Edit app/ })
-      .click()
+    await this.page.getByRole('menuitem', { name: 'Build app' }).click()
     await this.comfyPage.nextFrame()
   }
 
   /** Toggle app mode (linear view) on/off. */
   async toggleAppMode() {
-    await this.comfyPage.workflow.waitForActiveWorkflow()
-    await this.comfyPage.command.executeCommand('Comfy.ToggleLinear')
+    await this.page.evaluate(() => {
+      window.app!.extensionManager.command.execute('Comfy.ToggleLinear')
+    })
     await this.comfyPage.nextFrame()
   }
 
@@ -93,61 +78,11 @@ 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/AppModeWidgetHelper.ts

@@ -1,93 +0,0 @@
-import type { Locator, Page } from '@playwright/test'
-
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-
-/**
- * Helper for interacting with widgets rendered in app mode (linear view).
- *
- * Widgets are located by their key (format: "nodeId:widgetName") via the
- * `data-widget-key` attribute on each widget item.
- */
-export class AppModeWidgetHelper {
-  constructor(private readonly comfyPage: ComfyPage) {}
-
-  private get page(): Page {
-    return this.comfyPage.page
-  }
-
-  private get container(): Locator {
-    return this.comfyPage.appMode.linearWidgets
-  }
-
-  /** Get a widget item container by its key (e.g. "6:text", "3:seed"). */
-  getWidgetItem(key: string): Locator {
-    return this.container.locator(`[data-widget-key="${key}"]`)
-  }
-
-  /** Fill a textarea widget (e.g. CLIP Text Encode prompt). */
-  async fillTextarea(key: string, value: string) {
-    const widget = this.getWidgetItem(key)
-    await widget.locator('textarea').fill(value)
-  }
-
-  /**
-   * Set a number input widget value (INT or FLOAT).
-   * Targets the last input inside the widget — this works for both
-   * ScrubableNumberInput (single input) and slider+InputNumber combos
-   * (last input is the editable number field).
-   */
-  async fillNumber(key: string, value: string) {
-    const widget = this.getWidgetItem(key)
-    const input = widget.locator('input').last()
-    await input.fill(value)
-    await input.press('Enter')
-  }
-
-  /** Fill a string text input widget (e.g. filename_prefix). */
-  async fillText(key: string, value: string) {
-    const widget = this.getWidgetItem(key)
-    await widget.locator('input').fill(value)
-  }
-
-  /** Select an option from a combo/select widget. */
-  async selectOption(key: string, optionName: string) {
-    const widget = this.getWidgetItem(key)
-    await widget.getByRole('combobox').click()
-    await this.page
-      .getByRole('option', { name: optionName, exact: true })
-      .click()
-  }
-
-  /**
-   * Intercept the /api/prompt POST, click Run, and return the prompt payload.
-   * Fulfills the route with a mock success response.
-   */
-  async runAndCapturePrompt(): Promise<
-    Record<string, { inputs: Record<string, unknown> }>
-  > {
-    let promptBody: Record<string, { inputs: Record<string, unknown> }> | null =
-      null
-    await this.page.route(
-      '**/api/prompt',
-      async (route, req) => {
-        promptBody = req.postDataJSON().prompt
-        await route.fulfill({
-          status: 200,
-          body: JSON.stringify({
-            prompt_id: 'test-id',
-            number: 1,
-            node_errors: {}
-          })
-        })
-      },
-      { times: 1 }
-    )
-
-    const responsePromise = this.page.waitForResponse('**/api/prompt')
-    await this.comfyPage.appMode.runButton.click()
-    await responsePromise
-
-    if (!promptBody) throw new Error('No prompt payload captured')
-    return promptBody
-  }
-}

browser_tests/fixtures/helpers/AssetHelper.ts

@@ -1,317 +0,0 @@
-import type { Page, Route } from '@playwright/test'
-
-import type {
-  Asset,
-  ListAssetsResponse,
-  UpdateAssetData
-} from '@comfyorg/ingest-types'
-import {
-  generateModels,
-  generateInputFiles,
-  generateOutputAssets
-} from '@e2e/fixtures/data/assetFixtures'
-
-export interface MutationRecord {
-  endpoint: string
-  method: string
-  url: string
-  body: unknown
-  timestamp: number
-}
-
-interface PaginationOptions {
-  total: number
-  hasMore: boolean
-}
-export interface AssetConfig {
-  readonly assets: ReadonlyMap<string, Asset>
-  readonly pagination: PaginationOptions | null
-  readonly uploadResponse: Record<string, unknown> | null
-}
-
-function emptyConfig(): AssetConfig {
-  return { assets: new Map(), pagination: null, uploadResponse: null }
-}
-
-export type AssetOperator = (config: AssetConfig) => AssetConfig
-
-function addAssets(config: AssetConfig, newAssets: Asset[]): AssetConfig {
-  const merged = new Map(config.assets)
-  for (const asset of newAssets) {
-    merged.set(asset.id, asset)
-  }
-  return { ...config, assets: merged }
-}
-export function withModels(
-  countOrAssets: number | Asset[],
-  category: 'checkpoints' | 'loras' | 'vae' | 'embeddings' = 'checkpoints'
-): AssetOperator {
-  return (config) => {
-    const assets =
-      typeof countOrAssets === 'number'
-        ? generateModels(countOrAssets, category)
-        : countOrAssets
-    return addAssets(config, assets)
-  }
-}
-
-export function withInputFiles(countOrAssets: number | Asset[]): AssetOperator {
-  return (config) => {
-    const assets =
-      typeof countOrAssets === 'number'
-        ? generateInputFiles(countOrAssets)
-        : countOrAssets
-    return addAssets(config, assets)
-  }
-}
-
-export function withOutputAssets(
-  countOrAssets: number | Asset[]
-): AssetOperator {
-  return (config) => {
-    const assets =
-      typeof countOrAssets === 'number'
-        ? generateOutputAssets(countOrAssets)
-        : countOrAssets
-    return addAssets(config, assets)
-  }
-}
-
-export function withAsset(asset: Asset): AssetOperator {
-  return (config) => addAssets(config, [asset])
-}
-
-export function withPagination(options: PaginationOptions): AssetOperator {
-  return (config) => ({ ...config, pagination: options })
-}
-
-export function withUploadResponse(
-  response: Record<string, unknown>
-): AssetOperator {
-  return (config) => ({ ...config, uploadResponse: response })
-}
-export class AssetHelper {
-  private store: Map<string, Asset>
-  private paginationOptions: PaginationOptions | null
-  private routeHandlers: Array<{
-    pattern: string
-    handler: (route: Route) => Promise<void>
-  }> = []
-  private mutations: MutationRecord[] = []
-  private uploadResponse: Record<string, unknown> | null
-
-  constructor(
-    private readonly page: Page,
-    config: AssetConfig = emptyConfig()
-  ) {
-    this.store = new Map(config.assets)
-    this.paginationOptions = config.pagination
-    this.uploadResponse = config.uploadResponse
-  }
-  async mock(): Promise<void> {
-    const handler = async (route: Route) => {
-      const url = new URL(route.request().url())
-      const method = route.request().method()
-      const path = url.pathname
-      const isMutation = ['POST', 'PUT', 'DELETE'].includes(method)
-      let body: Record<string, unknown> | null = null
-      if (isMutation) {
-        try {
-          body = route.request().postDataJSON()
-        } catch {
-          body = null
-        }
-      }
-
-      if (isMutation) {
-        this.mutations.push({
-          endpoint: path,
-          method,
-          url: route.request().url(),
-          body,
-          timestamp: Date.now()
-        })
-      }
-
-      if (method === 'GET' && /\/assets\/?$/.test(path))
-        return this.handleListAssets(route, url)
-      if (method === 'GET' && /\/assets\/[^/]+$/.test(path))
-        return this.handleGetAsset(route, path)
-      if (method === 'PUT' && /\/assets\/[^/]+$/.test(path))
-        return this.handleUpdateAsset(route, path, body)
-      if (method === 'DELETE' && /\/assets\/[^/]+$/.test(path))
-        return this.handleDeleteAsset(route, path)
-      if (method === 'POST' && /\/assets\/?$/.test(path))
-        return this.handleUploadAsset(route)
-      if (method === 'POST' && path.endsWith('/assets/download'))
-        return this.handleDownloadAsset(route)
-
-      return route.fallback()
-    }
-
-    const pattern = '**/assets**'
-    this.routeHandlers.push({ pattern, handler })
-    await this.page.route(pattern, handler)
-  }
-
-  async mockError(
-    statusCode: number,
-    error: string = 'Internal Server Error'
-  ): Promise<void> {
-    const handler = async (route: Route) => {
-      return route.fulfill({
-        status: statusCode,
-        json: { error }
-      })
-    }
-
-    const pattern = '**/assets**'
-    this.routeHandlers.push({ pattern, handler })
-    await this.page.route(pattern, handler)
-  }
-  async fetch(
-    path: string,
-    init?: RequestInit
-  ): Promise<{ status: number; body: unknown }> {
-    return this.page.evaluate(
-      async ([fetchUrl, fetchInit]) => {
-        const res = await fetch(fetchUrl, fetchInit)
-        const text = await res.text()
-        let body: unknown
-        try {
-          body = JSON.parse(text)
-        } catch {
-          body = text
-        }
-        return { status: res.status, body }
-      },
-      [path, init] as const
-    )
-  }
-
-  configure(...operators: AssetOperator[]): void {
-    const config = operators.reduce<AssetConfig>(
-      (cfg, op) => op(cfg),
-      emptyConfig()
-    )
-    this.store = new Map(config.assets)
-    this.paginationOptions = config.pagination
-    this.uploadResponse = config.uploadResponse
-  }
-
-  getMutations(): MutationRecord[] {
-    return [...this.mutations]
-  }
-
-  getAssets(): Asset[] {
-    return [...this.store.values()]
-  }
-
-  getAsset(id: string): Asset | undefined {
-    return this.store.get(id)
-  }
-
-  get assetCount(): number {
-    return this.store.size
-  }
-  private handleListAssets(route: Route, url: URL) {
-    const includeTags = url.searchParams.get('include_tags')?.split(',') ?? []
-    const limit = parseInt(url.searchParams.get('limit') ?? '0', 10)
-    const offset = parseInt(url.searchParams.get('offset') ?? '0', 10)
-
-    let filtered = this.getFilteredAssets(includeTags)
-    if (limit > 0) {
-      filtered = filtered.slice(offset, offset + limit)
-    }
-
-    const response: ListAssetsResponse = {
-      assets: filtered,
-      total: this.paginationOptions?.total ?? this.store.size,
-      has_more: this.paginationOptions?.hasMore ?? false
-    }
-    return route.fulfill({ json: response })
-  }
-
-  private handleGetAsset(route: Route, path: string) {
-    const id = path.split('/').pop()!
-    const asset = this.store.get(id)
-    if (asset) return route.fulfill({ json: asset })
-    return route.fulfill({ status: 404, json: { error: 'Not found' } })
-  }
-
-  private handleUpdateAsset(
-    route: Route,
-    path: string,
-    body: UpdateAssetData['body'] | null
-  ) {
-    const id = path.split('/').pop()!
-    const asset = this.store.get(id)
-    if (asset) {
-      const updated = {
-        ...asset,
-        ...(body ?? {}),
-        updated_at: new Date().toISOString()
-      }
-      this.store.set(id, updated)
-      return route.fulfill({ json: updated })
-    }
-    return route.fulfill({ status: 404, json: { error: 'Not found' } })
-  }
-
-  private handleDeleteAsset(route: Route, path: string) {
-    const id = path.split('/').pop()!
-    this.store.delete(id)
-    return route.fulfill({ status: 204, body: '' })
-  }
-
-  private handleUploadAsset(route: Route) {
-    const response = this.uploadResponse ?? {
-      id: `upload-${Date.now()}`,
-      name: 'uploaded_file.safetensors',
-      tags: ['models', 'checkpoints'],
-      created_at: new Date().toISOString(),
-      created_new: true
-    }
-    return route.fulfill({ status: 201, json: response })
-  }
-
-  private handleDownloadAsset(route: Route) {
-    return route.fulfill({
-      status: 202,
-      json: {
-        task_id: 'download-task-001',
-        status: 'created',
-        message: 'Download started'
-      }
-    })
-  }
-
-  async clearMocks(): Promise<void> {
-    for (const { pattern, handler } of this.routeHandlers) {
-      await this.page.unroute(pattern, handler)
-    }
-    this.routeHandlers = []
-    this.store.clear()
-    this.mutations = []
-    this.paginationOptions = null
-    this.uploadResponse = null
-  }
-  private getFilteredAssets(tags: string[]): Asset[] {
-    const assets = [...this.store.values()]
-    if (tags.length === 0) return assets
-
-    return assets.filter((asset) =>
-      tags.every((tag) => (asset.tags ?? []).includes(tag))
-    )
-  }
-}
-export function createAssetHelper(
-  page: Page,
-  ...operators: AssetOperator[]
-): AssetHelper {
-  const config = operators.reduce<AssetConfig>(
-    (cfg, op) => op(cfg),
-    emptyConfig()
-  )
-  return new AssetHelper(page, config)
-}

browser_tests/fixtures/helpers/AssetsHelper.ts

@@ -1,7 +1,7 @@
 import type { Page, Route } from '@playwright/test'
 import type { JobsListResponse } from '@comfyorg/ingest-types'
 
-import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
+import type { RawJobListItem } from '../../../src/platform/remote/comfyui/jobs/jobTypes'
 
 const jobsListRoutePattern = /\/api\/jobs(?:\?.*)?$/
 const inputFilesRoutePattern = /\/internal\/files\/input(?:\?.*)?$/

browser_tests/fixtures/helpers/BuilderFooterHelper.ts

@@ -1,7 +1,7 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
+import type { ComfyPage } from '../ComfyPage'
+import { TestIds } from '../selectors'
 
 export class BuilderFooterHelper {
   constructor(private readonly comfyPage: ComfyPage) {}

browser_tests/fixtures/helpers/BuilderSaveAsHelper.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '../ComfyPage'
 
 export class BuilderSaveAsHelper {
   constructor(private readonly comfyPage: ComfyPage) {}

browser_tests/fixtures/helpers/BuilderSelectHelper.ts

@@ -1,35 +1,8 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
-
-/**
- * Drag an element from one index to another within a list of locators.
- * Uses mousedown/mousemove/mouseup to trigger the DraggableList library.
- *
- * DraggableList toggles position when the dragged item's center crosses
- * past an idle item's center. To reliably land at the target position,
- * we overshoot slightly past the target's far edge.
- */
-async function dragByIndex(items: Locator, fromIndex: number, toIndex: number) {
-  const fromBox = await items.nth(fromIndex).boundingBox()
-  const toBox = await items.nth(toIndex).boundingBox()
-  if (!fromBox || !toBox) throw new Error('Item not visible for drag')
-
-  const draggingDown = toIndex > fromIndex
-  const targetY = draggingDown
-    ? toBox.y + toBox.height * 0.9
-    : toBox.y + toBox.height * 0.1
-
-  const page = items.page()
-  await page.mouse.move(
-    fromBox.x + fromBox.width / 2,
-    fromBox.y + fromBox.height / 2
-  )
-  await page.mouse.down()
-  await page.mouse.move(toBox.x + toBox.width / 2, targetY, { steps: 10 })
-  await page.mouse.up()
-}
+import type { ComfyPage } from '../ComfyPage'
+import type { NodeReference } from '../utils/litegraphUtils'
+import { TestIds } from '../selectors'
 
 export class BuilderSelectHelper {
   constructor(private readonly comfyPage: ComfyPage) {}
@@ -126,89 +99,41 @@ export class BuilderSelectHelper {
     await this.comfyPage.nextFrame()
   }
 
-  /**
-   * Click a widget on the canvas to select it as a builder input.
-   * @param nodeTitle The displayed title of the node.
-   * @param widgetName The widget name to click.
-   */
-  async selectInputWidget(nodeTitle: string, widgetName: string) {
+  /** Center on a node and click its first widget to select it as input. */
+  async selectInputWidget(node: NodeReference) {
     await this.comfyPage.canvasOps.setScale(1)
-    const nodeRef = (
-      await this.comfyPage.nodeOps.getNodeRefsByTitle(nodeTitle)
-    )[0]
-    if (!nodeRef) throw new Error(`Node ${nodeTitle} not found`)
-    await nodeRef.centerOnNode()
-    const widgetLocator = this.comfyPage.vueNodes
-      .getNodeLocator(String(nodeRef.id))
-      .getByLabel(widgetName, { exact: true })
-    await widgetLocator.click({ force: true })
-    await this.comfyPage.nextFrame()
-  }
+    await node.centerOnNode()
 
-  /**
-   * Get the subtitle locator for a builder IoItem by its title text.
-   * Useful for asserting "Widget not visible" on disconnected inputs.
-   */
-  getInputItemSubtitle(title: string): Locator {
-    return this.page
-      .getByTestId(TestIds.builder.ioItem)
-      .filter({
-        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) {
-    const items = this.page.getByTestId(TestIds.builder.ioItem)
-    await dragByIndex(items, fromIndex, toIndex)
-    await this.comfyPage.nextFrame()
-  }
-
-  /**
-   * Drag a widget item from one index to another in the preview/arrange step.
-   */
-  async dragPreviewItem(fromIndex: number, toIndex: number) {
-    const items = this.page.getByTestId(TestIds.builder.widgetItem)
-    await dragByIndex(items, fromIndex, toIndex)
-    await this.comfyPage.nextFrame()
-  }
-
-  /**
-   * Click an output node on the canvas to select it as a builder output.
-   * @param nodeTitle The displayed title of the output node.
-   */
-  async selectOutputNode(nodeTitle: string) {
-    await this.comfyPage.canvasOps.setScale(1)
-    const nodeRef = (
-      await this.comfyPage.nodeOps.getNodeRefsByTitle(nodeTitle)
-    )[0]
-    if (!nodeRef) throw new Error(`Node ${nodeTitle} not found`)
-    await nodeRef.centerOnNode()
-    const nodeLocator = this.comfyPage.vueNodes.getNodeLocator(
-      String(nodeRef.id)
+    const widgetRef = await node.getWidget(0)
+    const widgetPos = await widgetRef.getPosition()
+    const titleHeight = await this.page.evaluate(
+      () => window.LiteGraph!['NODE_TITLE_HEIGHT'] as number
+    )
+    await this.page.mouse.click(widgetPos.x, widgetPos.y + titleHeight)
+    await this.comfyPage.nextFrame()
+  }
+
+  /** Click the first SaveImage/PreviewImage node on the canvas. */
+  async selectOutputNode() {
+    const saveImageNodeId = await this.page.evaluate(() => {
+      const node = window.app!.rootGraph.nodes.find(
+        (n: { type?: string }) =>
+          n.type === 'SaveImage' || n.type === 'PreviewImage'
+      )
+      return node ? String(node.id) : null
+    })
+    if (!saveImageNodeId)
+      throw new Error('SaveImage/PreviewImage node not found')
+    const saveImageRef =
+      await this.comfyPage.nodeOps.getNodeRefById(saveImageNodeId)
+    await saveImageRef.centerOnNode()
+
+    const canvasBox = await this.page.locator('#graph-canvas').boundingBox()
+    if (!canvasBox) throw new Error('Canvas not found')
+    await this.page.mouse.click(
+      canvasBox.x + canvasBox.width / 2,
+      canvasBox.y + canvasBox.height / 2
     )
-    await nodeLocator.click({ force: true })
     await this.comfyPage.nextFrame()
   }
 }

browser_tests/fixtures/helpers/BuilderStepsHelper.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '../ComfyPage'
 
 export class BuilderStepsHelper {
   constructor(private readonly comfyPage: ComfyPage) {}

browser_tests/fixtures/helpers/CanvasHelper.ts

@@ -1,7 +1,7 @@
 import type { Locator, Page } from '@playwright/test'
 
-import { DefaultGraphPositions } from '@e2e/fixtures/constants/defaultGraphPositions'
-import type { Position } from '@e2e/fixtures/types'
+import { DefaultGraphPositions } from '../constants/defaultGraphPositions'
+import type { Position } from '../types'
 
 export class CanvasHelper {
   constructor(

browser_tests/fixtures/helpers/ClipboardHelper.ts

@@ -3,8 +3,8 @@ import { basename } from 'path'
 
 import type { Locator, Page } from '@playwright/test'
 
-import type { KeyboardHelper } from '@e2e/fixtures/helpers/KeyboardHelper'
-import { getMimeType } from '@e2e/fixtures/helpers/mimeTypeUtil'
+import type { KeyboardHelper } from './KeyboardHelper'
+import { getMimeType } from './mimeTypeUtil'
 
 export class ClipboardHelper {
   constructor(

browser_tests/fixtures/helpers/CloudAuthHelper.ts

@@ -1,171 +0,0 @@
-import type { Page } from '@playwright/test'
-
-/**
- * Mocks Firebase authentication for cloud E2E tests.
- *
- * The cloud build's router guard waits for Firebase `onAuthStateChanged`
- * to fire, then checks `getAuthHeader()`. In CI no Firebase project is
- * configured, so the user is never authenticated and the app redirects
- * to `/cloud/login`.
- *
- * This helper seeds Firebase's IndexedDB persistence layer with a mock
- * user and intercepts the Firebase REST APIs (securetoken, identitytoolkit)
- * so the SDK believes a user is signed in. Must be called before navigation.
- */
-export class CloudAuthHelper {
-  constructor(private readonly page: Page) {}
-
-  /**
-   * Set up all auth mocks. Must be called before `comfyPage.setup()`.
-   */
-  async mockAuth(): Promise<void> {
-    await this.seedFirebaseIndexedDB()
-    await this.mockFirebaseEndpoints()
-  }
-
-  /**
-   * Navigate to a lightweight same-origin page to seed Firebase's
-   * IndexedDB persistence with a mock user. This ensures the data
-   * is written before the app loads and Firebase reads it.
-   *
-   * Firebase auth uses `browserLocalPersistence` which stores data in
-   * IndexedDB database `firebaseLocalStorageDb`, object store
-   * `firebaseLocalStorage`, keyed by `firebase:authUser:<apiKey>:<appName>`.
-   */
-  private async seedFirebaseIndexedDB(): Promise<void> {
-    // Navigate to a lightweight endpoint to get a same-origin context
-    await this.page.goto('http://localhost:8188/api/users')
-
-    await this.page.evaluate(() => {
-      const MOCK_USER_DATA = {
-        uid: 'test-user-e2e',
-        email: 'e2e@test.comfy.org',
-        displayName: 'E2E Test User',
-        emailVerified: true,
-        isAnonymous: false,
-        providerData: [
-          {
-            providerId: 'google.com',
-            uid: 'test-user-e2e',
-            displayName: 'E2E Test User',
-            email: 'e2e@test.comfy.org',
-            phoneNumber: null,
-            photoURL: null
-          }
-        ],
-        stsTokenManager: {
-          refreshToken: 'mock-refresh-token',
-          accessToken: 'mock-firebase-id-token',
-          expirationTime: Date.now() + 60 * 60 * 1000
-        },
-        apiKey: 'AIzaSyDa_YMeyzV0SkVe92vBZ1tVikWBmOU5KVE',
-        appName: '[DEFAULT]'
-      }
-
-      const DB_NAME = 'firebaseLocalStorageDb'
-      const STORE_NAME = 'firebaseLocalStorage'
-      const KEY = `firebase:authUser:${MOCK_USER_DATA.apiKey}:${MOCK_USER_DATA.appName}`
-
-      return new Promise<void>((resolve, reject) => {
-        const request = indexedDB.open(DB_NAME)
-        request.onerror = () => reject(request.error)
-        request.onupgradeneeded = () => {
-          const db = request.result
-          if (!db.objectStoreNames.contains(STORE_NAME)) {
-            db.createObjectStore(STORE_NAME)
-          }
-        }
-        request.onsuccess = () => {
-          const db = request.result
-          if (!db.objectStoreNames.contains(STORE_NAME)) {
-            db.close()
-            const upgradeReq = indexedDB.open(DB_NAME, db.version + 1)
-            upgradeReq.onerror = () => reject(upgradeReq.error)
-            upgradeReq.onupgradeneeded = () => {
-              const upgradedDb = upgradeReq.result
-              if (!upgradedDb.objectStoreNames.contains(STORE_NAME)) {
-                upgradedDb.createObjectStore(STORE_NAME)
-              }
-            }
-            upgradeReq.onsuccess = () => {
-              const upgradedDb = upgradeReq.result
-              const tx = upgradedDb.transaction(STORE_NAME, 'readwrite')
-              tx.objectStore(STORE_NAME).put(
-                { fpiVersion: '1', value: MOCK_USER_DATA },
-                KEY
-              )
-              tx.oncomplete = () => {
-                upgradedDb.close()
-                resolve()
-              }
-              tx.onerror = () => reject(tx.error)
-            }
-            return
-          }
-          const tx = db.transaction(STORE_NAME, 'readwrite')
-          tx.objectStore(STORE_NAME).put(
-            { fpiVersion: '1', value: MOCK_USER_DATA },
-            KEY
-          )
-          tx.oncomplete = () => {
-            db.close()
-            resolve()
-          }
-          tx.onerror = () => reject(tx.error)
-        }
-      })
-    })
-  }
-
-  /**
-   * Intercept Firebase Auth REST API endpoints so the SDK can
-   * "refresh" the mock user's token without real credentials.
-   */
-  private async mockFirebaseEndpoints(): Promise<void> {
-    await this.page.route('**/securetoken.googleapis.com/**', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify({
-          access_token: 'mock-access-token',
-          expires_in: '3600',
-          token_type: 'Bearer',
-          refresh_token: 'mock-refresh-token',
-          id_token: 'mock-firebase-id-token',
-          user_id: 'test-user-e2e',
-          project_id: 'dreamboothy-dev'
-        })
-      })
-    )
-
-    await this.page.route('**/identitytoolkit.googleapis.com/**', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify({
-          kind: 'identitytoolkit#GetAccountInfoResponse',
-          users: [
-            {
-              localId: 'test-user-e2e',
-              email: 'e2e@test.comfy.org',
-              displayName: 'E2E Test User',
-              emailVerified: true,
-              validSince: '0',
-              lastLoginAt: String(Date.now()),
-              createdAt: String(Date.now()),
-              lastRefreshAt: new Date().toISOString()
-            }
-          ]
-        })
-      })
-    )
-
-    await this.page.route('**/__/auth/**', (route) =>
-      route.fulfill({
-        status: 200,
-        contentType: 'text/html',
-        body: '<html><body></body></html>'
-      })
-    )
-  }
-}

browser_tests/fixtures/helpers/CommandHelper.ts

@@ -1,6 +1,6 @@
 import type { Page } from '@playwright/test'
 
-import type { KeyCombo } from '@/platform/keybindings/types'
+import type { KeyCombo } from '../../../src/platform/keybindings/types'
 
 export class CommandHelper {
   constructor(private readonly page: Page) {}
@@ -41,7 +41,6 @@ export class CommandHelper {
           commands: [
             {
               id: commandId,
-              // oxlint-disable-next-line no-eval -- intentional: eval reconstructs a serialized function inside Playwright's page context
               function: eval(commandStr)
             }
           ]
@@ -77,7 +76,6 @@ export class CommandHelper {
           commands: [
             {
               id: commandId,
-              // oxlint-disable-next-line no-eval -- intentional: eval reconstructs a serialized function inside Playwright's page context
               function: eval(commandStr)
             }
           ]

browser_tests/fixtures/helpers/DragDropHelper.ts

@@ -2,9 +2,9 @@ import { readFileSync } from 'fs'
 
 import type { Page } from '@playwright/test'
 
-import type { Position } from '@e2e/fixtures/types'
-import { getMimeType } from '@e2e/fixtures/helpers/mimeTypeUtil'
-import { assetPath } from '@e2e/fixtures/utils/paths'
+import type { Position } from '../types'
+import { getMimeType } from './mimeTypeUtil'
+import { assetPath } from '../utils/paths'
 
 export class DragDropHelper {
   constructor(private readonly page: Page) {}

browser_tests/fixtures/helpers/ModelLibraryHelper.ts

@@ -3,7 +3,7 @@ import type { Page, Route } from '@playwright/test'
 import type {
   ModelFile,
   ModelFolderInfo
-} from '@/platform/assets/schemas/assetSchema'
+} from '../../../src/platform/assets/schemas/assetSchema'
 
 const modelFoldersRoutePattern = /\/api\/experiment\/models$/
 const modelFilesRoutePattern = /\/api\/experiment\/models\/([^?]+)/

browser_tests/fixtures/helpers/NodeOperationsHelper.ts

@@ -1,11 +1,14 @@
 import type { Locator } from '@playwright/test'
 
-import type { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { DefaultGraphPositions } from '@e2e/fixtures/constants/defaultGraphPositions'
-import type { Position, Size } from '@e2e/fixtures/types'
-import { NodeReference } from '@e2e/fixtures/utils/litegraphUtils'
+import type {
+  LGraph,
+  LGraphNode
+} from '../../../src/lib/litegraph/src/litegraph'
+import type { NodeId } from '../../../src/platform/workflow/validation/schemas/workflowSchema'
+import type { ComfyPage } from '../ComfyPage'
+import { DefaultGraphPositions } from '../constants/defaultGraphPositions'
+import type { Position, Size } from '../types'
+import { NodeReference } from '../utils/litegraphUtils'
 
 export class NodeOperationsHelper {
   constructor(private comfyPage: ComfyPage) {}
@@ -30,12 +33,6 @@ export class NodeOperationsHelper {
     })
   }
 
-  /** Remove all nodes from the graph and clean. */
-  async clearGraph() {
-    await this.comfyPage.settings.setSetting('Comfy.ConfirmClear', false)
-    await this.comfyPage.command.executeCommand('Comfy.ClearWorkflow')
-  }
-
   /** Reads from `window.app.graph` (the root workflow graph). */
   async getNodeCount(): Promise<number> {
     return await this.page.evaluate(() => window.app!.graph.nodes.length)

browser_tests/fixtures/helpers/SubgraphHelper.ts

@@ -7,10 +7,10 @@ import type {
 } from '@/lib/litegraph/src/litegraph'
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
-import type { NodeReference } from '@e2e/fixtures/utils/litegraphUtils'
-import { SubgraphSlotReference } from '@e2e/fixtures/utils/litegraphUtils'
+import type { ComfyPage } from '../ComfyPage'
+import { TestIds } from '../selectors'
+import type { NodeReference } from '../utils/litegraphUtils'
+import { SubgraphSlotReference } from '../utils/litegraphUtils'
 
 export class SubgraphHelper {
   constructor(private readonly comfyPage: ComfyPage) {}
@@ -484,16 +484,7 @@ export class SubgraphHelper {
     await this.comfyPage.vueNodes.enterSubgraph(hostNodeId)
     await this.comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', false)
     await this.comfyPage.nextFrame()
-    await this.comfyPage.canvas.dispatchEvent('pointerdown', {
-      bubbles: true,
-      cancelable: true,
-      button: 0
-    })
-    await this.comfyPage.canvas.dispatchEvent('pointerup', {
-      bubbles: true,
-      cancelable: true,
-      button: 0
-    })
+    await this.comfyPage.canvas.click()
     await this.comfyPage.canvas.press('Control+a')
     await this.comfyPage.nextFrame()
     await this.page.evaluate(() => {
@@ -502,16 +493,7 @@ export class SubgraphHelper {
     })
     await this.comfyPage.nextFrame()
     await this.exitViaBreadcrumb()
-    await this.comfyPage.canvas.dispatchEvent('pointerdown', {
-      bubbles: true,
-      cancelable: true,
-      button: 0
-    })
-    await this.comfyPage.canvas.dispatchEvent('pointerup', {
-      bubbles: true,
-      cancelable: true,
-      button: 0
-    })
+    await this.comfyPage.canvas.click()
     await this.comfyPage.nextFrame()
   }
 

browser_tests/fixtures/helpers/WorkflowHelper.ts

@@ -1,13 +1,13 @@
 import { readFileSync } from 'fs'
 
-import type { AppMode } from '@/composables/useAppMode'
+import type { AppMode } from '../../../src/composables/useAppMode'
 import type {
   ComfyApiWorkflow,
   ComfyWorkflowJSON
-} from '@/platform/workflow/validation/schemas/workflowSchema'
-import type { WorkspaceStore } from '@e2e/types/globals'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { assetPath } from '@e2e/fixtures/utils/paths'
+} from '../../../src/platform/workflow/validation/schemas/workflowSchema'
+import type { WorkspaceStore } from '../../types/globals'
+import type { ComfyPage } from '../ComfyPage'
+import { assetPath } from '../utils/paths'
 
 type FolderStructure = {
   [key: string]: FolderStructure | string
@@ -58,16 +58,6 @@ export class WorkflowHelper {
     await this.comfyPage.nextFrame()
   }
 
-  async waitForDraftPersisted({ timeout = 5000 } = {}) {
-    await this.comfyPage.page.waitForFunction(
-      () =>
-        Object.keys(localStorage).some((k) =>
-          k.startsWith('Comfy.Workflow.Draft.v2:')
-        ),
-      { timeout }
-    )
-  }
-
   async loadWorkflow(workflowName: string) {
     await this.comfyPage.workflowUploadInput.setInputFiles(
       assetPath(`${workflowName}.json`)
@@ -116,14 +106,6 @@ export class WorkflowHelper {
     })
   }
 
-  async waitForActiveWorkflow(): Promise<void> {
-    await this.comfyPage.page.waitForFunction(
-      () =>
-        (window.app!.extensionManager as WorkspaceStore).workflow
-          .activeWorkflow !== null
-    )
-  }
-
   async getActiveWorkflowPath(): Promise<string | undefined> {
     return this.comfyPage.page.evaluate(() => {
       return (window.app!.extensionManager as WorkspaceStore).workflow

browser_tests/fixtures/selectors.ts

@@ -41,21 +41,10 @@ export const TestIds = {
     missingNodeCard: 'missing-node-card',
     errorCardFindOnGithub: 'error-card-find-on-github',
     errorCardCopy: 'error-card-copy',
-    errorDialog: 'error-dialog',
-    errorDialogShowReport: 'error-dialog-show-report',
-    errorDialogContactSupport: 'error-dialog-contact-support',
-    errorDialogCopyReport: 'error-dialog-copy-report',
-    errorDialogFindIssues: 'error-dialog-find-issues',
     about: 'about-panel',
     whatsNewSection: 'whats-new-section',
     missingNodePacksGroup: 'error-group-missing-node',
     missingModelsGroup: 'error-group-missing-model',
-    missingModelExpand: 'missing-model-expand',
-    missingModelLocate: 'missing-model-locate',
-    missingModelCopyName: 'missing-model-copy-name',
-    missingModelCopyUrl: 'missing-model-copy-url',
-    missingModelDownload: 'missing-model-download',
-    missingModelImportUnsupported: 'missing-model-import-unsupported',
     missingMediaGroup: 'error-group-missing-media',
     missingMediaRow: 'missing-media-row',
     missingMediaUploadDropzone: 'missing-media-upload-dropzone',
@@ -63,8 +52,7 @@ export const TestIds = {
     missingMediaStatusCard: 'missing-media-status-card',
     missingMediaConfirmButton: 'missing-media-confirm-button',
     missingMediaCancelButton: 'missing-media-cancel-button',
-    missingMediaLocateButton: 'missing-media-locate-button',
-    publishTabPanel: 'publish-tab-panel'
+    missingMediaLocateButton: 'missing-media-locate-button'
   },
   keybindings: {
     presetMenu: 'keybinding-preset-menu'
@@ -122,21 +110,8 @@ export const TestIds = {
     saveAsChevron: 'builder-save-as-chevron',
     ioItem: 'builder-io-item',
     ioItemTitle: 'builder-io-item-title',
-    ioItemSubtitle: 'builder-io-item-subtitle',
     widgetActionsMenu: 'widget-actions-menu',
-    opensAs: 'builder-opens-as',
-    widgetItem: 'builder-widget-item',
-    widgetLabel: 'builder-widget-label',
-    outputPlaceholder: 'builder-output-placeholder',
-    connectOutputPopover: 'builder-connect-output-popover'
-  },
-  appMode: {
-    widgetItem: 'app-mode-widget-item',
-    welcome: 'linear-welcome',
-    emptyWorkflow: 'linear-welcome-empty-workflow',
-    buildApp: 'linear-welcome-build-app',
-    backToWorkflow: 'linear-welcome-back-to-workflow',
-    loadTemplate: 'linear-welcome-load-template'
+    opensAs: 'builder-opens-as'
   },
   breadcrumb: {
     subgraph: 'subgraph-breadcrumb'
@@ -174,7 +149,6 @@ export type TestIdValue =
   | (typeof TestIds.selectionToolbox)[keyof typeof TestIds.selectionToolbox]
   | (typeof TestIds.widgets)[keyof typeof TestIds.widgets]
   | (typeof TestIds.builder)[keyof typeof TestIds.builder]
-  | (typeof TestIds.appMode)[keyof typeof TestIds.appMode]
   | (typeof TestIds.breadcrumb)[keyof typeof TestIds.breadcrumb]
   | Exclude<
       (typeof TestIds.templates)[keyof typeof TestIds.templates],

browser_tests/fixtures/utils/customMatchers.ts

@@ -1,7 +1,7 @@
 import type { ExpectMatcherState, Locator } from '@playwright/test'
 import { expect } from '@playwright/test'
 
-import type { NodeReference } from '@e2e/fixtures/utils/litegraphUtils'
+import type { NodeReference } from './litegraphUtils'
 
 function makeMatcher<T>(
   getValue: (node: NodeReference) => Promise<T> | T,

browser_tests/fixtures/utils/litegraphUtils.ts

@@ -1,10 +1,10 @@
 import { expect } from '@playwright/test'
 import type { Page } from '@playwright/test'
 
-import type { NodeId } from '@/platform/workflow/validation/schemas/workflowSchema'
-import { ManageGroupNode } from '@e2e/helpers/manageGroupNode'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import type { Position, Size } from '@e2e/fixtures/types'
+import type { NodeId } from '../../../src/platform/workflow/validation/schemas/workflowSchema'
+import { ManageGroupNode } from '../../helpers/manageGroupNode'
+import type { ComfyPage } from '../ComfyPage'
+import type { Position, Size } from '../types'
 
 export const getMiddlePoint = (pos1: Position, pos2: Position) => {
   return {

browser_tests/fixtures/utils/vueNodeFixtures.ts

@@ -1,6 +1,6 @@
 import type { Locator } from '@playwright/test'
 
-import { TestIds } from '@e2e/fixtures/selectors'
+import { TestIds } from '../selectors'
 
 /** DOM-centric helper for a single Vue-rendered node on the canvas. */
 export class VueNodeFixture {

browser_tests/globalSetup.ts

@@ -1,6 +1,6 @@
 import { config as dotenvConfig } from 'dotenv'
 
-import { backupPath } from '@e2e/utils/backupUtils'
+import { backupPath } from './utils/backupUtils'
 
 dotenvConfig()
 

browser_tests/globalTeardown.ts

@@ -1,7 +1,7 @@
 import { config as dotenvConfig } from 'dotenv'
 
-import { writePerfReport } from '@e2e/helpers/perfReporter'
-import { restorePath } from '@e2e/utils/backupUtils'
+import { writePerfReport } from './helpers/perfReporter'
+import { restorePath } from './utils/backupUtils'
 
 dotenvConfig()
 

browser_tests/helpers/actionbar.ts

@@ -1,8 +1,8 @@
 import type { Locator, Page } from '@playwright/test'
 
-import type { AutoQueueMode } from '@/stores/queueStore'
-import { TestIds } from '@e2e/fixtures/selectors'
-import type { WorkspaceStore } from '@e2e/types/globals'
+import type { AutoQueueMode } from '../../src/stores/queueStore'
+import { TestIds } from '../fixtures/selectors'
+import type { WorkspaceStore } from '../types/globals'
 
 export class ComfyActionbar {
   public readonly root: Locator

browser_tests/helpers/builderTestUtils.ts

@@ -1,16 +1,10 @@
 import { expect } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
-import type { NodeReference } from '@e2e/fixtures/utils/litegraphUtils'
+import type { ComfyPage } from '../fixtures/ComfyPage'
+import type { NodeReference } from '../fixtures/utils/litegraphUtils'
 
-import { comfyExpect } from '@e2e/fixtures/ComfyPage'
-import { fitToViewInstant } from '@e2e/helpers/fitToView'
-
-interface BuilderSetupResult {
-  inputNodeTitle: string
-  widgetNames: string[]
-}
+import { fitToViewInstant } from './fitToView'
+import { getPromotedWidgetNames } from './promotedWidgets'
 
 /**
  * Enter builder on the default workflow and select I/O.
@@ -19,97 +13,55 @@ interface BuilderSetupResult {
  * to subgraph), then enters builder mode and selects inputs + outputs.
  *
  * @param comfyPage - The page fixture.
- * @param prepareGraph - Optional callback to transform the graph before
- *   entering builder. Receives the KSampler node ref and returns the
- *   input node title and widget names to select.
- *   Defaults to KSampler with its first widget.
- *   Mutually exclusive with widgetNames.
- * @param widgetNames - Widget names to select from the KSampler node.
- *   Only used when prepareGraph is not provided.
- *   Mutually exclusive with prepareGraph.
+ * @param getInputNode - Returns the node to click for input selection.
+ *   Receives the KSampler node ref and can transform the graph before
+ *   returning the target node. Defaults to using KSampler directly.
+ * @returns The node used for input selection.
  */
 export async function setupBuilder(
   comfyPage: ComfyPage,
-  prepareGraph?: (ksampler: NodeReference) => Promise<BuilderSetupResult>,
-  widgetNames?: string[]
-): Promise<void> {
+  getInputNode?: (ksampler: NodeReference) => Promise<NodeReference>
+): Promise<NodeReference> {
   const { appMode } = comfyPage
   await comfyPage.workflow.loadWorkflow('default')
 
   const ksampler = await comfyPage.nodeOps.getNodeRefById('3')
-
-  const { inputNodeTitle, widgetNames: inputWidgets } = prepareGraph
-    ? await prepareGraph(ksampler)
-    : { inputNodeTitle: 'KSampler', widgetNames: widgetNames ?? ['seed'] }
+  const inputNode = getInputNode ? await getInputNode(ksampler) : ksampler
 
   await fitToViewInstant(comfyPage)
   await appMode.enterBuilder()
   await appMode.steps.goToInputs()
-
-  for (const name of inputWidgets) {
-    await appMode.select.selectInputWidget(inputNodeTitle, name)
-  }
+  await appMode.select.selectInputWidget(inputNode)
 
   await appMode.steps.goToOutputs()
-  await appMode.select.selectOutputNode('Save Image')
+  await appMode.select.selectOutputNode()
+
+  return inputNode
 }
 
 /**
  * Convert the KSampler to a subgraph, then enter builder with I/O selected.
+ *
+ * Returns the subgraph node reference for further interaction.
  */
 export async function setupSubgraphBuilder(
   comfyPage: ComfyPage
-): Promise<void> {
-  await setupBuilder(comfyPage, async (ksampler) => {
+): Promise<NodeReference> {
+  return setupBuilder(comfyPage, async (ksampler) => {
     await ksampler.click('title')
-    await ksampler.convertToSubgraph()
+    const subgraphNode = await ksampler.convertToSubgraph()
     await comfyPage.nextFrame()
 
-    return {
-      inputNodeTitle: 'New Subgraph',
-      widgetNames: ['seed']
-    }
+    const promotedNames = await getPromotedWidgetNames(
+      comfyPage,
+      String(subgraphNode.id)
+    )
+    expect(promotedNames).toContain('seed')
+
+    return subgraphNode
   })
 }
 
-/**
- * Open the save-as dialog, fill name + view type, click save,
- * and wait for the success dialog.
- */
-export async function builderSaveAs(
-  appMode: AppModeHelper,
-  workflowName: string,
-  viewType: 'App' | 'Node graph' = 'App'
-) {
-  await appMode.footer.saveAsButton.click()
-  await comfyExpect(appMode.saveAs.nameInput).toBeVisible({ timeout: 5000 })
-  await appMode.saveAs.fillAndSave(workflowName, viewType)
-  await comfyExpect(appMode.saveAs.successMessage).toBeVisible({
-    timeout: 5000
-  })
-}
-
-/**
- * Load a different workflow, then reopen the named one from the sidebar.
- * Caller must ensure the page is in graph mode (not builder or app mode)
- * before calling.
- */
-export async function openWorkflowFromSidebar(
-  comfyPage: ComfyPage,
-  name: string
-) {
-  await comfyPage.workflow.loadWorkflow('default')
-  await comfyPage.nextFrame()
-  const { workflowsTab } = comfyPage.menu
-  await workflowsTab.open()
-  await workflowsTab.getPersistedItem(name).dblclick()
-  await comfyPage.nextFrame()
-
-  await expect
-    .poll(() => comfyPage.workflow.getActiveWorkflowPath())
-    .toContain(name)
-}
-
 /** Save the workflow, reopen it, and enter app mode. */
 export async function saveAndReopenInAppMode(
   comfyPage: ComfyPage,

browser_tests/helpers/clipboardSpy.ts

@@ -1,19 +0,0 @@
-import type { Page } from '@playwright/test'
-
-export async function interceptClipboardWrite(page: Page) {
-  await page.evaluate(() => {
-    const w = window as Window & { __copiedText?: string }
-    w.__copiedText = ''
-    navigator.clipboard.writeText = async (text: string) => {
-      w.__copiedText = text
-    }
-  })
-}
-
-export async function getClipboardText(page: Page): Promise<string> {
-  return (
-    (await page.evaluate(
-      () => (window as Window & { __copiedText?: string }).__copiedText
-    )) ?? ''
-  )
-}

browser_tests/helpers/fitToView.ts

@@ -1,5 +1,5 @@
-import type { ReadOnlyRect } from '@/lib/litegraph/src/interfaces'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { ReadOnlyRect } from '../../src/lib/litegraph/src/interfaces'
+import type { ComfyPage } from '../fixtures/ComfyPage'
 
 interface FitToViewOptions {
   selectionOnly?: boolean

browser_tests/helpers/perfReporter.ts

@@ -1,7 +1,7 @@
 import { mkdirSync, readdirSync, readFileSync, writeFileSync } from 'fs'
 import { join } from 'path'
 
-import type { PerfMeasurement } from '@e2e/fixtures/helpers/PerformanceHelper'
+import type { PerfMeasurement } from '../fixtures/helpers/PerformanceHelper'
 
 export interface PerfReport {
   timestamp: string
@@ -41,7 +41,6 @@ export function logMeasurement(
     if (formatter) return formatter(m)
     return `${f}=${m[f]}`
   })
-  // oxlint-disable-next-line no-console -- perf reporter intentionally logs to stdout
   console.log(`${label}: ${parts.join(', ')}`)
 }
 

browser_tests/helpers/promotedWidgets.ts

@@ -1,4 +1,4 @@
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
 
 export type PromotedWidgetEntry = [string, string]
 

browser_tests/helpers/templates.ts

@@ -5,8 +5,8 @@ import path from 'path'
 import type {
   TemplateInfo,
   WorkflowTemplates
-} from '@/platform/workflow/templates/types/template'
-import { TestIds } from '@e2e/fixtures/selectors'
+} from '../../src/platform/workflow/templates/types/template'
+import { TestIds } from '../fixtures/selectors'
 
 export class ComfyTemplates {
   readonly content: Locator
@@ -18,9 +18,12 @@ export class ComfyTemplates {
   }
 
   async expectMinimumCardCount(count: number) {
-    await expect
-      .poll(() => this.allTemplateCards.count())
-      .toBeGreaterThanOrEqual(count)
+    await expect(async () => {
+      const cardCount = await this.allTemplateCards.count()
+      expect(cardCount).toBeGreaterThanOrEqual(count)
+    }).toPass({
+      timeout: 1_000
+    })
   }
 
   async loadTemplate(id: string) {

browser_tests/tests/actionbar.spec.ts

@@ -1,10 +1,10 @@
 import type { Response } from '@playwright/test'
 import { expect, mergeTests } from '@playwright/test'
 
-import type { StatusWsMessage } from '@/schemas/apiSchema'
+import type { StatusWsMessage } from '../../src/schemas/apiSchema'
 import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
 import { webSocketFixture } from '@e2e/fixtures/ws'
-import type { WorkspaceStore } from '@e2e/types/globals'
+import type { WorkspaceStore } from '../types/globals'
 
 const test = mergeTests(comfyPageFixture, webSocketFixture)
 

browser_tests/tests/appModeDropdownClipping.spec.ts

@@ -3,7 +3,7 @@ import type { Page } from '@playwright/test'
 import {
   comfyPageFixture as test,
   comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
+} from '../fixtures/ComfyPage'
 
 /**
  * Default workflow widget inputs as [nodeId, widgetName] tuples.
@@ -60,7 +60,13 @@ async function addNode(page: Page, nodeType: string): Promise<string> {
 
 test.describe('App mode dropdown clipping', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.appMode.enableLinearMode()
+    await comfyPage.page.evaluate(() => {
+      window.app!.api.serverFeatureFlags.value = {
+        ...window.app!.api.serverFeatureFlags.value,
+        linear_toggle_enabled: true
+      }
+    })
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
   })
 
   test('Select dropdown is not clipped in app mode panel', async ({
@@ -139,7 +145,10 @@ test.describe('App mode dropdown clipping', { tag: '@ui' }, () => {
 
     // 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
+    const popover = comfyPage.page
+      .getByRole('dialog')
+      .filter({ has: comfyPage.page.getByRole('button', { name: 'All' }) })
+      .first()
     await expect(popover).toBeVisible({ timeout: 5000 })
 
     const isInViewport = await popover.evaluate((el) => {

browser_tests/tests/appModePruning.spec.ts

@@ -1,105 +0,0 @@
-import type { ComfyPage } from '../fixtures/ComfyPage'
-import {
-  comfyPageFixture as test,
-  comfyExpect as expect
-} from '../fixtures/ComfyPage'
-import { setupBuilder } from '../helpers/builderTestUtils'
-import { fitToViewInstant } from '../helpers/fitToView'
-
-const RESIZE_NODE_TITLE = 'Resize Image/Mask'
-const RESIZE_NODE_ID = '1'
-const SAVE_IMAGE_NODE_ID = '9'
-
-/**
- * Load the dynamic combo workflow, enter builder,
- * select a dynamic sub-widget as input and SaveImage as output.
- */
-async function setupDynamicComboBuilder(comfyPage: ComfyPage) {
-  const { appMode } = comfyPage
-  await comfyPage.workflow.loadWorkflow('inputs/dynamic_combo')
-  await fitToViewInstant(comfyPage)
-  await appMode.enterBuilder()
-  await appMode.steps.goToInputs()
-  await appMode.select.selectInputWidget(RESIZE_NODE_TITLE, 'resize_type.width')
-  await appMode.steps.goToOutputs()
-  await appMode.select.selectOutputNode('Save Image')
-}
-
-test.describe('App Mode Pruning', { tag: ['@ui'] }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.appMode.enableLinearMode()
-    await comfyPage.settings.setSetting(
-      'Comfy.AppBuilder.VueNodeSwitchDismissed',
-      true
-    )
-  })
-
-  test('prunes deleted outputs', async ({ comfyPage }) => {
-    const { appMode } = comfyPage
-
-    // Enter builder with default workflow (seed input + SaveImage output)
-    await setupBuilder(comfyPage)
-
-    // Verify save-as dialog opens
-    await appMode.footer.saveAsButton.click()
-    await expect(appMode.saveAs.dialog).toBeVisible()
-    await appMode.saveAs.dialog.press('Escape')
-
-    // Exit builder, delete SaveImage node
-    await appMode.footer.exitBuilder()
-    await comfyPage.vueNodes.deleteNode(SAVE_IMAGE_NODE_ID)
-    await expect(
-      comfyPage.vueNodes.getNodeLocator(SAVE_IMAGE_NODE_ID)
-    ).not.toBeAttached()
-
-    // Re-enter builder - pruning should auto-clean stale outputs
-    await appMode.enterBuilder()
-    await appMode.steps.goToOutputs()
-    await expect(appMode.outputPlaceholder).toBeVisible()
-
-    // Verify can't save
-    await appMode.footer.saveAsButton.click()
-    await expect(appMode.connectOutputPopover).toBeVisible()
-  })
-
-  test('does not prune missing widgets when node still exists for dynamic widgets', async ({
-    comfyPage
-  }) => {
-    const { appMode } = comfyPage
-
-    await setupDynamicComboBuilder(comfyPage)
-    await appMode.footer.exitBuilder()
-    await fitToViewInstant(comfyPage)
-
-    // Change dynamic combo from "scale dimensions" to "scale by multiplier"
-    // This removes the width/height widgets and adds factor
-    await comfyPage.vueNodes.selectComboOption(
-      RESIZE_NODE_TITLE,
-      'resize_type',
-      'scale by multiplier'
-    )
-
-    // Re-enter builder - node exists but widget is gone
-    await appMode.enterBuilder()
-    await appMode.steps.goToInputs()
-
-    // The input should still be listed but show "Widget not visible"
-    const subtitle = appMode.select.getInputItemSubtitle('resize_type.width')
-    await expect(subtitle).toHaveText('Widget not visible')
-  })
-
-  test('prunes missing widgets when node deleted', async ({ comfyPage }) => {
-    const { appMode } = comfyPage
-
-    await setupDynamicComboBuilder(comfyPage)
-    await appMode.footer.exitBuilder()
-
-    // Delete the ResizeImageMaskNode entirely
-    await comfyPage.vueNodes.deleteNode(RESIZE_NODE_ID)
-
-    // Re-enter builder - pruning should auto-clean stale inputs
-    await appMode.enterBuilder()
-    await appMode.steps.goToInputs()
-    await expect(appMode.select.inputItems).toHaveCount(0)
-  })
-})

browser_tests/tests/appModeWelcome.spec.ts

@@ -1,61 +0,0 @@
-import {
-  comfyPageFixture as test,
-  comfyExpect as expect
-} from '../fixtures/ComfyPage'
-
-test.describe('App mode welcome states', { tag: '@ui' }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.appMode.enableLinearMode()
-  })
-
-  test('Empty workflow text is visible when no nodes', async ({
-    comfyPage
-  }) => {
-    await comfyPage.nodeOps.clearGraph()
-    await comfyPage.appMode.toggleAppMode()
-
-    await expect(comfyPage.appMode.welcome).toBeVisible()
-    await expect(comfyPage.appMode.emptyWorkflowText).toBeVisible()
-    await expect(comfyPage.appMode.buildAppButton).not.toBeVisible()
-  })
-
-  test('Build app button is visible when no outputs selected', async ({
-    comfyPage
-  }) => {
-    await comfyPage.appMode.toggleAppMode()
-
-    await expect(comfyPage.appMode.welcome).toBeVisible()
-    await expect(comfyPage.appMode.buildAppButton).toBeVisible()
-    await expect(comfyPage.appMode.emptyWorkflowText).not.toBeVisible()
-  })
-
-  test('Empty workflow and build app are hidden when app has outputs', async ({
-    comfyPage
-  }) => {
-    await comfyPage.appMode.enterAppModeWithInputs([['3', 'seed']])
-
-    await expect(comfyPage.appMode.linearWidgets).toBeVisible()
-    await expect(comfyPage.appMode.emptyWorkflowText).not.toBeVisible()
-    await expect(comfyPage.appMode.buildAppButton).not.toBeVisible()
-  })
-
-  test('Back to workflow returns to graph mode', async ({ comfyPage }) => {
-    await comfyPage.appMode.toggleAppMode()
-
-    await expect(comfyPage.appMode.welcome).toBeVisible()
-    await comfyPage.appMode.backToWorkflowButton.click()
-
-    await expect(comfyPage.canvas).toBeVisible()
-    await expect(comfyPage.appMode.welcome).not.toBeVisible()
-  })
-
-  test('Load template opens template selector', async ({ comfyPage }) => {
-    await comfyPage.nodeOps.clearGraph()
-    await comfyPage.appMode.toggleAppMode()
-
-    await expect(comfyPage.appMode.welcome).toBeVisible()
-    await comfyPage.appMode.loadTemplateButton.click()
-
-    await expect(comfyPage.templates.content).toBeVisible()
-  })
-})

browser_tests/tests/appModeWidgetRename.spec.ts

@@ -1,15 +1,21 @@
 import {
   comfyPageFixture as test,
   comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
+} from '../fixtures/ComfyPage'
 import {
   saveAndReopenInAppMode,
   setupSubgraphBuilder
-} from '@e2e/helpers/builderTestUtils'
+} from '../helpers/builderTestUtils'
 
 test.describe('App mode widget rename', { tag: ['@ui', '@subgraph'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.appMode.enableLinearMode()
+    await comfyPage.page.evaluate(() => {
+      window.app!.api.serverFeatureFlags.value = {
+        ...window.app!.api.serverFeatureFlags.value,
+        linear_toggle_enabled: true
+      }
+    })
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.AppBuilder.VueNodeSwitchDismissed',
       true

browser_tests/tests/appModeWidgetValues.spec.ts

@@ -1,94 +0,0 @@
-import {
-  comfyPageFixture as test,
-  comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
-
-/** One representative of each widget type from the default workflow. */
-type WidgetType = 'textarea' | 'number' | 'select' | 'text'
-
-const WIDGET_TEST_DATA: {
-  nodeId: string
-  widgetName: string
-  type: WidgetType
-  fill: string
-  expected: unknown
-}[] = [
-  {
-    nodeId: '6',
-    widgetName: 'text',
-    type: 'textarea',
-    fill: 'test prompt',
-    expected: 'test prompt'
-  },
-  {
-    nodeId: '5',
-    widgetName: 'width',
-    type: 'number',
-    fill: '768',
-    expected: 768
-  },
-  {
-    nodeId: '3',
-    widgetName: 'cfg',
-    type: 'number',
-    fill: '3.5',
-    expected: 3.5
-  },
-  {
-    nodeId: '3',
-    widgetName: 'sampler_name',
-    type: 'select',
-    fill: 'uni_pc',
-    expected: 'uni_pc'
-  },
-  {
-    nodeId: '9',
-    widgetName: 'filename_prefix',
-    type: 'text',
-    fill: 'test_prefix',
-    expected: 'test_prefix'
-  }
-]
-
-test.describe('App mode widget values in prompt', { tag: '@ui' }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.appMode.enableLinearMode()
-  })
-
-  test('Widget values are sent correctly in prompt POST', async ({
-    comfyPage
-  }) => {
-    const { appMode } = comfyPage
-    const inputs: [string, string][] = WIDGET_TEST_DATA.map(
-      ({ nodeId, widgetName }) => [nodeId, widgetName]
-    )
-    await appMode.enterAppModeWithInputs(inputs)
-    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
-
-    for (const { nodeId, widgetName, type, fill } of WIDGET_TEST_DATA) {
-      const key = `${nodeId}:${widgetName}`
-      switch (type) {
-        case 'textarea':
-          await appMode.widgets.fillTextarea(key, fill)
-          break
-        case 'number':
-          await appMode.widgets.fillNumber(key, fill)
-          break
-        case 'select':
-          await appMode.widgets.selectOption(key, fill)
-          break
-        case 'text':
-          await appMode.widgets.fillText(key, fill)
-          break
-        default:
-          throw new Error(`Unknown widget type: ${type satisfies never}`)
-      }
-    }
-
-    const prompt = await appMode.widgets.runAndCapturePrompt()
-
-    for (const { nodeId, widgetName, expected } of WIDGET_TEST_DATA) {
-      expect(prompt[nodeId].inputs[widgetName]).toBe(expected)
-    }
-  })
-})

browser_tests/tests/assetHelper.spec.ts

@@ -1,382 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import {
-  createAssetHelper,
-  withModels,
-  withInputFiles,
-  withOutputAssets,
-  withAsset,
-  withPagination,
-  withUploadResponse
-} from '@e2e/fixtures/helpers/AssetHelper'
-import {
-  STABLE_CHECKPOINT,
-  STABLE_LORA,
-  STABLE_INPUT_IMAGE,
-  STABLE_OUTPUT
-} from '@e2e/fixtures/data/assetFixtures'
-
-test.describe('AssetHelper', () => {
-  test.describe('operators and configuration', () => {
-    test('creates helper with models via withModels operator', async ({
-      comfyPage
-    }) => {
-      const helper = createAssetHelper(
-        comfyPage.page,
-        withModels(3, 'checkpoints')
-      )
-      expect(helper.assetCount).toBe(3)
-      expect(
-        helper.getAssets().every((a) => a.tags?.includes('checkpoints'))
-      ).toBe(true)
-    })
-
-    test('composes multiple operators', async ({ comfyPage }) => {
-      const helper = createAssetHelper(
-        comfyPage.page,
-        withModels(2, 'checkpoints'),
-        withInputFiles(2),
-        withOutputAssets(1)
-      )
-      expect(helper.assetCount).toBe(5)
-    })
-
-    test('adds individual assets via withAsset', async ({ comfyPage }) => {
-      const helper = createAssetHelper(
-        comfyPage.page,
-        withAsset(STABLE_CHECKPOINT),
-        withAsset(STABLE_LORA)
-      )
-      expect(helper.assetCount).toBe(2)
-      expect(helper.getAsset(STABLE_CHECKPOINT.id)).toMatchObject({
-        id: STABLE_CHECKPOINT.id,
-        name: STABLE_CHECKPOINT.name
-      })
-    })
-
-    test('withPagination sets pagination options', async ({ comfyPage }) => {
-      const helper = createAssetHelper(
-        comfyPage.page,
-        withModels(2),
-        withPagination({ total: 100, hasMore: true })
-      )
-      expect(helper.assetCount).toBe(2)
-    })
-  })
-
-  test.describe('mock API routes', () => {
-    test('GET /assets returns all assets', async ({ comfyPage }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(
-        withAsset(STABLE_CHECKPOINT),
-        withAsset(STABLE_INPUT_IMAGE)
-      )
-      await assetApi.mock()
-
-      const { status, body } = await assetApi.fetch(
-        `${comfyPage.url}/api/assets`
-      )
-      expect(status).toBe(200)
-
-      const data = body as {
-        assets: unknown[]
-        total: number
-        has_more: boolean
-      }
-      expect(data.assets).toHaveLength(2)
-      expect(data.total).toBe(2)
-      expect(data.has_more).toBe(false)
-
-      await assetApi.clearMocks()
-    })
-
-    test('GET /assets respects pagination params', async ({ comfyPage }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(
-        withModels(5),
-        withPagination({ total: 10, hasMore: true })
-      )
-      await assetApi.mock()
-
-      const { body } = await assetApi.fetch(
-        `${comfyPage.url}/api/assets?limit=2&offset=0`
-      )
-      const data = body as {
-        assets: unknown[]
-        total: number
-        has_more: boolean
-      }
-      expect(data.assets).toHaveLength(2)
-      expect(data.total).toBe(10)
-      expect(data.has_more).toBe(true)
-
-      await assetApi.clearMocks()
-    })
-
-    test('GET /assets filters by include_tags', async ({ comfyPage }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(
-        withAsset(STABLE_CHECKPOINT),
-        withAsset(STABLE_LORA),
-        withAsset(STABLE_INPUT_IMAGE)
-      )
-      await assetApi.mock()
-
-      const { body } = await assetApi.fetch(
-        `${comfyPage.url}/api/assets?include_tags=models,checkpoints`
-      )
-      const data = body as { assets: Array<{ id: string }> }
-      expect(data.assets).toHaveLength(1)
-      expect(data.assets[0].id).toBe(STABLE_CHECKPOINT.id)
-
-      await assetApi.clearMocks()
-    })
-
-    test('GET /assets/:id returns single asset or 404', async ({
-      comfyPage
-    }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(withAsset(STABLE_CHECKPOINT))
-      await assetApi.mock()
-
-      const found = await assetApi.fetch(
-        `${comfyPage.url}/api/assets/${STABLE_CHECKPOINT.id}`
-      )
-      expect(found.status).toBe(200)
-      const asset = found.body as { id: string }
-      expect(asset.id).toBe(STABLE_CHECKPOINT.id)
-
-      const notFound = await assetApi.fetch(
-        `${comfyPage.url}/api/assets/nonexistent-id`
-      )
-      expect(notFound.status).toBe(404)
-
-      await assetApi.clearMocks()
-    })
-
-    test('PUT /assets/:id updates asset in store', async ({ comfyPage }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(withAsset(STABLE_CHECKPOINT))
-      await assetApi.mock()
-
-      const { status, body } = await assetApi.fetch(
-        `${comfyPage.url}/api/assets/${STABLE_CHECKPOINT.id}`,
-        {
-          method: 'PUT',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ name: 'renamed.safetensors' })
-        }
-      )
-      expect(status).toBe(200)
-
-      const updated = body as { name: string }
-      expect(updated.name).toBe('renamed.safetensors')
-      expect(assetApi.getAsset(STABLE_CHECKPOINT.id)?.name).toBe(
-        'renamed.safetensors'
-      )
-
-      await assetApi.clearMocks()
-    })
-
-    test('DELETE /assets/:id removes asset from store', async ({
-      comfyPage
-    }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(withAsset(STABLE_CHECKPOINT), withAsset(STABLE_LORA))
-      await assetApi.mock()
-
-      const { status } = await assetApi.fetch(
-        `${comfyPage.url}/api/assets/${STABLE_CHECKPOINT.id}`,
-        { method: 'DELETE' }
-      )
-      expect(status).toBe(204)
-      expect(assetApi.assetCount).toBe(1)
-      expect(assetApi.getAsset(STABLE_CHECKPOINT.id)).toBeUndefined()
-
-      await assetApi.clearMocks()
-    })
-
-    test('POST /assets returns upload response', async ({ comfyPage }) => {
-      const customUpload = {
-        id: 'custom-upload-001',
-        name: 'custom.safetensors',
-        tags: ['models'],
-        created_at: '2025-01-01T00:00:00Z',
-        created_new: true
-      }
-      const { assetApi } = comfyPage
-      assetApi.configure(withUploadResponse(customUpload))
-      await assetApi.mock()
-
-      const { status, body } = await assetApi.fetch(
-        `${comfyPage.url}/api/assets`,
-        { method: 'POST' }
-      )
-      expect(status).toBe(201)
-      const data = body as { id: string; name: string }
-      expect(data.id).toBe('custom-upload-001')
-      expect(data.name).toBe('custom.safetensors')
-
-      await assetApi.clearMocks()
-    })
-
-    test('POST /assets/download returns async download response', async ({
-      comfyPage
-    }) => {
-      const { assetApi } = comfyPage
-      await assetApi.mock()
-
-      const { status, body } = await assetApi.fetch(
-        `${comfyPage.url}/api/assets/download`,
-        { method: 'POST' }
-      )
-      expect(status).toBe(202)
-      const data = body as { task_id: string; status: string }
-      expect(data.task_id).toBe('download-task-001')
-      expect(data.status).toBe('created')
-
-      await assetApi.clearMocks()
-    })
-  })
-
-  test.describe('mutation tracking', () => {
-    test('tracks POST, PUT, DELETE mutations', async ({ comfyPage }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(withAsset(STABLE_CHECKPOINT))
-      await assetApi.mock()
-
-      await assetApi.fetch(`${comfyPage.url}/api/assets`, { method: 'POST' })
-      await assetApi.fetch(
-        `${comfyPage.url}/api/assets/${STABLE_CHECKPOINT.id}`,
-        {
-          method: 'PUT',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ name: 'updated.safetensors' })
-        }
-      )
-      await assetApi.fetch(
-        `${comfyPage.url}/api/assets/${STABLE_CHECKPOINT.id}`,
-        { method: 'DELETE' }
-      )
-
-      const mutations = assetApi.getMutations()
-      expect(mutations).toHaveLength(3)
-      expect(mutations[0].method).toBe('POST')
-      expect(mutations[1].method).toBe('PUT')
-      expect(mutations[2].method).toBe('DELETE')
-
-      await assetApi.clearMocks()
-    })
-
-    test('GET requests are not tracked as mutations', async ({ comfyPage }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(withAsset(STABLE_CHECKPOINT))
-      await assetApi.mock()
-
-      await assetApi.fetch(`${comfyPage.url}/api/assets`)
-      await assetApi.fetch(
-        `${comfyPage.url}/api/assets/${STABLE_CHECKPOINT.id}`
-      )
-
-      expect(assetApi.getMutations()).toHaveLength(0)
-
-      await assetApi.clearMocks()
-    })
-  })
-
-  test.describe('mockError', () => {
-    test('returns error status for all asset routes', async ({ comfyPage }) => {
-      const { assetApi } = comfyPage
-      await assetApi.mockError(503, 'Service Unavailable')
-
-      const { status, body } = await assetApi.fetch(
-        `${comfyPage.url}/api/assets`
-      )
-      expect(status).toBe(503)
-      const data = body as { error: string }
-      expect(data.error).toBe('Service Unavailable')
-
-      await assetApi.clearMocks()
-    })
-  })
-
-  test.describe('clearMocks', () => {
-    test('resets store, mutations, and unroutes handlers', async ({
-      comfyPage
-    }) => {
-      const { assetApi } = comfyPage
-      assetApi.configure(withAsset(STABLE_CHECKPOINT))
-      await assetApi.mock()
-
-      await assetApi.fetch(`${comfyPage.url}/api/assets`, { method: 'POST' })
-      expect(assetApi.getMutations()).toHaveLength(1)
-      expect(assetApi.assetCount).toBe(1)
-
-      await assetApi.clearMocks()
-      expect(assetApi.getMutations()).toHaveLength(0)
-      expect(assetApi.assetCount).toBe(0)
-    })
-  })
-
-  test.describe('fixture generators', () => {
-    test('generateModels produces deterministic assets', async ({
-      comfyPage
-    }) => {
-      const helper = createAssetHelper(comfyPage.page, withModels(3, 'loras'))
-      const assets = helper.getAssets()
-
-      expect(assets).toHaveLength(3)
-      expect(assets.every((a) => a.tags?.includes('loras'))).toBe(true)
-      expect(assets.every((a) => a.tags?.includes('models'))).toBe(true)
-
-      const ids = assets.map((a) => a.id)
-      expect(new Set(ids).size).toBe(3)
-    })
-
-    test('generateInputFiles produces deterministic input assets', async ({
-      comfyPage
-    }) => {
-      const helper = createAssetHelper(comfyPage.page, withInputFiles(3))
-      const assets = helper.getAssets()
-
-      expect(assets).toHaveLength(3)
-      expect(assets.every((a) => a.tags?.includes('input'))).toBe(true)
-    })
-
-    test('generateOutputAssets produces deterministic output assets', async ({
-      comfyPage
-    }) => {
-      const helper = createAssetHelper(comfyPage.page, withOutputAssets(5))
-      const assets = helper.getAssets()
-
-      expect(assets).toHaveLength(5)
-      expect(assets.every((a) => a.tags?.includes('output'))).toBe(true)
-      expect(assets.every((a) => a.name.startsWith('ComfyUI_'))).toBe(true)
-    })
-
-    test('stable fixtures have expected properties', async ({ comfyPage }) => {
-      const helper = createAssetHelper(
-        comfyPage.page,
-        withAsset(STABLE_CHECKPOINT),
-        withAsset(STABLE_LORA),
-        withAsset(STABLE_INPUT_IMAGE),
-        withAsset(STABLE_OUTPUT)
-      )
-
-      const checkpoint = helper.getAsset(STABLE_CHECKPOINT.id)!
-      expect(checkpoint.tags).toContain('checkpoints')
-      expect(checkpoint.size).toBeGreaterThan(0)
-      expect(checkpoint.created_at).toBeTruthy()
-
-      const lora = helper.getAsset(STABLE_LORA.id)!
-      expect(lora.tags).toContain('loras')
-
-      const input = helper.getAsset(STABLE_INPUT_IMAGE.id)!
-      expect(input.tags).toContain('input')
-
-      const output = helper.getAsset(STABLE_OUTPUT.id)!
-      expect(output.tags).toContain('output')
-    })
-  })
-})

browser_tests/tests/backgroundImageUpload.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
   await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')

browser_tests/tests/bottomPanelLogs.spec.ts

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

browser_tests/tests/bottomPanelShortcuts.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.describe('Bottom Panel Shortcuts', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {

browser_tests/tests/browserTabTitle.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import type { WorkspaceStore } from '@e2e/types/globals'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import type { WorkspaceStore } from '../types/globals'
 
 test.describe('Browser tab title', { tag: '@smoke' }, () => {
   test.describe('Beta Menu', () => {

browser_tests/tests/builderReorder.spec.ts

@@ -1,157 +0,0 @@
-import {
-  comfyPageFixture as test,
-  comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
-import {
-  builderSaveAs,
-  openWorkflowFromSidebar,
-  setupBuilder
-} from '@e2e/helpers/builderTestUtils'
-
-const WIDGETS = ['seed', 'steps', 'cfg']
-
-/** Save as app, close it by loading default, reopen from sidebar, enter app mode. */
-async function saveCloseAndReopenAsApp(
-  comfyPage: ComfyPage,
-  appMode: AppModeHelper,
-  workflowName: string
-) {
-  await appMode.steps.goToPreview()
-  await builderSaveAs(appMode, workflowName)
-  await appMode.saveAs.closeButton.click()
-  await comfyPage.nextFrame()
-
-  await appMode.footer.exitBuilder()
-  await openWorkflowFromSidebar(comfyPage, workflowName)
-  await appMode.toggleAppMode()
-}
-
-test.describe('Builder input reordering', { tag: '@ui' }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.appMode.enableLinearMode()
-    await comfyPage.settings.setSetting(
-      'Comfy.AppBuilder.VueNodeSwitchDismissed',
-      true
-    )
-  })
-
-  test('Drag first input to last position', async ({ comfyPage }) => {
-    const { appMode } = comfyPage
-    await setupBuilder(comfyPage, undefined, WIDGETS)
-
-    await appMode.steps.goToInputs()
-    await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
-
-    await appMode.select.dragInputItem(0, 2)
-    await expect(appMode.select.inputItemTitles).toHaveText([
-      'steps',
-      'cfg',
-      'seed'
-    ])
-
-    await appMode.steps.goToPreview()
-    await expect(appMode.select.previewWidgetLabels).toHaveText([
-      'steps',
-      'cfg',
-      'seed'
-    ])
-  })
-
-  test('Drag last input to first position', async ({ comfyPage }) => {
-    const { appMode } = comfyPage
-    await setupBuilder(comfyPage, undefined, WIDGETS)
-
-    await appMode.steps.goToInputs()
-    await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
-
-    await appMode.select.dragInputItem(2, 0)
-    await expect(appMode.select.inputItemTitles).toHaveText([
-      'cfg',
-      'seed',
-      'steps'
-    ])
-
-    await appMode.steps.goToPreview()
-    await expect(appMode.select.previewWidgetLabels).toHaveText([
-      'cfg',
-      'seed',
-      'steps'
-    ])
-  })
-
-  test('Drag input to middle position', async ({ comfyPage }) => {
-    const { appMode } = comfyPage
-    await setupBuilder(comfyPage, undefined, WIDGETS)
-
-    await appMode.steps.goToInputs()
-    await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
-
-    await appMode.select.dragInputItem(0, 1)
-    await expect(appMode.select.inputItemTitles).toHaveText([
-      'steps',
-      'seed',
-      'cfg'
-    ])
-
-    await appMode.steps.goToPreview()
-    await expect(appMode.select.previewWidgetLabels).toHaveText([
-      'steps',
-      'seed',
-      'cfg'
-    ])
-  })
-
-  test('Reorder in preview step reflects in app mode after save', async ({
-    comfyPage
-  }) => {
-    const { appMode } = comfyPage
-    await setupBuilder(comfyPage, undefined, WIDGETS)
-
-    await appMode.steps.goToPreview()
-    await expect(appMode.select.previewWidgetLabels).toHaveText(WIDGETS)
-
-    await appMode.select.dragPreviewItem(0, 2)
-    await expect(appMode.select.previewWidgetLabels).toHaveText([
-      'steps',
-      'cfg',
-      'seed'
-    ])
-
-    const workflowName = `${Date.now()} reorder-preview`
-    await saveCloseAndReopenAsApp(comfyPage, appMode, workflowName)
-
-    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
-    await expect(appMode.select.previewWidgetLabels).toHaveText([
-      'steps',
-      'cfg',
-      'seed'
-    ])
-  })
-
-  test('Reorder inputs persists after save and reload', async ({
-    comfyPage
-  }) => {
-    const { appMode } = comfyPage
-    await setupBuilder(comfyPage, undefined, WIDGETS)
-
-    await appMode.steps.goToInputs()
-    await appMode.select.dragInputItem(0, 2)
-    await expect(appMode.select.inputItemTitles).toHaveText([
-      'steps',
-      'cfg',
-      'seed'
-    ])
-
-    const workflowName = `${Date.now()} reorder-persist`
-    await saveCloseAndReopenAsApp(comfyPage, appMode, workflowName)
-
-    await expect(appMode.linearWidgets).toBeVisible({ timeout: 5000 })
-    await expect(appMode.select.previewWidgetLabels).toHaveText([
-      'steps',
-      'cfg',
-      'seed'
-    ])
-  })
-})

browser_tests/tests/builderSaveFlow.spec.ts

@@ -1,14 +1,45 @@
 import {
   comfyPageFixture as test,
   comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
-import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
-import {
-  builderSaveAs,
-  openWorkflowFromSidebar,
-  setupBuilder
-} from '@e2e/helpers/builderTestUtils'
-import { fitToViewInstant } from '@e2e/helpers/fitToView'
+} from '../fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
+import type { AppModeHelper } from '../fixtures/helpers/AppModeHelper'
+import { setupBuilder } from '../helpers/builderTestUtils'
+import { fitToViewInstant } from '../helpers/fitToView'
+
+/**
+ * Open the save-as dialog, fill name + view type, click save,
+ * and wait for the success dialog.
+ */
+async function builderSaveAs(
+  appMode: AppModeHelper,
+  workflowName: string,
+  viewType: 'App' | 'Node graph'
+) {
+  await appMode.footer.saveAsButton.click()
+  await expect(appMode.saveAs.nameInput).toBeVisible({ timeout: 5000 })
+  await appMode.saveAs.fillAndSave(workflowName, viewType)
+  await expect(appMode.saveAs.successMessage).toBeVisible({ timeout: 5000 })
+}
+
+/**
+ * Load a different workflow, then reopen the named one from the sidebar.
+ * Caller must ensure the page is in graph mode (not builder or app mode)
+ * before calling.
+ */
+async function openWorkflowFromSidebar(comfyPage: ComfyPage, name: string) {
+  await comfyPage.workflow.loadWorkflow('default')
+  await comfyPage.nextFrame()
+  const { workflowsTab } = comfyPage.menu
+  await workflowsTab.open()
+  await workflowsTab.getPersistedItem(name).dblclick()
+  await comfyPage.nextFrame()
+
+  await expect(async () => {
+    const path = await comfyPage.workflow.getActiveWorkflowPath()
+    expect(path).toContain(name)
+  }).toPass({ timeout: 5000 })
+}
 
 /**
  * After a first save, open save-as again from the chevron,
@@ -26,7 +57,13 @@ async function reSaveAs(
 
 test.describe('Builder save flow', { tag: ['@ui'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.appMode.enableLinearMode()
+    await comfyPage.page.evaluate(() => {
+      window.app!.api.serverFeatureFlags.value = {
+        ...window.app!.api.serverFeatureFlags.value,
+        linear_toggle_enabled: true
+      }
+    })
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.AppBuilder.VueNodeSwitchDismissed',
       true
@@ -166,9 +203,10 @@ test.describe('Builder save flow', { tag: ['@ui'] }, () => {
 
     // Select I/O to enable the button
     await appMode.steps.goToInputs()
-    await appMode.select.selectInputWidget('KSampler', 'seed')
+    const ksampler = await comfyPage.nodeOps.getNodeRefById('3')
+    await appMode.select.selectInputWidget(ksampler)
     await appMode.steps.goToOutputs()
-    await appMode.select.selectOutputNode('Save Image')
+    await appMode.select.selectOutputNode()
 
     // State 2: Enabled "Save as" (unsaved, has outputs)
     const enabledBox = await appMode.footer.saveAsButton.boundingBox()

browser_tests/tests/changeTracker.spec.ts

@@ -1,8 +1,8 @@
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
 import {
   comfyExpect as expect,
   comfyPageFixture as test
-} from '@e2e/fixtures/ComfyPage'
+} from '../fixtures/ComfyPage'
 
 async function beforeChange(comfyPage: ComfyPage) {
   await comfyPage.page.evaluate(() => {
@@ -27,51 +27,41 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
     })
 
     test('Can undo multiple operations', async ({ comfyPage }) => {
-      await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(0)
-      await expect.poll(() => comfyPage.workflow.getRedoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
 
       // Save, confirm no errors & workflow modified flag removed
       await comfyPage.menu.topbar.saveWorkflow('undo-redo-test')
-      await expect.poll(() => comfyPage.toast.getToastErrorCount()).toBe(0)
-      await expect
-        .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
-        .toBe(false)
-      await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(0)
-      await expect.poll(() => comfyPage.workflow.getRedoQueueSize()).toBe(0)
+      expect(await comfyPage.toast.getToastErrorCount()).toBe(0)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
 
       const node = (await comfyPage.nodeOps.getFirstNodeRef())!
       await node.click('title')
       await node.click('collapse')
       await expect(node).toBeCollapsed()
-      await expect
-        .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
-        .toBe(true)
-      await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(1)
-      await expect.poll(() => comfyPage.workflow.getRedoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(1)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
 
       await comfyPage.keyboard.bypass()
       await expect(node).toBeBypassed()
-      await expect
-        .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
-        .toBe(true)
-      await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(2)
-      await expect.poll(() => comfyPage.workflow.getRedoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(2)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(0)
 
       await comfyPage.keyboard.undo()
       await expect(node).not.toBeBypassed()
-      await expect
-        .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
-        .toBe(true)
-      await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(1)
-      await expect.poll(() => comfyPage.workflow.getRedoQueueSize()).toBe(1)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(true)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(1)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(1)
 
       await comfyPage.keyboard.undo()
       await expect(node).not.toBeCollapsed()
-      await expect
-        .poll(() => comfyPage.workflow.isCurrentWorkflowModified())
-        .toBe(false)
-      await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(0)
-      await expect.poll(() => comfyPage.workflow.getRedoQueueSize()).toBe(2)
+      expect(await comfyPage.workflow.isCurrentWorkflowModified()).toBe(false)
+      expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
+      expect(await comfyPage.workflow.getRedoQueueSize()).toBe(2)
     })
   })
 
@@ -164,7 +154,7 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
   })
 
   test('Can detect changes in workflow.extra', async ({ comfyPage }) => {
-    await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(0)
+    expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
     await comfyPage.page.evaluate(() => {
       window.app!.graph!.extra.foo = 'bar'
     })
@@ -174,7 +164,7 @@ test.describe('Change Tracker', { tag: '@workflow' }, () => {
   })
 
   test('Ignores changes in workflow.ds', async ({ comfyPage }) => {
-    await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(0)
+    expect(await comfyPage.workflow.getUndoQueueSize()).toBe(0)
     await comfyPage.canvasOps.pan({ x: 10, y: 10 })
     await expect.poll(() => comfyPage.workflow.getUndoQueueSize()).toBe(0)
   })

browser_tests/tests/changeTrackerLoadGuard.spec.ts

@@ -1,8 +1,8 @@
 import {
   comfyExpect as expect,
   comfyPageFixture as test
-} from '@e2e/fixtures/ComfyPage'
-import type { WorkspaceStore } from '@e2e/types/globals'
+} from '../fixtures/ComfyPage'
+import type { WorkspaceStore } from '../types/globals'
 
 test.describe(
   'Change Tracker - isLoadingGraph guard',

browser_tests/tests/collapsedNodeLinks.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { assertNodeSlotsWithinBounds } from '@e2e/fixtures/utils/slotBoundsUtil'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { assertNodeSlotsWithinBounds } from '../fixtures/utils/slotBoundsUtil'
 
 const NODE_ID = '3'
 const NODE_TITLE = 'KSampler'

browser_tests/tests/colorPalette.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import type { WorkspaceStore } from '@e2e/types/globals'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import type { WorkspaceStore } from '../types/globals'
 
 test.beforeEach(async ({ comfyPage }) => {
   await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')

browser_tests/tests/commands.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
   await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')

browser_tests/tests/confirmDialogTextWrap.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.describe('Confirm dialog text wrapping', { tag: ['@mobile'] }, () => {
   test('@mobile confirm dialog buttons are visible with long unbreakable text', async ({

browser_tests/tests/containAudit.spec.ts

@@ -1,8 +1,8 @@
 import { expect } from '@playwright/test'
 
-import type { PerfMeasurement } from '@e2e/fixtures/helpers/PerformanceHelper'
+import type { PerfMeasurement } from '../fixtures/helpers/PerformanceHelper'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 interface ContainCandidate {
   selector: string

browser_tests/tests/copyPaste.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { DefaultGraphPositions } from '@e2e/fixtures/constants/defaultGraphPositions'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { DefaultGraphPositions } from '../fixtures/constants/defaultGraphPositions'
 
 test.beforeEach(async ({ comfyPage }) => {
   await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
@@ -38,9 +38,8 @@ test.describe('Copy Paste', { tag: ['@screenshot', '@workflow'] }, () => {
     await comfyPage.clipboard.copy(null)
     await comfyPage.clipboard.paste(null)
     await comfyPage.clipboard.paste(null)
-    await expect
-      .poll(() => textBox.inputValue())
-      .toBe(originalString + originalString)
+    const resultString = await textBox.inputValue()
+    expect(resultString).toBe(originalString + originalString)
   })
 
   test('Can copy and paste widget value', async ({ comfyPage }) => {
@@ -115,24 +114,20 @@ test.describe('Copy Paste', { tag: ['@screenshot', '@workflow'] }, () => {
   test('Can undo paste multiple nodes as single action', async ({
     comfyPage
   }) => {
-    await expect
-      .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-      .toBeGreaterThan(1)
     const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
+    expect(initialCount).toBeGreaterThan(1)
     await comfyPage.canvas.click()
     await comfyPage.keyboard.selectAll()
     await comfyPage.page.mouse.move(10, 10)
     await comfyPage.clipboard.copy()
     await comfyPage.clipboard.paste()
 
-    await expect
-      .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-      .toBe(initialCount * 2)
+    const pasteCount = await comfyPage.nodeOps.getGraphNodesCount()
+    expect(pasteCount).toBe(initialCount * 2)
 
     await comfyPage.keyboard.undo()
-    await expect
-      .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-      .toBe(initialCount)
+    const undoCount = await comfyPage.nodeOps.getGraphNodesCount()
+    expect(undoCount).toBe(initialCount)
   })
 
   test(
@@ -140,7 +135,7 @@ test.describe('Copy Paste', { tag: ['@screenshot', '@workflow'] }, () => {
     { tag: ['@node'] },
     async ({ comfyPage }) => {
       await comfyPage.workflow.loadWorkflow('nodes/load_image_with_ksampler')
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(2)
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(2)
 
       // Step 1: Copy a KSampler node with Ctrl+C and paste with Ctrl+V
       const ksamplerNodes =
@@ -179,7 +174,7 @@ test.describe('Copy Paste', { tag: ['@screenshot', '@workflow'] }, () => {
           { timeout: 5_000 }
         )
         .toContain('image32x32')
-      await expect.poll(() => comfyPage.nodeOps.getGraphNodesCount()).toBe(3)
+      expect(await comfyPage.nodeOps.getGraphNodesCount()).toBe(3)
 
       // Step 3: Click empty canvas area, paste image → creates new LoadImage
       await comfyPage.canvas.click({ position: { x: 50, y: 500 } })

browser_tests/tests/customIcons.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 import type { Locator } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 async function verifyCustomIconSvg(iconElement: Locator) {
   const svgVariable = await iconElement.evaluate((element) => {

browser_tests/tests/defaultKeybindings.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 async function pressKeyAndExpectRequest(
   comfyPage: ComfyPage,

browser_tests/tests/dialog.spec.ts

@@ -1,13 +1,263 @@
 import { expect } from '@playwright/test'
 
-import type { Keybinding } from '@/platform/keybindings/types'
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { DefaultGraphPositions } from '@e2e/fixtures/constants/defaultGraphPositions'
+import type { Keybinding } from '../../src/platform/keybindings/types'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
+import { DefaultGraphPositions } from '../fixtures/constants/defaultGraphPositions'
+import { TestIds } from '../fixtures/selectors'
 
 test.beforeEach(async ({ comfyPage }) => {
   await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
 })
 
+test.describe('Missing nodes in Error Overlay', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.RightSidePanel.ShowErrorsTab',
+      true
+    )
+  })
+
+  test('Should show error overlay when loading a workflow with missing nodes', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
+
+    const errorOverlay = comfyPage.page.getByTestId(
+      TestIds.dialogs.errorOverlay
+    )
+    await expect(errorOverlay).toBeVisible()
+
+    const messages = errorOverlay.getByTestId(
+      TestIds.dialogs.errorOverlayMessages
+    )
+    await expect(messages).toBeVisible()
+    await expect(messages).toHaveText(/missing.*installed/i)
+  })
+
+  test('Should show error overlay when loading a workflow with missing nodes in subgraphs', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('missing/missing_nodes_in_subgraph')
+
+    const errorOverlay = comfyPage.page.getByTestId(
+      TestIds.dialogs.errorOverlay
+    )
+    await expect(errorOverlay).toBeVisible()
+
+    const messages = errorOverlay.getByTestId(
+      TestIds.dialogs.errorOverlayMessages
+    )
+    await expect(messages).toBeVisible()
+    await expect(messages).toHaveText(/missing.*installed/i)
+
+    // Click "See Errors" to open the errors tab and verify subgraph node content
+    await errorOverlay
+      .getByTestId(TestIds.dialogs.errorOverlaySeeErrors)
+      .click()
+    await expect(errorOverlay).not.toBeVisible()
+
+    const missingNodeCard = comfyPage.page.getByTestId(
+      TestIds.dialogs.missingNodeCard
+    )
+    await expect(missingNodeCard).toBeVisible()
+
+    // Expand the pack group row to reveal node type names
+    await missingNodeCard
+      .getByRole('button', { name: /expand/i })
+      .first()
+      .click()
+    await expect(
+      missingNodeCard.getByText('MISSING_NODE_TYPE_IN_SUBGRAPH')
+    ).toBeVisible()
+  })
+
+  test('Should show MissingNodeCard in errors tab when clicking See Errors', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
+
+    const errorOverlay = comfyPage.page.getByTestId(
+      TestIds.dialogs.errorOverlay
+    )
+    await expect(errorOverlay).toBeVisible()
+
+    // Click "See Errors" to open the right side panel errors tab
+    await errorOverlay
+      .getByTestId(TestIds.dialogs.errorOverlaySeeErrors)
+      .click()
+    await expect(errorOverlay).not.toBeVisible()
+
+    // Verify MissingNodeCard is rendered in the errors tab
+    const missingNodeCard = comfyPage.page.getByTestId(
+      TestIds.dialogs.missingNodeCard
+    )
+    await expect(missingNodeCard).toBeVisible()
+  })
+})
+
+test('Does not resurface missing nodes on undo/redo', async ({ comfyPage }) => {
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  await comfyPage.settings.setSetting(
+    'Comfy.RightSidePanel.ShowErrorsTab',
+    true
+  )
+  await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
+
+  const errorOverlay = comfyPage.page.getByTestId(TestIds.dialogs.errorOverlay)
+  await expect(errorOverlay).toBeVisible()
+
+  // Dismiss the error overlay
+  await errorOverlay.getByTestId(TestIds.dialogs.errorOverlayDismiss).click()
+  await expect(errorOverlay).not.toBeVisible()
+
+  // Make a change to the graph by moving a node
+  await comfyPage.canvas.click()
+  await comfyPage.nextFrame()
+  await comfyPage.page.keyboard.press('Control+a')
+  await comfyPage.page.mouse.move(400, 300)
+  await comfyPage.page.mouse.down()
+  await comfyPage.page.mouse.move(450, 350, { steps: 5 })
+  await comfyPage.page.mouse.up()
+  await comfyPage.nextFrame()
+
+  // Undo and redo should not resurface the error overlay
+  await comfyPage.keyboard.undo()
+  await expect(errorOverlay).not.toBeVisible({ timeout: 5000 })
+
+  await comfyPage.keyboard.redo()
+  await expect(errorOverlay).not.toBeVisible({ timeout: 5000 })
+})
+
+test.describe('Execution error', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.RightSidePanel.ShowErrorsTab',
+      true
+    )
+    await comfyPage.setup()
+  })
+
+  test('Should display an error message when an execution error occurs', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('nodes/execution_error')
+    await comfyPage.command.executeCommand('Comfy.QueuePrompt')
+    await comfyPage.nextFrame()
+
+    // Wait for the error overlay to be visible
+    const errorOverlay = comfyPage.page.getByTestId(
+      TestIds.dialogs.errorOverlay
+    )
+    await expect(errorOverlay).toBeVisible()
+  })
+})
+
+test.describe('Error actions in Errors Tab', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.RightSidePanel.ShowErrorsTab',
+      true
+    )
+  })
+
+  test('Should show Find on GitHub and Copy buttons in error card after execution error', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('nodes/execution_error')
+    await comfyPage.command.executeCommand('Comfy.QueuePrompt')
+    await comfyPage.nextFrame()
+
+    // Wait for error overlay and click "See Errors"
+    const errorOverlay = comfyPage.page.getByTestId(
+      TestIds.dialogs.errorOverlay
+    )
+    await expect(errorOverlay).toBeVisible()
+    await errorOverlay
+      .getByTestId(TestIds.dialogs.errorOverlaySeeErrors)
+      .click()
+    await expect(errorOverlay).not.toBeVisible()
+
+    // Verify Find on GitHub button is present in the error card
+    const findOnGithubButton = comfyPage.page.getByTestId(
+      TestIds.dialogs.errorCardFindOnGithub
+    )
+    await expect(findOnGithubButton).toBeVisible()
+
+    // Verify Copy button is present in the error card
+    const copyButton = comfyPage.page.getByTestId(TestIds.dialogs.errorCardCopy)
+    await expect(copyButton).toBeVisible()
+  })
+})
+
+test.describe('Missing models in Error Tab', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.RightSidePanel.ShowErrorsTab',
+      true
+    )
+    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()
+  })
+
+  test('Should show error overlay with missing models when workflow has missing models', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('missing/missing_models')
+
+    const errorOverlay = comfyPage.page.getByTestId(
+      TestIds.dialogs.errorOverlay
+    )
+    await expect(errorOverlay).toBeVisible()
+
+    const messages = errorOverlay.getByTestId(
+      TestIds.dialogs.errorOverlayMessages
+    )
+    await expect(messages).toBeVisible()
+    await expect(messages).toHaveText(/required model.*missing/i)
+  })
+
+  test('Should show missing models from node properties', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow(
+      'missing/missing_models_from_node_properties'
+    )
+
+    const errorOverlay = comfyPage.page.getByTestId(
+      TestIds.dialogs.errorOverlay
+    )
+    await expect(errorOverlay).toBeVisible()
+
+    const messages = errorOverlay.getByTestId(
+      TestIds.dialogs.errorOverlayMessages
+    )
+    await expect(messages).toBeVisible()
+    await expect(messages).toHaveText(/required model.*missing/i)
+  })
+
+  test('Should not show missing models when widget values have changed', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow(
+      'missing/model_metadata_widget_mismatch'
+    )
+
+    await expect(
+      comfyPage.page.getByTestId(TestIds.dialogs.errorOverlay)
+    ).not.toBeVisible()
+    await expect(
+      comfyPage.page.getByTestId(TestIds.dialogs.errorOverlayMessages)
+    ).not.toBeVisible()
+  })
+})
+
 test.describe('Settings', () => {
   test('@mobile Should be visible on mobile', async ({ comfyPage }) => {
     await comfyPage.page.keyboard.press('Control+,')
@@ -129,6 +379,38 @@ test.describe('Support', () => {
   })
 })
 
+test.describe('Error dialog', () => {
+  test('Should display an error dialog when graph configure fails', async ({
+    comfyPage
+  }) => {
+    await comfyPage.page.evaluate(() => {
+      const graph = window.graph!
+      ;(graph as { configure: () => void }).configure = () => {
+        throw new Error('Error on configure!')
+      }
+    })
+
+    await comfyPage.workflow.loadWorkflow('default')
+
+    const errorDialog = comfyPage.page.locator('.comfy-error-report')
+    await expect(errorDialog).toBeVisible()
+  })
+
+  test('Should display an error dialog when prompt execution fails', async ({
+    comfyPage
+  }) => {
+    await comfyPage.page.evaluate(async () => {
+      const app = window.app!
+      app.api.queuePrompt = () => {
+        throw new Error('Error on queuePrompt!')
+      }
+      await app.queuePrompt(0)
+    })
+    const errorDialog = comfyPage.page.locator('.comfy-error-report')
+    await expect(errorDialog).toBeVisible()
+  })
+})
+
 test.describe('Signin dialog', () => {
   test('Paste content to signin dialog should not paste node on canvas', async ({
     comfyPage

browser_tests/tests/dialogs/queueClearHistory.spec.ts

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

browser_tests/tests/dialogs/settingsDialog.spec.ts

@@ -1,166 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
-import { mockSystemStats } from '../../fixtures/data/systemStats'
-
-const MOCK_COMFYUI_VERSION = '9.99.0-e2e-test'
-
-test.describe('Settings dialog', { tag: '@ui' }, () => {
-  test('About panel renders mocked version from server', async ({
-    comfyPage
-  }) => {
-    const stats = {
-      ...mockSystemStats,
-      system: {
-        ...mockSystemStats.system,
-        comfyui_version: MOCK_COMFYUI_VERSION
-      }
-    }
-    await comfyPage.page.route('**/system_stats**', async (route) => {
-      await route.fulfill({ json: stats })
-    })
-    await comfyPage.setup()
-
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
-    await dialog.goToAboutPanel()
-
-    const aboutPanel = comfyPage.page.getByTestId('about-panel')
-    await expect(aboutPanel).toBeVisible()
-    await expect(aboutPanel).toContainText(MOCK_COMFYUI_VERSION)
-    await expect(aboutPanel).toContainText('ComfyUI_frontend')
-  })
-
-  test('Toggling a boolean setting through UI persists the value', async ({
-    comfyPage
-  }) => {
-    const settingId = 'Comfy.Validation.Workflows'
-    const initialValue = await comfyPage.settings.getSetting<boolean>(settingId)
-
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
-
-    try {
-      await dialog.searchBox.fill('Validate workflows')
-      const settingRow = dialog.root.locator(`[data-setting-id="${settingId}"]`)
-      await expect(settingRow).toBeVisible()
-
-      await settingRow.locator('.p-toggleswitch').click()
-
-      await expect
-        .poll(() => comfyPage.settings.getSetting<boolean>(settingId))
-        .toBe(!initialValue)
-    } finally {
-      await comfyPage.settings.setSetting(settingId, initialValue)
-    }
-  })
-
-  test('Can be closed via close button', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
-    await expect(dialog.root).toBeVisible()
-
-    await dialog.close()
-    await expect(dialog.root).not.toBeVisible()
-  })
-
-  test('Escape key closes dialog', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
-    await expect(dialog.root).toBeVisible()
-
-    await comfyPage.page.keyboard.press('Escape')
-    await expect(dialog.root).not.toBeVisible()
-  })
-
-  test('Search filters settings list', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
-
-    const settingItems = dialog.root.locator('[data-setting-id]')
-    const countBeforeSearch = await settingItems.count()
-
-    await dialog.searchBox.fill('Validate workflows')
-    await expect
-      .poll(() => settingItems.count())
-      .toBeLessThan(countBeforeSearch)
-  })
-
-  test('Search can be cleared to restore all settings', async ({
-    comfyPage
-  }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
-
-    const settingItems = dialog.root.locator('[data-setting-id]')
-    const countBeforeSearch = await settingItems.count()
-
-    await dialog.searchBox.fill('Validate workflows')
-    await expect
-      .poll(() => settingItems.count())
-      .toBeLessThan(countBeforeSearch)
-
-    await dialog.searchBox.clear()
-    await expect.poll(() => settingItems.count()).toBe(countBeforeSearch)
-  })
-
-  test('Category navigation changes content area', async ({ comfyPage }) => {
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
-
-    const firstCategory = dialog.categories.first()
-    const firstCategoryName = await firstCategory.textContent()
-    await firstCategory.click()
-    const firstContent = await dialog.contentArea.textContent()
-
-    // Find a different category to click
-    const categoryCount = await dialog.categories.count()
-    let switched = false
-    for (let i = 1; i < categoryCount; i++) {
-      const cat = dialog.categories.nth(i)
-      const catName = await cat.textContent()
-      if (catName !== firstCategoryName) {
-        await cat.click()
-        await expect
-          .poll(() => dialog.contentArea.textContent())
-          .not.toBe(firstContent)
-        switched = true
-        break
-      }
-    }
-    expect(switched).toBe(true)
-  })
-
-  test('Dropdown setting can be changed and persists', async ({
-    comfyPage
-  }) => {
-    const settingId = 'Comfy.UseNewMenu'
-    const initialValue = await comfyPage.settings.getSetting<string>(settingId)
-
-    const dialog = comfyPage.settingDialog
-    await dialog.open()
-
-    try {
-      await dialog.searchBox.fill('Use new menu')
-      const settingRow = dialog.root.locator(`[data-setting-id="${settingId}"]`)
-      await expect(settingRow).toBeVisible()
-
-      // 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 overlay
-        .locator(`.p-select-option-label:text-is("${targetValue}")`)
-        .click()
-
-      await expect
-        .poll(() => comfyPage.settings.getSetting<string>(settingId))
-        .toBe(targetValue)
-    } finally {
-      await comfyPage.settings.setSetting(settingId, initialValue)
-    }
-  })
-})

browser_tests/tests/dialogs/shareWorkflowDialog.spec.ts

@@ -1,352 +0,0 @@
-import type { Page } from '@playwright/test'
-import { expect } from '@playwright/test'
-
-import type { AssetInfo } from '../../../src/schemas/apiSchema'
-import { comfyPageFixture } from '../../fixtures/ComfyPage'
-import { TestIds } from '../../fixtures/selectors'
-
-interface PublishRecord {
-  workflow_id: string
-  share_id: string | null
-  listed: boolean
-  publish_time: string | null
-}
-
-const PUBLISHED_RECORD: PublishRecord = {
-  workflow_id: 'wf-1',
-  share_id: 'share-abc',
-  listed: false,
-  publish_time: new Date(Date.now() + 60_000).toISOString()
-}
-
-const PRIVATE_ASSET: AssetInfo = {
-  id: 'asset-1',
-  name: 'photo.png',
-  preview_url: '',
-  storage_url: '',
-  model: false,
-  public: false,
-  in_library: false
-}
-
-const test = comfyPageFixture
-
-/**
- * Enable the workflow_sharing_enabled server feature flag at runtime.
- * FeatureFlagHelper.mockServerFeatures() intercepts `/api/features` but the
- * flags are already loaded by the time tests run, so direct mutation of the
- * reactive ref is the only reliable approach for server-side flags.
- */
-async function enableWorkflowSharing(page: Page): Promise<void> {
-  await page.evaluate(() => {
-    const api = window.app!.api
-    api.serverFeatureFlags.value = {
-      ...api.serverFeatureFlags.value,
-      workflow_sharing_enabled: true
-    }
-  })
-}
-
-async function mockPublishStatus(
-  page: Page,
-  record: PublishRecord | null
-): Promise<void> {
-  await page.route('**/api/userdata/*/publish', async (route) => {
-    if (route.request().method() === 'GET') {
-      if (!record || !record.share_id) {
-        await route.fulfill({ status: 404, body: 'Not found' })
-      } else {
-        await route.fulfill({
-          status: 200,
-          contentType: 'application/json',
-          body: JSON.stringify(record)
-        })
-      }
-    } else {
-      await route.fallback()
-    }
-  })
-}
-
-async function mockPublishWorkflow(
-  page: Page,
-  result: PublishRecord
-): Promise<void> {
-  await page.route('**/api/userdata/*/publish', async (route) => {
-    if (route.request().method() === 'POST') {
-      await route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        body: JSON.stringify(result)
-      })
-    } else {
-      await route.fallback()
-    }
-  })
-}
-
-async function mockShareableAssets(
-  page: Page,
-  assets: AssetInfo[] = []
-): Promise<void> {
-  await page.route('**/api/assets/from-workflow', async (route) => {
-    await route.fulfill({
-      status: 200,
-      contentType: 'application/json',
-      body: JSON.stringify({ assets })
-    })
-  })
-}
-
-/**
- * Dismiss stale PrimeVue dialog masks left by cloud-mode's onboarding flow
- * or auth-triggered modals by pressing Escape until they clear.
- */
-async function dismissOverlays(page: Page): Promise<void> {
-  const mask = page.locator('.p-dialog-mask')
-  for (let attempt = 0; attempt < 3; attempt++) {
-    if ((await mask.count()) === 0) break
-    await page.keyboard.press('Escape')
-    await mask
-      .first()
-      .waitFor({ state: 'hidden', timeout: 2000 })
-      .catch(() => {})
-  }
-}
-
-/**
- * Save the active workflow via the topbar Save menu action.
- * Mocks the userdata POST endpoint to avoid real server calls in tests.
- */
-async function saveAndWait(
-  comfyPage: {
-    page: Page
-    menu: { topbar: { saveWorkflow: (name: string) => Promise<void> } }
-  },
-  workflowName: string
-): Promise<void> {
-  const filename =
-    workflowName + (workflowName.endsWith('.json') ? '' : '.json')
-  await comfyPage.page.route(
-    /\/api\/userdata\/workflows(%2F|\/).*$/,
-    async (route) => {
-      if (route.request().method() === 'POST') {
-        await route.fulfill({
-          status: 200,
-          contentType: 'application/json',
-          body: JSON.stringify({
-            path: `workflows/${filename}`,
-            size: 1024,
-            modified: Date.now()
-          })
-        })
-      } else {
-        await route.fallback()
-      }
-    }
-  )
-
-  await comfyPage.menu.topbar.saveWorkflow(workflowName)
-}
-
-async function openShareDialog(page: Page): Promise<void> {
-  await enableWorkflowSharing(page)
-  await dismissOverlays(page)
-  const shareButton = page.getByRole('button', { name: 'Share workflow' })
-  await shareButton.click()
-}
-
-function getShareDialog(page: Page) {
-  return page.getByRole('dialog')
-}
-
-test.describe('Share Workflow Dialog', { tag: '@cloud' }, () => {
-  test('should show unsaved state for a new workflow', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-
-    await mockPublishStatus(page, null)
-    await mockShareableAssets(page)
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    await expect(dialog).toBeVisible()
-    await expect(
-      dialog.getByRole('button', { name: /save workflow/i })
-    ).toBeVisible()
-  })
-
-  test('should show ready state with create link button', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-    const workflowName = 'share-test-ready'
-
-    await saveAndWait(comfyPage, workflowName)
-
-    await mockPublishStatus(page, null)
-    await mockShareableAssets(page)
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    await expect(dialog).toBeVisible()
-    await expect(
-      dialog.getByRole('button', { name: /create a link/i })
-    ).toBeVisible()
-  })
-
-  test('should show shared state with copy URL after publishing', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-    const workflowName = 'share-test-shared'
-
-    await saveAndWait(comfyPage, workflowName)
-
-    await mockPublishStatus(page, PUBLISHED_RECORD)
-    await mockShareableAssets(page)
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    await expect(dialog).toBeVisible()
-    await expect(
-      dialog.getByRole('textbox', { name: /share.*url/i })
-    ).toBeVisible()
-  })
-
-  test('should show stale state with update link button', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-    const workflowName = 'share-test-stale'
-
-    await saveAndWait(comfyPage, workflowName)
-
-    const staleRecord: PublishRecord = {
-      ...PUBLISHED_RECORD,
-      publish_time: '2020-01-01T00:00:00Z'
-    }
-
-    await mockPublishStatus(page, staleRecord)
-    await mockShareableAssets(page)
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    await expect(dialog).toBeVisible()
-    await expect(
-      dialog.getByRole('button', { name: /update\s+link/i })
-    ).toBeVisible()
-  })
-
-  test('should close dialog when close button is clicked', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-
-    await mockPublishStatus(page, null)
-    await mockShareableAssets(page)
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    await expect(dialog).toBeVisible()
-
-    await dialog.getByRole('button', { name: /close/i }).click()
-    await expect(dialog).toBeHidden()
-  })
-
-  test('should create link and transition to shared state', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-    const workflowName = 'share-test-create'
-
-    await saveAndWait(comfyPage, workflowName)
-
-    await mockPublishStatus(page, null)
-    await mockShareableAssets(page)
-    await mockPublishWorkflow(page, PUBLISHED_RECORD)
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    const createButton = dialog.getByRole('button', { name: /create a link/i })
-    await expect(createButton).toBeVisible()
-    await createButton.click()
-
-    await expect(
-      dialog.getByRole('textbox', { name: /share.*url/i })
-    ).toBeVisible()
-  })
-
-  test('should show tab buttons when comfyHubUploadEnabled is true', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-
-    await page.evaluate(() => {
-      const api = window.app!.api
-      api.serverFeatureFlags.value = {
-        ...api.serverFeatureFlags.value,
-        comfyhub_upload_enabled: true
-      }
-    })
-
-    await mockPublishStatus(page, null)
-    await mockShareableAssets(page)
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    await expect(dialog).toBeVisible()
-    await expect(dialog.getByRole('tab', { name: /share/i })).toBeVisible()
-    await expect(dialog.getByRole('tab', { name: /publish/i })).toBeVisible()
-  })
-
-  test('should switch between share link and publish tabs', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-
-    await page.evaluate(() => {
-      const api = window.app!.api
-      api.serverFeatureFlags.value = {
-        ...api.serverFeatureFlags.value,
-        comfyhub_upload_enabled: true
-      }
-    })
-
-    await mockPublishStatus(page, null)
-    await mockShareableAssets(page)
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    await expect(dialog).toBeVisible()
-
-    await dialog.getByRole('tab', { name: /publish/i }).click()
-
-    const publishPanel = dialog.getByTestId(TestIds.dialogs.publishTabPanel)
-    await expect(publishPanel).toBeVisible()
-
-    await dialog.getByRole('tab', { name: /share/i }).click()
-    await expect(publishPanel).toBeHidden()
-  })
-
-  test('should require acknowledgment before publishing private assets', async ({
-    comfyPage
-  }) => {
-    const { page } = comfyPage
-    const workflowName = 'share-test-ack'
-
-    await saveAndWait(comfyPage, workflowName)
-
-    await mockPublishStatus(page, null)
-    await mockShareableAssets(page, [PRIVATE_ASSET])
-    await openShareDialog(page)
-
-    const dialog = getShareDialog(page)
-    const createButton = dialog.getByRole('button', { name: /create a link/i })
-    await expect(createButton).toBeDisabled()
-
-    await dialog.getByRole('checkbox').check()
-    await expect(createButton).toBeEnabled()
-  })
-})

browser_tests/tests/dialogs/signInDialog.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { SignInDialog } from '@e2e/fixtures/components/SignInDialog'
+import { comfyPageFixture as test } from '../../fixtures/ComfyPage'
+import { SignInDialog } from '../../fixtures/components/SignInDialog'
 
 test.describe('Sign In dialog', { tag: '@ui' }, () => {
   let dialog: SignInDialog
@@ -83,7 +83,7 @@ test.describe('Sign In dialog', { tag: '@ui' }, () => {
   })
 
   test('Should close dialog via close button', async () => {
-    await dialog.closeButton.click()
+    await dialog.close()
     await expect(dialog.root).toBeHidden()
   })
 

browser_tests/tests/domWidget.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { comfyPageFixture as test } from '../fixtures/ComfyPage'
 
 test.beforeEach(async ({ comfyPage }) => {
   await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')