From 52f6faba097d4a171e2a7fd154b890458b8d9891 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 17 Oct 2026 02:10:53 +0000 Subject: [PATCH 1/2] refactor: rename isDesktop to isLegacyDesktopBuild and add isComfyDesktop2 isDesktop is true only for the DISTRIBUTION=desktop build, which ships only in the legacy Electron app (Desktop 1). Comfy-Desktop (Desktop 2) runs the standard localhost build, so isDesktop is false there, but the name reads as "running in the desktop app" and has been used to gate Desktop 2 behaviour by mistake. - Rename the constant to isLegacyDesktopBuild across src, tests and docs. - Add isComfyDesktop2(), a runtime check for window.__comfyDesktop2, and use it for the PostHog client axis. - AGENTS.md: note that "Desktop" means two apps and how to detect each. - ADR CRDT-FOLLOWER-0025: stop equating Comfy-Desktop with isDesktop. --- .agents/checks/follower-boundary.md | 2 +- .coderabbit.yaml | 5 +++-- AGENTS.md | 7 ++++++- docs/SETTINGS.md | 2 +- ...er-and-distribution-resolved-boundaries.md | 9 ++++++--- src/App.vue | 4 ++-- .../tabs/terminal/BaseTerminal.test.ts | 6 +++--- .../tabs/terminal/BaseTerminal.vue | 4 ++-- ...kflowTemplateSelectorDialog.detail.test.ts | 13 +++++++----- .../widget/WorkflowTemplateSelectorDialog.vue | 4 ++-- .../dialog/content/setting/UserPanel.test.ts | 2 +- src/components/graph/GraphCanvas.test.ts | 2 +- .../helpcenter/HelpCenterMenuContent.test.ts | 14 ++++++------- .../helpcenter/HelpCenterMenuContent.vue | 20 +++++++++++-------- .../rightSidePanel/errors/TabErrors.vue | 8 ++++++-- src/components/sidebar/SideToolbar.test.ts | 2 +- src/components/sidebar/SideToolbar.vue | 8 ++++++-- .../sidebar/tabs/ModelLibrarySidebarTab.vue | 4 ++-- src/components/topbar/WorkflowTabs.test.ts | 8 ++++---- src/components/topbar/WorkflowTabs.vue | 12 ++++++++--- .../registerCoreBottomPanelTabs.test.ts | 18 ++++++++++------- .../registerCoreBottomPanelTabs.ts | 4 ++-- .../bottomPanelTabs/useTerminal.ts | 4 ++-- .../useModelLibrarySidebarTab.test.ts | 2 +- .../sidebarTabs/useModelLibrarySidebarTab.ts | 4 ++-- src/composables/useExternalLink.test.ts | 16 +++++++-------- src/composables/useExternalLink.ts | 4 ++-- src/extensions/core/electronAdapter.ts | 4 ++-- src/main.ts | 4 ++-- .../auth/nonWebClientsStayOnTokens.test.ts | 2 +- src/platform/auth/webSessionFlagOff.test.ts | 2 +- src/platform/auth/webSessionFlagOn.test.ts | 2 +- ...DesktopCloudNotificationController.test.ts | 2 +- .../DesktopCloudNotificationController.vue | 4 ++-- src/platform/distribution/types.ts | 20 +++++++++++++++++-- .../components/MissingModelCard.test.ts | 2 +- .../components/MissingModelRow.test.ts | 2 +- .../missingModel/missingModelDownload.test.ts | 2 +- .../missingModel/missingModelDownload.ts | 4 ++-- .../missingModel/releaseModelOptions.test.ts | 2 +- .../settings/composables/useSettingUI.test.ts | 8 ++++---- .../settings/composables/useSettingUI.ts | 8 +++++--- .../settings/constants/coreSettings.ts | 8 ++++++-- .../surveys/ErrorPanelSurveyCta.test.ts | 2 +- .../surveys/NightlySurveyPopover.test.ts | 2 +- .../surveys/useSurveyEligibility.test.ts | 10 +++++----- src/platform/surveys/useSurveyEligibility.ts | 10 ++++++++-- .../cloud/PostHogTelemetryProvider.ts | 3 ++- .../updates/common/releaseStore.test.ts | 11 ++++++---- src/platform/updates/common/releaseStore.ts | 8 ++++---- .../ReleaseNotificationToast.test.ts | 12 +++++------ .../components/ReleaseNotificationToast.vue | 4 ++-- .../composables/useTemplateWorkflows.test.ts | 2 +- .../composables/useTemplateWorkflows.ts | 4 ++-- .../useComboWidget.deployment.test.ts | 2 +- .../useRemoteWidget.webSession.test.ts | 2 +- src/router.ts | 8 ++++---- .../__tests__/authTokenPriority.test.ts | 2 +- src/stores/aboutPanelStore.ts | 4 ++-- .../apiKeyAuthStore.integration.test.ts | 2 +- src/stores/authStore.test.ts | 6 +++--- src/stores/electronDownloadStore.test.ts | 4 +++- src/stores/electronDownloadStore.ts | 8 +++++--- src/stores/subgraphStore.test.ts | 6 +++--- src/stores/subgraphStore.ts | 4 ++-- src/stores/systemStatsStore.test.ts | 12 +++++------ src/stores/systemStatsStore.ts | 4 ++-- src/utils/envUtil.ts | 6 ++++-- src/views/GraphView.test.ts | 10 +++++----- src/views/GraphView.vue | 10 +++++----- src/views/templates/BaseViewTemplate.vue | 4 ++-- 71 files changed, 249 insertions(+), 177 deletions(-) diff --git a/.agents/checks/follower-boundary.md b/.agents/checks/follower-boundary.md index c20839288ba..fe4138c887f 100644 --- a/.agents/checks/follower-boundary.md +++ b/.agents/checks/follower-boundary.md @@ -123,7 +123,7 @@ boundary keyed on `DISTRIBUTION`. Flag: -- **`DISTRIBUTION` / `isCloud` / `isDesktop` checks scattered through follower core** — +- **`DISTRIBUTION` / `isCloud` / `isLegacyDesktopBuild` / `isComfyDesktop2()` checks scattered through follower core** — distribution conditionals inside the CRDT apply seam, `DocFrameClient`, or rendering. They belong only in the agent connection/configuration boundary. - **Auth reduced to `isCloud`** — resolving credentials by distribution instead of diff --git a/.coderabbit.yaml b/.coderabbit.yaml index 74e736d6a83..a6752126c94 100644 --- a/.coderabbit.yaml +++ b/.coderabbit.yaml @@ -123,8 +123,9 @@ reviews: semantic doc, an optimistic overlay merged back as a Yjs update, `op_id` regeneration on retry, a second applier reimplemented instead of importing `@comfyorg/comfy-multi-player`, `DISTRIBUTION`/`isCloud`/ - `isDesktop` checks scattered outside the agent connection boundary, and - auth reduced to `isCloud` instead of `authStore.getAuthHeader()`. + `isLegacyDesktopBuild`/`isComfyDesktop2()` checks scattered outside the + agent connection boundary, and auth reduced to `isCloud` instead of + `authStore.getAuthHeader()`. - path: '**/*.test.ts' instructions: | Treat `.agents/checks/test-quality.md`, `docs/testing/README.md`, diff --git a/AGENTS.md b/AGENTS.md index 546a6dc19b2..41b18194725 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -57,7 +57,7 @@ This project uses **pnpm**. Always prefer scripts defined in `package.json` (e.g - `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 dev:electron`: Dev server with legacy Desktop 1 Electron API mocks - `pnpm build`: Type-check then production build to `dist/` - `pnpm preview`: Preview the production build locally - `pnpm test:unit`: Run Vitest unit tests @@ -239,6 +239,11 @@ ADR files are named `[-]--descriptive-title.md`: at mos ## Common Pitfalls +- "Desktop" means two apps. Comfy-Desktop (Desktop 2) runs the standard + localhost build and is detected at runtime with `isComfyDesktop2()` + (`window.__comfyDesktop2`). `isLegacyDesktopBuild`, `electronAPI()` and + `pnpm dev:electron` cover only the legacy Electron app (Desktop 1) and are + false or absent inside Desktop 2. New desktop behaviour targets Desktop 2. - NEVER derive a server fact on the client: a gate renders one fact from the API as received, without combining it with role, tier, plan state, seats or `isCloud`. Local UI state (loading, in-flight, form validity) may only diff --git a/docs/SETTINGS.md b/docs/SETTINGS.md index 328e70ffd25..292d9673f9b 100644 --- a/docs/SETTINGS.md +++ b/docs/SETTINGS.md @@ -131,7 +131,7 @@ Example versioned defaults from codebase: { id: 'Comfy.VueNodes.Enabled', defaultValue: false, - defaultsByInstallVersion: { '1.41.0': isCloud || isDesktop } + defaultsByInstallVersion: { '1.41.0': isCloud || isLegacyDesktopBuild } } ``` diff --git a/docs/adr/CRDT-FOLLOWER-0025-in-app-agent-crdt-follower-and-distribution-resolved-boundaries.md b/docs/adr/CRDT-FOLLOWER-0025-in-app-agent-crdt-follower-and-distribution-resolved-boundaries.md index 67768e5cff1..86ac99d2760 100644 --- a/docs/adr/CRDT-FOLLOWER-0025-in-app-agent-crdt-follower-and-distribution-resolved-boundaries.md +++ b/docs/adr/CRDT-FOLLOWER-0025-in-app-agent-crdt-follower-and-distribution-resolved-boundaries.md @@ -32,8 +32,11 @@ on the user's own machine — a real product surface, not a dev rig), and **Dev/ephemeral** (a Vite dev server against a selected backend). The build models this in `src/platform/distribution/types.ts` (`Distribution = 'desktop' | 'localhost' | 'cloud'`, `DISTRIBUTION`, `isCloud`, -`isDesktop`), resolved by `vite.config.mts` into the compile-time -`__DISTRIBUTION__` define. +`isLegacyDesktopBuild`), resolved by `vite.config.mts` into the compile-time +`__DISTRIBUTION__` define. The `desktop` build ships only in the legacy +Electron app (Desktop 1). Comfy-Desktop (Desktop 2) runs the standard +`localhost` build and is detected at runtime with `isComfyDesktop2()` +(`window.__comfyDesktop2`), not by the build. The follower **apply** path has no product-specific graph semantics — every surface receives the same host-made `doc_update` and applies it the same way. @@ -182,7 +185,7 @@ module **when direct-to-agent product wiring is implemented** — it resolves th agent HTTP/WS base URL (an `AGENT_BASE_URL`-style value), whether the route is same-origin through cloud ingest or direct to the local/Desktop agent binary, and credentials by delegating to `authStore.getAuthHeader()`. Use -`DISTRIBUTION`/`isCloud`/`isDesktop` **inside that boundary only**; do not +`DISTRIBUTION`/`isCloud`/`isLegacyDesktopBuild`/`isComfyDesktop2()` **inside that boundary only**; do not scatter distribution checks through the follower apply path or rendering, and never reduce auth to `isCloud` (Local and Desktop are authenticated product surfaces). Dev-only Vite proxy/credential behavior stays in Vite config and is diff --git a/src/App.vue b/src/App.vue index e77075680a9..acb5825dc01 100644 --- a/src/App.vue +++ b/src/App.vue @@ -26,7 +26,7 @@ import GlobalDialog from '@/components/dialog/GlobalDialog.vue' import config from '@/config' import TooltipProvider from '@/components/ui/tooltip/TooltipProvider.vue' import SessionReconnecting from '@/platform/auth/session/components/SessionReconnecting.vue' -import { isCloud, isDesktop } from '@/platform/distribution/types' +import { isCloud, isLegacyDesktopBuild } from '@/platform/distribution/types' import { reportPreloadError, reportResourceLoadError @@ -79,7 +79,7 @@ const showContextMenu = (event: MouseEvent) => { onMounted(() => { window['__COMFYUI_FRONTEND_VERSION__'] = config.app_version - if (isDesktop) { + if (isLegacyDesktopBuild) { document.addEventListener('contextmenu', showContextMenu) } diff --git a/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts b/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts index 1abd3fd132e..7a2c321385c 100644 --- a/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts +++ b/src/components/bottomPanel/tabs/terminal/BaseTerminal.test.ts @@ -59,11 +59,11 @@ vi.mock(import('@/utils/envUtil'), () => ({ electronAPI: vi.fn(() => null) })) -const mockData = vi.hoisted(() => ({ isDesktop: false })) +const mockData = vi.hoisted(() => ({ isLegacyDesktopBuild: false })) vi.mock(import('@/platform/distribution/types'), () => ({ - get isDesktop() { - return mockData.isDesktop + get isLegacyDesktopBuild() { + return mockData.isLegacyDesktopBuild } })) diff --git a/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue b/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue index c21b6de641a..5415093f498 100644 --- a/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue +++ b/src/components/bottomPanel/tabs/terminal/BaseTerminal.vue @@ -38,7 +38,7 @@ import { useI18n } from 'vue-i18n' import Button from '@/components/ui/button/Button.vue' import { useTerminal } from '@/composables/bottomPanelTabs/useTerminal' import { electronAPI } from '@/utils/envUtil' -import { isDesktop } from '@/platform/distribution/types' +import { isLegacyDesktopBuild } from '@/platform/distribution/types' import { cn } from '@comfyorg/tailwind-utils' const { t } = useI18n() @@ -88,7 +88,7 @@ const showContextMenu = (event: MouseEvent) => { electronAPI()?.showContextMenu({ type: 'text' }) } -if (isDesktop) { +if (isLegacyDesktopBuild) { useEventListener(terminalEl, 'contextmenu', showContextMenu) } diff --git a/src/components/custom/widget/WorkflowTemplateSelectorDialog.detail.test.ts b/src/components/custom/widget/WorkflowTemplateSelectorDialog.detail.test.ts index 848d8f99d1f..f055e06e6ae 100644 --- a/src/components/custom/widget/WorkflowTemplateSelectorDialog.detail.test.ts +++ b/src/components/custom/widget/WorkflowTemplateSelectorDialog.detail.test.ts @@ -112,7 +112,10 @@ const fixtures = vi.hoisted(() => { } }) -const runtime = vi.hoisted(() => ({ isCloud: false, isDesktop: true })) +const runtime = vi.hoisted(() => ({ + isCloud: false, + isLegacyDesktopBuild: true +})) const mocks = vi.hoisted(() => ({ filterTemplatesByCategory: vi.fn(() => [fixtures.template]), getTemplateDescription: vi.fn( @@ -173,8 +176,8 @@ vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return runtime.isCloud }, - get isDesktop() { - return runtime.isDesktop + get isLegacyDesktopBuild() { + return runtime.isLegacyDesktopBuild } })) @@ -364,7 +367,7 @@ describe('WorkflowTemplateSelectorDialog detail routing', () => { ).mockImplementation(mocks.filterTemplatesByCategory) vi.mocked(workflowTemplatesStore.loadWorkflowTemplates).mockResolvedValue() runtime.isCloud = false - runtime.isDesktop = true + runtime.isLegacyDesktopBuild = true mocks.prepareWorkflowTemplate.mockResolvedValue(fixtures.prepared) mocks.openPreparedWorkflowTemplate.mockResolvedValue('loaded') mocks.resolveAvailability.mockResolvedValue([ @@ -659,7 +662,7 @@ describe('WorkflowTemplateSelectorDialog detail routing', () => { }) it('opens directly outside Desktop without resolving model inventory', async () => { - runtime.isDesktop = false + runtime.isLegacyDesktopBuild = false renderDialog() await clickTemplateCard() diff --git a/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue b/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue index 9af3f651b17..df4ac6042ff 100644 --- a/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue +++ b/src/components/custom/widget/WorkflowTemplateSelectorDialog.vue @@ -480,7 +480,7 @@ import { useTemplateFiltering } from '@/composables/useTemplateFiltering' import type { TemplateSortMode } from '@/composables/useTemplateFiltering' import { getComfyCloudBaseUrl } from '@/config/comfyApi' import { formatCategoryLabel } from '@/platform/assets/utils/categoryLabel' -import { isCloud, isDesktop } from '@/platform/distribution/types' +import { isCloud, isLegacyDesktopBuild } from '@/platform/distribution/types' import { loadFolderPathsOnce } from '@/platform/missingModel/folderPathCache' import { isModelDownloadable, @@ -1258,7 +1258,7 @@ async function showModelSetupIfNeeded( prepared: PreparedWorkflowTemplate, generation: number ): Promise { - if (!isDesktop) return false + if (!isLegacyDesktopBuild) return false const requirements = extractTemplateModelRequirementDetails( prepared.data.json diff --git a/src/components/dialog/content/setting/UserPanel.test.ts b/src/components/dialog/content/setting/UserPanel.test.ts index eaff4059952..4c7a90605e6 100644 --- a/src/components/dialog/content/setting/UserPanel.test.ts +++ b/src/components/dialog/content/setting/UserPanel.test.ts @@ -29,7 +29,7 @@ vi.mock(import('@/services/dialogService')) vi.mock(import('@/platform/distribution/types'), () => ({ DISTRIBUTION: 'cloud' as const, isCloud: true, - isDesktop: false, + isLegacyDesktopBuild: false, isNightly: false })) vi.mock(import('@/platform/auth/firebaseIdentity'), () => ({ diff --git a/src/components/graph/GraphCanvas.test.ts b/src/components/graph/GraphCanvas.test.ts index bc78a071631..3fe41d8a09f 100644 --- a/src/components/graph/GraphCanvas.test.ts +++ b/src/components/graph/GraphCanvas.test.ts @@ -37,7 +37,7 @@ import GraphCanvas from './GraphCanvas.vue' const distribution = vi.hoisted(() => ({ isCloud: false })) vi.mock(import('@/platform/distribution/types'), () => ({ DISTRIBUTION: 'localhost' as const, - isDesktop: false, + isLegacyDesktopBuild: false, isNightly: false, get isCloud() { return distribution.isCloud diff --git a/src/components/helpcenter/HelpCenterMenuContent.test.ts b/src/components/helpcenter/HelpCenterMenuContent.test.ts index c81391546e6..c7cefe69118 100644 --- a/src/components/helpcenter/HelpCenterMenuContent.test.ts +++ b/src/components/helpcenter/HelpCenterMenuContent.test.ts @@ -26,7 +26,7 @@ beforeEach(() => { const distribution = vi.hoisted(() => ({ isCloud: false, - isDesktop: false, + isLegacyDesktopBuild: false, isNightly: false })) @@ -35,8 +35,8 @@ vi.mock(import('@/platform/distribution/types'), () => ({ get isCloud() { return distribution.isCloud }, - get isDesktop() { - return distribution.isDesktop + get isLegacyDesktopBuild() { + return distribution.isLegacyDesktopBuild }, get isNightly() { return distribution.isNightly @@ -89,7 +89,7 @@ describe('HelpCenterMenuContent feedback item', () => { beforeEach(() => { distribution.isCloud = false - distribution.isDesktop = false + distribution.isLegacyDesktopBuild = false distribution.isNightly = false openSpy = vi.spyOn(window, 'open').mockReturnValue(null) }) @@ -139,7 +139,7 @@ describe('HelpCenterMenuContent system status item', () => { beforeEach(() => { distribution.isCloud = false - distribution.isDesktop = false + distribution.isLegacyDesktopBuild = false distribution.isNightly = false openSpy = vi.spyOn(window, 'open').mockReturnValue(null) }) @@ -166,7 +166,7 @@ describe('HelpCenterMenuContent system status item', () => { describe('HelpCenterMenuContent onboarding replay', () => { it('is hidden outside developer mode', async () => { - distribution.isDesktop = true + distribution.isLegacyDesktopBuild = true useSettingStore().settingValues['Comfy.DevMode'] = false const { user } = renderComponent() @@ -196,7 +196,7 @@ describe('HelpCenterMenuContent onboarding replay', () => { describe('HelpCenterMenuContent ComfyUI update', () => { beforeEach(() => { distribution.isCloud = false - distribution.isDesktop = false + distribution.isLegacyDesktopBuild = false managerState.isNewManagerUI.value = true }) diff --git a/src/components/helpcenter/HelpCenterMenuContent.vue b/src/components/helpcenter/HelpCenterMenuContent.vue index 40df3ac06fd..afee2f53eb2 100644 --- a/src/components/helpcenter/HelpCenterMenuContent.vue +++ b/src/components/helpcenter/HelpCenterMenuContent.vue @@ -161,7 +161,11 @@ import { useI18n } from 'vue-i18n' import PuzzleIcon from '@/components/icons/PuzzleIcon.vue' import { useExternalLink } from '@/composables/useExternalLink' -import { isCloud, isDesktop, isNightly } from '@/platform/distribution/types' +import { + isCloud, + isLegacyDesktopBuild, + isNightly +} from '@/platform/distribution/types' import { useSettingStore } from '@/platform/settings/settingStore' import { buildFeedbackTypeformUrl } from '@/platform/support/config' import { useTelemetry } from '@/platform/telemetry' @@ -247,7 +251,7 @@ const moreItems = computed(() => { key: 'desktop-guide', type: 'item', label: t('helpCenter.desktopUserGuide'), - visible: isDesktop, + visible: isLegacyDesktopBuild, action: () => { trackResourceClick('docs', true) openExternalLink( @@ -263,7 +267,7 @@ const moreItems = computed(() => { key: 'dev-tools', type: 'item', label: t('helpCenter.openDevTools'), - visible: isDesktop, + visible: isLegacyDesktopBuild, action: () => { openDevTools() emit('close') @@ -272,13 +276,13 @@ const moreItems = computed(() => { { key: 'divider-1', type: 'divider', - visible: isDesktop + visible: isLegacyDesktopBuild }, { key: 'reinstall', type: 'item', label: t('helpCenter.reinstall'), - visible: isDesktop, + visible: isLegacyDesktopBuild, action: () => { onReinstall() emit('close') @@ -415,7 +419,7 @@ const menuItems = computed(() => { }) } // Update ComfyUI - only for non-desktop, non-cloud with new manager UI - if (!isDesktop && !isCloud && isNewManagerUI.value) { + if (!isLegacyDesktopBuild && !isCloud && isNewManagerUI.value) { items.push({ key: 'update-comfyui', type: 'item', @@ -593,13 +597,13 @@ const onSubmenuLeave = (): void => { } const openDevTools = (): void => { - if (isDesktop) { + if (isLegacyDesktopBuild) { electronAPI().openDevTools() } } const onReinstall = (): void => { - if (isDesktop) { + if (isLegacyDesktopBuild) { void electronAPI().reinstall() } } diff --git a/src/components/rightSidePanel/errors/TabErrors.vue b/src/components/rightSidePanel/errors/TabErrors.vue index 8a1aa9450ec..d297f6c9153 100644 --- a/src/components/rightSidePanel/errors/TabErrors.vue +++ b/src/components/rightSidePanel/errors/TabErrors.vue @@ -43,13 +43,17 @@ import { defineAsyncComponent } from 'vue' import { useI18n } from 'vue-i18n' import Button from '@/components/ui/button/Button.vue' -import { isCloud, isDesktop, isNightly } from '@/platform/distribution/types' +import { + isCloud, + isLegacyDesktopBuild, + isNightly +} from '@/platform/distribution/types' import ErrorGroupList from './ErrorGroupList.vue' import { useErrorActions } from './useErrorActions' const ErrorPanelSurveyCta = - isNightly && !isCloud && !isDesktop + isNightly && !isCloud && !isLegacyDesktopBuild ? defineAsyncComponent( () => import('@/platform/surveys/ErrorPanelSurveyCta.vue') ) diff --git a/src/components/sidebar/SideToolbar.test.ts b/src/components/sidebar/SideToolbar.test.ts index e7baf456434..de1bfa73c18 100644 --- a/src/components/sidebar/SideToolbar.test.ts +++ b/src/components/sidebar/SideToolbar.test.ts @@ -34,7 +34,7 @@ const spies = vi.hoisted(() => ({ vi.mock(import('@/platform/distribution/types'), () => ({ isCloud: false, - isDesktop: false, + isLegacyDesktopBuild: false, isNightly: false })) diff --git a/src/components/sidebar/SideToolbar.vue b/src/components/sidebar/SideToolbar.vue index a9781e5d9cb..31e7d0ff041 100644 --- a/src/components/sidebar/SideToolbar.vue +++ b/src/components/sidebar/SideToolbar.vue @@ -92,7 +92,11 @@ import ComfyMenuButton from '@/components/sidebar/ComfyMenuButton.vue' import SidebarBottomPanelToggleButton from '@/components/sidebar/SidebarBottomPanelToggleButton.vue' import SidebarSettingsButton from '@/components/sidebar/SidebarSettingsButton.vue' import SidebarShortcutsToggleButton from '@/components/sidebar/SidebarShortcutsToggleButton.vue' -import { isCloud, isDesktop, isNightly } from '@/platform/distribution/types' +import { + isCloud, + isLegacyDesktopBuild, + isNightly +} from '@/platform/distribution/types' import { useSettingStore } from '@/platform/settings/settingStore' import { useTelemetry } from '@/platform/telemetry' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' @@ -119,7 +123,7 @@ const { }>() const NightlySurveyController = - isNightly && !isCloud && !isDesktop + isNightly && !isCloud && !isLegacyDesktopBuild ? defineAsyncComponent( () => import('@/platform/surveys/NightlySurveyController.vue') ) diff --git a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue index 4ae06061989..250be80f373 100644 --- a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue +++ b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue @@ -49,7 +49,7 @@