docs: weekly documentation accuracy update

.claude/settings.json

@@ -1,86 +1,9 @@
 {
-  "hooks": {
-    "PreToolUse": [
-      {
-        "matcher": "Bash",
-        "hooks": [
-          {
-            "type": "command",
-            "if": "Bash(tsc *)",
-            "command": "echo 'Use `pnpm typecheck` instead of running tsc directly.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(vue-tsc *)",
-            "command": "echo 'Use `pnpm typecheck` instead of running vue-tsc directly.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(npx tsc *)",
-            "command": "echo 'Use `pnpm typecheck` instead of running tsc via npx.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(pnpx tsc *)",
-            "command": "echo 'Use `pnpm typecheck` instead of running tsc via pnpx.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(pnpm exec tsc *)",
-            "command": "echo 'Use `pnpm typecheck` instead of `pnpm exec tsc`.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(npx vitest *)",
-            "command": "echo 'Use `pnpm test:unit` (or `pnpm test:unit -- <path>`) instead of npx vitest.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(pnpx vitest *)",
-            "command": "echo 'Use `pnpm test:unit` (or `pnpm test:unit -- <path>`) instead of pnpx vitest.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(npx eslint *)",
-            "command": "echo 'Use `pnpm lint` or `pnpm lint:fix` instead of npx eslint.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(pnpx eslint *)",
-            "command": "echo 'Use `pnpm lint` or `pnpm lint:fix` instead of pnpx eslint.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(npx prettier *)",
-            "command": "echo 'This project uses oxfmt, not prettier. Use `pnpm format` or `pnpm format:check`.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(pnpx prettier *)",
-            "command": "echo 'This project uses oxfmt, not prettier. Use `pnpm format` or `pnpm format:check`.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(npx oxlint *)",
-            "command": "echo 'Use `pnpm oxlint` instead of npx oxlint.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(npx stylelint *)",
-            "command": "echo 'Use `pnpm stylelint` instead of npx stylelint.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(npx knip *)",
-            "command": "echo 'Use `pnpm knip` instead of npx knip.' >&2 && exit 2"
-          },
-          {
-            "type": "command",
-            "if": "Bash(pnpx knip *)",
-            "command": "echo 'Use `pnpm knip` instead of pnpx knip.' >&2 && exit 2"
-          }
-        ]
-      }
+  "permissions": {
+    "allow": [
+      "Bash(pnpx vitest run --testPathPattern=\"draftCacheV2.property\")",
+      "Bash(pnpx vitest run \"draftCacheV2.property\")",
+      "Bash(node -e \"const fc = require\\(''fast-check''\\); console.log\\(Object.keys\\(fc\\).filter\\(k => k.includes\\(''string''\\)\\).join\\('', ''\\)\\)\")"
     ]
   }
 }

.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false

.github/workflows/release-biweekly-comfyui.yaml

@@ -1,23 +1,14 @@
-# Release workflow for ComfyUI frontend: version bump → PyPI publish → ComfyUI PR.
-# Runs on a bi-weekly schedule for minor releases, or manually for patch/hotfix releases.
-name: 'Release: ComfyUI'
+# Automated bi-weekly workflow to bump ComfyUI frontend RC releases
+name: 'Release: Bi-weekly ComfyUI'
 
 on:
-  # Bi-weekly schedule: Monday at 20:00 UTC
+  # Schedule for Monday at 12:00 PM PST (20:00 UTC)
   schedule:
     - cron: '0 20 * * 1'
 
-  # Manual trigger for both on-demand minor and patch/hotfix releases
+  # Allow manual triggering (bypasses bi-weekly check)
   workflow_dispatch:
     inputs:
-      release_type:
-        description: 'minor = next minor version (bi-weekly cadence), patch = hotfix for current production version'
-        required: true
-        default: 'minor'
-        type: choice
-        options:
-          - minor
-          - patch
       comfyui_fork:
         description: 'ComfyUI fork to use for PR (e.g., Comfy-Org/ComfyUI)'
         required: false
@@ -50,11 +41,10 @@ jobs:
 
       - name: Summary
         run: |
-          echo "## Release Check" >> $GITHUB_STEP_SUMMARY
+          echo "## Bi-weekly Check" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "- Is release week: ${{ steps.check.outputs.is_release_week }}" >> $GITHUB_STEP_SUMMARY
           echo "- Manual trigger: ${{ github.event_name == 'workflow_dispatch' }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Release type: ${{ inputs.release_type || 'minor (scheduled)' }}" >> $GITHUB_STEP_SUMMARY
 
   resolve-version:
     needs: check-release-week
@@ -86,8 +76,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
-        with:
-          package_json_file: frontend/package.json
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -101,8 +89,6 @@ jobs:
       - name: Resolve release information
         id: resolve
         working-directory: frontend
-        env:
-          RELEASE_TYPE: ${{ inputs.release_type || 'minor' }}
         run: |
           set -euo pipefail
 

AGENTS.md

@@ -44,6 +44,7 @@ This project uses **pnpm**. Always prefer scripts defined in `package.json` (e.g
 ## Build, Test, and Development Commands
 
 - `pnpm dev`: Start Vite dev server.
+- `pnpm dev:cloud`: Dev server connected to cloud backend (testcloud.comfy.org)
 - `pnpm dev:electron`: Dev server with Electron API mocks
 - `pnpm build`: Type-check then production build to `dist/`
 - `pnpm preview`: Preview the production build locally

browser_tests/assets/linear-basic-app-1.json

@@ -1,154 +0,0 @@
-{
-  "last_node_id": 9,
-  "last_link_id": 9,
-  "nodes": [
-    {
-      "id": 7,
-      "type": "CLIPTextEncode",
-      "pos": [413, 389],
-      "size": [425.27801513671875, 180.6060791015625],
-      "flags": {},
-      "order": 3,
-      "mode": 0,
-      "inputs": [{ "name": "clip", "type": "CLIP", "link": 5 }],
-      "outputs": [
-        {
-          "name": "CONDITIONING",
-          "type": "CONDITIONING",
-          "links": [6],
-          "slot_index": 0
-        }
-      ],
-      "properties": {},
-      "widgets_values": ["text, watermark"]
-    },
-    {
-      "id": 6,
-      "type": "CLIPTextEncode",
-      "pos": [415, 186],
-      "size": [422.84503173828125, 164.31304931640625],
-      "flags": {},
-      "order": 2,
-      "mode": 0,
-      "inputs": [{ "name": "clip", "type": "CLIP", "link": 3 }],
-      "outputs": [
-        {
-          "name": "CONDITIONING",
-          "type": "CONDITIONING",
-          "links": [4],
-          "slot_index": 0
-        }
-      ],
-      "properties": {},
-      "widgets_values": [
-        "beautiful scenery nature glass bottle landscape, , purple galaxy bottle,"
-      ]
-    },
-    {
-      "id": 5,
-      "type": "EmptyLatentImage",
-      "pos": [473, 609],
-      "size": [315, 106],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "outputs": [
-        { "name": "LATENT", "type": "LATENT", "links": [2], "slot_index": 0 }
-      ],
-      "properties": {},
-      "widgets_values": [512, 512, 1]
-    },
-    {
-      "id": 3,
-      "type": "KSampler",
-      "pos": [863, 186],
-      "size": [315, 262],
-      "flags": {},
-      "order": 4,
-      "mode": 0,
-      "inputs": [
-        { "name": "model", "type": "MODEL", "link": 1 },
-        { "name": "positive", "type": "CONDITIONING", "link": 4 },
-        { "name": "negative", "type": "CONDITIONING", "link": 6 },
-        { "name": "latent_image", "type": "LATENT", "link": 2 }
-      ],
-      "outputs": [
-        { "name": "LATENT", "type": "LATENT", "links": [7], "slot_index": 0 }
-      ],
-      "properties": {},
-      "widgets_values": [156680208700286, true, 20, 8, "euler", "normal", 1]
-    },
-    {
-      "id": 8,
-      "type": "VAEDecode",
-      "pos": [1209, 188],
-      "size": [210, 46],
-      "flags": {},
-      "order": 5,
-      "mode": 0,
-      "inputs": [
-        { "name": "samples", "type": "LATENT", "link": 7 },
-        { "name": "vae", "type": "VAE", "link": 8 }
-      ],
-      "outputs": [
-        { "name": "IMAGE", "type": "IMAGE", "links": [9], "slot_index": 0 }
-      ],
-      "properties": {}
-    },
-    {
-      "id": 9,
-      "type": "SaveImage",
-      "pos": [1451, 189],
-      "size": [210, 26],
-      "flags": {},
-      "order": 6,
-      "mode": 0,
-      "inputs": [{ "name": "images", "type": "IMAGE", "link": 9 }],
-      "properties": {}
-    },
-    {
-      "id": 4,
-      "type": "CheckpointLoaderSimple",
-      "pos": [26, 474],
-      "size": [315, 98],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "outputs": [
-        { "name": "MODEL", "type": "MODEL", "links": [1], "slot_index": 0 },
-        { "name": "CLIP", "type": "CLIP", "links": [3, 5], "slot_index": 1 },
-        { "name": "VAE", "type": "VAE", "links": [8], "slot_index": 2 }
-      ],
-      "properties": {},
-      "widgets_values": ["v1-5-pruned-emaonly-fp16.safetensors"]
-    }
-  ],
-  "links": [
-    [1, 4, 0, 3, 0, "MODEL"],
-    [2, 5, 0, 3, 3, "LATENT"],
-    [3, 4, 1, 6, 0, "CLIP"],
-    [4, 6, 0, 3, 1, "CONDITIONING"],
-    [5, 4, 1, 7, 0, "CLIP"],
-    [6, 7, 0, 3, 2, "CONDITIONING"],
-    [7, 3, 0, 8, 0, "LATENT"],
-    [8, 4, 2, 8, 1, "VAE"],
-    [9, 8, 0, 9, 0, "IMAGE"]
-  ],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    },
-    "linearData": {
-      "inputs": [
-        ["3", "seed"],
-        ["3", "steps"],
-        ["3", "cfg"]
-      ],
-      "outputs": ["9"]
-    }
-  },
-  "version": 0.4
-}

browser_tests/assets/linear-basic-app-2.json

@@ -1,153 +0,0 @@
-{
-  "last_node_id": 9,
-  "last_link_id": 9,
-  "nodes": [
-    {
-      "id": 7,
-      "type": "CLIPTextEncode",
-      "pos": [413, 389],
-      "size": [425.27801513671875, 180.6060791015625],
-      "flags": {},
-      "order": 3,
-      "mode": 0,
-      "inputs": [{ "name": "clip", "type": "CLIP", "link": 5 }],
-      "outputs": [
-        {
-          "name": "CONDITIONING",
-          "type": "CONDITIONING",
-          "links": [6],
-          "slot_index": 0
-        }
-      ],
-      "properties": {},
-      "widgets_values": ["text, watermark"]
-    },
-    {
-      "id": 6,
-      "type": "CLIPTextEncode",
-      "pos": [415, 186],
-      "size": [422.84503173828125, 164.31304931640625],
-      "flags": {},
-      "order": 2,
-      "mode": 0,
-      "inputs": [{ "name": "clip", "type": "CLIP", "link": 3 }],
-      "outputs": [
-        {
-          "name": "CONDITIONING",
-          "type": "CONDITIONING",
-          "links": [4],
-          "slot_index": 0
-        }
-      ],
-      "properties": {},
-      "widgets_values": [
-        "beautiful scenery nature glass bottle landscape, , purple galaxy bottle,"
-      ]
-    },
-    {
-      "id": 5,
-      "type": "EmptyLatentImage",
-      "pos": [473, 609],
-      "size": [315, 106],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "outputs": [
-        { "name": "LATENT", "type": "LATENT", "links": [2], "slot_index": 0 }
-      ],
-      "properties": {},
-      "widgets_values": [512, 512, 1]
-    },
-    {
-      "id": 3,
-      "type": "KSampler",
-      "pos": [863, 186],
-      "size": [315, 262],
-      "flags": {},
-      "order": 4,
-      "mode": 0,
-      "inputs": [
-        { "name": "model", "type": "MODEL", "link": 1 },
-        { "name": "positive", "type": "CONDITIONING", "link": 4 },
-        { "name": "negative", "type": "CONDITIONING", "link": 6 },
-        { "name": "latent_image", "type": "LATENT", "link": 2 }
-      ],
-      "outputs": [
-        { "name": "LATENT", "type": "LATENT", "links": [7], "slot_index": 0 }
-      ],
-      "properties": {},
-      "widgets_values": [156680208700286, true, 20, 8, "euler", "normal", 1]
-    },
-    {
-      "id": 8,
-      "type": "VAEDecode",
-      "pos": [1209, 188],
-      "size": [210, 46],
-      "flags": {},
-      "order": 5,
-      "mode": 0,
-      "inputs": [
-        { "name": "samples", "type": "LATENT", "link": 7 },
-        { "name": "vae", "type": "VAE", "link": 8 }
-      ],
-      "outputs": [
-        { "name": "IMAGE", "type": "IMAGE", "links": [9], "slot_index": 0 }
-      ],
-      "properties": {}
-    },
-    {
-      "id": 9,
-      "type": "SaveImage",
-      "pos": [1451, 189],
-      "size": [210, 26],
-      "flags": {},
-      "order": 6,
-      "mode": 0,
-      "inputs": [{ "name": "images", "type": "IMAGE", "link": 9 }],
-      "properties": {}
-    },
-    {
-      "id": 4,
-      "type": "CheckpointLoaderSimple",
-      "pos": [26, 474],
-      "size": [315, 98],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "outputs": [
-        { "name": "MODEL", "type": "MODEL", "links": [1], "slot_index": 0 },
-        { "name": "CLIP", "type": "CLIP", "links": [3, 5], "slot_index": 1 },
-        { "name": "VAE", "type": "VAE", "links": [8], "slot_index": 2 }
-      ],
-      "properties": {},
-      "widgets_values": ["v1-5-pruned-emaonly-fp16.safetensors"]
-    }
-  ],
-  "links": [
-    [1, 4, 0, 3, 0, "MODEL"],
-    [2, 5, 0, 3, 3, "LATENT"],
-    [3, 4, 1, 6, 0, "CLIP"],
-    [4, 6, 0, 3, 1, "CONDITIONING"],
-    [5, 4, 1, 7, 0, "CLIP"],
-    [6, 7, 0, 3, 2, "CONDITIONING"],
-    [7, 3, 0, 8, 0, "LATENT"],
-    [8, 4, 2, 8, 1, "VAE"],
-    [9, 8, 0, 9, 0, "IMAGE"]
-  ],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": {
-      "offset": [0, 0],
-      "scale": 1
-    },
-    "linearData": {
-      "inputs": [
-        ["3", "seed"],
-        ["3", "steps"]
-      ],
-      "outputs": ["9"]
-    }
-  },
-  "version": 0.4
-}

browser_tests/assets/missing/missing_media_bypassed.json

@@ -1,34 +0,0 @@
-{
-  "last_node_id": 10,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 10,
-      "type": "LoadImage",
-      "pos": [50, 200],
-      "size": [315, 314],
-      "flags": {},
-      "order": 0,
-      "mode": 4,
-      "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/missing/missing_media_multiple.json

@@ -5,7 +5,7 @@
     {
       "id": 10,
       "type": "LoadImage",
-      "pos": [50, 200],
+      "pos": [50, 50],
       "size": [315, 314],
       "flags": {},
       "order": 0,
@@ -31,7 +31,7 @@
     {
       "id": 11,
       "type": "LoadImage",
-      "pos": [450, 200],
+      "pos": [450, 50],
       "size": [315, 314],
       "flags": {},
       "order": 1,

browser_tests/assets/missing/missing_media_single.json

@@ -5,7 +5,7 @@
     {
       "id": 10,
       "type": "LoadImage",
-      "pos": [50, 200],
+      "pos": [50, 50],
       "size": [315, 314],
       "flags": {},
       "order": 0,

browser_tests/assets/missing/missing_models.json

@@ -1,27 +1,7 @@
 {
-  "last_node_id": 1,
+  "last_node_id": 0,
   "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "CheckpointLoaderSimple",
-      "pos": [256, 256],
-      "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"]
-    }
-  ],
+  "nodes": [],
   "links": [],
   "groups": [],
   "config": {},
@@ -35,7 +15,7 @@
     {
       "name": "fake_model.safetensors",
       "url": "http://localhost:8188/api/devtools/fake_model.safetensors",
-      "directory": "checkpoints"
+      "directory": "text_encoders"
     }
   ],
   "version": 0.4

browser_tests/assets/missing/missing_models_bypassed.json

@@ -1,42 +0,0 @@
-{
-  "last_node_id": 1,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "CheckpointLoaderSimple",
-      "pos": [256, 256],
-      "size": [315, 98],
-      "flags": {},
-      "order": 0,
-      "mode": 4,
-      "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": "checkpoints"
-    }
-  ],
-  "version": 0.4
-}

browser_tests/assets/missing/missing_models_in_subgraph.json

@@ -1,141 +0,0 @@
-{
-  "id": "test-missing-models-in-subgraph",
-  "revision": 0,
-  "last_node_id": 2,
-  "last_link_id": 0,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "KSampler",
-      "pos": [100, 100],
-      "size": [270, 262],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "inputs": [
-        { "name": "model", "type": "MODEL", "link": null },
-        { "name": "positive", "type": "CONDITIONING", "link": null },
-        { "name": "negative", "type": "CONDITIONING", "link": null },
-        { "name": "latent_image", "type": "LATENT", "link": null }
-      ],
-      "outputs": [{ "name": "LATENT", "type": "LATENT", "links": [] }],
-      "properties": {
-        "Node name for S&R": "KSampler"
-      },
-      "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
-    },
-    {
-      "id": 2,
-      "type": "subgraph-with-missing-model",
-      "pos": [450, 100],
-      "size": [400, 200],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [{ "name": "model", "type": "MODEL", "link": null }],
-      "outputs": [{ "name": "MODEL", "type": "MODEL", "links": null }],
-      "properties": {},
-      "widgets_values": []
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "definitions": {
-    "subgraphs": [
-      {
-        "id": "subgraph-with-missing-model",
-        "version": 1,
-        "state": {
-          "lastGroupId": 0,
-          "lastNodeId": 1,
-          "lastLinkId": 2,
-          "lastRerouteId": 0
-        },
-        "revision": 0,
-        "config": {},
-        "name": "Subgraph with Missing Model",
-        "inputNode": {
-          "id": -10,
-          "bounding": [100, 200, 120, 60]
-        },
-        "outputNode": {
-          "id": -20,
-          "bounding": [500, 200, 120, 60]
-        },
-        "inputs": [
-          {
-            "id": "input1-id",
-            "name": "model",
-            "type": "MODEL",
-            "linkIds": [1],
-            "pos": { "0": 150, "1": 220 }
-          }
-        ],
-        "outputs": [
-          {
-            "id": "output1-id",
-            "name": "MODEL",
-            "type": "MODEL",
-            "linkIds": [2],
-            "pos": { "0": 520, "1": 220 }
-          }
-        ],
-        "widgets": [],
-        "nodes": [
-          {
-            "id": 1,
-            "type": "CheckpointLoaderSimple",
-            "pos": [250, 180],
-            "size": [315, 98],
-            "flags": {},
-            "order": 0,
-            "mode": 0,
-            "inputs": [],
-            "outputs": [
-              { "name": "MODEL", "type": "MODEL", "links": [2] },
-              { "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": [
-          {
-            "id": 1,
-            "origin_id": -10,
-            "origin_slot": 0,
-            "target_id": 1,
-            "target_slot": 0,
-            "type": "MODEL"
-          },
-          {
-            "id": 2,
-            "origin_id": 1,
-            "origin_slot": 0,
-            "target_id": -20,
-            "target_slot": 0,
-            "type": "MODEL"
-          }
-        ]
-      }
-    ]
-  },
-  "config": {},
-  "extra": {
-    "ds": {
-      "scale": 1,
-      "offset": [0, 0]
-    }
-  },
-  "models": [
-    {
-      "name": "fake_model.safetensors",
-      "url": "http://localhost:8188/api/devtools/fake_model.safetensors",
-      "directory": "checkpoints"
-    }
-  ],
-  "version": 0.4
-}

browser_tests/assets/missing/missing_models_with_nodes.json

@@ -78,7 +78,7 @@
     {
       "name": "fake_model.safetensors",
       "url": "http://localhost:8188/api/devtools/fake_model.safetensors",
-      "directory": "checkpoints"
+      "directory": "text_encoders"
     }
   ],
   "version": 0.4

browser_tests/assets/subgraphs/subgraph-multi-instance-promoted-text-values.json

@@ -1,284 +0,0 @@
-{
-  "id": "2f54e2f0-6db4-4bdf-84a8-9c3ea3ec0123",
-  "revision": 0,
-  "last_node_id": 13,
-  "last_link_id": 9,
-  "nodes": [
-    {
-      "id": 11,
-      "type": "422723e8-4bf6-438c-823f-881ca81acead",
-      "pos": [120, 180],
-      "size": [210, 168],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [
-        { "name": "clip", "type": "CLIP", "link": null },
-        { "name": "model", "type": "MODEL", "link": null },
-        { "name": "positive", "type": "CONDITIONING", "link": null },
-        { "name": "negative", "type": "CONDITIONING", "link": null },
-        { "name": "latent_image", "type": "LATENT", "link": null }
-      ],
-      "outputs": [],
-      "properties": {},
-      "widgets_values": ["Alpha\n"]
-    },
-    {
-      "id": 12,
-      "type": "422723e8-4bf6-438c-823f-881ca81acead",
-      "pos": [420, 180],
-      "size": [210, 168],
-      "flags": {},
-      "order": 1,
-      "mode": 0,
-      "inputs": [
-        { "name": "clip", "type": "CLIP", "link": null },
-        { "name": "model", "type": "MODEL", "link": null },
-        { "name": "positive", "type": "CONDITIONING", "link": null },
-        { "name": "negative", "type": "CONDITIONING", "link": null },
-        { "name": "latent_image", "type": "LATENT", "link": null }
-      ],
-      "outputs": [],
-      "properties": {},
-      "widgets_values": ["Beta\n"]
-    },
-    {
-      "id": 13,
-      "type": "422723e8-4bf6-438c-823f-881ca81acead",
-      "pos": [720, 180],
-      "size": [210, 168],
-      "flags": {},
-      "order": 2,
-      "mode": 0,
-      "inputs": [
-        { "name": "clip", "type": "CLIP", "link": null },
-        { "name": "model", "type": "MODEL", "link": null },
-        { "name": "positive", "type": "CONDITIONING", "link": null },
-        { "name": "negative", "type": "CONDITIONING", "link": null },
-        { "name": "latent_image", "type": "LATENT", "link": null }
-      ],
-      "outputs": [],
-      "properties": {},
-      "widgets_values": ["Gamma\n"]
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "definitions": {
-    "subgraphs": [
-      {
-        "id": "422723e8-4bf6-438c-823f-881ca81acead",
-        "version": 1,
-        "state": {
-          "lastGroupId": 0,
-          "lastNodeId": 11,
-          "lastLinkId": 15,
-          "lastRerouteId": 0
-        },
-        "revision": 0,
-        "config": {},
-        "name": "New Subgraph",
-        "inputNode": {
-          "id": -10,
-          "bounding": [481.59912109375, 379.13336181640625, 120, 160]
-        },
-        "outputNode": {
-          "id": -20,
-          "bounding": [1121.59912109375, 379.13336181640625, 120, 40]
-        },
-        "inputs": [
-          {
-            "id": "0f07c10e-5705-4764-9b24-b69606c6dbcc",
-            "name": "text",
-            "type": "STRING",
-            "linkIds": [10],
-            "pos": { "0": 581.59912109375, "1": 399.13336181640625 }
-          },
-          {
-            "id": "214a5060-24dd-4299-ab78-8027dc5b9c59",
-            "name": "clip",
-            "type": "CLIP",
-            "linkIds": [11],
-            "pos": { "0": 581.59912109375, "1": 419.13336181640625 }
-          },
-          {
-            "id": "8ab94c5d-e7df-433c-9177-482a32340552",
-            "name": "model",
-            "type": "MODEL",
-            "linkIds": [12],
-            "pos": { "0": 581.59912109375, "1": 439.13336181640625 }
-          },
-          {
-            "id": "8a4cd719-8c67-473b-9b44-ac0582d02641",
-            "name": "positive",
-            "type": "CONDITIONING",
-            "linkIds": [13],
-            "pos": { "0": 581.59912109375, "1": 459.13336181640625 }
-          },
-          {
-            "id": "a78d6b3a-ad40-4300-b0a5-2cdbdb8dc135",
-            "name": "negative",
-            "type": "CONDITIONING",
-            "linkIds": [14],
-            "pos": { "0": 581.59912109375, "1": 479.13336181640625 }
-          },
-          {
-            "id": "4c7abe0c-902d-49ef-a5b0-cbf02b50b693",
-            "name": "latent_image",
-            "type": "LATENT",
-            "linkIds": [15],
-            "pos": { "0": 581.59912109375, "1": 499.13336181640625 }
-          }
-        ],
-        "outputs": [],
-        "widgets": [],
-        "nodes": [
-          {
-            "id": 10,
-            "type": "CLIPTextEncode",
-            "pos": [661.59912109375, 314.13336181640625],
-            "size": [400, 200],
-            "flags": {},
-            "order": 1,
-            "mode": 0,
-            "inputs": [
-              {
-                "localized_name": "clip",
-                "name": "clip",
-                "type": "CLIP",
-                "link": 11
-              },
-              {
-                "localized_name": "text",
-                "name": "text",
-                "type": "STRING",
-                "widget": { "name": "text" },
-                "link": 10
-              }
-            ],
-            "outputs": [
-              {
-                "localized_name": "CONDITIONING",
-                "name": "CONDITIONING",
-                "type": "CONDITIONING",
-                "links": null
-              }
-            ],
-            "properties": {
-              "Node name for S&R": "CLIPTextEncode"
-            },
-            "widgets_values": [""]
-          },
-          {
-            "id": 11,
-            "type": "KSampler",
-            "pos": [674.1234741210938, 570.5839233398438],
-            "size": [270, 262],
-            "flags": {},
-            "order": 0,
-            "mode": 0,
-            "inputs": [
-              {
-                "localized_name": "model",
-                "name": "model",
-                "type": "MODEL",
-                "link": 12
-              },
-              {
-                "localized_name": "positive",
-                "name": "positive",
-                "type": "CONDITIONING",
-                "link": 13
-              },
-              {
-                "localized_name": "negative",
-                "name": "negative",
-                "type": "CONDITIONING",
-                "link": 14
-              },
-              {
-                "localized_name": "latent_image",
-                "name": "latent_image",
-                "type": "LATENT",
-                "link": 15
-              }
-            ],
-            "outputs": [
-              {
-                "localized_name": "LATENT",
-                "name": "LATENT",
-                "type": "LATENT",
-                "links": null
-              }
-            ],
-            "properties": {
-              "Node name for S&R": "KSampler"
-            },
-            "widgets_values": [0, "randomize", 20, 8, "euler", "simple", 1]
-          }
-        ],
-        "groups": [],
-        "links": [
-          {
-            "id": 10,
-            "origin_id": -10,
-            "origin_slot": 0,
-            "target_id": 10,
-            "target_slot": 1,
-            "type": "STRING"
-          },
-          {
-            "id": 11,
-            "origin_id": -10,
-            "origin_slot": 1,
-            "target_id": 10,
-            "target_slot": 0,
-            "type": "CLIP"
-          },
-          {
-            "id": 12,
-            "origin_id": -10,
-            "origin_slot": 2,
-            "target_id": 11,
-            "target_slot": 0,
-            "type": "MODEL"
-          },
-          {
-            "id": 13,
-            "origin_id": -10,
-            "origin_slot": 3,
-            "target_id": 11,
-            "target_slot": 1,
-            "type": "CONDITIONING"
-          },
-          {
-            "id": 14,
-            "origin_id": -10,
-            "origin_slot": 4,
-            "target_id": 11,
-            "target_slot": 2,
-            "type": "CONDITIONING"
-          },
-          {
-            "id": 15,
-            "origin_id": -10,
-            "origin_slot": 5,
-            "target_id": 11,
-            "target_slot": 3,
-            "type": "LATENT"
-          }
-        ],
-        "extra": {}
-      }
-    ]
-  },
-  "config": {},
-  "extra": {
-    "ds": {
-      "scale": 1,
-      "offset": [0, 0]
-    },
-    "frontendVersion": "1.24.1"
-  },
-  "version": 0.4
-}

browser_tests/fixtures/ComfyPage.ts

@@ -197,7 +197,7 @@ export class ComfyPage {
   ) {
     this.url = process.env.PLAYWRIGHT_TEST_URL || 'http://localhost:8188'
     this.canvas = page.locator('#graph-canvas')
-    this.selectionToolbox = page.getByTestId(TestIds.selectionToolbox.root)
+    this.selectionToolbox = page.locator('.selection-toolbox')
     this.widgetTextBox = page.getByPlaceholder('text').nth(1)
     this.resetViewButton = page.getByRole('button', { name: 'Reset View' })
     this.queueButton = page.getByRole('button', { name: 'Queue Prompt' })
@@ -414,8 +414,6 @@ export const comfyPageFixture = base.extend<{
     const userId = await comfyPage.setupUser(username)
     comfyPage.userIds[parallelIndex] = userId
 
-    const isVueNodes = testInfo.tags.includes('@vue-nodes')
-
     try {
       await comfyPage.setupSettings({
         'Comfy.UseNewMenu': 'Top',
@@ -438,8 +436,7 @@ export const comfyPageFixture = base.extend<{
         'Comfy.VersionCompatibility.DisableWarnings': true,
         // Disable errors tab to prevent missing model detection from
         // rendering error indicators on nodes during unrelated tests.
-        'Comfy.RightSidePanel.ShowErrorsTab': false,
-        ...(isVueNodes && { 'Comfy.VueNodes.Enabled': true })
+        'Comfy.RightSidePanel.ShowErrorsTab': false
       })
     } catch (e) {
       console.error(e)
@@ -451,10 +448,6 @@ export const comfyPageFixture = base.extend<{
 
     await comfyPage.setup()
 
-    if (isVueNodes) {
-      await comfyPage.vueNodes.waitForNodes()
-    }
-
     const needsPerf =
       testInfo.tags.includes('@perf') || testInfo.tags.includes('@audit')
     if (needsPerf) await comfyPage.perf.init()

browser_tests/fixtures/components/ApiSignin.ts

@@ -1,22 +0,0 @@
-import type { Locator, Page } from '@playwright/test'
-
-import { BaseDialog } from '@e2e/fixtures/components/BaseDialog'
-import { TestIds } from '@e2e/fixtures/selectors'
-
-export class ApiSignin extends BaseDialog {
-  readonly cancel: Locator
-
-  constructor(page: Page) {
-    super(page, TestIds.dialogs.apiSignin)
-    this.cancel = this.root.getByRole('button', { name: 'Cancel' })
-  }
-  async open(nodes: string[] = []) {
-    const result = this.page.evaluate(
-      (nodes) =>
-        window.app!.extensionManager.dialog.showApiNodesSignInDialog(nodes),
-      nodes
-    )
-    await this.waitForVisible()
-    return { result }
-  }
-}

browser_tests/fixtures/components/BottomPanel.ts

@@ -20,8 +20,6 @@ export class BottomPanel {
   readonly root: Locator
   readonly keyboardShortcutsButton: Locator
   readonly toggleButton: Locator
-  readonly closeButton: Locator
-  readonly resizeGutter: Locator
   readonly shortcuts: ShortcutsTab
 
   constructor(readonly page: Page) {
@@ -32,28 +30,6 @@ export class BottomPanel {
     this.toggleButton = page.getByRole('button', {
       name: /Toggle Bottom Panel/i
     })
-    this.closeButton = this.root.getByRole('button', { name: /^Close$/i })
-    // PrimeVue renders the splitter gutter outside the panel body.
-    this.resizeGutter = page.locator(
-      '.splitter-overlay-bottom > .p-splitter-gutter'
-    )
     this.shortcuts = new ShortcutsTab(page)
   }
-
-  async resizeByDragging(deltaY: number): Promise<void> {
-    const gutterBox = await this.resizeGutter.boundingBox()
-    if (!gutterBox) {
-      throw new Error('Bottom panel resize gutter should have layout')
-    }
-
-    const gutterCenterX = gutterBox.x + gutterBox.width / 2
-    const gutterCenterY = gutterBox.y + gutterBox.height / 2
-
-    await this.page.mouse.move(gutterCenterX, gutterCenterY)
-    await this.page.mouse.down()
-    await this.page.mouse.move(gutterCenterX, gutterCenterY + deltaY, {
-      steps: 5
-    })
-    await this.page.mouse.up()
-  }
 }

browser_tests/fixtures/components/CloudNotification.ts

@@ -1,21 +0,0 @@
-import type { Locator, Page } from '@playwright/test'
-
-import { BaseDialog } from '@e2e/fixtures/components/BaseDialog'
-import { TestIds } from '@e2e/fixtures/selectors'
-
-export class CloudNotification extends BaseDialog {
-  readonly toCloud: Locator
-  readonly back: Locator
-
-  constructor(page: Page) {
-    super(page, TestIds.dialogs.cloudNotification)
-    this.toCloud = this.root.getByRole('button', { name: 'Try Cloud for Free' })
-    this.back = this.root.getByRole('button', { name: 'Continue Locally' })
-  }
-  async open() {
-    await this.page.evaluate(() => {
-      void window.app!.extensionManager.dialog.showCloudNotification()
-    })
-    await this.waitForVisible()
-  }
-}

browser_tests/fixtures/components/ConfirmDialog.ts

@@ -9,7 +9,6 @@ type KeysOfType<T, Match> = {
 export class ConfirmDialog {
   public readonly root: Locator
   public readonly delete: Locator
-  public readonly noWarnOverwriteToggle: Locator
   public readonly overwrite: Locator
   public readonly reject: Locator
   public readonly confirm: Locator
@@ -22,7 +21,6 @@ export class ConfirmDialog {
     this.reject = this.root.getByRole('button', { name: 'Cancel' })
     this.confirm = this.root.getByRole('button', { name: 'Confirm' })
     this.save = this.root.getByRole('button', { name: 'Save' })
-    this.noWarnOverwriteToggle = this.root.locator('#doNotAskAgain')
   }
 
   async click(locator: KeysOfType<ConfirmDialog, Locator>) {

browser_tests/fixtures/components/OutputHistory.ts

@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test'
 
-import { TestIds } from '@e2e/fixtures/selectors'
+import { TestIds } from '../selectors'
 
 const ids = TestIds.outputHistory
 

browser_tests/fixtures/components/SignInDialog.ts

@@ -57,12 +57,4 @@ export class SignInDialog extends BaseDialog {
     })
     await this.waitForVisible()
   }
-
-  async openWithResult(): Promise<{ result: Promise<boolean> }> {
-    const result = this.page.evaluate(() =>
-      window.app!.extensionManager.dialog.showSignInDialog()
-    )
-    await this.waitForVisible()
-    return { result }
-  }
 }

browser_tests/fixtures/components/UpdatePassword.ts

@@ -1,23 +0,0 @@
-import type { Locator, Page } from '@playwright/test'
-
-import { BaseDialog } from '@e2e/fixtures/components/BaseDialog'
-import { TestIds } from '@e2e/fixtures/selectors'
-
-export class UpdatePassword extends BaseDialog {
-  readonly confirm: Locator
-  readonly password: Locator
-  readonly confirmPassword: Locator
-
-  constructor(page: Page) {
-    super(page, TestIds.dialogs.updatePassword)
-    this.confirm = this.root.getByRole('button', { name: 'Update Password' })
-    this.password = this.root.getByLabel('Password', { exact: true })
-    this.confirmPassword = this.root.getByLabel('Confirm Password')
-  }
-  async open() {
-    await this.page.evaluate(() => {
-      void window.app!.extensionManager.dialog.showUpdatePasswordDialog()
-    })
-    await this.waitForVisible()
-  }
-}

browser_tests/fixtures/helpers/ExecutionHelper.ts

@@ -1,8 +1,8 @@
 import type { WebSocketRoute } from '@playwright/test'
 
 import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { createMockJob } from '@e2e/fixtures/helpers/AssetsHelper'
+import type { ComfyPage } from '../ComfyPage'
+import { createMockJob } from './AssetsHelper'
 
 /**
  * Helper for simulating prompt execution in e2e tests.

browser_tests/fixtures/helpers/NodeOperationsHelper.ts

@@ -168,22 +168,6 @@ export class NodeOperationsHelper {
     await this.comfyPage.nextFrame()
   }
 
-  async panToNode(nodeRef: NodeReference): Promise<void> {
-    const nodePos = await nodeRef.getPosition()
-    await this.page.evaluate((pos) => {
-      const canvas = window.app!.canvas
-      canvas.ds.offset[0] = -pos.x + canvas.canvas.width / 2
-      canvas.ds.offset[1] = -pos.y + canvas.canvas.height / 2 + 100
-      canvas.setDirty(true, true)
-    }, nodePos)
-    await this.comfyPage.nextFrame()
-  }
-
-  async selectNodeWithPan(nodeRef: NodeReference): Promise<void> {
-    await this.panToNode(nodeRef)
-    await nodeRef.click('title')
-  }
-
   async dragTextEncodeNode2(): Promise<void> {
     await this.comfyPage.canvasOps.dragAndDrop(
       DefaultGraphPositions.textEncodeNode2,

browser_tests/fixtures/helpers/SubgraphHelper.ts

@@ -5,7 +5,6 @@ import type {
   CanvasPointerEvent,
   Subgraph
 } from '@/lib/litegraph/src/litegraph'
-import type { ComfyWorkflow } from '@/platform/workflow/management/stores/comfyWorkflow'
 import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
 
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
@@ -515,23 +514,6 @@ export class SubgraphHelper {
     })
     await this.comfyPage.nextFrame()
   }
-  async publishSubgraph(name: string = 'test blueprint') {
-    await this.comfyPage.command.executeCommand('Comfy.PublishSubgraph', {
-      name
-    })
-  }
-
-  //Blueprints will show an overwrite confirmation dialogue if they have not
-  //already been saved during the active session.
-  //Forcibly reset this flag without an expensive reload operation.
-  async setSaveUnpromptedOnActiveBlueprint() {
-    await this.page.evaluate(() => {
-      const { activeWorkflow } = window.app!.extensionManager.workflow
-      ;(
-        activeWorkflow as ComfyWorkflow & { hasPromptedSave: boolean }
-      ).hasPromptedSave = false
-    })
-  }
 
   static getTextSlotPosition(page: Page, nodeId: string) {
     return page.evaluate((id) => {

browser_tests/fixtures/helpers/WorkflowHelper.ts

@@ -1,7 +1,5 @@
 import { readFileSync } from 'fs'
 
-import { test } from '@playwright/test'
-
 import type { AppMode } from '@/composables/useAppMode'
 import type {
   ComfyApiWorkflow,
@@ -75,9 +73,6 @@ export class WorkflowHelper {
       assetPath(`${workflowName}.json`)
     )
     await this.comfyPage.nextFrame()
-    if (test.info().tags.includes('@vue-nodes')) {
-      await this.comfyPage.vueNodes.waitForNodes()
-    }
   }
 
   async deleteWorkflow(
@@ -180,11 +175,6 @@ export class WorkflowHelper {
     )
   }
 
-  async switchToTab(tabName: string): Promise<void> {
-    await this.comfyPage.menu.topbar.getWorkflowTab(tabName).click()
-    await this.waitForWorkflowIdle()
-  }
-
   async getExportedWorkflow(options: { api: true }): Promise<ComfyApiWorkflow>
   async getExportedWorkflow(options?: {
     api?: false

browser_tests/fixtures/selectors.ts

@@ -68,10 +68,7 @@ export const TestIds = {
     missingMediaConfirmButton: 'missing-media-confirm-button',
     missingMediaCancelButton: 'missing-media-cancel-button',
     missingMediaLocateButton: 'missing-media-locate-button',
-    publishTabPanel: 'publish-tab-panel',
-    apiSignin: 'api-signin-dialog',
-    updatePassword: 'update-password-dialog',
-    cloudNotification: 'cloud-notification-dialog'
+    publishTabPanel: 'publish-tab-panel'
   },
   keybindings: {
     presetMenu: 'keybinding-preset-menu'
@@ -86,8 +83,7 @@ export const TestIds = {
     bookmarksSection: 'node-library-bookmarks-section'
   },
   propertiesPanel: {
-    root: 'properties-panel',
-    errorsTab: 'panel-tab-errors'
+    root: 'properties-panel'
   },
   subgraphEditor: {
     toggle: 'subgraph-editor-toggle',
@@ -106,7 +102,6 @@ export const TestIds = {
     mainImage: 'main-image'
   },
   selectionToolbox: {
-    root: 'selection-toolbox',
     colorPickerButton: 'color-picker-button',
     colorPickerCurrentColor: 'color-picker-current-color',
     colorBlue: 'blue',

browser_tests/helpers/builderTestUtils.ts

@@ -122,3 +122,21 @@ export async function saveAndReopenInAppMode(
 
   await comfyPage.appMode.toggleAppMode()
 }
+
+/**
+ * Enter builder, select the given widgets as inputs + SaveImage as output,
+ * save as an app, and close the success dialog.
+ *
+ * Returns on the builder arrange/preview step.
+ */
+export async function createAndSaveApp(
+  comfyPage: ComfyPage,
+  appName: string,
+  widgetNames: string[] = ['seed']
+): Promise<void> {
+  await setupBuilder(comfyPage, undefined, widgetNames)
+  await comfyPage.appMode.steps.goToPreview()
+  await builderSaveAs(comfyPage.appMode, appName)
+  await comfyPage.appMode.saveAs.closeButton.click()
+  await comfyPage.nextFrame()
+}

browser_tests/tests/actionbar.spec.ts

@@ -8,6 +8,10 @@ import type { WorkspaceStore } from '@e2e/types/globals'
 const test = mergeTests(comfyPageFixture, webSocketFixture)
 
 test.describe('Actionbar', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   /**
    * This test ensures that the autoqueue change mode can only queue one change at a time
    */

browser_tests/tests/appModePruning.spec.ts

@@ -1,10 +1,10 @@
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
 import {
   comfyPageFixture as test,
   comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
-import { setupBuilder } from '@e2e/helpers/builderTestUtils'
-import { fitToViewInstant } from '@e2e/helpers/fitToView'
+} 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'

browser_tests/tests/bottomPanel.spec.ts

@@ -1,102 +0,0 @@
-import {
-  comfyPageFixture as test,
-  comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
-
-test.describe('Bottom Panel', { tag: '@ui' }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
-  })
-
-  test('should close panel via close button inside the panel', async ({
-    comfyPage
-  }) => {
-    const { bottomPanel } = comfyPage
-
-    await bottomPanel.toggleButton.click()
-    await expect(
-      bottomPanel.root,
-      'Panel should be open before testing close button'
-    ).toBeVisible()
-
-    await bottomPanel.closeButton.click()
-    await expect(bottomPanel.root).toBeHidden()
-  })
-
-  test('should display resize gutter when panel is open', async ({
-    comfyPage
-  }) => {
-    const { bottomPanel } = comfyPage
-
-    await bottomPanel.toggleButton.click()
-    await expect(
-      bottomPanel.root,
-      'Panel should be open before checking the resize gutter'
-    ).toBeVisible()
-    await expect(bottomPanel.resizeGutter).toBeVisible()
-  })
-
-  test('should hide resize gutter when panel is closed', async ({
-    comfyPage
-  }) => {
-    const { bottomPanel } = comfyPage
-
-    await expect(bottomPanel.root).toBeHidden()
-    await expect(bottomPanel.resizeGutter).toBeHidden()
-  })
-
-  test('should resize panel by dragging the gutter', async ({ comfyPage }) => {
-    const { bottomPanel } = comfyPage
-
-    await bottomPanel.toggleButton.click()
-    await expect(
-      bottomPanel.root,
-      'Panel should be open before resizing'
-    ).toBeVisible()
-
-    const initialHeight = await bottomPanel.root.evaluate(
-      (el) => el.getBoundingClientRect().height
-    )
-
-    await bottomPanel.resizeByDragging(-100)
-
-    await expect
-      .poll(
-        () =>
-          bottomPanel.root.evaluate((el) => el.getBoundingClientRect().height),
-        {
-          message:
-            'Panel height should increase after dragging the resize gutter'
-        }
-      )
-      .toBeGreaterThan(initialHeight)
-  })
-
-  test('should not block canvas interactions when panel is closed', async ({
-    comfyPage
-  }) => {
-    const { bottomPanel } = comfyPage
-
-    await expect(bottomPanel.root).toBeHidden()
-
-    await comfyPage.canvas.click({
-      position: { x: 100, y: 100 }
-    })
-    await expect(comfyPage.canvas).toHaveFocus()
-  })
-
-  test('should close panel via close button from shortcuts view', async ({
-    comfyPage
-  }) => {
-    const { bottomPanel } = comfyPage
-
-    await bottomPanel.keyboardShortcutsButton.click()
-    await expect(
-      bottomPanel.root,
-      'Panel should be open before closing it from the shortcuts view'
-    ).toBeVisible()
-
-    await bottomPanel.closeButton.click()
-    await expect(bottomPanel.root).toBeHidden()
-  })
-})

browser_tests/tests/bottomPanelLogs.spec.ts

@@ -4,6 +4,10 @@ import {
 } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Bottom Panel Logs', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('should open bottom panel via toggle button', async ({ comfyPage }) => {
     const { bottomPanel } = comfyPage
 

browser_tests/tests/bottomPanelShortcuts.spec.ts

@@ -3,6 +3,10 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Bottom Panel Shortcuts', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('should toggle shortcuts panel visibility', async ({ comfyPage }) => {
     const { bottomPanel } = comfyPage
 

browser_tests/tests/browserTabTitle.spec.ts

@@ -5,6 +5,10 @@ import type { WorkspaceStore } from '@e2e/types/globals'
 
 test.describe('Browser tab title', { tag: '@smoke' }, () => {
   test.describe('Beta Menu', () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    })
+
     test('Can display workflow name', async ({ comfyPage }) => {
       const workflowName = await comfyPage.page.evaluate(async () => {
         return (window.app!.extensionManager as WorkspaceStore).workflow

browser_tests/tests/builderReorder.spec.ts

@@ -2,10 +2,11 @@ import {
   comfyPageFixture as test,
   comfyExpect as expect
 } from '@e2e/fixtures/ComfyPage'
-import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
+import type { AppModeHelper } from '@e2e/fixtures/helpers/AppModeHelper'
 import {
   builderSaveAs,
+  createAndSaveApp,
   openWorkflowFromSidebar,
   setupBuilder
 } from '@e2e/helpers/builderTestUtils'
@@ -159,38 +160,46 @@ test.describe('Builder input reordering', { tag: '@ui' }, () => {
     comfyPage
   }) => {
     const { appMode } = comfyPage
+    const suffix = String(Date.now())
+    const app1Name = `app1-${suffix}`
+    const app2Name = `app2-${suffix}`
     const app2Widgets = ['seed', 'steps']
+
+    // Create and save app1 with [seed, steps, cfg]
+    await createAndSaveApp(comfyPage, app1Name, WIDGETS)
+    await appMode.footer.exitBuilder()
+
+    // Create app2 in a new tab so both apps are open simultaneously
+    await comfyPage.menu.topbar.triggerTopbarCommand(['New'])
+    await createAndSaveApp(comfyPage, app2Name, app2Widgets)
+    await appMode.footer.exitBuilder()
+
+    // Switch to app1 tab and enter builder
+    await comfyPage.menu.topbar.getWorkflowTab(app1Name).click()
+    await appMode.enterBuilder()
+    await appMode.steps.goToInputs()
+    await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
+
+    // Reorder app1 inputs: drag 'seed' from first to last
+    await appMode.select.dragInputItem(0, 2)
     const app1Reordered = ['steps', 'cfg', 'seed']
+    await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
 
-    await test.step('Load both apps', async () => {
-      await comfyPage.workflow.loadWorkflow('linear-basic-app-1')
-      await comfyPage.workflow.loadWorkflow('linear-basic-app-2')
-    })
+    // Switch to app2 tab and enter builder
+    await appMode.footer.exitBuilder()
+    await comfyPage.menu.topbar.getWorkflowTab(app2Name).click()
+    await appMode.enterBuilder()
+    await appMode.steps.goToInputs()
 
-    await test.step('Reorder app1 inputs', async () => {
-      await comfyPage.workflow.switchToTab('linear-basic-app-1')
-      await appMode.enterBuilder()
-      await appMode.steps.goToInputs()
-      await expect(appMode.select.inputItemTitles).toHaveText(WIDGETS)
+    // Verify app2 inputs are not corrupted — still [seed, steps]
+    await expect(appMode.select.inputItemTitles).toHaveText(app2Widgets)
 
-      await appMode.select.dragInputItem(0, 2)
-      await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
-    })
+    // Switch back to app1 and verify reorder persisted
+    await appMode.footer.exitBuilder()
+    await comfyPage.menu.topbar.getWorkflowTab(app1Name).click()
+    await appMode.enterBuilder()
+    await appMode.steps.goToInputs()
 
-    await test.step('Verify app2 inputs are not corrupted', async () => {
-      await appMode.footer.exitBuilder()
-      await comfyPage.workflow.switchToTab('linear-basic-app-2')
-      await appMode.enterBuilder()
-      await appMode.steps.goToInputs()
-      await expect(appMode.select.inputItemTitles).toHaveText(app2Widgets)
-    })
-
-    await test.step('Verify app1 reorder persisted', async () => {
-      await appMode.footer.exitBuilder()
-      await comfyPage.workflow.switchToTab('linear-basic-app-1')
-      await appMode.enterBuilder()
-      await appMode.steps.goToInputs()
-      await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
-    })
+    await expect(appMode.select.inputItemTitles).toHaveText(app1Reordered)
   })
 })

browser_tests/tests/cloud.spec.ts

@@ -1,5 +1,4 @@
-import { expect } from '@playwright/test'
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
+import { expect, test } from '@playwright/test'
 
 /**
  * Cloud distribution E2E tests.

browser_tests/tests/collapsedNodeLinks.spec.ts

@@ -8,10 +8,12 @@ const NODE_TITLE = 'KSampler'
 
 test.describe(
   'Collapsed node link positions',
-  { tag: ['@canvas', '@node', '@vue-nodes'] },
+  { tag: ['@canvas', '@node'] },
   () => {
     test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
       await comfyPage.workflow.loadWorkflow('default')
+      await comfyPage.vueNodes.waitForNodes()
     })
 
     test.afterEach(async ({ comfyPage }) => {

browser_tests/tests/customIcons.spec.ts

@@ -20,6 +20,10 @@ async function verifyCustomIconSvg(iconElement: Locator) {
 }
 
 test.describe('Custom Icons', { tag: '@settings' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('sidebar tab icons use custom SVGs', async ({ comfyPage }) => {
     // Find the icon in the sidebar
     const icon = comfyPage.page.locator(

browser_tests/tests/defaultKeybindings.spec.ts

@@ -20,6 +20,7 @@ async function pressKeyAndExpectRequest(
 test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
   test.describe('Sidebar Toggle Shortcuts', () => {
     test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
       await comfyPage.canvas.click({ position: { x: 400, y: 400 } })
       await comfyPage.nextFrame()
     })
@@ -163,6 +164,8 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
 
   test.describe('Mode and Panel Toggles', () => {
     test("'Alt+m' toggles app mode", async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
       // Set up linearData so app mode has something to show
       await comfyPage.appMode.enterAppModeWithInputs([])
       await expect(comfyPage.appMode.linearWidgets).toBeVisible()
@@ -177,6 +180,7 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
     })
 
     test("'Alt+Shift+m' toggles minimap", async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
       await comfyPage.settings.setSetting('Comfy.Minimap.Visible', true)
       await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
       await comfyPage.workflow.loadWorkflow('default')
@@ -192,6 +196,8 @@ test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
     })
 
     test("'Ctrl+`' toggles terminal/logs panel", async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
       await expect(comfyPage.bottomPanel.root).toBeHidden()
 
       await comfyPage.page.keyboard.press('Control+Backquote')

browser_tests/tests/dialog.spec.ts

@@ -2,10 +2,6 @@ import { expect } from '@playwright/test'
 
 import type { Keybinding } from '@/platform/keybindings/types'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { SignInDialog } from '@e2e/fixtures/components/SignInDialog'
-import { ApiSignin } from '@e2e/fixtures/components/ApiSignin'
-import { CloudNotification } from '@e2e/fixtures/components/CloudNotification'
-import { UpdatePassword } from '@e2e/fixtures/components/UpdatePassword'
 import { DefaultGraphPositions } from '@e2e/fixtures/constants/defaultGraphPositions'
 
 test.beforeEach(async ({ comfyPage }) => {
@@ -107,6 +103,7 @@ test.describe('Support', () => {
     comfyPage
   }) => {
     await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
     // Prevent loading the external page
     await comfyPage.page
       .context()
@@ -155,161 +152,4 @@ test.describe('Signin dialog', () => {
 
     await expect.poll(() => comfyPage.nodeOps.getNodeCount()).toBe(nodeNum)
   })
-
-  test('Sign-in dialog resolves true on login', async ({ comfyPage }) => {
-    const dialog = new SignInDialog(comfyPage.page)
-    const { result: dialogResult } = await dialog.openWithResult()
-
-    await dialog.emailInput.fill('test@example.com')
-    await dialog.passwordInput.fill('TestPassword123!')
-    await expect(dialog.root).toBeVisible()
-
-    await dialog.signInButton.click()
-    await expect(dialog.root).toBeHidden()
-    expect(await dialogResult).toBe(true)
-  })
-
-  test('Sign-in dialog resolves false when closed without sign-in', async ({
-    comfyPage
-  }) => {
-    const dialog = new SignInDialog(comfyPage.page)
-    const { result: dialogResult } = await dialog.openWithResult()
-
-    await dialog.close()
-    await expect(dialog.root).toBeHidden()
-    expect(await dialogResult).toBe(false)
-  })
-})
-
-test('API Nodes sign-in dialog', async ({ comfyPage }) => {
-  const dialog = new ApiSignin(comfyPage.page)
-  const { result: dialogResult } = await dialog.open([
-    'FluxProGenerate',
-    'StableDiffusion3Generate'
-  ])
-
-  await expect(dialog.root.getByText('FluxProGenerate')).toBeVisible()
-  await expect(dialog.root.getByText('StableDiffusion3Generate')).toBeVisible()
-
-  await dialog.cancel.click()
-  await expect(dialog.root).toBeHidden()
-  expect(await dialogResult).toBe(false)
-})
-
-test.describe('Update password dialog', () => {
-  test('Should only allow submission when inputs are valid', async ({
-    comfyPage
-  }) => {
-    const dialog = new UpdatePassword(comfyPage.page)
-    await dialog.open()
-
-    await dialog.confirm.click()
-    await expect(dialog.root, 'Check that password exists').toBeVisible()
-
-    const testPassword = 'Unguessable Password #2'
-    await dialog.password.fill(testPassword)
-
-    await dialog.confirm.click()
-    await expect(dialog.root, 'Check that inputs match').toBeVisible()
-
-    await dialog.confirmPassword.fill(testPassword)
-    await dialog.confirm.click()
-    await expect(dialog.root, 'Dialog closes after submission').toBeHidden()
-  })
-})
-
-test.describe('Cloud notification dialog', () => {
-  test('Should display cloud notification and navigate to comfy.org on Explore', async ({
-    comfyPage
-  }) => {
-    const dialog = new CloudNotification(comfyPage.page)
-    await dialog.open()
-
-    await expect(
-      dialog.root.getByText('Run ComfyUI in the Cloud')
-    ).toBeVisible()
-
-    const popupPromise = comfyPage.page.waitForEvent('popup')
-    await dialog.toCloud.click()
-    const popup = await popupPromise
-
-    expect(new URL(popup.url()).hostname).toContain('comfy.org')
-    await popup.close()
-    await expect(dialog.root).toBeHidden()
-  })
-
-  test('Should close when Continue Locally is clicked', async ({
-    comfyPage
-  }) => {
-    const dialog = new CloudNotification(comfyPage.page)
-    await dialog.open()
-
-    await dialog.back.click()
-    await expect(dialog.root).toBeHidden()
-  })
-})
-
-test('Blueprint overwrite', { tag: ['@subgraph'] }, async ({ comfyPage }) => {
-  const blueprintName = `test-blueprint-overwrite-${Date.now()}`
-  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
-  await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
-  await comfyPage.settings.setSetting(
-    'Comfy.Workflow.WarnBlueprintOverwrite',
-    true
-  )
-
-  const tab = comfyPage.menu.nodeLibraryTabV2
-
-  await test.step('Publish a basic subgraph', async () => {
-    const ksampler = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
-    await comfyPage.contextMenu.openForVueNode(ksampler.header)
-    await comfyPage.contextMenu.clickMenuItemExact('Convert to Subgraph')
-    await comfyPage.subgraph.publishSubgraph(blueprintName)
-
-    await tab.open()
-    await tab.getFolder('My Blueprints').click()
-    await tab.getFolder('User').click()
-  })
-
-  const steps = comfyPage.vueNodes.getWidgetByName('KSampler', 'steps')
-
-  await test.step('Edit the published subgraph', async () => {
-    const blueprintNode = tab.getNode(blueprintName)
-    await expect(blueprintNode, 'blueprint visible in library').toBeVisible()
-    await blueprintNode.getByRole('button', { name: 'Edit' }).click()
-    await steps.waitFor({ state: 'visible' })
-  })
-
-  const confirmDialog = comfyPage.confirmDialog.root
-  const { incrementButton } = comfyPage.vueNodes.getInputNumberControls(steps)
-  const dirtyGraphAndSave = async () => {
-    await incrementButton.click()
-    await comfyPage.page.keyboard.press('Control+s')
-  }
-
-  await test.step('No dialog: user prompted on publish', async () => {
-    await dirtyGraphAndSave()
-    await comfyPage.nextFrame()
-    await expect(confirmDialog).toBeHidden()
-  })
-
-  await test.step('Should show dialog', async () => {
-    await comfyPage.subgraph.setSaveUnpromptedOnActiveBlueprint()
-    await dirtyGraphAndSave()
-    const { noWarnOverwriteToggle } = comfyPage.confirmDialog
-    await expect(noWarnOverwriteToggle).toBeVisible()
-
-    await test.step('Disable overwrite warning', async () => {
-      await noWarnOverwriteToggle.check()
-      await expect(confirmDialog.getByText(/Re-enable in/i)).toBeVisible()
-      await comfyPage.confirmDialog.click('overwrite')
-    })
-  })
-
-  await test.step('No dialog: disabled by setting', async () => {
-    await comfyPage.subgraph.setSaveUnpromptedOnActiveBlueprint()
-    await dirtyGraphAndSave()
-    await comfyPage.nextFrame()
-    await expect(confirmDialog).toBeHidden()
-  })
 })

browser_tests/tests/dialogs/queueClearHistory.spec.ts

@@ -5,6 +5,7 @@ import {
 
 test.describe('Queue Clear History Dialog', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.setup()
     await comfyPage.queuePanel.overlayToggle.click()
   })
 

browser_tests/tests/dialogs/signInDialog.spec.ts

@@ -7,6 +7,7 @@ test.describe('Sign In dialog', { tag: '@ui' }, () => {
   let dialog: SignInDialog
 
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     dialog = new SignInDialog(comfyPage.page)
     await dialog.open()
   })

browser_tests/tests/errorDialog.spec.ts

@@ -137,59 +137,4 @@ test.describe('Error dialog', () => {
 
     await popup.close()
   })
-
-  test('Should display extension file hint when available', async ({
-    comfyPage
-  }) => {
-    await comfyPage.page.evaluate(() => {
-      const error = new Error('Extension error!')
-      ;(error as Error & { fileName: string }).fileName =
-        '/extensions/my-custom-extension/main.js'
-
-      window.app!.extensionManager.dialog.showErrorDialog(error)
-    })
-
-    const errorDialog = comfyPage.page.getByTestId(TestIds.dialogs.errorDialog)
-    await expect(errorDialog).toBeVisible()
-
-    await expect(
-      errorDialog.getByText('/extensions/my-custom-extension/main.js')
-    ).toBeVisible()
-    await expect(
-      errorDialog.getByText('This may be due to the following script')
-    ).toBeVisible()
-  })
-
-  test('Should display string error messages', async ({ comfyPage }) => {
-    await comfyPage.page.evaluate(() => {
-      window.app!.extensionManager.dialog.showErrorDialog(
-        'Something went wrong',
-        {
-          title: 'Custom Error Title'
-        }
-      )
-    })
-
-    const errorDialog = comfyPage.page.getByTestId(TestIds.dialogs.errorDialog)
-    await expect(errorDialog).toBeVisible()
-
-    await expect(errorDialog.getByText('Custom Error Title')).toBeVisible()
-    await expect(errorDialog.getByText('Something went wrong')).toBeVisible()
-  })
-
-  test('Should display default title when no title provided', async ({
-    comfyPage
-  }) => {
-    await comfyPage.page.evaluate(() => {
-      window.app!.extensionManager.dialog.showErrorDialog(
-        'A simple string error'
-      )
-    })
-
-    const errorDialog = comfyPage.page.getByTestId(TestIds.dialogs.errorDialog)
-    await expect(errorDialog).toBeVisible()
-
-    await expect(errorDialog.getByText('Unknown Error')).toBeVisible()
-    await expect(errorDialog.getByText('A simple string error')).toBeVisible()
-  })
 })

browser_tests/tests/errorOverlay.spec.ts

@@ -5,10 +5,10 @@ import {
   comfyExpect as expect
 } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
-import { cleanupFakeModel } from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
 
 test.describe('Error overlay', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.RightSidePanel.ShowErrorsTab',
       true
@@ -47,7 +47,16 @@ test.describe('Error overlay', { tag: '@ui' }, () => {
     test('Should display "Show missing models" button for missing model errors', async ({
       comfyPage
     }) => {
-      await cleanupFakeModel(comfyPage)
+      await expect
+        .poll(() =>
+          comfyPage.page.evaluate(async (url: string) => {
+            const response = await fetch(
+              `${url}/api/devtools/cleanup_fake_model`
+            )
+            return response.ok
+          }, comfyPage.url)
+        )
+        .toBeTruthy()
 
       await comfyPage.workflow.loadWorkflow('missing/missing_models')
 
@@ -108,33 +117,6 @@ test.describe('Error overlay', { tag: '@ui' }, () => {
       await comfyPage.keyboard.redo()
       await expect(errorOverlay).toBeHidden()
     })
-
-    test('Does not resurface error overlay when switching back to workflow with missing nodes', async ({
-      comfyPage
-    }) => {
-      await comfyPage.settings.setSetting(
-        'Comfy.Workflow.WorkflowTabsPosition',
-        'Sidebar'
-      )
-      await comfyPage.menu.workflowsTab.open()
-
-      await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
-
-      const errorOverlay = getOverlay(comfyPage.page)
-      await expect(errorOverlay).toBeVisible()
-
-      await errorOverlay
-        .getByTestId(TestIds.dialogs.errorOverlayDismiss)
-        .click()
-      await expect(errorOverlay).toBeHidden()
-
-      await comfyPage.menu.workflowsTab.open()
-      await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
-
-      await comfyPage.menu.workflowsTab.switchToWorkflow('missing_nodes')
-
-      await expect(errorOverlay).toBeHidden()
-    })
   })
 
   test.describe('See Errors flow', () => {

browser_tests/tests/extensionAPI.spec.ts

@@ -13,6 +13,10 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 type TestSettingId = keyof Settings
 
 test.describe('Topbar commands', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('Should allow registering topbar commands', async ({ comfyPage }) => {
     await comfyPage.page.evaluate(() => {
       window.app!.registerExtension({

browser_tests/tests/focusMode.spec.ts

@@ -4,6 +4,11 @@ import {
 } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Focus Mode', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.setup()
+  })
+
   test('Focus mode hides UI chrome', async ({ comfyPage }) => {
     await expect(comfyPage.menu.sideToolbar).toBeVisible()
 

browser_tests/tests/imageCompare.spec.ts

@@ -4,9 +4,11 @@ import { expect } from '@playwright/test'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
-test.describe('Image Compare', { tag: ['@widget', '@vue-nodes'] }, () => {
+test.describe('Image Compare', { tag: '@widget' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.workflow.loadWorkflow('widgets/image_compare_widget')
+    await comfyPage.vueNodes.waitForNodes()
   })
 
   function createTestImageDataUrl(label: string, color: string): string {

browser_tests/tests/interaction.spec.ts

@@ -895,6 +895,7 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
 
     test.beforeEach(async ({ comfyPage }) => {
       await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
       workflowA = generateUniqueFilename()
       await comfyPage.menu.topbar.saveWorkflow(workflowA)
       workflowB = generateUniqueFilename()
@@ -969,6 +970,7 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
 
     test.beforeEach(async ({ comfyPage }) => {
       await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
       workflowA = generateUniqueFilename()
       await comfyPage.menu.topbar.saveWorkflow(workflowA)
       workflowB = generateUniqueFilename()
@@ -1058,10 +1060,13 @@ test.describe('Load workflow', { tag: '@screenshot' }, () => {
 })
 
 test.describe('Load duplicate workflow', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('A workflow can be loaded multiple times in a row', async ({
     comfyPage
   }) => {
-    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
     await comfyPage.menu.workflowsTab.open()
     await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')

browser_tests/tests/jobHistoryActions.spec.ts

@@ -7,6 +7,9 @@ import {
 
 test.describe('Job History Actions', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.setup()
+
     // Expand the queue overlay so the JobHistoryActionsMenu is visible
     await comfyPage.page.getByTestId('queue-overlay-toggle').click()
   })

browser_tests/tests/linearMode.spec.ts

@@ -4,6 +4,11 @@ import {
 } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Linear Mode', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.setup()
+  })
+
   test('Displays linear controls when app mode active', async ({
     comfyPage
   }) => {

browser_tests/tests/maskEditor.spec.ts

@@ -3,9 +3,14 @@ import { expect } from '@playwright/test'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
-test.describe('Mask Editor', { tag: '@vue-nodes' }, () => {
+test.describe('Mask Editor', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+  })
+
   async function loadImageOnNode(comfyPage: ComfyPage) {
     await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+    await comfyPage.vueNodes.waitForNodes()
 
     const loadImageNode = (
       await comfyPage.nodeOps.getNodeRefsByType('LoadImage')

browser_tests/tests/menu.spec.ts

@@ -3,6 +3,10 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Menu', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('Can register sidebar tab', async ({ comfyPage }) => {
     const initialChildrenCount = await comfyPage.menu.buttons.count()
 

browser_tests/tests/minimap.spec.ts

@@ -35,6 +35,7 @@ async function clickMinimapAt(
 
 test.describe('Minimap', { tag: '@canvas' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting('Comfy.Minimap.Visible', true)
     await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
     await comfyPage.workflow.loadWorkflow('default')

browser_tests/tests/nodeHelp.spec.ts

@@ -87,6 +87,8 @@ async function setLocaleAndWaitForWorkflowReload(
 
 test.describe('Node Help', { tag: ['@slow', '@ui'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.setup()
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
   })
 

browser_tests/tests/nodeLibraryEssentials.spec.ts

@@ -5,6 +5,8 @@ import {
 
 test.describe('Node Library Essentials Tab', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
     // Enable the essentials feature flag via the reactive serverFeatureFlags ref.
     // In production, this flag comes via WebSocket or remoteConfig (cloud only).
     // The localhost test server has neither, so we set it directly.

browser_tests/tests/outputHistory.spec.ts

@@ -2,13 +2,10 @@ import type { WebSocketRoute } from '@playwright/test'
 import { mergeTests } from '@playwright/test'
 
 import type { RawJobListItem } from '@/platform/remote/comfyui/jobs/jobTypes'
-import {
-  comfyPageFixture,
-  comfyExpect as expect
-} from '@e2e/fixtures/ComfyPage'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-import { webSocketFixture } from '@e2e/fixtures/ws'
-import { ExecutionHelper } from '@e2e/fixtures/helpers/ExecutionHelper'
+import { comfyPageFixture, comfyExpect as expect } from '../fixtures/ComfyPage'
+import type { ComfyPage } from '../fixtures/ComfyPage'
+import { webSocketFixture } from '../fixtures/ws'
+import { ExecutionHelper } from '../fixtures/helpers/ExecutionHelper'
 
 const test = mergeTests(comfyPageFixture, webSocketFixture)
 
@@ -43,6 +40,7 @@ function imageOutput(...filenames: string[]) {
 
 test.describe('Output History', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.appMode.enterAppModeWithInputs([[KSAMPLER_NODE, 'seed']])
     await expect(comfyPage.appMode.linearWidgets).toBeVisible()
     await comfyPage.nextFrame()

browser_tests/tests/painter.spec.ts

@@ -9,10 +9,12 @@ import {
   triggerSerialization
 } from '@e2e/helpers/painter'
 
-test.describe('Painter', { tag: ['@widget', '@vue-nodes'] }, () => {
+test.describe('Painter', { tag: '@widget' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     await comfyPage.page.evaluate(() => window.app?.graph?.clear())
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.workflow.loadWorkflow('widgets/painter_widget')
+    await comfyPage.vueNodes.waitForNodes()
   })
 
   test(

browser_tests/tests/pasteImageContextMenu.spec.ts

@@ -2,53 +2,53 @@ import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
-test.describe(
-  'Paste Image context menu option',
-  { tag: ['@node', '@vue-nodes'] },
-  () => {
-    test('shows Paste Image in LoadImage node context menu', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+test.describe('Paste Image context menu option', { tag: ['@node'] }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+  })
 
-      const loadImageNode = (
-        await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
-      )[0]
+  test('shows Paste Image in LoadImage node context menu', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
 
-      const nodeEl = comfyPage.page.locator(
-        `[data-node-id="${loadImageNode.id}"]`
-      )
-      await nodeEl.click({ button: 'right' })
-      const menu = comfyPage.page.locator('.p-contextmenu')
-      await menu.waitFor({ state: 'visible' })
-      const menuLabels = await menu
-        .locator('[role="menuitem"] span.flex-1')
-        .allInnerTexts()
+    const loadImageNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
+    )[0]
 
-      expect(menuLabels).toContain('Paste Image')
-    })
+    const nodeEl = comfyPage.page.locator(
+      `[data-node-id="${loadImageNode.id}"]`
+    )
+    await nodeEl.click({ button: 'right' })
+    const menu = comfyPage.page.locator('.p-contextmenu')
+    await menu.waitFor({ state: 'visible' })
+    const menuLabels = await menu
+      .locator('[role="menuitem"] span.flex-1')
+      .allInnerTexts()
 
-    test('does not show Paste Image on output-only image nodes', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow('nodes/single_save_image_node')
+    expect(menuLabels).toContain('Paste Image')
+  })
 
-      const saveImageNode = (
-        await comfyPage.nodeOps.getNodeRefsByType('SaveImage')
-      )[0]
+  test('does not show Paste Image on output-only image nodes', async ({
+    comfyPage
+  }) => {
+    await comfyPage.workflow.loadWorkflow('nodes/single_save_image_node')
 
-      const nodeEl = comfyPage.page.locator(
-        `[data-node-id="${saveImageNode.id}"]`
-      )
-      await nodeEl.click({ button: 'right' })
-      const menu = comfyPage.page.locator('.p-contextmenu')
-      await menu.waitFor({ state: 'visible' })
-      const menuLabels = await menu
-        .locator('[role="menuitem"] span.flex-1')
-        .allInnerTexts()
+    const saveImageNode = (
+      await comfyPage.nodeOps.getNodeRefsByType('SaveImage')
+    )[0]
 
-      expect(menuLabels).not.toContain('Paste Image')
-      expect(menuLabels).not.toContain('Open Image')
-    })
-  }
-)
+    const nodeEl = comfyPage.page.locator(
+      `[data-node-id="${saveImageNode.id}"]`
+    )
+    await nodeEl.click({ button: 'right' })
+    const menu = comfyPage.page.locator('.p-contextmenu')
+    await menu.waitFor({ state: 'visible' })
+    const menuLabels = await menu
+      .locator('[role="menuitem"] span.flex-1')
+      .allInnerTexts()
+
+    expect(menuLabels).not.toContain('Paste Image')
+    expect(menuLabels).not.toContain('Open Image')
+  })
+})

browser_tests/tests/propertiesPanel/ErrorsTabHelper.ts

@@ -2,9 +2,8 @@ import { expect } from '@playwright/test'
 
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
-import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper'
 
-export async function loadWorkflowAndOpenErrorsTab(
+export async function openErrorsTabViaSeeErrors(
   comfyPage: ComfyPage,
   workflow: string
 ) {
@@ -16,30 +15,3 @@ export async function loadWorkflowAndOpenErrorsTab(
   await errorOverlay.getByTestId(TestIds.dialogs.errorOverlaySeeErrors).click()
   await expect(errorOverlay).toBeHidden()
 }
-
-export async function openErrorsTab(comfyPage: ComfyPage) {
-  const panel = new PropertiesPanelHelper(comfyPage.page)
-  await panel.open(comfyPage.actionbar.propertiesButton)
-
-  const errorsTab = comfyPage.page.getByTestId(
-    TestIds.propertiesPanel.errorsTab
-  )
-  await expect(errorsTab).toBeVisible()
-  await errorsTab.click()
-}
-
-/**
- * Remove the fake model file from the backend so it is detected as missing.
- * Fixture URLs (e.g. http://localhost:8188/...) are not actually downloaded
- * during tests — they only serve as metadata for the missing model UI.
- */
-export async function cleanupFakeModel(comfyPage: ComfyPage) {
-  await expect
-    .poll(() =>
-      comfyPage.page.evaluate(async (url: string) => {
-        const response = await fetch(`${url}/api/devtools/cleanup_fake_model`)
-        return response.ok
-      }, comfyPage.url)
-    )
-    .toBeTruthy()
-}

browser_tests/tests/propertiesPanel/errorsTab.spec.ts

@@ -6,6 +6,7 @@ import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPane
 
 test.describe('Errors tab - common', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.RightSidePanel.ShowErrorsTab',
       true

browser_tests/tests/propertiesPanel/errorsTabExecution.spec.ts

@@ -7,6 +7,7 @@ import { TestIds } from '@e2e/fixtures/selectors'
 
 test.describe('Errors tab - Execution errors', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.RightSidePanel.ShowErrorsTab',
       true

browser_tests/tests/propertiesPanel/errorsTabMissingMedia.spec.ts

@@ -3,7 +3,7 @@ import { expect } from '@playwright/test'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
-import { loadWorkflowAndOpenErrorsTab } from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
+import { openErrorsTabViaSeeErrors } from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
 
 async function uploadFileViaDropzone(comfyPage: ComfyPage) {
   const dropzone = comfyPage.page.getByTestId(
@@ -38,6 +38,7 @@ function getDropzone(comfyPage: ComfyPage) {
 
 test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.RightSidePanel.ShowErrorsTab',
       true
@@ -46,10 +47,7 @@ test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
 
   test.describe('Detection', () => {
     test('Shows missing media group in errors tab', async ({ comfyPage }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_media_single')
 
       await expect(
         comfyPage.page.getByTestId(TestIds.dialogs.missingMediaGroup)
@@ -59,7 +57,7 @@ test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
     test('Shows correct number of missing media rows', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(
+      await openErrorsTabViaSeeErrors(
         comfyPage,
         'missing/missing_media_multiple'
       )
@@ -70,10 +68,7 @@ test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
     test('Shows upload dropzone and library select for each missing item', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_media_single')
 
       await expect(getDropzone(comfyPage)).toBeVisible()
       await expect(
@@ -86,10 +81,7 @@ test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
     test('Upload via file picker shows status card then allows confirm', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_media_single')
       await uploadFileViaDropzone(comfyPage)
 
       await expect(getStatusCard(comfyPage)).toBeVisible()
@@ -103,10 +95,7 @@ test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
     test('Selecting from library shows status card then allows confirm', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_media_single')
 
       const librarySelect = comfyPage.page.getByTestId(
         TestIds.dialogs.missingMediaLibrarySelect
@@ -133,10 +122,7 @@ test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
     test('Cancelling pending selection returns to upload/library UI', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_media_single')
       await uploadFileViaDropzone(comfyPage)
 
       await expect(getStatusCard(comfyPage)).toBeVisible()
@@ -155,10 +141,7 @@ test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
     test('Missing Inputs group disappears when all items are resolved', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_media_single')
       await uploadFileViaDropzone(comfyPage)
       await confirmPendingSelection(comfyPage)
 
@@ -172,10 +155,7 @@ test.describe('Errors tab - Missing media', { tag: '@ui' }, () => {
     test('Locate button navigates canvas to the missing media node', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_media_single')
 
       const offsetBefore = await comfyPage.page.evaluate(() => {
         const canvas = window['app']?.canvas

browser_tests/tests/propertiesPanel/errorsTabMissingModels.spec.ts

@@ -6,24 +6,29 @@ import {
   interceptClipboardWrite,
   getClipboardText
 } from '@e2e/helpers/clipboardSpy'
-import {
-  cleanupFakeModel,
-  loadWorkflowAndOpenErrorsTab
-} from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
+import { openErrorsTabViaSeeErrors } from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
 
 test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.RightSidePanel.ShowErrorsTab',
       true
     )
-    await cleanupFakeModel(comfyPage)
+    await expect
+      .poll(async () => {
+        return await comfyPage.page.evaluate(async (url: string) => {
+          const response = await fetch(`${url}/api/devtools/cleanup_fake_model`)
+          return response.ok
+        }, comfyPage.url)
+      })
+      .toBeTruthy()
   })
 
   test('Should show missing models group in errors tab', async ({
     comfyPage
   }) => {
-    await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
+    await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_models')
 
     await expect(
       comfyPage.page.getByTestId(TestIds.dialogs.missingModelsGroup)
@@ -33,7 +38,7 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
   test('Should display model name with referencing node count', async ({
     comfyPage
   }) => {
-    await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
+    await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_models')
 
     const modelsGroup = comfyPage.page.getByTestId(
       TestIds.dialogs.missingModelsGroup
@@ -44,7 +49,7 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
   test('Should expand model row to show referencing nodes', async ({
     comfyPage
   }) => {
-    await loadWorkflowAndOpenErrorsTab(
+    await openErrorsTabViaSeeErrors(
       comfyPage,
       'missing/missing_models_with_nodes'
     )
@@ -64,14 +69,14 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
   })
 
   test('Should copy model name to clipboard', async ({ comfyPage }) => {
-    await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
+    await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_models')
     await interceptClipboardWrite(comfyPage.page)
 
     const copyButton = comfyPage.page.getByTestId(
       TestIds.dialogs.missingModelCopyName
     )
     await expect(copyButton.first()).toBeVisible()
-    await copyButton.first().dispatchEvent('click')
+    await copyButton.first().click()
 
     const copiedText = await getClipboardText(comfyPage.page)
     expect(copiedText).toContain('fake_model.safetensors')
@@ -81,7 +86,7 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
     test('Should show Copy URL button for non-asset models', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_models')
 
       const copyUrlButton = comfyPage.page.getByTestId(
         TestIds.dialogs.missingModelCopyUrl
@@ -92,7 +97,7 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
     test('Should show Download button for downloadable models', async ({
       comfyPage
     }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
+      await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_models')
 
       const downloadButton = comfyPage.page.getByTestId(
         TestIds.dialogs.missingModelDownload

browser_tests/tests/propertiesPanel/errorsTabMissingNodes.spec.ts

@@ -2,10 +2,11 @@ import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
-import { loadWorkflowAndOpenErrorsTab } from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
+import { openErrorsTabViaSeeErrors } from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
 
 test.describe('Errors tab - Missing nodes', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.RightSidePanel.ShowErrorsTab',
       true
@@ -13,7 +14,7 @@ test.describe('Errors tab - Missing nodes', { tag: '@ui' }, () => {
   })
 
   test('Should show MissingNodeCard in errors tab', async ({ comfyPage }) => {
-    await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_nodes')
+    await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_nodes')
 
     await expect(
       comfyPage.page.getByTestId(TestIds.dialogs.missingNodeCard)
@@ -21,7 +22,7 @@ test.describe('Errors tab - Missing nodes', { tag: '@ui' }, () => {
   })
 
   test('Should show missing node packs group', async ({ comfyPage }) => {
-    await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_nodes')
+    await openErrorsTabViaSeeErrors(comfyPage, 'missing/missing_nodes')
 
     await expect(
       comfyPage.page.getByTestId(TestIds.dialogs.missingNodePacksGroup)
@@ -31,7 +32,7 @@ test.describe('Errors tab - Missing nodes', { tag: '@ui' }, () => {
   test('Should expand pack group to reveal node type names', async ({
     comfyPage
   }) => {
-    await loadWorkflowAndOpenErrorsTab(
+    await openErrorsTabViaSeeErrors(
       comfyPage,
       'missing/missing_nodes_in_subgraph'
     )
@@ -51,7 +52,7 @@ test.describe('Errors tab - Missing nodes', { tag: '@ui' }, () => {
   })
 
   test('Should collapse expanded pack group', async ({ comfyPage }) => {
-    await loadWorkflowAndOpenErrorsTab(
+    await openErrorsTabViaSeeErrors(
       comfyPage,
       'missing/missing_nodes_in_subgraph'
     )
@@ -79,7 +80,7 @@ test.describe('Errors tab - Missing nodes', { tag: '@ui' }, () => {
   test('Locate node button is visible for expanded pack nodes', async ({
     comfyPage
   }) => {
-    await loadWorkflowAndOpenErrorsTab(
+    await openErrorsTabViaSeeErrors(
       comfyPage,
       'missing/missing_nodes_in_subgraph'
     )

browser_tests/tests/propertiesPanel/errorsTabModeAware.spec.ts

@@ -1,519 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
-import { TestIds } from '@e2e/fixtures/selectors'
-import {
-  cleanupFakeModel,
-  openErrorsTab,
-  loadWorkflowAndOpenErrorsTab
-} from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
-
-test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
-    await comfyPage.settings.setSetting(
-      'Comfy.RightSidePanel.ShowErrorsTab',
-      true
-    )
-  })
-
-  test.describe('Missing nodes', () => {
-    test('Deleting a missing node removes its error from the errors tab', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_nodes')
-
-      const missingNodeGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingNodePacksGroup
-      )
-      await expect(missingNodeGroup).toBeVisible()
-
-      const node = await comfyPage.nodeOps.getNodeRefById('1')
-      await node.delete()
-
-      await expect(missingNodeGroup).toBeHidden()
-    })
-
-    test('Undo after bypass restores error without showing overlay', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_nodes')
-
-      const missingNodeGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingNodePacksGroup
-      )
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(missingNodeGroup).toBeVisible()
-
-      const node = await comfyPage.nodeOps.getNodeRefById('1')
-      await node.click('title')
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => node.isBypassed()).toBeTruthy()
-      await expect(missingNodeGroup).toBeHidden()
-
-      await comfyPage.keyboard.undo()
-      await expect.poll(() => node.isBypassed()).toBeFalsy()
-      await expect(errorOverlay).toBeHidden()
-      await openErrorsTab(comfyPage)
-      await expect(missingNodeGroup).toBeVisible()
-
-      await comfyPage.keyboard.redo()
-      await expect.poll(() => node.isBypassed()).toBeTruthy()
-      await expect(missingNodeGroup).toBeHidden()
-    })
-  })
-
-  test.describe('Missing models', () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      await cleanupFakeModel(comfyPage)
-    })
-
-    test.afterEach(async ({ comfyPage }) => {
-      await cleanupFakeModel(comfyPage)
-    })
-
-    test('Loading a workflow with all nodes bypassed shows no errors', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow('missing/missing_models_bypassed')
-
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(errorOverlay).toBeHidden()
-
-      await comfyPage.actionbar.propertiesButton.click()
-      await expect(
-        comfyPage.page.getByTestId(TestIds.propertiesPanel.errorsTab)
-      ).toBeHidden()
-    })
-
-    test('Bypassing a node hides its error, un-bypassing restores it', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-      await expect(missingModelGroup).toBeVisible()
-
-      const node = await comfyPage.nodeOps.getNodeRefById('1')
-      await node.click('title')
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => node.isBypassed()).toBeTruthy()
-      await expect(missingModelGroup).toBeHidden()
-
-      await node.click('title')
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => node.isBypassed()).toBeFalsy()
-      await openErrorsTab(comfyPage)
-      await expect(missingModelGroup).toBeVisible()
-    })
-
-    test('Pasting a node with missing model increases referencing node count', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-      await expect(missingModelGroup).toBeVisible()
-      await expect(missingModelGroup).toContainText(
-        /fake_model\.safetensors\s*\(1\)/
-      )
-
-      const node = await comfyPage.nodeOps.getNodeRefById('1')
-      await node.click('title')
-      await comfyPage.clipboard.copy()
-      await comfyPage.clipboard.paste()
-
-      await expect.poll(() => comfyPage.nodeOps.getNodeCount()).toBe(2)
-
-      await comfyPage.canvas.click()
-      await expect(missingModelGroup).toContainText(
-        /fake_model\.safetensors\s*\(2\)/
-      )
-    })
-
-    test('Pasting a bypassed node does not add a new error', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-
-      const node = await comfyPage.nodeOps.getNodeRefById('1')
-      await node.click('title')
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => node.isBypassed()).toBeTruthy()
-      await expect(missingModelGroup).toBeHidden()
-
-      await comfyPage.clipboard.copy()
-      await comfyPage.clipboard.paste()
-
-      await expect.poll(() => comfyPage.nodeOps.getNodeCount()).toBe(2)
-      await expect(missingModelGroup).toBeHidden()
-    })
-
-    test('Deleting a node with missing model removes its error', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-      await expect(missingModelGroup).toBeVisible()
-
-      const node = await comfyPage.nodeOps.getNodeRefById('1')
-      await node.delete()
-
-      await expect(missingModelGroup).toBeHidden()
-    })
-
-    test('Undo after bypass restores error without showing overlay', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(missingModelGroup).toBeVisible()
-
-      const node = await comfyPage.nodeOps.getNodeRefById('1')
-      await node.click('title')
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => node.isBypassed()).toBeTruthy()
-      await expect(missingModelGroup).toBeHidden()
-
-      await comfyPage.keyboard.undo()
-      await expect.poll(() => node.isBypassed()).toBeFalsy()
-      await expect(errorOverlay).toBeHidden()
-      await openErrorsTab(comfyPage)
-      await expect(missingModelGroup).toBeVisible()
-
-      await comfyPage.keyboard.redo()
-      await expect.poll(() => node.isBypassed()).toBeTruthy()
-      await expect(missingModelGroup).toBeHidden()
-    })
-
-    test('Selecting a node filters errors tab to only that node', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_models_with_nodes'
-      )
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-      await expect(missingModelGroup).toContainText(/\(2\)/)
-
-      const node1 = await comfyPage.nodeOps.getNodeRefById('1')
-      await node1.click('title')
-      await expect(missingModelGroup).toContainText(/\(1\)/)
-
-      await comfyPage.canvas.click()
-      await expect(missingModelGroup).toContainText(/\(2\)/)
-    })
-  })
-
-  test.describe('Missing media', () => {
-    test('Loading a workflow with all nodes bypassed shows no errors', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow('missing/missing_media_bypassed')
-
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(errorOverlay).toBeHidden()
-
-      await comfyPage.actionbar.propertiesButton.click()
-      await expect(
-        comfyPage.page.getByTestId(TestIds.propertiesPanel.errorsTab)
-      ).toBeHidden()
-    })
-
-    test('Bypassing a node hides its error, un-bypassing restores it', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
-
-      const missingMediaGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingMediaGroup
-      )
-      await expect(missingMediaGroup).toBeVisible()
-
-      const node = await comfyPage.nodeOps.getNodeRefById('10')
-      await node.click('title')
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => node.isBypassed()).toBeTruthy()
-      await expect(missingMediaGroup).toBeHidden()
-
-      await node.click('title')
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => node.isBypassed()).toBeFalsy()
-      await openErrorsTab(comfyPage)
-      await expect(missingMediaGroup).toBeVisible()
-    })
-
-    test('Pasting a bypassed node does not add a new error', async ({
-      comfyPage
-    }) => {
-      await loadWorkflowAndOpenErrorsTab(
-        comfyPage,
-        'missing/missing_media_single'
-      )
-
-      const missingMediaGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingMediaGroup
-      )
-
-      const node = await comfyPage.nodeOps.getNodeRefById('10')
-      await node.click('title')
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => node.isBypassed()).toBeTruthy()
-      await expect(missingMediaGroup).toBeHidden()
-
-      await comfyPage.clipboard.copy()
-      await comfyPage.clipboard.paste()
-
-      await expect.poll(() => comfyPage.nodeOps.getNodeCount()).toBe(2)
-      await expect(missingMediaGroup).toBeHidden()
-    })
-
-    test('Selecting a node filters errors tab to only that node', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow('missing/missing_media_multiple')
-
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(errorOverlay).toBeVisible()
-      await errorOverlay
-        .getByTestId(TestIds.dialogs.errorOverlayDismiss)
-        .click()
-
-      const mediaRows = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingMediaRow
-      )
-
-      await openErrorsTab(comfyPage)
-      await expect(mediaRows).toHaveCount(2)
-
-      const node = await comfyPage.nodeOps.getNodeRefById('10')
-      await node.click('title')
-      await expect(mediaRows).toHaveCount(1)
-
-      await comfyPage.canvas.click({ position: { x: 400, y: 600 } })
-      await expect(mediaRows).toHaveCount(2)
-    })
-  })
-
-  test.describe('Subgraph', () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      await cleanupFakeModel(comfyPage)
-    })
-
-    test.afterEach(async ({ comfyPage }) => {
-      await cleanupFakeModel(comfyPage)
-    })
-
-    test('Bypassing a subgraph hides interior errors, un-bypassing restores them', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow(
-        'missing/missing_models_in_subgraph'
-      )
-
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(errorOverlay).toBeVisible()
-      await errorOverlay
-        .getByTestId(TestIds.dialogs.errorOverlayDismiss)
-        .click()
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-
-      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
-      const errorsTab = comfyPage.page.getByTestId(
-        TestIds.propertiesPanel.errorsTab
-      )
-
-      await comfyPage.keyboard.selectAll()
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => subgraphNode.isBypassed()).toBeTruthy()
-
-      await comfyPage.actionbar.propertiesButton.click()
-      await expect(errorsTab).toBeHidden()
-
-      await comfyPage.keyboard.selectAll()
-      await comfyPage.keyboard.bypass()
-      await expect.poll(() => subgraphNode.isBypassed()).toBeFalsy()
-      await openErrorsTab(comfyPage)
-      await expect(missingModelGroup).toBeVisible()
-    })
-
-    test('Deleting a node inside a subgraph removes its missing model error', async ({
-      comfyPage
-    }) => {
-      // Regression: before the execId fix, onNodeRemoved fell back to the
-      // interior node's local id (e.g. "1") when node.graph was already
-      // null, so the error keyed under "2:1" was never removed.
-      await comfyPage.workflow.loadWorkflow(
-        'missing/missing_models_in_subgraph'
-      )
-
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(errorOverlay).toBeVisible()
-      await errorOverlay
-        .getByTestId(TestIds.dialogs.errorOverlayDismiss)
-        .click()
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-      await openErrorsTab(comfyPage)
-      await expect(missingModelGroup).toBeVisible()
-
-      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
-      await subgraphNode.navigateIntoSubgraph()
-
-      // Select-all + Delete: interior node IDs may be reassigned during
-      // subgraph configure when they collide with root-graph IDs, so
-      // looking up by static id can fail.
-      await comfyPage.keyboard.selectAll()
-      await comfyPage.page.keyboard.press('Delete')
-
-      await expect(missingModelGroup).toBeHidden()
-    })
-
-    test('Deleting a node inside a subgraph removes its missing node-type error', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow('missing/missing_nodes_in_subgraph')
-
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(errorOverlay).toBeVisible()
-      await errorOverlay
-        .getByTestId(TestIds.dialogs.errorOverlayDismiss)
-        .click()
-
-      const missingNodeGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingNodePacksGroup
-      )
-      await openErrorsTab(comfyPage)
-      await expect(missingNodeGroup).toBeVisible()
-
-      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
-      await subgraphNode.navigateIntoSubgraph()
-
-      // Select-all + Delete: interior node IDs may be reassigned during
-      // subgraph configure when they collide with root-graph IDs, so
-      // looking up by static id can fail.
-      await comfyPage.keyboard.selectAll()
-      await comfyPage.page.keyboard.press('Delete')
-
-      await expect(missingNodeGroup).toBeHidden()
-    })
-
-    test('Bypassing a node inside a subgraph hides its error, un-bypassing restores it', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow(
-        'missing/missing_models_in_subgraph'
-      )
-
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(errorOverlay).toBeVisible()
-      await errorOverlay
-        .getByTestId(TestIds.dialogs.errorOverlayDismiss)
-        .click()
-
-      const missingModelGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelsGroup
-      )
-
-      const subgraphNode = await comfyPage.nodeOps.getNodeRefById('2')
-      await subgraphNode.navigateIntoSubgraph()
-
-      await comfyPage.keyboard.selectAll()
-      await comfyPage.keyboard.bypass()
-
-      const errorsTab = comfyPage.page.getByTestId(
-        TestIds.propertiesPanel.errorsTab
-      )
-      await comfyPage.actionbar.propertiesButton.click()
-      await expect(errorsTab).toBeHidden()
-
-      await comfyPage.keyboard.selectAll()
-      await comfyPage.keyboard.bypass()
-      await openErrorsTab(comfyPage)
-      await expect(missingModelGroup).toBeVisible()
-    })
-  })
-
-  test.describe('Workflow switching', () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.settings.setSetting(
-        'Comfy.Workflow.WorkflowTabsPosition',
-        'Sidebar'
-      )
-      await comfyPage.menu.workflowsTab.open()
-    })
-
-    test('Restores missing nodes in errors tab when switching back to workflow', async ({
-      comfyPage
-    }) => {
-      await comfyPage.workflow.loadWorkflow('missing/missing_nodes')
-
-      const errorOverlay = comfyPage.page.getByTestId(
-        TestIds.dialogs.errorOverlay
-      )
-      await expect(errorOverlay).toBeVisible()
-      await errorOverlay
-        .getByTestId(TestIds.dialogs.errorOverlayDismiss)
-        .click()
-
-      const missingNodeGroup = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingNodePacksGroup
-      )
-
-      await openErrorsTab(comfyPage)
-      await expect(missingNodeGroup).toBeVisible()
-
-      await comfyPage.menu.workflowsTab.open()
-      await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
-      await expect(missingNodeGroup).toBeHidden()
-
-      await comfyPage.menu.workflowsTab.switchToWorkflow('missing_nodes')
-      await openErrorsTab(comfyPage)
-      await expect(missingNodeGroup).toBeVisible()
-    })
-  })
-})

browser_tests/tests/propertiesPanel/nodeSettings.spec.ts

@@ -3,11 +3,13 @@ import { expect } from '@playwright/test'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper'
 
-test.describe('Properties panel - Node settings', { tag: '@vue-nodes' }, () => {
+test.describe('Properties panel - Node settings', () => {
   let panel: PropertiesPanelHelper
 
   test.beforeEach(async ({ comfyPage }) => {
     panel = new PropertiesPanelHelper(comfyPage.page)
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.vueNodes.waitForNodes()
     await comfyPage.actionbar.propertiesButton.click()
     await comfyPage.nodeOps.selectNodes(['KSampler'])
     await panel.switchToTab('Settings')

browser_tests/tests/releaseNotifications.spec.ts

@@ -19,6 +19,10 @@ function createMockRelease(overrides?: Partial<ReleaseNote>): ReleaseNote {
 }
 
 test.describe('Release Notifications', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('should show help center with release information', async ({
     comfyPage
   }) => {

browser_tests/tests/remoteWidgets.spec.ts

@@ -47,6 +47,7 @@ test.describe('Remote COMBO Widget', { tag: '@widget' }, () => {
   }
 
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
     await comfyPage.settings.setSetting(
       'Comfy.NodeSearchBoxImpl',
@@ -56,6 +57,7 @@ test.describe('Remote COMBO Widget', { tag: '@widget' }, () => {
 
   test.describe('Loading options', () => {
     test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
       await comfyPage.page.route(
         '**/api/models/checkpoints**',
         async (route, request) => {

browser_tests/tests/rerouteNode.spec.ts

@@ -4,6 +4,10 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { getMiddlePoint } from '@e2e/fixtures/utils/litegraphUtils'
 
 test.describe('Reroute Node', { tag: ['@screenshot', '@node'] }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test.afterEach(async ({ comfyPage }) => {
     await comfyPage.workflow.setupWorkflowsDirectory({})
   })

browser_tests/tests/resultGallery.spec.ts

@@ -3,11 +3,18 @@ import { expect } from '@playwright/test'
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
-test.describe('MediaLightbox', { tag: ['@slow', '@vue-nodes'] }, () => {
+test.describe('MediaLightbox', { tag: ['@slow'] }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.setup()
+  })
+
   async function runAndOpenGallery(comfyPage: ComfyPage) {
     await comfyPage.workflow.loadWorkflow(
       'widgets/save_image_and_animated_webp'
     )
+    await comfyPage.vueNodes.waitForNodes()
     await comfyPage.runButton.click()
 
     // Wait for SaveImage node to produce output

browser_tests/tests/rightSidePanelTabs.spec.ts

@@ -5,6 +5,10 @@ import {
 import { TestIds } from '@e2e/fixtures/selectors'
 
 test.describe('Right Side Panel Tabs', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('Properties panel opens with workflow overview', async ({
     comfyPage
   }) => {

browser_tests/tests/saveImageAndWebp.spec.ts

@@ -4,14 +4,20 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
 test.describe(
   'Save Image and WEBM preview',
-  { tag: ['@screenshot', '@widget', '@vue-nodes'] },
+  { tag: ['@screenshot', '@widget'] },
   () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+      await comfyPage.vueNodes.waitForNodes()
+    })
+
     test('Can preview both SaveImage and SaveWEBM outputs', async ({
       comfyPage
     }) => {
       await comfyPage.workflow.loadWorkflow(
         'widgets/save_image_and_animated_webp'
       )
+      await comfyPage.vueNodes.waitForNodes()
 
       await comfyPage.runButton.click()
 

browser_tests/tests/selectionRectangle.spec.ts

@@ -3,7 +3,14 @@ import {
   comfyPageFixture as test
 } from '@e2e/fixtures/ComfyPage'
 
-test.describe('@canvas Selection Rectangle', { tag: '@vue-nodes' }, () => {
+test.describe('@canvas Selection Rectangle', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.setup()
+    await comfyPage.vueNodes.waitForNodes()
+  })
+
   test('Ctrl+A selects all nodes', async ({ comfyPage }) => {
     await expect
       .poll(() => comfyPage.vueNodes.getNodeCount())

browser_tests/tests/selectionToolboxActions.spec.ts

@@ -28,6 +28,10 @@ async function selectNodeWithPan(comfyPage: ComfyPage, nodeRef: NodeReference) {
   await nodeRef.click('title')
 }
 
+test.beforeEach(async ({ comfyPage }) => {
+  await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+})
+
 test.describe('Selection Toolbox - Button Actions', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)

browser_tests/tests/selectionToolboxMoreActions.spec.ts

@@ -1,168 +0,0 @@
-import {
-  comfyExpect as expect,
-  comfyPageFixture as test
-} from '@e2e/fixtures/ComfyPage'
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
-
-async function openMoreOptions(comfyPage: ComfyPage) {
-  await expect(comfyPage.selectionToolbox).toBeVisible()
-
-  const moreOptionsBtn = comfyPage.page.getByTestId('more-options-button')
-  await expect(moreOptionsBtn).toBeVisible()
-  await moreOptionsBtn.click()
-  await comfyPage.nextFrame()
-
-  // Wait for the context menu to appear by checking for 'Copy', which is
-  // always present regardless of single or multi-node selection.
-  const menu = comfyPage.page.locator('.p-contextmenu')
-  await expect(menu.getByText('Copy', { exact: true })).toBeVisible()
-}
-
-test.describe('Selection Toolbox - More Options', { tag: '@ui' }, () => {
-  test.describe('Single node actions', () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
-      await comfyPage.workflow.loadWorkflow('nodes/single_ksampler')
-      await comfyPage.nextFrame()
-    })
-
-    test('pin and unpin node via More Options menu', async ({ comfyPage }) => {
-      const nodeRef = (
-        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
-      )[0]
-      await comfyPage.nodeOps.selectNodeWithPan(nodeRef)
-
-      await expect(nodeRef).not.toBePinned()
-
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Pin', { exact: true }).click()
-      await comfyPage.nextFrame()
-
-      await expect(nodeRef).toBePinned()
-
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Unpin', { exact: true }).click()
-      await comfyPage.nextFrame()
-
-      await expect(nodeRef).not.toBePinned()
-    })
-
-    test('minimize and expand node via More Options menu', async ({
-      comfyPage
-    }) => {
-      const nodeRef = (
-        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
-      )[0]
-      await comfyPage.nodeOps.selectNodeWithPan(nodeRef)
-
-      await expect(nodeRef).not.toBeCollapsed()
-
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Minimize Node', { exact: true }).click()
-      await comfyPage.nextFrame()
-
-      await expect(nodeRef).toBeCollapsed()
-
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Expand Node', { exact: true }).click()
-      await comfyPage.nextFrame()
-
-      await expect(nodeRef).not.toBeCollapsed()
-    })
-
-    test('copy via More Options menu', async ({ comfyPage }) => {
-      const nodeRef = (
-        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
-      )[0]
-      await comfyPage.nodeOps.selectNodeWithPan(nodeRef)
-
-      const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
-
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Copy', { exact: true }).click()
-      await comfyPage.nextFrame()
-
-      // Paste the copied node
-      await comfyPage.clipboard.paste()
-      await comfyPage.nextFrame()
-
-      await expect
-        .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-        .toBe(initialCount + 1)
-    })
-
-    test('duplicate via More Options menu', async ({ comfyPage }) => {
-      const nodeRef = (
-        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
-      )[0]
-      await comfyPage.nodeOps.selectNodeWithPan(nodeRef)
-
-      const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
-
-      await openMoreOptions(comfyPage)
-      await comfyPage.page.getByText('Duplicate', { exact: true }).click()
-      await comfyPage.nextFrame()
-
-      await expect
-        .poll(() => comfyPage.nodeOps.getGraphNodesCount())
-        .toBe(initialCount + 1)
-    })
-
-    test('refresh button is rendered in toolbox when node is selected', async ({
-      comfyPage
-    }) => {
-      const nodeRef = (
-        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
-      )[0]
-      await comfyPage.nodeOps.selectNodeWithPan(nodeRef)
-
-      await expect(comfyPage.selectionToolbox).toBeVisible()
-
-      // The refresh button uses v-show so it's always in the DOM;
-      // actual visibility depends on backend-provided widget refresh
-      // capabilities which vary between local and CI environments.
-      const refreshButton = comfyPage.page.getByTestId('refresh-button')
-      await expect(refreshButton).toBeAttached()
-    })
-  })
-
-  test.describe('Multiple node actions', () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.settings.setSetting('Comfy.Canvas.SelectionToolbox', true)
-      await comfyPage.workflow.loadWorkflow('default')
-      await comfyPage.nextFrame()
-    })
-
-    test('bypass button toggles bypass on multiple selected nodes', async ({
-      comfyPage
-    }) => {
-      await comfyPage.nodeOps.selectNodes(['KSampler', 'Empty Latent Image'])
-      await comfyPage.nextFrame()
-
-      const ksampler = (
-        await comfyPage.nodeOps.getNodeRefsByTitle('KSampler')
-      )[0]
-      const emptyLatent = (
-        await comfyPage.nodeOps.getNodeRefsByTitle('Empty Latent Image')
-      )[0]
-
-      await expect(ksampler).not.toBeBypassed()
-      await expect(emptyLatent).not.toBeBypassed()
-
-      const bypassButton = comfyPage.page.getByTestId('bypass-button')
-      await expect(bypassButton).toBeVisible()
-      await bypassButton.click()
-      await comfyPage.nextFrame()
-
-      await expect(ksampler).toBeBypassed()
-      await expect(emptyLatent).toBeBypassed()
-
-      // Toggle back
-      await bypassButton.click()
-      await comfyPage.nextFrame()
-
-      await expect(ksampler).not.toBeBypassed()
-      await expect(emptyLatent).not.toBeBypassed()
-    })
-  })
-})

browser_tests/tests/sidebar/nodeLibrary.spec.ts

@@ -43,6 +43,7 @@ async function renameInlineFolder(comfyPage: ComfyPage, newName: string) {
 
 test.describe('Node library sidebar', () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
     await comfyPage.settings.setSetting(bookmarksSettingId, [])
     await comfyPage.settings.setSetting(bookmarksCustomizationSettingId, {})

browser_tests/tests/sidebar/nodeLibraryV2.spec.ts

@@ -4,6 +4,7 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Node library sidebar V2', () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', true)
 
     const tab = comfyPage.menu.nodeLibraryTabV2

browser_tests/tests/sidebar/sidebarSplitterWidth.spec.ts

@@ -5,6 +5,7 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Sidebar splitter width independence', () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting('Comfy.Sidebar.UnifiedWidth', true)
     await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
   })

browser_tests/tests/sidebar/workflows.spec.ts

@@ -2,10 +2,10 @@ import { expect } from '@playwright/test'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
-import { openErrorsTab } from '@e2e/tests/propertiesPanel/ErrorsTabHelper'
 
 test.describe('Workflows sidebar', () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.Workflow.WorkflowTabsPosition',
       'Sidebar'
@@ -249,7 +249,7 @@ test.describe('Workflows sidebar', () => {
       .toEqual('workflow1')
   })
 
-  test('Restores missing nodes errors silently when switching back to workflow', async ({
+  test('Reports missing nodes warning again when switching back to workflow', async ({
     comfyPage
   }) => {
     await comfyPage.settings.setSetting(
@@ -271,17 +271,11 @@ test.describe('Workflows sidebar', () => {
     await comfyPage.menu.workflowsTab.open()
     await comfyPage.command.executeCommand('Comfy.NewBlankWorkflow')
 
-    // Switch back to the missing_nodes workflow — overlay should NOT
-    // reappear (silent restore), but errors tab should have content
+    // Switch back to the missing_nodes workflow — overlay should reappear
+    // so users can install missing node packs without a page reload
     await comfyPage.menu.workflowsTab.switchToWorkflow('missing_nodes')
 
-    await expect(errorOverlay).toBeHidden()
-
-    // Errors tab should still show missing nodes after silent restore
-    await openErrorsTab(comfyPage)
-    await expect(
-      comfyPage.page.getByTestId(TestIds.dialogs.missingNodePacksGroup)
-    ).toBeVisible()
+    await expect(errorOverlay).toBeVisible()
   })
 
   test('Can close saved-workflows from the open workflows section', async ({

browser_tests/tests/subgraph/subgraphDuplicateIndependentValues.spec.ts

@@ -11,8 +11,14 @@ async function openVueNodeContextMenu(comfyPage: ComfyPage, nodeTitle: string) {
 
 test.describe(
   'Subgraph Duplicate Independent Values',
-  { tag: ['@slow', '@subgraph', '@vue-nodes'] },
+  { tag: ['@slow', '@subgraph'] },
   () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+      await comfyPage.vueNodes.waitForNodes()
+    })
+
     test('Duplicated subgraphs maintain independent widget values', async ({
       comfyPage
     }) => {

browser_tests/tests/subgraph/subgraphLifecycle.spec.ts

@@ -8,6 +8,10 @@ const domPreviewSelector = '.image-preview'
 
 test.describe('Subgraph Lifecycle', { tag: ['@subgraph'] }, () => {
   test.describe('Cleanup Behavior After Promoted Source Removal', () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    })
+
     test('Deleting the promoted source removes the exterior DOM widget', async ({
       comfyPage
     }) => {

browser_tests/tests/subgraph/subgraphNavigation.spec.ts

@@ -33,6 +33,10 @@ function hasVisibleNodeInViewport() {
 
 test.describe('Subgraph Navigation', { tag: ['@slow', '@subgraph'] }, () => {
   test.describe('Subgraph Navigation and UI', () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    })
+
     test('Breadcrumb updates when subgraph node title is changed', async ({
       comfyPage
     }) => {
@@ -104,6 +108,10 @@ test.describe('Subgraph Navigation', { tag: ['@slow', '@subgraph'] }, () => {
   })
 
   test.describe('Navigation Hotkeys', () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    })
+
     test('Navigation hotkey can be customized', async ({ comfyPage }) => {
       await comfyPage.workflow.loadWorkflow('subgraphs/basic-subgraph')
       await comfyPage.nextFrame()

browser_tests/tests/subgraph/subgraphPromotion.spec.ts

@@ -182,6 +182,10 @@ test.describe(
     })
 
     test.describe('Manual Promote/Demote via Context Menu', () => {
+      test.beforeEach(async ({ comfyPage }) => {
+        await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+      })
+
       test('Can promote and un-promote a widget from inside a subgraph', async ({
         comfyPage
       }) => {
@@ -473,6 +477,8 @@ test.describe(
       test('Nested promoted widget entries reflect interior changes after slot removal', async ({
         comfyPage
       }) => {
+        await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
         await comfyPage.workflow.loadWorkflow(
           'subgraphs/subgraph-nested-promotion'
         )
@@ -516,6 +522,8 @@ test.describe(
       test('Removing I/O slot removes associated promoted widget', async ({
         comfyPage
       }) => {
+        await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
         await comfyPage.workflow.loadWorkflow(
           'subgraphs/subgraph-with-promoted-text-widget'
         )

browser_tests/tests/subgraph/subgraphPromotionDom.spec.ts

@@ -115,6 +115,8 @@ test.describe('Subgraph Promotion DOM', { tag: ['@subgraph'] }, () => {
     test('DOM elements are cleaned up when widget is disconnected from I/O', async ({
       comfyPage
     }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+
       await comfyPage.workflow.loadWorkflow(
         'subgraphs/subgraph-with-promoted-text-widget'
       )

browser_tests/tests/subgraph/subgraphSearch.spec.ts

@@ -42,6 +42,7 @@ async function searchAndExpectResult(
 
 test.describe('Subgraph Search Aliases', { tag: ['@subgraph'] }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.NodeSearchBoxImpl',
       'v1 (legacy)'

browser_tests/tests/subgraph/subgraphSerialization.spec.ts

@@ -1,6 +1,5 @@
 import { expect } from '@playwright/test'
 
-import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { getPromotedWidgets } from '@e2e/helpers/promotedWidgets'
 
@@ -9,31 +8,6 @@ const LEGACY_PREFIXED_WORKFLOW =
   'subgraphs/nested-subgraph-legacy-prefixed-proxy-widgets'
 
 test.describe('Subgraph Serialization', { tag: ['@subgraph'] }, () => {
-  const getPromotedHostWidgetValues = async (
-    comfyPage: ComfyPage,
-    nodeIds: string[]
-  ) => {
-    return comfyPage.page.evaluate((ids) => {
-      const graph = window.app!.canvas.graph!
-
-      return ids.map((id) => {
-        const node = graph.getNodeById(id)
-        if (
-          !node ||
-          typeof node.isSubgraphNode !== 'function' ||
-          !node.isSubgraphNode()
-        ) {
-          return { id, values: [] as unknown[] }
-        }
-
-        return {
-          id,
-          values: (node.widgets ?? []).map((widget) => widget.value)
-        }
-      })
-    }, nodeIds)
-  }
-
   test('Promoted widget remains usable after serialize and reload', async ({
     comfyPage
   }) => {
@@ -111,35 +85,5 @@ test.describe('Subgraph Serialization', { tag: ['@subgraph'] }, () => {
       await expect(textarea).toBeVisible()
       await expect(textarea).toBeDisabled()
     })
-
-    test('Multiple instances of the same subgraph keep distinct promoted widget values after load and reload', async ({
-      comfyPage
-    }) => {
-      const workflowName =
-        'subgraphs/subgraph-multi-instance-promoted-text-values'
-      const hostNodeIds = ['11', '12', '13']
-      const expectedValues = ['Alpha\n', 'Beta\n', 'Gamma\n']
-
-      await comfyPage.workflow.loadWorkflow(workflowName)
-      await comfyPage.nextFrame()
-
-      const initialValues = await getPromotedHostWidgetValues(
-        comfyPage,
-        hostNodeIds
-      )
-      expect(initialValues.map(({ values }) => values[0])).toEqual(
-        expectedValues
-      )
-
-      await comfyPage.subgraph.serializeAndReload()
-
-      const reloadedValues = await getPromotedHostWidgetValues(
-        comfyPage,
-        hostNodeIds
-      )
-      expect(reloadedValues.map(({ values }) => values[0])).toEqual(
-        expectedValues
-      )
-    })
   })
 })

browser_tests/tests/subgraph/subgraphZeroUuid.spec.ts

@@ -4,8 +4,15 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
 test.describe(
   'Zero UUID workflow: subgraph undo rendering',
-  { tag: ['@workflow', '@subgraph', '@vue-nodes'] },
+  { tag: ['@workflow', '@subgraph'] },
   () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      test.setTimeout(30000) // Extend timeout as we need to reload the page an additional time
+      await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+      await comfyPage.page.reload() // Reload page as we need to enter in Vue mode
+      await comfyPage.page.waitForFunction(() => !!window.app?.graph)
+    })
+
     test('Undo after subgraph enter/exit renders all nodes when workflow starts with zero UUID', async ({
       comfyPage
     }) => {

browser_tests/tests/subgraphPromotedWidgetPanel.spec.ts

@@ -46,6 +46,10 @@ test.describe(
   'Subgraph promoted widget panel',
   { tag: ['@node', '@widget'] },
   () => {
+    test.beforeEach(async ({ comfyPage }) => {
+      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    })
+
     test.describe('SubgraphEditor (Settings panel)', () => {
       test('linked promoted widgets have hide toggle disabled', async ({
         comfyPage

browser_tests/tests/templates.spec.ts

@@ -16,6 +16,10 @@ async function checkTemplateFileExists(
 }
 
 test.describe('Templates', { tag: ['@slow', '@workflow'] }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+  })
+
   test('should have a JSON workflow file for each template', async ({
     comfyPage
   }) => {

browser_tests/tests/toastNotifications.spec.ts

@@ -4,6 +4,11 @@ import {
 } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Toast Notifications', { tag: '@ui' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.setup()
+  })
+
   async function triggerErrorToast(comfyPage: {
     page: { evaluate: (fn: () => void) => Promise<void> }
     nextFrame: () => Promise<void>

browser_tests/tests/topbar/workflowTabs.spec.ts

@@ -4,6 +4,7 @@ import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 
 test.describe('Workflow tabs', () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.Workflow.WorkflowTabsPosition',
       'Topbar'

browser_tests/tests/versionMismatchWarnings.spec.ts

@@ -37,6 +37,7 @@ test.describe('Version Mismatch Warnings', { tag: '@slow' }, () => {
   }
 
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
     await comfyPage.settings.setSetting(
       'Comfy.VersionCompatibility.DisableWarnings',
       false

browser_tests/tests/vueNodes/groups/groups.spec.ts

@@ -112,9 +112,11 @@ async function getNodeGroupCenteringErrors(
   })
 }
 
-test.describe('Vue Node Groups', { tag: ['@screenshot', '@vue-nodes'] }, () => {
+test.describe('Vue Node Groups', { tag: '@screenshot' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.settings.setSetting('Comfy.Minimap.ShowGroups', true)
+    await comfyPage.vueNodes.waitForNodes()
   })
 
   test('should allow creating groups with hotkey', async ({ comfyPage }) => {
@@ -128,6 +130,7 @@ test.describe('Vue Node Groups', { tag: ['@screenshot', '@vue-nodes'] }, () => {
   })
 
   test('should allow fitting group to contents', async ({ comfyPage }) => {
+    await comfyPage.setup()
     await comfyPage.workflow.loadWorkflow('groups/oversized_group')
     await comfyPage.keyboard.selectAll()
     await comfyPage.command.executeCommand('Comfy.Graph.FitGroupToContents')

browser_tests/tests/vueNodes/interactions/canvas/pan.spec.ts

@@ -3,7 +3,12 @@ import {
   comfyPageFixture as test
 } from '@e2e/fixtures/ComfyPage'
 
-test.describe('Vue Nodes Canvas Pan', { tag: '@vue-nodes' }, () => {
+test.describe('Vue Nodes Canvas Pan', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.vueNodes.waitForNodes()
+  })
+
   test(
     '@mobile Can pan with touch',
     { tag: '@screenshot' },

browser_tests/tests/vueNodes/interactions/canvas/zoom.spec.ts

@@ -3,9 +3,11 @@ import {
   comfyPageFixture as test
 } from '@e2e/fixtures/ComfyPage'
 
-test.describe('Vue Nodes Zoom', { tag: '@vue-nodes' }, () => {
+test.describe('Vue Nodes Zoom', () => {
   test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
     await comfyPage.settings.setSetting('LiteGraph.Canvas.MinFontSizeForLOD', 8)
+    await comfyPage.vueNodes.waitForNodes()
   })
 
   test(

browser_tests/tests/vueNodes/interactions/node/bringToFront.spec.ts

@@ -5,150 +5,146 @@ import {
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import { fitToViewInstant } from '@e2e/helpers/fitToView'
 
-test.describe(
-  'Vue Node Bring to Front',
-  { tag: ['@screenshot', '@vue-nodes'] },
-  () => {
-    test.beforeEach(async ({ comfyPage }) => {
-      await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
-      await comfyPage.workflow.loadWorkflow('vueNodes/simple-triple')
-      await fitToViewInstant(comfyPage)
-    })
+test.describe('Vue Node Bring to Front', { tag: '@screenshot' }, () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Disabled')
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.workflow.loadWorkflow('vueNodes/simple-triple')
+    await comfyPage.vueNodes.waitForNodes()
+    await fitToViewInstant(comfyPage)
+  })
 
-    /**
-     * Helper to get the z-index of a node by its title
-     */
-    async function getNodeZIndex(
-      comfyPage: ComfyPage,
-      title: string
-    ): Promise<number> {
-      const node = comfyPage.vueNodes.getNodeByTitle(title)
-      const style = await node.getAttribute('style')
-      const match = style?.match(/z-index:\s*(\d+)/)
-      return match ? parseInt(match[1], 10) : Number.NaN
-    }
-
-    /**
-     * Helper to get the bounding box center of a node
-     */
-    async function getNodeCenter(
-      comfyPage: ComfyPage,
-      title: string
-    ): Promise<{ x: number; y: number }> {
-      const node = comfyPage.vueNodes.getNodeByTitle(title)
-      const box = await node.boundingBox()
-      if (!box) throw new Error(`Node "${title}" not found`)
-      return { x: box.x + box.width / 2, y: box.y + box.height / 2 }
-    }
-
-    test('should bring overlapped node to front when clicking on it', async ({
-      comfyPage
-    }) => {
-      // Get initial positions
-      const clipCenter = await getNodeCenter(comfyPage, 'CLIP Text Encode')
-      const ksamplerHeader = await comfyPage.page
-        .getByText('KSampler')
-        .boundingBox()
-      if (!ksamplerHeader) throw new Error('KSampler header not found')
-
-      // Drag KSampler on top of CLIP Text Encode
-      await comfyPage.canvasOps.dragAndDrop(
-        { x: ksamplerHeader.x + 50, y: ksamplerHeader.y + 10 },
-        clipCenter
-      )
-      await comfyPage.nextFrame()
-
-      // Screenshot showing KSampler on top of CLIP
-      await expect(comfyPage.canvas).toHaveScreenshot(
-        'bring-to-front-overlapped-before.png'
-      )
-
-      // KSampler should be on top (higher z-index) after being dragged
-      await expect
-        .poll(async () => {
-          const ksamplerZ = await getNodeZIndex(comfyPage, 'KSampler')
-          const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
-          return ksamplerZ - clipZ
-        })
-        .toBeGreaterThan(0)
-
-      // Click on CLIP Text Encode (underneath) - need to click on a visible part
-      // Since KSampler is on top, we click on the edge of CLIP that should still be visible
-      const clipNode = comfyPage.vueNodes.getNodeByTitle('CLIP Text Encode')
-      const clipBox = await clipNode.boundingBox()
-      if (!clipBox) throw new Error('CLIP node not found')
-
-      // Click on a visible edge of CLIP
-      await comfyPage.page.mouse.click(clipBox.x + 30, clipBox.y + 10)
-      await comfyPage.nextFrame()
-
-      // CLIP should now be on top - compare post-action z-indices
-      await expect
-        .poll(async () => {
-          const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
-          const ksamplerZ = await getNodeZIndex(comfyPage, 'KSampler')
-          return clipZ - ksamplerZ
-        })
-        .toBeGreaterThan(0)
-
-      // Screenshot showing CLIP now on top
-      await expect(comfyPage.canvas).toHaveScreenshot(
-        'bring-to-front-overlapped-after.png'
-      )
-    })
-
-    test('should bring overlapped node to front when clicking on its widget', async ({
-      comfyPage
-    }) => {
-      // Get CLIP Text Encode position (it has a text widget)
-      const clipCenter = await getNodeCenter(comfyPage, 'CLIP Text Encode')
-
-      // Get VAE Decode position and drag it on top of CLIP
-      const vaeHeader = await comfyPage.page
-        .getByText('VAE Decode')
-        .boundingBox()
-      if (!vaeHeader) throw new Error('VAE Decode header not found')
-
-      await comfyPage.canvasOps.dragAndDrop(
-        { x: vaeHeader.x + 50, y: vaeHeader.y + 10 },
-        { x: clipCenter.x - 50, y: clipCenter.y }
-      )
-      await comfyPage.nextFrame()
-
-      // VAE should be on top after drag
-      await expect
-        .poll(async () => {
-          const vaeZ = await getNodeZIndex(comfyPage, 'VAE Decode')
-          const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
-          return vaeZ - clipZ
-        })
-        .toBeGreaterThan(0)
-
-      // Screenshot showing VAE on top
-      await expect(comfyPage.canvas).toHaveScreenshot(
-        'bring-to-front-widget-overlapped-before.png'
-      )
-
-      // Click on the text widget of CLIP Text Encode
-      const clipNode = comfyPage.vueNodes.getNodeByTitle('CLIP Text Encode')
-      const clipBox = await clipNode.boundingBox()
-      if (!clipBox) throw new Error('CLIP node not found')
-      await comfyPage.page.mouse.click(clipBox.x + 170, clipBox.y + 80)
-      await comfyPage.nextFrame()
-
-      // CLIP should now be on top - compare post-action z-indices
-      await expect
-        .poll(async () => {
-          const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
-          const vaeZ = await getNodeZIndex(comfyPage, 'VAE Decode')
-          return clipZ - vaeZ
-        })
-        .toBeGreaterThan(0)
-
-      // Screenshot showing CLIP now on top after widget click
-      await expect(comfyPage.canvas).toHaveScreenshot(
-        'bring-to-front-widget-overlapped-after.png'
-      )
-    })
+  /**
+   * Helper to get the z-index of a node by its title
+   */
+  async function getNodeZIndex(
+    comfyPage: ComfyPage,
+    title: string
+  ): Promise<number> {
+    const node = comfyPage.vueNodes.getNodeByTitle(title)
+    const style = await node.getAttribute('style')
+    const match = style?.match(/z-index:\s*(\d+)/)
+    return match ? parseInt(match[1], 10) : Number.NaN
   }
-)
+
+  /**
+   * Helper to get the bounding box center of a node
+   */
+  async function getNodeCenter(
+    comfyPage: ComfyPage,
+    title: string
+  ): Promise<{ x: number; y: number }> {
+    const node = comfyPage.vueNodes.getNodeByTitle(title)
+    const box = await node.boundingBox()
+    if (!box) throw new Error(`Node "${title}" not found`)
+    return { x: box.x + box.width / 2, y: box.y + box.height / 2 }
+  }
+
+  test('should bring overlapped node to front when clicking on it', async ({
+    comfyPage
+  }) => {
+    // Get initial positions
+    const clipCenter = await getNodeCenter(comfyPage, 'CLIP Text Encode')
+    const ksamplerHeader = await comfyPage.page
+      .getByText('KSampler')
+      .boundingBox()
+    if (!ksamplerHeader) throw new Error('KSampler header not found')
+
+    // Drag KSampler on top of CLIP Text Encode
+    await comfyPage.canvasOps.dragAndDrop(
+      { x: ksamplerHeader.x + 50, y: ksamplerHeader.y + 10 },
+      clipCenter
+    )
+    await comfyPage.nextFrame()
+
+    // Screenshot showing KSampler on top of CLIP
+    await expect(comfyPage.canvas).toHaveScreenshot(
+      'bring-to-front-overlapped-before.png'
+    )
+
+    // KSampler should be on top (higher z-index) after being dragged
+    await expect
+      .poll(async () => {
+        const ksamplerZ = await getNodeZIndex(comfyPage, 'KSampler')
+        const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
+        return ksamplerZ - clipZ
+      })
+      .toBeGreaterThan(0)
+
+    // Click on CLIP Text Encode (underneath) - need to click on a visible part
+    // Since KSampler is on top, we click on the edge of CLIP that should still be visible
+    const clipNode = comfyPage.vueNodes.getNodeByTitle('CLIP Text Encode')
+    const clipBox = await clipNode.boundingBox()
+    if (!clipBox) throw new Error('CLIP node not found')
+
+    // Click on a visible edge of CLIP
+    await comfyPage.page.mouse.click(clipBox.x + 30, clipBox.y + 10)
+    await comfyPage.nextFrame()
+
+    // CLIP should now be on top - compare post-action z-indices
+    await expect
+      .poll(async () => {
+        const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
+        const ksamplerZ = await getNodeZIndex(comfyPage, 'KSampler')
+        return clipZ - ksamplerZ
+      })
+      .toBeGreaterThan(0)
+
+    // Screenshot showing CLIP now on top
+    await expect(comfyPage.canvas).toHaveScreenshot(
+      'bring-to-front-overlapped-after.png'
+    )
+  })
+
+  test('should bring overlapped node to front when clicking on its widget', async ({
+    comfyPage
+  }) => {
+    // Get CLIP Text Encode position (it has a text widget)
+    const clipCenter = await getNodeCenter(comfyPage, 'CLIP Text Encode')
+
+    // Get VAE Decode position and drag it on top of CLIP
+    const vaeHeader = await comfyPage.page.getByText('VAE Decode').boundingBox()
+    if (!vaeHeader) throw new Error('VAE Decode header not found')
+
+    await comfyPage.canvasOps.dragAndDrop(
+      { x: vaeHeader.x + 50, y: vaeHeader.y + 10 },
+      { x: clipCenter.x - 50, y: clipCenter.y }
+    )
+    await comfyPage.nextFrame()
+
+    // VAE should be on top after drag
+    await expect
+      .poll(async () => {
+        const vaeZ = await getNodeZIndex(comfyPage, 'VAE Decode')
+        const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
+        return vaeZ - clipZ
+      })
+      .toBeGreaterThan(0)
+
+    // Screenshot showing VAE on top
+    await expect(comfyPage.canvas).toHaveScreenshot(
+      'bring-to-front-widget-overlapped-before.png'
+    )
+
+    // Click on the text widget of CLIP Text Encode
+    const clipNode = comfyPage.vueNodes.getNodeByTitle('CLIP Text Encode')
+    const clipBox = await clipNode.boundingBox()
+    if (!clipBox) throw new Error('CLIP node not found')
+    await comfyPage.page.mouse.click(clipBox.x + 170, clipBox.y + 80)
+    await comfyPage.nextFrame()
+
+    // CLIP should now be on top - compare post-action z-indices
+    await expect
+      .poll(async () => {
+        const clipZ = await getNodeZIndex(comfyPage, 'CLIP Text Encode')
+        const vaeZ = await getNodeZIndex(comfyPage, 'VAE Decode')
+        return clipZ - vaeZ
+      })
+      .toBeGreaterThan(0)
+
+    // Screenshot showing CLIP now on top after widget click
+    await expect(comfyPage.canvas).toHaveScreenshot(
+      'bring-to-front-widget-overlapped-after.png'
+    )
+  })
+})

browser_tests/tests/vueNodes/interactions/node/contextMenu.spec.ts

@@ -60,7 +60,13 @@ async function getNodeRef(comfyPage: ComfyPage, nodeTitle: string) {
   return refs[0]
 }
 
-test.describe('Vue Node Context Menu', { tag: '@vue-nodes' }, () => {
+test.describe('Vue Node Context Menu', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.vueNodes.waitForNodes()
+  })
+
   test.describe('Single Node Actions', () => {
     test('should rename node via context menu', async ({ comfyPage }) => {
       await openContextMenu(comfyPage, 'KSampler')

browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts

@@ -7,9 +7,14 @@ import {
   getPromotedWidgetCountByName
 } from '@e2e/helpers/promotedWidgets'
 
-test.describe('Vue Nodes Image Preview', { tag: '@vue-nodes' }, () => {
+test.describe('Vue Nodes Image Preview', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+  })
+
   async function loadImageOnNode(comfyPage: ComfyPage) {
     await comfyPage.workflow.loadWorkflow('widgets/load_image_widget')
+    await comfyPage.vueNodes.waitForNodes()
 
     const loadImageNode = (
       await comfyPage.nodeOps.getNodeRefsByType('LoadImage')
@@ -68,6 +73,7 @@ test.describe('Vue Nodes Image Preview', { tag: '@vue-nodes' }, () => {
       await comfyPage.workflow.loadWorkflow(
         'subgraphs/subgraph-with-multiple-promoted-previews'
       )
+      await comfyPage.vueNodes.waitForNodes()
 
       const firstSubgraphNode = comfyPage.vueNodes.getNodeLocator('7')
       const secondSubgraphNode = comfyPage.vueNodes.getNodeLocator('8')

browser_tests/tests/vueNodes/interactions/node/move.spec.ts

@@ -5,7 +5,12 @@ import {
 import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
 import type { Position } from '@e2e/fixtures/types'
 
-test.describe('Vue Node Moving', { tag: '@vue-nodes' }, () => {
+test.describe('Vue Node Moving', () => {
+  test.beforeEach(async ({ comfyPage }) => {
+    await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true)
+    await comfyPage.vueNodes.waitForNodes()
+  })
+
   const getHeaderPos = async (
     comfyPage: ComfyPage,
     title: string