Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
835c2f7
feat(workspace): a Release switcher under the workspace selector (FE-…
vqt123 Sep 17, 2026
a6ae63c
feat(workspace): the Release switcher shows the workspace default, an…
vqt123 Sep 28, 2026
58b4e9c
refactor(workspace): the switcher picks a deployment, not a Release (…
vqt123 Oct 2, 2026
73ad909
fix(workspace): a picked deployment that no longer exists shows as Co…
vqt123 Oct 4, 2026
545ee22
fix(workspace): missing nodes on a deployment name the deployment, no…
vqt123 Oct 4, 2026
4262fe6
fix(workspace): a model the deployment's Release has is not reported …
vqt123 Oct 4, 2026
9c9d0d9
fix(workspace): the switcher asks for a reload when what the page run…
vqt123 Oct 4, 2026
bcb5efc
fix(workspace): the switcher reads the gone pick and gone default ing…
vqt123 Oct 4, 2026
2b61cba
fix(workspace): the switcher builds on main and drops a listing when …
vqt123 Oct 7, 2026
2ce5494
fix(workspace): missing-model warnings appear when the deployment lis…
vqt123 Oct 7, 2026
8b49048
fix(workspace): the switcher stops saying the pick is gone once a dep…
vqt123 Oct 7, 2026
2a9ec14
fix(workspace): the switcher shows a Build name with ', & or / as wri…
vqt123 Oct 7, 2026
cd1ca68
fix(workspace): a person whose picked deployment was deleted is told …
vqt123 Oct 7, 2026
da8d603
fix(workspace): a model the deployment's Release has is no longer rep…
vqt123 Oct 7, 2026
7efa29c
fix(workspace): the missing-model check reports missing models even w…
vqt123 Oct 7, 2026
a12a686
fix(workspace): the switcher builds on main again: its toasts use the…
vqt123 Oct 9, 2026
207a4ff
fix(workspace): the switcher keeps to main's domain boundaries (FE-2434)
vqt123 Oct 14, 2026
a8c638f
fix(workspace): an owner can clear a workspace default that no longer…
vqt123 Oct 14, 2026
ccd35e4
fix(workspace): a refused listing refresh no longer unlocks a pick in…
vqt123 Oct 14, 2026
3b8c8dc
fix(workspace): keep the one-shot gone-pick notice when a newer listi…
vqt123 Oct 14, 2026
b970dde
test(workspace): cover the release model lookup at both scan entry po…
vqt123 Oct 14, 2026
d6e1b1a
test(workspace): cover the deployment pick check at editor startup (F…
vqt123 Oct 14, 2026
934ed37
fix(workspace): track the interim default-deployment permission
vqt123 Oct 14, 2026
60d66d6
feat(workspace): a link opens the editor on a named deployment (BE-20…
vqt123 Oct 12, 2026
13ab17d
fix(workspace): bound deployment link startup and serialize picks
vqt123 Oct 12, 2026
da34ae0
fix(workspace): honor the deployment listing startup deadline
vqt123 Oct 12, 2026
55e81ec
fix(workspace): cancel deployment link selections that stall
vqt123 Oct 12, 2026
2792e63
fix(workspace): plainer wording for the deployment link's error messages
vqt123 Oct 13, 2026
f6c63bc
feat(workspace): title deployments with their names
vqt123 Oct 14, 2026
cfaaceb
fix(workspace): take the deployment types from @comfyorg/ingest-types
vqt123 Oct 14, 2026
8befb02
test(models): derive the catalog fixture type from its store
vqt123 Oct 14, 2026
19ba0cf
fix(workspace): trust the server's gone deployment fields
vqt123 Oct 14, 2026
98afb1a
test(workspace): use server deletion fact in startup fixture
vqt123 Oct 14, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/components/rightSidePanel/errors/useErrorGroups.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { LGraphNode, SubgraphNode } from '@/lib/litegraph/src/litegraph'
import { createBoundaryLinkedSubgraph } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers'
import type { MissingMediaCandidate } from '@/platform/missingMedia/types'
import { useMissingNodesErrorStore } from '@/platform/nodeReplacement/missingNodesErrorStore'
import { useDeploymentPickStore } from '@/platform/workspace/stores/deploymentPickStore'
import { useExecutionErrorStore } from '@/stores/executionErrorStore'
import type { useComfyRegistryService } from '@/services/comfyRegistryService'
import type { MissingNodeType } from '@/platform/nodeReplacement/types'
Expand Down Expand Up @@ -57,6 +58,7 @@ vi.mock(import('@/platform/distribution/types'), () => ({

vi.mock<unknown>(import('@/i18n'), () => {
const messages: Record<string, string> = {
'deploymentSwitcher.deployment': '{build} v{version}',
'errorCatalog.validationErrors.required_input_missing.title':
'Missing connection',
'errorCatalog.validationErrors.required_input_missing.message':
Expand Down Expand Up @@ -376,6 +378,33 @@ describe('useErrorGroups', () => {
)
})

it('names the deployment this page booted on in the missing_node copy', async () => {
mockIsCloud.value = true
useDeploymentPickStore().$patch({
bootDeployment: {
deployment_id: 'dep-2',
release_id: 'r-2',
build_name: 'Studio Build',
release_version: 2,
status: 'ready',
created_at: '2026-10-01T00:00:00Z'
}
})
const { groups } = createErrorGroups()
const missingNodesStore = useMissingNodesErrorStore()
missingNodesStore.setMissingNodeTypes([
makeMissingNodeType('NodeA', { cnrId: 'pack-1' })
])
await nextTick()

const missingGroup = groups.allErrorGroups.value.find(
(g) => g.type === 'missing_node'
)
expect(missingGroup?.displayMessage).toBe(
"These nodes aren't on Studio Build v2. Replace them, or pick a deployment that has them."
)
})

it('includes swap_nodes group when replaceable nodes exist', async () => {
const { groups } = createErrorGroups()
const missingNodesStore = useMissingNodesErrorStore()
Expand Down
11 changes: 8 additions & 3 deletions src/components/rightSidePanel/errors/useErrorGroups.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
import { app } from '@/scripts/app'
import { isCloud } from '@/platform/distribution/types'
import { useBootDeploymentLabel } from '@/platform/workspace/composables/useDeploymentLabels'
import { SubgraphNode } from '@/lib/litegraph/src/litegraph'
import type { LGraphNode } from '@/lib/litegraph/src/litegraph'

Expand Down Expand Up @@ -269,6 +270,7 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
const collapseState = reactive<Record<string, boolean>>({})

const errorClassification = useErrorClassification()
const deploymentLabel = isCloud ? useBootDeploymentLabel() : undefined

const selectedNodeInfo = computed(() => {
const rootGraph = app.rootGraphOrUndefined
Expand Down Expand Up @@ -743,7 +745,8 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
kind: 'missing_node',
nodeTypes: error.nodeTypes,
count: packCount,
isCloud
isCloud,
deploymentLabel: deploymentLabel?.value
})
})
}
Expand Down Expand Up @@ -773,7 +776,8 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
kind: 'missing_model',
groups: missingModelGroups.value,
count,
isCloud
isCloud,
deploymentLabel: deploymentLabel?.value
})
}
]
Expand Down Expand Up @@ -886,7 +890,8 @@ export function useErrorGroups(searchQuery: MaybeRefOrGetter<string>) {
kind: 'missing_model',
groups: missingModelGroupsForSelection.value,
count,
isCloud
isCloud,
deploymentLabel: deploymentLabel?.value
})
}
]
Expand Down
40 changes: 37 additions & 3 deletions src/composables/graph/useErrorClearingHooks.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { useMissingMediaStore } from '@/platform/missingMedia/missingMediaStore'
import * as missingModelScan from '@/platform/missingModel/missingModelScan'
import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
import { useMissingNodesErrorStore } from '@/platform/nodeReplacement/missingNodesErrorStore'
import { cloudReleaseModelOptions } from '@/platform/missingModel/releaseModelOptions'
import { app } from '@/scripts/app'
import { ChangeTracker } from '@/scripts/changeTracker'
import { useExecutionErrorStore } from '@/stores/executionErrorStore'
Expand All @@ -34,6 +35,11 @@ import { nodeError, validationError } from '@/utils/__tests__/nodeErrorHelpers'
import type { MissingMediaCandidate } from '@/platform/missingMedia/types'
import type { MissingModelCandidate } from '@/platform/missingModel/types'

vi.mock(import('@/platform/missingModel/releaseModelOptions'), () => ({
cloudReleaseModelOptions: vi.fn(),
releaseModelOptions: vi.fn()
}))

function stubAppRootGraph(graph: LGraph | undefined) {
vi.spyOn(app, 'rootGraphOrUndefined', 'get').mockReturnValue(graph)
}
Expand Down Expand Up @@ -1483,6 +1489,31 @@ describe('realtime scan verifies pending cloud candidates', () => {
})
})

it('hands the scan the lookup of the models the boot Release has', async () => {
const releaseModelOptions = vi.fn(async () => ['release.safetensors'])
vi.mocked(cloudReleaseModelOptions).mockReturnValue(releaseModelOptions)
const graph = new LGraph()
const node = new LGraphNode('CheckpointLoaderSimple')
node.mode = LGraphEventMode.BYPASS
graph.add(node)
stubAppRootGraph(graph)
const scanSpy = vi
.spyOn(missingModelScan, 'scanNodeModelCandidates')
.mockReturnValue([])
vi.spyOn(missingMediaScan, 'scanNodeMediaCandidates').mockReturnValue([])

installErrorClearingHooks(graph)
setNodeMode(graph, node, LGraphEventMode.ALWAYS)

expect(scanSpy).toHaveBeenCalledWith(
graph,
node,
expect.any(Function),
expect.any(Function),
releaseModelOptions
)
})

it('does not add candidates that remain confirmed-present after verification', async () => {
const graph = new LGraph()
const node = new LGraphNode('CheckpointLoaderSimple')
Expand Down Expand Up @@ -1795,19 +1826,22 @@ describe('scan skips interior of bypassed subgraph containers', () => {
rootGraph,
outerSubgraphNode,
expect.any(Function),
expect.any(Function)
expect.any(Function),
undefined
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
)
expect(modelScanSpy).toHaveBeenCalledWith(
rootGraph,
leafNode,
expect.any(Function),
expect.any(Function)
expect.any(Function),
undefined
)
expect(modelScanSpy).toHaveBeenCalledWith(
rootGraph,
innerSubgraphNode,
expect.any(Function),
expect.any(Function)
expect.any(Function),
undefined
)
expect(mediaScanSpy).toHaveBeenCalledWith(rootGraph, outerSubgraphNode)
expect(mediaScanSpy).toHaveBeenCalledWith(rootGraph, leafNode)
Expand Down
4 changes: 3 additions & 1 deletion src/composables/graph/useErrorClearingHooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
verifyAssetSupportedCandidates
} from '@/platform/missingModel/missingModelScan'
import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
import { cloudReleaseModelOptions } from '@/platform/missingModel/releaseModelOptions'
import {
isMissingMediaCandidateActive,
isMissingMediaCandidateScopeActive,
Expand Down Expand Up @@ -219,7 +220,8 @@ function scanSingleNodeModelsAndTypes(
rootGraph,
node,
assetService.shouldUseWidgetAssetPicker,
(nodeType) => useModelToNodeStore().getCategoryForNodeType(nodeType)
(nodeType) => useModelToNodeStore().getCategoryForNodeType(nodeType),
cloudReleaseModelOptions()
)
const confirmedModels = modelCandidates.filter((c) => c.isMissing === true)
if (confirmedModels.length) {
Expand Down
60 changes: 60 additions & 0 deletions src/composables/useUrlActionLoaders.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ vi.mock(import('@/platform/distribution/types'), () => ({

const mocks = vi.hoisted(() => ({
reportError: vi.fn(),
loadDeployment: vi.fn(async (): Promise<boolean> => false),
loadWorkspace: vi.fn(async (): Promise<boolean | undefined> => undefined),
loadInvite: vi.fn(async () => undefined),
loadCreateWorkspace: vi.fn(async () => undefined),
Expand All @@ -22,6 +23,7 @@ const mocks = vi.hoisted(() => ({
loadSettings: vi.fn(),
loadAssets: vi.fn(async () => undefined),
loadPaymentReturn: vi.fn(async () => undefined),
useDeployment: vi.fn(),
useWorkspace: vi.fn(),
useInvite: vi.fn(),
useCreateWorkspace: vi.fn(),
Expand All @@ -31,6 +33,9 @@ const mocks = vi.hoisted(() => ({
useAssets: vi.fn(),
usePaymentReturn: vi.fn()
}))
mocks.useDeployment.mockImplementation(() => ({
loadDeploymentFromUrl: mocks.loadDeployment
}))
mocks.useWorkspace.mockImplementation(() => ({
loadWorkspaceFromUrl: mocks.loadWorkspace
}))
Expand Down Expand Up @@ -66,6 +71,12 @@ const router = createRouter({
routes: [{ path: '/:pathMatch(.*)*', component: { template: '<div />' } }]
})

vi.mock(
import('@/platform/workspace/composables/useDeploymentUrlLoader'),
() => ({
useDeploymentUrlLoader: mocks.useDeployment
})
)
vi.mock(
import('@/platform/workspace/composables/useWorkspaceUrlLoader'),
() => ({
Expand Down Expand Up @@ -111,6 +122,9 @@ vi.mock(import('@/platform/telemetry/reportError'), () => ({
describe('useUrlActionLoaders', () => {
beforeEach(async () => {
mockIsCloud.value = true
mocks.useDeployment.mockImplementation(() => ({
loadDeploymentFromUrl: mocks.loadDeployment
}))
mocks.useWorkspace.mockImplementation(() => ({
loadWorkspaceFromUrl: mocks.loadWorkspace
}))
Expand Down Expand Up @@ -204,6 +218,7 @@ describe('useUrlActionLoaders', () => {
const { runUrlActionLoaders } = useUrlActionLoaders()
await runUrlActionLoaders()

expect(mocks.useDeployment).not.toHaveBeenCalled()
expect(mocks.useWorkspace).not.toHaveBeenCalled()
expect(mocks.useInvite).not.toHaveBeenCalled()
expect(mocks.useCreateWorkspace).not.toHaveBeenCalled()
Expand All @@ -213,6 +228,7 @@ describe('useUrlActionLoaders', () => {
expect(mocks.useAssets).not.toHaveBeenCalled()
expect(mocks.usePaymentReturn).not.toHaveBeenCalled()
expect(useSubscriptionDialog).not.toHaveBeenCalled()
expect(mocks.loadDeployment).not.toHaveBeenCalled()
expect(mocks.loadWorkspace).not.toHaveBeenCalled()
expect(mocks.loadInvite).not.toHaveBeenCalled()
expect(mocks.loadCreateWorkspace).not.toHaveBeenCalled()
Expand All @@ -230,6 +246,7 @@ describe('useUrlActionLoaders', () => {
const { runUrlActionLoaders } = useUrlActionLoaders()
await runUrlActionLoaders()

expect(mocks.loadDeployment).toHaveBeenCalledOnce()
expect(mocks.loadWorkspace).toHaveBeenCalledOnce()
expect(mocks.loadInvite).toHaveBeenCalledOnce()
expect(mocks.loadCreateWorkspace).toHaveBeenCalledOnce()
Expand Down Expand Up @@ -258,6 +275,49 @@ describe('useUrlActionLoaders', () => {
)
})

// With ?deployment the deployment link owns ?workspace too: the workspace
// loader alone would strip ?workspace and switch, and the boot after that
// reload would find a link with no workspace in it.
it('reads a deployment link before the workspace link', async () => {
const { runUrlActionLoaders } = useUrlActionLoaders()
await runUrlActionLoaders()

expect(mocks.loadDeployment.mock.invocationCallOrder[0]).toBeLessThan(
mocks.loadWorkspace.mock.invocationCallOrder[0]
)
})

// The deployment link keeps both params across its own workspace switch,
// so the boot after the reload can pick; nothing may strip them first.
it('stops before every other step, the sweep included, when the deployment link reloads', async () => {
await router.replace({
path: '/',
query: { workspace: 'w-2', deployment: 'dep-1' }
})
mocks.loadDeployment.mockResolvedValueOnce(true)

const { runUrlActionLoaders } = useUrlActionLoaders()
await runUrlActionLoaders()

expect(mocks.loadWorkspace).not.toHaveBeenCalled()
expect(router.currentRoute.value.query).toEqual({
workspace: 'w-2',
deployment: 'dep-1'
})
})

it('clears a deployment param no loader acted on', async () => {
await router.replace({
path: '/',
query: { deployment: 'dep-1', workflow: 'keep-me' }
})

const { runUrlActionLoaders } = useUrlActionLoaders()
await runUrlActionLoaders()

expect(router.currentRoute.value.query).toEqual({ workflow: 'keep-me' })
})

it('isolates a workspace-loader failure so it does not abort the boot chain', async () => {
mocks.loadWorkspace.mockRejectedValueOnce(new Error('boom'))

Expand Down
Loading
Loading