fix: address missing model review gaps

browser_tests/fixtures/selectors.ts

@@ -61,13 +61,11 @@ export const TestIds = {
     missingModelsGroup: 'error-group-missing-model',
     missingModelExpand: 'missing-model-expand',
     missingModelLocate: 'missing-model-locate',
-    missingModelCopyName: 'missing-model-copy-name',
-    missingModelCopyUrl: 'missing-model-copy-url',
+    missingModelReferenceCount: 'missing-model-reference-count',
     missingModelDownload: 'missing-model-download',
     missingModelActions: 'missing-model-actions',
     missingModelDownloadAll: 'missing-model-download-all',
-    missingModelRefresh: 'missing-model-refresh',
-    missingModelImportUnsupported: 'missing-model-import-unsupported',
+    missingModelRefresh: 'missing-model-header-refresh',
     missingMediaGroup: 'error-group-missing-media',
     swapNodesGroup: 'error-group-swap-nodes',
     swapNodeGroupCount: 'swap-node-group-count',

browser_tests/tests/propertiesPanel/errorsTabMissingModels.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+import type { Locator } from '@playwright/test'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
@@ -11,6 +12,18 @@ import {
   loadWorkflowAndOpenErrorsTab
 } from '@e2e/fixtures/helpers/ErrorsTabHelper'
 
+const FAKE_MODEL_NAME = 'fake_model.safetensors'
+
+function getModelLabel(group: Locator, modelName: string = FAKE_MODEL_NAME) {
+  return group.getByRole('button', { name: modelName, exact: true })
+}
+
+async function expectReferenceBadge(group: Locator, count: number) {
+  await expect(
+    group.getByTestId(TestIds.dialogs.missingModelReferenceCount)
+  ).toHaveText(String(count))
+}
+
 test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     await comfyPage.settings.setSetting(
@@ -34,15 +47,14 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
     ).toHaveText(/\S/)
   })
 
-  test('Should display model name with referencing node count', async ({
-    comfyPage
-  }) => {
+  test('Should display model name and metadata', async ({ comfyPage }) => {
     await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
 
     const modelsGroup = comfyPage.page.getByTestId(
       TestIds.dialogs.missingModelsGroup
     )
-    await expect(modelsGroup).toContainText(/fake_model\.safetensors\s*\(\d+\)/)
+    await expect(getModelLabel(modelsGroup)).toBeVisible()
+    await expect(modelsGroup.getByText('checkpoints')).toBeVisible()
   })
 
   test('Should expand model row to show referencing nodes', async ({
@@ -53,32 +65,33 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
       'missing/missing_models_with_nodes'
     )
 
-    const locateButton = comfyPage.page.getByTestId(
-      TestIds.dialogs.missingModelLocate
+    const modelsGroup = comfyPage.page.getByTestId(
+      TestIds.dialogs.missingModelsGroup
     )
-    await expect(locateButton.first()).toBeHidden()
-
-    const expandButton = comfyPage.page.getByTestId(
+    const expandButton = modelsGroup.getByTestId(
       TestIds.dialogs.missingModelExpand
     )
     await expect(expandButton.first()).toBeVisible()
+    await expectReferenceBadge(modelsGroup, 2)
     await expandButton.first().click()
 
-    await expect(locateButton.first()).toBeVisible()
+    await expect(
+      modelsGroup.getByTestId(TestIds.dialogs.missingModelLocate)
+    ).toHaveCount(2)
   })
 
-  test('Should copy model name to clipboard', async ({ comfyPage }) => {
+  test('Should copy model URL to clipboard', async ({ comfyPage }) => {
     await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
     await interceptClipboardWrite(comfyPage.page)
 
-    const copyButton = comfyPage.page.getByTestId(
-      TestIds.dialogs.missingModelCopyName
-    )
+    const copyButton = comfyPage.page.getByRole('button', {
+      name: 'Copy URL'
+    })
     await expect(copyButton.first()).toBeVisible()
     await copyButton.first().dispatchEvent('click')
 
     const copiedText = await getClipboardText(comfyPage.page)
-    expect(copiedText).toContain('fake_model.safetensors')
+    expect(copiedText).toContain('/api/devtools/')
   })
 
   test.describe('OSS-specific', { tag: '@oss' }, () => {
@@ -87,9 +100,9 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
     }) => {
       await loadWorkflowAndOpenErrorsTab(comfyPage, 'missing/missing_models')
 
-      const copyUrlButton = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelCopyUrl
-      )
+      const copyUrlButton = comfyPage.page.getByRole('button', {
+        name: 'Copy URL'
+      })
       await expect(copyUrlButton.first()).toBeVisible()
     })
 
@@ -102,6 +115,7 @@ test.describe('Errors tab - Missing models', { tag: '@ui' }, () => {
         TestIds.dialogs.missingModelDownload
       )
       await expect(downloadButton.first()).toBeVisible()
+      await expect(downloadButton.first()).toHaveText('Download')
     })
 
     test('Should render Download all and Refresh actions for one downloadable model', async ({

browser_tests/tests/propertiesPanel/errorsTabModeAware.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+import type { Locator } from '@playwright/test'
 
 import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
 import { TestIds } from '@e2e/fixtures/selectors'
@@ -8,6 +9,18 @@ import {
   loadWorkflowAndOpenErrorsTab
 } from '@e2e/fixtures/helpers/ErrorsTabHelper'
 
+const FAKE_MODEL_NAME = 'fake_model.safetensors'
+
+function getModelLabel(group: Locator, modelName: string = FAKE_MODEL_NAME) {
+  return group.getByRole('button', { name: modelName, exact: true })
+}
+
+async function expectReferenceBadge(group: Locator, count: number) {
+  await expect(
+    group.getByTestId(TestIds.dialogs.missingModelReferenceCount)
+  ).toHaveText(String(count))
+}
+
 test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
   test.beforeEach(async ({ comfyPage }) => {
     await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
@@ -130,9 +143,9 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
         'missing/missing_models_from_node_properties'
       )
 
-      const copyUrlButton = comfyPage.page.getByTestId(
-        TestIds.dialogs.missingModelCopyUrl
-      )
+      const copyUrlButton = comfyPage.page.getByRole('button', {
+        name: 'Copy URL'
+      })
       await expect(copyUrlButton.first()).toBeVisible()
 
       const node = await comfyPage.nodeOps.getNodeRefById('1')
@@ -156,9 +169,7 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
         TestIds.dialogs.missingModelsGroup
       )
       await expect(missingModelGroup).toBeVisible()
-      await expect(missingModelGroup).toContainText(
-        /fake_model\.safetensors\s*\(1\)/
-      )
+      await expect(getModelLabel(missingModelGroup)).toBeVisible()
 
       const node = await comfyPage.nodeOps.getNodeRefById('1')
       await node.click('title')
@@ -168,9 +179,7 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
       await expect.poll(() => comfyPage.nodeOps.getNodeCount()).toBe(2)
 
       await comfyPage.canvas.click()
-      await expect(missingModelGroup).toContainText(
-        /fake_model\.safetensors\s*\(2\)/
-      )
+      await expectReferenceBadge(missingModelGroup, 2)
     })
 
     test('Pasting a bypassed node does not add a new error', async ({
@@ -252,14 +261,17 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
       const missingModelGroup = comfyPage.page.getByTestId(
         TestIds.dialogs.missingModelsGroup
       )
-      await expect(missingModelGroup).toContainText(/\(2\)/)
+      await expectReferenceBadge(missingModelGroup, 2)
 
       const node1 = await comfyPage.nodeOps.getNodeRefById('1')
       await node1.click('title')
-      await expect(missingModelGroup).toContainText(/\(1\)/)
+      await expect(getModelLabel(missingModelGroup)).toBeVisible()
+      await expect(
+        missingModelGroup.getByTestId(TestIds.dialogs.missingModelLocate)
+      ).toHaveCount(1)
 
       await comfyPage.canvas.click()
-      await expect(missingModelGroup).toContainText(/\(2\)/)
+      await expectReferenceBadge(missingModelGroup, 2)
     })
   })
 
@@ -384,9 +396,7 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
         const missingModelGroup = comfyPage.page.getByTestId(
           TestIds.dialogs.missingModelsGroup
         )
-        await expect(missingModelGroup).toContainText(
-          /fake_model\.safetensors\s*\(1\)/
-        )
+        await expect(getModelLabel(missingModelGroup)).toBeVisible()
 
         await comfyPage.page.evaluate((value) => {
           const hostNode = window.app!.graph!.getNodeById(2)
@@ -439,9 +449,7 @@ test.describe('Errors tab - Mode-aware errors', { tag: '@ui' }, () => {
         const missingModelGroup = comfyPage.page.getByTestId(
           TestIds.dialogs.missingModelsGroup
         )
-        await expect(missingModelGroup).toContainText(
-          /fake_model\.safetensors\s*\(1\)/
-        )
+        await expect(getModelLabel(missingModelGroup)).toBeVisible()
 
         const promotedModelCombo = comfyPage.vueNodes
           .getNodeByTitle('Subgraph with Promoted Missing Model')

src/components/rightSidePanel/errors/TabErrors.test.ts

@@ -539,7 +539,7 @@ describe('TabErrors.vue', () => {
     ).toBeInTheDocument()
   })
 
-  it('keeps missing model Refresh in the card actions when models are downloadable', () => {
+  it('renders missing model Refresh in the header and Download all in the card when models are downloadable', () => {
     const missingModel = {
       nodeId: '1',
       nodeType: 'CheckpointLoaderSimple',
@@ -557,11 +557,8 @@ describe('TabErrors.vue', () => {
       }
     })
 
-    expect(
-      screen.queryByTestId('missing-model-header-refresh')
-    ).not.toBeInTheDocument()
+    expect(screen.getByTestId('missing-model-header-refresh')).toBeVisible()
     expect(screen.getByTestId('missing-model-actions')).toBeInTheDocument()
     expect(screen.getByRole('button', { name: /Download all/ })).toBeVisible()
-    expect(screen.getByRole('button', { name: 'Refresh' })).toBeVisible()
   })
 })

src/components/rightSidePanel/errors/TabErrors.vue

@@ -94,9 +94,10 @@
                   showMissingModelHeaderRefresh
                 "
                 data-testid="missing-model-header-refresh"
-                variant="secondary"
-                size="sm"
-                class="mr-2 h-8 shrink-0 rounded-lg text-sm"
+                variant="muted-textonly"
+                size="icon"
+                class="mr-2 shrink-0 rounded-lg hover:bg-transparent hover:text-base-foreground"
+                :aria-label="t('rightSidePanel.missingModels.refresh')"
                 :aria-busy="missingModelStore.isRefreshingMissingModels"
                 :aria-disabled="missingModelStore.isRefreshingMissingModels"
                 @click.stop="handleMissingModelRefresh"
@@ -112,7 +113,6 @@
                   aria-hidden="true"
                   class="icon-[lucide--refresh-cw] size-4 shrink-0"
                 />
-                {{ t('rightSidePanel.missingModels.refresh') }}
               </Button>
               <span
                 v-if="
@@ -246,7 +246,6 @@
           <MissingModelCard
             v-if="group.type === 'missing_model'"
             :missing-model-groups="missingModelGroups"
-            :show-node-id-badge="showNodeIdBadge"
             @locate-model="handleLocateAssetNode"
           />
 
@@ -301,11 +300,9 @@ import { cn } from '@comfyorg/tailwind-utils'
 
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
 import { useFocusNode } from '@/composables/canvas/useFocusNode'
-import { useSettingStore } from '@/platform/settings/settingStore'
 import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore'
 import { useManagerState } from '@/workbench/extensions/manager/composables/useManagerState'
 import { ManagerTab } from '@/workbench/extensions/manager/types/comfyManagerTypes'
-import { NodeBadgeMode } from '@/types/nodeSource'
 
 import PropertiesAccordionItem from '../layout/PropertiesAccordionItem.vue'
 import CollapseToggleButton from '../layout/CollapseToggleButton.vue'
@@ -319,7 +316,6 @@ import MissingMediaCard from '@/platform/missingMedia/components/MissingMediaCar
 import { isCloud, isDesktop, isNightly } from '@/platform/distribution/types'
 import Button from '@/components/ui/button/Button.vue'
 import DotSpinner from '@/components/common/DotSpinner.vue'
-import { getDownloadableModels } from '@/platform/missingModel/missingModelViewUtils'
 import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import { usePackInstall } from '@/workbench/extensions/manager/composables/nodePack/usePackInstall'
 import { useMissingNodes } from '@/workbench/extensions/manager/composables/nodePack/useMissingNodes'
@@ -347,7 +343,6 @@ const { t } = useI18n()
 const { copyToClipboard } = useCopyToClipboard()
 const { focusNode, enterSubgraph } = useFocusNode()
 const { openGitHubIssues, contactSupport } = useErrorActions()
-const settingStore = useSettingStore()
 const rightSidePanelStore = useRightSidePanelStore()
 const missingModelStore = useMissingModelStore()
 const { shouldShowManagerButtons, shouldShowInstallButton, openManager } =
@@ -371,12 +366,6 @@ function getGroupSize(group: ErrorGroup) {
   return fullSizeGroupTypes.has(group.type) ? 'lg' : 'default'
 }
 
-const showNodeIdBadge = computed(
-  () =>
-    (settingStore.get('Comfy.NodeBadge.NodeIdBadgeMode') as NodeBadgeMode) !==
-    NodeBadgeMode.None
-)
-
 function isExecutionItemListGroup(group: ErrorGroup) {
   return (
     group.type === 'execution' &&
@@ -463,17 +452,8 @@ const {
   swapNodeGroups
 } = useErrorGroups(searchQuery)
 
-const missingModelDownloadableModels = computed(() => {
-  if (isCloud) return []
-
-  return getDownloadableModels(missingModelGroups.value)
-})
-
 const showMissingModelHeaderRefresh = computed(
-  () =>
-    !isCloud &&
-    missingModelGroups.value.length > 0 &&
-    missingModelDownloadableModels.value.length === 0
+  () => !isCloud && missingModelGroups.value.length > 0
 )
 
 function handleMissingModelRefresh() {

src/locales/en/main.json

@@ -3087,6 +3087,13 @@
     "loadingModels": "Loading {type}...",
     "maxFileSize": "Max file size: {size}",
     "maxFileSizeValue": "1 GB",
+    "missingModelImportTypeLocked": "Locked to {type} for this missing model",
+    "missingModelImportTypeMismatchAlreadyImported": "This file is already imported as {actual}.",
+    "missingModelImportTypeMismatchNextAction": "Try importing a different {required} model that this node can use.",
+    "missingModelImportTypeMismatchRequired": "This node requires {required}, so this import cannot resolve the missing model.",
+    "missingModelImportTypeMismatchTitle": "This model cannot resolve the missing model.",
+    "missingModelImportUnknownType": "another model type",
+    "missingModelImportWillReplace": "This import will replace {model} in:",
     "modelAssociatedWithLink": "The model associated with the link you provided:",
     "modelName": "Model Name",
     "modelNamePlaceholder": "Enter a name for this model",
@@ -3640,9 +3647,7 @@
     },
     "missingModels": {
       "urlPlaceholder": "Paste Model URL (Civitai or Hugging Face)",
-      "or": "OR",
-      "useFromLibrary": "Use from Library",
-      "usingFromLibrary": "Using from Library",
+      "readyToApply": "Ready to apply",
       "unsupportedUrl": "Only Civitai and Hugging Face URLs are supported.",
       "metadataFetchFailed": "Failed to retrieve metadata. Please check the link and try again.",
       "import": "Import",

src/platform/assets/components/UploadModelConfirmation.test.ts

@@ -0,0 +1,81 @@
+import { render, screen } from '@testing-library/vue'
+import { createI18n } from 'vue-i18n'
+import { describe, expect, it } from 'vitest'
+
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
+import type { UploadModelDialogContext } from '@/platform/assets/composables/useUploadModelWizard'
+
+import UploadModelConfirmation from './UploadModelConfirmation.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: enMessages },
+  missingWarn: false,
+  fallbackWarn: false,
+  escapeParameter: true
+})
+
+const SingleSelectStub = {
+  name: 'SingleSelect',
+  props: {
+    disabled: Boolean,
+    modelValue: String
+  },
+  template:
+    '<button type="button" :disabled="disabled">{{ modelValue }}</button>'
+}
+
+describe('UploadModelConfirmation', () => {
+  it('shows missing-model replacement context and locks the model type', () => {
+    const uploadContext: UploadModelDialogContext = {
+      kind: 'missing-model-resolution',
+      missingModelName: 'segm/person_yolov8m-seg.pt',
+      requiredModelType: 'Ultralytics/bbox',
+      replacementTargets: [
+        {
+          nodeId: '1',
+          nodeLabel: 'Checkpoint Loader',
+          widgetName: 'ckpt_name'
+        }
+      ]
+    }
+
+    render(UploadModelConfirmation, {
+      props: {
+        modelValue: 'Ultralytics/bbox',
+        metadata: {
+          content_length: 100,
+          final_url: 'https://civitai.com/models/123',
+          filename: 'replacement.safetensors'
+        },
+        uploadContext,
+        'onUpdate:modelValue': () => {}
+      },
+      global: {
+        plugins: [i18n],
+        stubs: {
+          SingleSelect: SingleSelectStub
+        }
+      }
+    })
+
+    expect(screen.getByText('segm/person_yolov8m-seg.pt')).toBeInTheDocument()
+    expect(screen.getByText('Checkpoint Loader')).toBeInTheDocument()
+    expect(screen.getByText('- ckpt_name')).toBeInTheDocument()
+    const modelTypeSelect = screen.getByRole('button', {
+      name: 'Ultralytics/bbox'
+    })
+
+    expect(modelTypeSelect).toBeDisabled()
+    expect(
+      screen.getByText((_content, element) => {
+        return (
+          element?.textContent ===
+          'Locked to Ultralytics/bbox for this missing model'
+        )
+      })
+    ).toBeInTheDocument()
+    expect(screen.queryByText(/&#x2F;/)).not.toBeInTheDocument()
+  })
+})

src/platform/assets/components/UploadModelConfirmation.vue

@@ -22,16 +22,50 @@
       </div>
     </div>
 
+    <div
+      v-if="isMissingModelResolution"
+      class="flex flex-col gap-2 rounded-lg bg-secondary-background px-4 py-3"
+    >
+      <i18n-t
+        keypath="assetBrowser.missingModelImportWillReplace"
+        tag="p"
+        class="m-0 text-base-foreground"
+      >
+        <template #model>
+          <span>{{ missingModelName }}</span>
+        </template>
+      </i18n-t>
+      <ul class="m-0 list-none space-y-1 p-0">
+        <li
+          v-for="target in replacementTargets"
+          :key="`${target.nodeId}:${target.widgetName}`"
+          class="flex min-w-0 items-center gap-2"
+        >
+          <span class="min-w-0 truncate text-muted-foreground">
+            {{ target.nodeLabel }}
+          </span>
+          <span class="shrink-0 text-muted-foreground">
+            - {{ target.widgetName }}
+          </span>
+        </li>
+      </ul>
+    </div>
+
     <!-- Model Type Selection -->
     <div class="flex flex-col gap-2">
-      <div class="flex items-center gap-2">
-        <label>
-          {{ $t('assetBrowser.modelTypeSelectorLabel') }}
-        </label>
-        <i class="icon-[lucide--circle-question-mark] text-muted-foreground" />
-        <span class="text-muted-foreground">
-          {{ $t('assetBrowser.notSureLeaveAsIs') }}
-        </span>
+      <div class="flex flex-col gap-1">
+        <div class="flex items-center gap-2">
+          <label>
+            {{ $t('assetBrowser.modelTypeSelectorLabel') }}
+          </label>
+          <i
+            aria-hidden="true"
+            class="icon-[lucide--circle-question-mark] text-muted-foreground"
+          />
+          <span v-if="!isMissingModelResolution" class="text-muted-foreground">
+            {{ $t('assetBrowser.notSureLeaveAsIs') }}
+          </span>
+        </div>
       </div>
       <SingleSelect
         v-model="modelValue"
@@ -41,23 +75,37 @@
             : $t('assetBrowser.modelTypeSelectorPlaceholder')
         "
         :options="modelTypes"
-        :disabled="isLoading"
+        :disabled="isLoading || isMissingModelResolution"
         :content-style="selectContentStyle"
         data-attr="upload-model-step2-type-selector"
       />
+      <i18n-t
+        v-if="isMissingModelResolution"
+        keypath="assetBrowser.missingModelImportTypeLocked"
+        tag="span"
+        class="text-muted-foreground"
+      >
+        <template #type>
+          <span>{{ selectedModelTypeLabel }}</span>
+        </template>
+      </i18n-t>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
+
 import SingleSelect from '@/components/ui/single-select/SingleSelect.vue'
 import { usePrimeVueOverlayChildStyle } from '@/composables/usePopoverSizing'
 import { useModelTypes } from '@/platform/assets/composables/useModelTypes'
+import type { UploadModelDialogContext } from '@/platform/assets/composables/useUploadModelWizard'
 import type { AssetMetadata } from '@/platform/assets/schemas/assetSchema'
 
-defineProps<{
+const { uploadContext } = defineProps<{
   metadata?: AssetMetadata
   previewImage?: string
+  uploadContext?: UploadModelDialogContext
 }>()
 
 const modelValue = defineModel<string | undefined>()
@@ -65,4 +113,27 @@ const modelValue = defineModel<string | undefined>()
 const { modelTypes, isLoading } = useModelTypes()
 const primeVueOverlay = usePrimeVueOverlayChildStyle()
 const selectContentStyle = primeVueOverlay.contentStyle
+
+const isMissingModelResolution = computed(
+  () => uploadContext?.kind === 'missing-model-resolution'
+)
+const missingModelName = computed(() =>
+  uploadContext?.kind === 'missing-model-resolution'
+    ? uploadContext.missingModelName
+    : ''
+)
+const replacementTargets = computed(() =>
+  uploadContext?.kind === 'missing-model-resolution'
+    ? uploadContext.replacementTargets
+    : []
+)
+const selectedModelTypeLabel = computed(() => {
+  const value =
+    uploadContext?.kind === 'missing-model-resolution'
+      ? uploadContext.requiredModelType
+      : modelValue.value
+  return (
+    modelTypes.value.find((option) => option.value === value)?.name ?? value
+  )
+})
 </script>

src/platform/assets/components/UploadModelDialog.vue

@@ -17,6 +17,7 @@
         v-model="selectedModelType"
         :metadata="wizardData.metadata"
         :preview-image="wizardData.previewImage"
+        :upload-context="uploadContext"
       />
 
       <!-- Step 3: Upload Progress -->
@@ -24,6 +25,7 @@
         v-else-if="currentStep === 3 && uploadStatus != null"
         :result="uploadStatus"
         :error="uploadError"
+        :type-mismatch="uploadTypeMismatch"
         :metadata="wizardData.metadata"
         :model-type="selectedModelType"
         :preview-image="wizardData.previewImage"
@@ -39,6 +41,7 @@
       :can-fetch-metadata="canFetchMetadata"
       :can-upload-model="canUploadModel"
       :upload-status="uploadStatus"
+      :can-import-another="!isMissingModelResolution"
       @back="goToPreviousStep"
       @fetch-metadata="handleFetchMetadata"
       @upload="handleUploadModel"
@@ -49,29 +52,47 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from 'vue'
+import { computed, onMounted } from 'vue'
 
 import UploadModelConfirmation from '@/platform/assets/components/UploadModelConfirmation.vue'
 import UploadModelFooter from '@/platform/assets/components/UploadModelFooter.vue'
 import UploadModelProgress from '@/platform/assets/components/UploadModelProgress.vue'
 import UploadModelUrlInput from '@/platform/assets/components/UploadModelUrlInput.vue'
 import { useModelTypes } from '@/platform/assets/composables/useModelTypes'
+import type {
+  UploadModelDialogContext,
+  UploadModelSuccess
+} from '@/platform/assets/composables/useUploadModelWizard'
 import { useUploadModelWizard } from '@/platform/assets/composables/useUploadModelWizard'
 import { useDialogStore } from '@/stores/dialogStore'
 
 const dialogStore = useDialogStore()
 const { modelTypes, fetchModelTypes } = useModelTypes()
 
-const emit = defineEmits<{
-  'upload-success': []
+const { uploadContext } = defineProps<{
+  uploadContext?: UploadModelDialogContext
 }>()
 
+const emit = defineEmits<{
+  'upload-success': [result: UploadModelSuccess]
+}>()
+
+const isMissingModelResolution = computed(
+  () => uploadContext?.kind === 'missing-model-resolution'
+)
+const requiredModelType = computed(() =>
+  uploadContext?.kind === 'missing-model-resolution'
+    ? uploadContext.requiredModelType
+    : undefined
+)
+
 const {
   currentStep,
   isFetchingMetadata,
   isUploading,
   uploadStatus,
   uploadError,
+  uploadTypeMismatch,
   wizardData,
   selectedModelType,
   canFetchMetadata,
@@ -80,16 +101,18 @@ const {
   uploadModel,
   goToPreviousStep,
   resetWizard
-} = useUploadModelWizard(modelTypes)
+} = useUploadModelWizard(modelTypes, {
+  requiredModelType: requiredModelType.value
+})
 
 async function handleFetchMetadata() {
   await fetchMetadata()
 }
 
 async function handleUploadModel() {
-  const success = await uploadModel()
-  if (success) {
-    emit('upload-success')
+  const result = await uploadModel()
+  if (result) {
+    emit('upload-success', result)
   }
 }
 

src/platform/assets/components/UploadModelFooter.test.ts

@@ -0,0 +1,60 @@
+import { render, screen } from '@testing-library/vue'
+import { createI18n } from 'vue-i18n'
+import { describe, expect, it } from 'vitest'
+
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
+
+import UploadModelFooter from './UploadModelFooter.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: enMessages },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+function renderFooter(
+  props: Partial<InstanceType<typeof UploadModelFooter>['$props']> = {}
+) {
+  render(UploadModelFooter, {
+    props: {
+      currentStep: 3,
+      isFetchingMetadata: false,
+      isUploading: false,
+      canFetchMetadata: true,
+      canUploadModel: true,
+      uploadStatus: 'success',
+      ...props
+    },
+    global: {
+      plugins: [i18n],
+      stubs: {
+        VideoHelpDialog: true
+      }
+    }
+  })
+}
+
+describe('UploadModelFooter', () => {
+  it('allows importing another model by default', () => {
+    renderFooter()
+
+    expect(screen.getByRole('button', { name: 'Import Another' })).toBeEnabled()
+  })
+
+  it('disables importing another model when the upload resolves a missing model', () => {
+    renderFooter({ canImportAnother: false })
+
+    expect(
+      screen.getByRole('button', { name: 'Import Another' })
+    ).toBeDisabled()
+  })
+
+  it('shows recovery actions for upload errors', () => {
+    renderFooter({ uploadStatus: 'error' })
+
+    expect(screen.getByRole('button', { name: 'Back' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument()
+  })
+})

src/platform/assets/components/UploadModelFooter.vue

@@ -73,6 +73,7 @@
         variant="muted-textonly"
         size="lg"
         data-attr="upload-model-step3-import-another-button"
+        :disabled="!canImportAnother"
         @click="emit('importAnother')"
       >
         {{ $t('assetBrowser.importAnother') }}
@@ -90,6 +91,24 @@
         }}
       </Button>
     </template>
+    <template v-else-if="currentStep === 3 && uploadStatus === 'error'">
+      <Button
+        variant="muted-textonly"
+        size="lg"
+        data-attr="upload-model-step3-back-button"
+        @click="emit('back')"
+      >
+        {{ $t('g.back') }}
+      </Button>
+      <Button
+        variant="secondary"
+        size="lg"
+        data-attr="upload-model-step3-close-button"
+        @click="emit('close')"
+      >
+        {{ $t('g.close') }}
+      </Button>
+    </template>
     <VideoHelpDialog
       v-model="showCivitaiHelp"
       video-url="https://media.comfy.org/compressed_768/civitai_howto.webm"
@@ -113,13 +132,14 @@ import VideoHelpDialog from '@/platform/assets/components/VideoHelpDialog.vue'
 const showCivitaiHelp = ref(false)
 const showHuggingFaceHelp = ref(false)
 
-defineProps<{
+const { canImportAnother = true } = defineProps<{
   currentStep: number
   isFetchingMetadata: boolean
   isUploading: boolean
   canFetchMetadata: boolean
   canUploadModel: boolean
   uploadStatus?: 'processing' | 'success' | 'error'
+  canImportAnother?: boolean
 }>()
 
 const emit = defineEmits<{

src/platform/assets/components/UploadModelProgress.test.ts

@@ -0,0 +1,75 @@
+import { render, screen } from '@testing-library/vue'
+import { createI18n } from 'vue-i18n'
+import { describe, expect, it } from 'vitest'
+
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
+
+import UploadModelProgress from './UploadModelProgress.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: enMessages },
+  missingWarn: false,
+  fallbackWarn: false,
+  escapeParameter: true
+})
+
+describe('UploadModelProgress', () => {
+  it('renders missing-model type mismatch labels without escaped entities', () => {
+    render(UploadModelProgress, {
+      props: {
+        result: 'error',
+        typeMismatch: {
+          importedModelType: 'loras',
+          importedModelTypeLabel: 'LoRA/Custom',
+          requiredModelType: 'Ultralytics/bbox',
+          requiredModelTypeLabel: 'Ultralytics/bbox'
+        }
+      },
+      global: {
+        plugins: [i18n]
+      }
+    })
+
+    expect(
+      screen.getByText('This model cannot resolve the missing model.')
+    ).toBeInTheDocument()
+    expect(screen.getByText('LoRA/Custom')).toBeInTheDocument()
+    expect(screen.getAllByText('Ultralytics/bbox').length).toBeGreaterThan(0)
+    expect(
+      screen.getByText((_content, element) => {
+        return (
+          element?.textContent ===
+          'Try importing a different Ultralytics/bbox model that this node can use.'
+        )
+      })
+    ).toBeInTheDocument()
+    expect(screen.queryByText(///)).not.toBeInTheDocument()
+  })
+
+  it('uses fallback copy when the imported model type label is unknown', () => {
+    render(UploadModelProgress, {
+      props: {
+        result: 'error',
+        typeMismatch: {
+          requiredModelType: 'checkpoints',
+          requiredModelTypeLabel: 'Checkpoint'
+        }
+      },
+      global: {
+        plugins: [i18n]
+      }
+    })
+
+    expect(screen.getByText('another model type')).toBeInTheDocument()
+    expect(
+      screen.getByText((_content, element) => {
+        return (
+          element?.textContent ===
+          'This file is already imported as another model type.'
+        )
+      })
+    ).toBeInTheDocument()
+  })
+})

src/platform/assets/components/UploadModelProgress.vue

@@ -1,5 +1,12 @@
 <template>
-  <div class="flex flex-1 flex-col gap-6 text-sm text-muted-foreground">
+  <div
+    :class="
+      cn(
+        'flex flex-1 flex-col gap-6 text-sm text-muted-foreground',
+        isTypeMismatchError && 'min-h-full justify-center'
+      )
+    "
+  >
     <!-- Processing State (202 async download in progress) -->
     <div v-if="result === 'processing'" class="flex flex-col gap-2">
       <p class="m-0 font-bold">
@@ -67,8 +74,51 @@
       v-else-if="result === 'error'"
       class="flex flex-1 flex-col items-center justify-center gap-6"
     >
-      <i class="icon-[lucide--x-circle] text-6xl text-error" />
-      <div class="text-center">
+      <i
+        aria-hidden="true"
+        class="text-error"
+        :class="
+          typeMismatch
+            ? 'icon-[lucide--circle-alert] size-12'
+            : 'icon-[lucide--x-circle] size-16'
+        "
+      />
+      <div
+        v-if="typeMismatch"
+        class="flex max-w-2xl flex-col gap-3 text-center"
+      >
+        <p class="m-0 text-sm font-bold">
+          {{ $t('assetBrowser.missingModelImportTypeMismatchTitle') }}
+        </p>
+        <i18n-t
+          keypath="assetBrowser.missingModelImportTypeMismatchAlreadyImported"
+          tag="p"
+          class="m-0 text-sm text-muted"
+        >
+          <template #actual>
+            <span>{{ actualModelTypeLabel }}</span>
+          </template>
+        </i18n-t>
+        <i18n-t
+          keypath="assetBrowser.missingModelImportTypeMismatchRequired"
+          tag="p"
+          class="m-0 text-sm text-muted"
+        >
+          <template #required>
+            <span>{{ typeMismatch.requiredModelTypeLabel }}</span>
+          </template>
+        </i18n-t>
+        <i18n-t
+          keypath="assetBrowser.missingModelImportTypeMismatchNextAction"
+          tag="p"
+          class="m-0 text-sm text-base-foreground"
+        >
+          <template #required>
+            <span>{{ typeMismatch.requiredModelTypeLabel }}</span>
+          </template>
+        </i18n-t>
+      </div>
+      <div v-else class="text-center">
         <p class="m-0 text-sm font-bold">
           {{ $t('assetBrowser.uploadFailed') }}
         </p>
@@ -81,13 +131,26 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { cn } from '@comfyorg/tailwind-utils'
 import type { AssetMetadata } from '@/platform/assets/schemas/assetSchema'
+import type { UploadModelTypeMismatch } from '@/platform/assets/composables/useUploadModelWizard'
 
-defineProps<{
+const { typeMismatch } = defineProps<{
   result: 'processing' | 'success' | 'error'
   error?: string
   metadata?: AssetMetadata
   modelType?: string
   previewImage?: string
+  typeMismatch?: UploadModelTypeMismatch | null
 }>()
+
+const { t } = useI18n()
+const isTypeMismatchError = computed(() => typeMismatch != null)
+const actualModelTypeLabel = computed(
+  () =>
+    typeMismatch?.importedModelTypeLabel ??
+    t('assetBrowser.missingModelImportUnknownType')
+)
 </script>

src/platform/assets/composables/useModelUpload.ts

@@ -3,17 +3,28 @@ import { computed } from 'vue'
 import { useFeatureFlags } from '@/composables/useFeatureFlags'
 import UploadModelDialog from '@/platform/assets/components/UploadModelDialog.vue'
 import UploadModelDialogHeader from '@/platform/assets/components/UploadModelDialogHeader.vue'
+import type {
+  UploadModelDialogContext,
+  UploadModelSuccess
+} from '@/platform/assets/composables/useUploadModelWizard'
 import UploadModelUpgradeModal from '@/platform/assets/components/UploadModelUpgradeModal.vue'
 import UploadModelUpgradeModalHeader from '@/platform/assets/components/UploadModelUpgradeModalHeader.vue'
 import { useDialogStore } from '@/stores/dialogStore'
 
+type UploadModelContextResolver = () => UploadModelDialogContext | undefined
+
 export function useModelUpload(
-  onUploadSuccess?: () => Promise<unknown> | void
+  onUploadSuccess?: (result: UploadModelSuccess) => Promise<unknown> | void,
+  uploadContext?: UploadModelDialogContext | UploadModelContextResolver
 ) {
   const dialogStore = useDialogStore()
   const { flags } = useFeatureFlags()
   const isUploadButtonEnabled = computed(() => flags.modelUploadButtonEnabled)
 
+  function resolveUploadContext() {
+    return typeof uploadContext === 'function' ? uploadContext() : uploadContext
+  }
+
   function showUploadDialog() {
     if (!flags.privateModelsEnabled) {
       dialogStore.showDialog({
@@ -33,8 +44,9 @@ export function useModelUpload(
         headerComponent: UploadModelDialogHeader,
         component: UploadModelDialog,
         props: {
-          onUploadSuccess: async () => {
-            await onUploadSuccess?.()
+          uploadContext: resolveUploadContext(),
+          onUploadSuccess: async (result: UploadModelSuccess) => {
+            await onUploadSuccess?.(result)
           }
         },
         dialogComponentProps: {

src/platform/assets/composables/useUploadModelWizard.test.ts

@@ -1,14 +1,18 @@
 import { createTestingPinia } from '@pinia/testing'
 import { setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick, ref } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createApp, nextTick, ref } from 'vue'
+import type { App } from 'vue'
+import { createI18n } from 'vue-i18n'
 
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
 import type { AsyncUploadResponse } from '@/platform/assets/schemas/assetSchema'
 
 import { useUploadModelWizard } from './useUploadModelWizard'
 
 vi.mock('@/platform/assets/services/assetService', () => ({
   assetService: {
+    getAssetMetadata: vi.fn(),
     uploadAssetAsync: vi.fn(),
     uploadAssetPreviewImage: vi.fn()
   }
@@ -45,18 +49,52 @@ vi.mock('@/i18n', () => ({
   d: (date: Date) => date.toISOString()
 }))
 
-vi.mock('vue-i18n', () => ({
-  useI18n: () => ({ t: (key: string) => key })
-}))
-
 describe('useUploadModelWizard', () => {
   const modelTypes = ref([{ name: 'Checkpoint', value: 'checkpoints' }])
+  const mountedApps: App<Element>[] = []
+
+  function setupWithI18n<T>(factory: () => T): T {
+    let result: T | undefined
+    const host = document.createElement('div')
+    const app = createApp({
+      setup() {
+        result = factory()
+        return () => null
+      }
+    })
+    app.use(
+      createI18n({
+        legacy: false,
+        locale: 'en',
+        messages: { en: enMessages }
+      })
+    )
+    app.mount(host)
+    mountedApps.push(app)
+
+    if (result === undefined) {
+      throw new Error('Composable setup did not run')
+    }
+    return result
+  }
+
+  function setupUploadModelWizard(
+    ...args: Parameters<typeof useUploadModelWizard>
+  ): ReturnType<typeof useUploadModelWizard> {
+    return setupWithI18n(() => useUploadModelWizard(...args))
+  }
 
   beforeEach(() => {
     vi.clearAllMocks()
     setActivePinia(createTestingPinia({ stubActions: false }))
   })
 
+  afterEach(() => {
+    for (const app of mountedApps.splice(0)) {
+      app.unmount()
+    }
+  })
+
   it('updates uploadStatus to success when async download completes', async () => {
     const { assetService } =
       await import('@/platform/assets/services/assetService')
@@ -71,11 +109,18 @@ describe('useUploadModelWizard', () => {
     }
     vi.mocked(assetService.uploadAssetAsync).mockResolvedValue(asyncResponse)
 
-    const wizard = useUploadModelWizard(modelTypes)
+    const wizard = setupUploadModelWizard(modelTypes)
     wizard.wizardData.value.url = 'https://civitai.com/models/12345'
     wizard.selectedModelType.value = 'checkpoints'
 
-    await wizard.uploadModel()
+    const result = await wizard.uploadModel()
+
+    expect(result).toEqual({
+      filename: 'model',
+      modelType: 'checkpoints',
+      taskId: 'task-123',
+      status: 'processing'
+    })
 
     expect(wizard.uploadStatus.value).toBe('processing')
 
@@ -118,7 +163,7 @@ describe('useUploadModelWizard', () => {
     }
     vi.mocked(assetService.uploadAssetAsync).mockResolvedValue(asyncResponse)
 
-    const wizard = useUploadModelWizard(modelTypes)
+    const wizard = setupUploadModelWizard(modelTypes)
     wizard.wizardData.value.url = 'https://civitai.com/models/99999'
     wizard.selectedModelType.value = 'checkpoints'
 
@@ -169,7 +214,7 @@ describe('useUploadModelWizard', () => {
     }
     vi.mocked(assetService.uploadAssetAsync).mockResolvedValue(asyncResponse)
 
-    const wizard = useUploadModelWizard(modelTypes)
+    const wizard = setupUploadModelWizard(modelTypes)
     wizard.wizardData.value.url = 'https://civitai.red/models/12345'
     wizard.selectedModelType.value = 'checkpoints'
 
@@ -178,4 +223,124 @@ describe('useUploadModelWizard', () => {
     expect(assetService.uploadAssetAsync).toHaveBeenCalled()
     expect(wizard.uploadStatus.value).toBe('processing')
   })
+
+  it('keeps a required model type when metadata suggests another type', async () => {
+    const { assetService } =
+      await import('@/platform/assets/services/assetService')
+    vi.mocked(assetService.getAssetMetadata).mockResolvedValue({
+      content_length: 100,
+      final_url: 'https://civitai.com/models/12345',
+      filename: 'lora.safetensors',
+      tags: ['loras']
+    })
+
+    const wizard = setupUploadModelWizard(
+      ref([
+        { name: 'Checkpoint', value: 'checkpoints' },
+        { name: 'LoRA', value: 'loras' }
+      ]),
+      { requiredModelType: 'checkpoints' }
+    )
+    wizard.wizardData.value.url = 'https://civitai.com/models/12345'
+
+    await wizard.fetchMetadata()
+
+    expect(wizard.selectedModelType.value).toBe('checkpoints')
+  })
+
+  it('uploads with the required model type even if selection changes', async () => {
+    const { assetService } =
+      await import('@/platform/assets/services/assetService')
+    vi.mocked(assetService.uploadAssetAsync).mockResolvedValue({
+      type: 'sync',
+      asset: {
+        id: 'asset-1',
+        name: 'model.safetensors',
+        tags: ['models', 'checkpoints']
+      }
+    })
+
+    const wizard = setupUploadModelWizard(modelTypes, {
+      requiredModelType: 'checkpoints'
+    })
+    wizard.wizardData.value.url = 'https://civitai.com/models/12345'
+    wizard.selectedModelType.value = 'loras'
+
+    const result = await wizard.uploadModel()
+
+    expect(assetService.uploadAssetAsync).toHaveBeenCalledWith(
+      expect.objectContaining({
+        tags: ['models', 'checkpoints'],
+        user_metadata: expect.objectContaining({
+          model_type: 'checkpoints'
+        })
+      })
+    )
+    expect(result?.modelType).toBe('checkpoints')
+  })
+
+  it('blocks a missing-model import when an existing asset has the wrong model type', async () => {
+    const { assetService } =
+      await import('@/platform/assets/services/assetService')
+    vi.mocked(assetService.uploadAssetAsync).mockResolvedValue({
+      type: 'sync',
+      asset: {
+        id: 'asset-lora',
+        name: 'model.safetensors',
+        tags: ['models', 'loras']
+      }
+    })
+
+    const wizard = setupUploadModelWizard(
+      ref([
+        { name: 'Checkpoint', value: 'checkpoints' },
+        { name: 'LoRA', value: 'loras' }
+      ]),
+      { requiredModelType: 'checkpoints' }
+    )
+    wizard.wizardData.value.url = 'https://civitai.com/models/12345'
+
+    const result = await wizard.uploadModel()
+
+    expect(result).toBeNull()
+    expect(wizard.uploadStatus.value).toBe('error')
+    expect(wizard.uploadTypeMismatch.value).toEqual({
+      importedModelType: 'loras',
+      importedModelTypeLabel: 'LoRA',
+      requiredModelType: 'checkpoints',
+      requiredModelTypeLabel: 'Checkpoint'
+    })
+  })
+
+  it('keeps generic sync imports successful when an existing asset has another model type', async () => {
+    const { assetService } =
+      await import('@/platform/assets/services/assetService')
+    vi.mocked(assetService.uploadAssetAsync).mockResolvedValue({
+      type: 'sync',
+      asset: {
+        id: 'asset-lora',
+        name: 'model.safetensors',
+        tags: ['models', 'loras']
+      }
+    })
+
+    const wizard = setupUploadModelWizard(
+      ref([
+        { name: 'Checkpoint', value: 'checkpoints' },
+        { name: 'LoRA', value: 'loras' }
+      ])
+    )
+    wizard.wizardData.value.url = 'https://civitai.com/models/12345'
+    wizard.selectedModelType.value = 'checkpoints'
+
+    const result = await wizard.uploadModel()
+
+    expect(result).toEqual({
+      filename: 'model',
+      modelType: 'checkpoints',
+      status: 'success'
+    })
+    expect(wizard.uploadStatus.value).toBe('success')
+    expect(wizard.uploadTypeMismatch.value).toBeNull()
+  })
 })

src/platform/assets/composables/useUploadModelWizard.ts

@@ -5,7 +5,10 @@ import { useI18n } from 'vue-i18n'
 import { st } from '@/i18n'
 import { civitaiImportSource } from '@/platform/assets/importSources/civitaiImportSource'
 import { huggingfaceImportSource } from '@/platform/assets/importSources/huggingfaceImportSource'
-import type { AssetMetadata } from '@/platform/assets/schemas/assetSchema'
+import type {
+  AssetItem,
+  AssetMetadata
+} from '@/platform/assets/schemas/assetSchema'
 import { assetService } from '@/platform/assets/services/assetService'
 import type { ImportSource } from '@/platform/assets/types/importSource'
 import { validateSourceUrl } from '@/platform/assets/utils/importSourceUtil'
@@ -26,16 +29,54 @@ interface ModelTypeOption {
   value: string
 }
 
-export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
+const MODEL_ROOT_TAG = 'models'
+
+export interface UploadModelSuccess {
+  filename: string
+  modelType?: string
+  taskId?: string
+  status: 'processing' | 'success'
+}
+
+export interface UploadModelTypeMismatch {
+  importedModelType?: string
+  importedModelTypeLabel?: string
+  requiredModelType: string
+  requiredModelTypeLabel: string
+}
+
+interface MissingModelUploadContext {
+  kind: 'missing-model-resolution'
+  missingModelName: string
+  requiredModelType: string
+  replacementTargets: Array<{
+    nodeId: string
+    nodeLabel: string
+    widgetName: string
+  }>
+}
+
+export type UploadModelDialogContext = MissingModelUploadContext
+
+interface UploadModelWizardOptions {
+  requiredModelType?: string
+}
+
+export function useUploadModelWizard(
+  modelTypes: Ref<ModelTypeOption[]>,
+  options: UploadModelWizardOptions = {}
+) {
   const { t } = useI18n()
   const assetsStore = useAssetsStore()
   const assetDownloadStore = useAssetDownloadStore()
   const modelToNodeStore = useModelToNodeStore()
+  const requiredModelType = options.requiredModelType
   const currentStep = ref(1)
   const isFetchingMetadata = ref(false)
   const isUploading = ref(false)
   const uploadStatus = ref<'processing' | 'success' | 'error'>()
   const uploadError = ref('')
+  const uploadTypeMismatch = ref<UploadModelTypeMismatch | null>(null)
   let stopAsyncWatch: (() => void) | undefined
 
   const wizardData = ref<WizardData>({
@@ -44,7 +85,10 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     tags: []
   })
 
-  const selectedModelType = ref<string>()
+  const selectedModelType = ref<string | undefined>(requiredModelType)
+  const resolvedModelType = computed(
+    () => requiredModelType ?? selectedModelType.value
+  )
 
   const importSources: ImportSource[] = [
     civitaiImportSource,
@@ -65,16 +109,29 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     () => wizardData.value.url,
     () => {
       uploadError.value = ''
+      uploadTypeMismatch.value = null
     }
   )
 
+  if (requiredModelType) {
+    watch(
+      selectedModelType,
+      (value) => {
+        if (value !== requiredModelType) {
+          selectedModelType.value = requiredModelType
+        }
+      },
+      { immediate: true }
+    )
+  }
+
   // Validation - only enable Continue when URL matches a supported source
   const canFetchMetadata = computed(() => {
     return detectedSource.value !== null
   })
 
   const canUploadModel = computed(() => {
-    return !!selectedModelType.value
+    return !!resolvedModelType.value
   })
 
   async function fetchMetadata() {
@@ -128,7 +185,9 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
       wizardData.value.previewImage = metadata.preview_image
 
       // Pre-fill model type from metadata tags if available
-      if (metadata.tags && metadata.tags.length > 0) {
+      if (requiredModelType) {
+        selectedModelType.value = requiredModelType
+      } else if (metadata.tags && metadata.tags.length > 0) {
         wizardData.value.tags = metadata.tags
         // Try to detect model type from tags
         const typeTag = metadata.tags.find((tag) =>
@@ -183,10 +242,10 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
   }
 
   async function refreshModelCaches() {
-    if (!selectedModelType.value) return
+    if (!resolvedModelType.value) return
 
     const providers = modelToNodeStore.getAllNodeProviders(
-      selectedModelType.value
+      resolvedModelType.value
     )
     const results = await Promise.allSettled(
       providers.map((provider) =>
@@ -203,24 +262,61 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     })
   }
 
-  async function uploadModel(): Promise<boolean> {
-    if (isUploading.value) return false
+  function getModelTypeLabel(modelType: string): string {
+    return (
+      modelTypes.value.find((type) => type.value === modelType)?.name ??
+      modelType
+    )
+  }
+
+  function getImportedModelType(asset: AssetItem): string | undefined {
+    const knownType = asset.tags.find(
+      (tag) =>
+        tag !== MODEL_ROOT_TAG &&
+        modelTypes.value.some((type) => type.value === tag)
+    )
+    return knownType ?? asset.tags.find((tag) => tag !== MODEL_ROOT_TAG)
+  }
+
+  function blockMismatchedImportedModel(
+    asset: AssetItem,
+    requiredType: string
+  ): boolean {
+    if (asset.tags.includes(requiredType)) return false
+
+    const importedType = getImportedModelType(asset)
+    uploadStatus.value = 'error'
+    uploadError.value = ''
+    uploadTypeMismatch.value = {
+      importedModelType: importedType,
+      importedModelTypeLabel: importedType
+        ? getModelTypeLabel(importedType)
+        : undefined,
+      requiredModelType: requiredType,
+      requiredModelTypeLabel: getModelTypeLabel(requiredType)
+    }
+    return true
+  }
+
+  async function uploadModel(): Promise<UploadModelSuccess | null> {
+    if (isUploading.value) return null
     if (!canUploadModel.value) {
-      return false
+      return null
     }
 
     const source = detectedSource.value
     if (!source) {
       uploadError.value = t('assetBrowser.noValidSourceDetected')
-      return false
+      return null
     }
 
     isUploading.value = true
+    uploadTypeMismatch.value = null
+    let uploadSuccess: UploadModelSuccess | null = null
 
     try {
-      const tags = selectedModelType.value
-        ? ['models', selectedModelType.value]
-        : ['models']
+      const modelType = resolvedModelType.value
+      const tags = modelType ? ['models', modelType] : ['models']
       const filename =
         wizardData.value.metadata?.filename ||
         wizardData.value.metadata?.name ||
@@ -230,7 +326,7 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
       const userMetadata = {
         source: source.type,
         source_url: wizardData.value.url,
-        model_type: selectedModelType.value
+        model_type: modelType
       }
 
       const result = await assetService.uploadAssetAsync({
@@ -241,14 +337,20 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
       })
 
       if (result.type === 'async' && result.task.status !== 'completed') {
-        if (selectedModelType.value) {
+        if (modelType) {
           assetDownloadStore.trackDownload(
             result.task.task_id,
-            selectedModelType.value,
+            modelType,
             filename
           )
         }
         uploadStatus.value = 'processing'
+        uploadSuccess = {
+          filename,
+          modelType,
+          taskId: result.task.task_id,
+          status: 'processing'
+        }
 
         stopAsyncWatch?.()
         let resolved = false
@@ -288,8 +390,23 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
           stopAsyncWatch = stop
         }
       } else {
+        if (
+          requiredModelType &&
+          result.type === 'sync' &&
+          modelType &&
+          blockMismatchedImportedModel(result.asset, modelType)
+        ) {
+          currentStep.value = 3
+          return null
+        }
+
         uploadStatus.value = 'success'
         await refreshModelCaches()
+        uploadSuccess = {
+          filename,
+          modelType,
+          status: 'success'
+        }
       }
       currentStep.value = 3
     } catch (error) {
@@ -301,7 +418,7 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     } finally {
       isUploading.value = false
     }
-    return uploadStatus.value !== 'error'
+    return uploadSuccess
   }
 
   function goToPreviousStep() {
@@ -318,12 +435,13 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     isUploading.value = false
     uploadStatus.value = undefined
     uploadError.value = ''
+    uploadTypeMismatch.value = null
     wizardData.value = {
       url: '',
       name: '',
       tags: []
     }
-    selectedModelType.value = undefined
+    selectedModelType.value = requiredModelType
   }
 
   return {
@@ -333,6 +451,7 @@ export function useUploadModelWizard(modelTypes: Ref<ModelTypeOption[]>) {
     isUploading,
     uploadStatus,
     uploadError,
+    uploadTypeMismatch,
     wizardData,
     selectedModelType,
 

src/platform/missingModel/components/MissingModelCard.test.ts

@@ -1,24 +1,36 @@
 import { createTestingPinia } from '@pinia/testing'
-import { render, screen } from '@testing-library/vue'
+import { render, screen, within } from '@testing-library/vue'
 import userEvent from '@testing-library/user-event'
 import PrimeVue from 'primevue/config'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'
 
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
 import type {
   MissingModelGroup,
   MissingModelViewModel
 } from '@/platform/missingModel/types'
-import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 
 vi.mock('./MissingModelRow.vue', () => ({
   default: {
     name: 'MissingModelRow',
-    template:
-      '<div class="model-row" :data-show-node-id-badge="showNodeIdBadge" :data-is-asset-supported="isAssetSupported" :data-directory="directory"><button class="locate-trigger" @click="$emit(\'locate-model\', model?.representative?.nodeId)">Locate</button></div>',
-    props: ['model', 'directory', 'showNodeIdBadge', 'isAssetSupported'],
+    template: `
+      <div
+        data-testid="model-row"
+        class="model-row"
+        :data-model-name="model.name"
+        :data-is-asset-supported="isAssetSupported"
+        :data-directory="directory"
+      >
+        <button
+          class="locate-trigger"
+          @click="$emit('locate-model', model?.representative?.nodeId)"
+        >
+          Locate
+        </button>
+      </div>
+    `,
+    props: ['model', 'directory', 'isAssetSupported'],
     emits: ['locate-model']
   }
 }))
@@ -35,21 +47,7 @@ import MissingModelCard from './MissingModelCard.vue'
 const i18n = createI18n({
   legacy: false,
   locale: 'en',
-  messages: {
-    en: {
-      rightSidePanel: {
-        missingModels: {
-          importNotSupported: 'Import Not Supported',
-          customNodeDownloadDisabled:
-            'Cloud environment does not support model imports for custom nodes.',
-          unknownCategory: 'Unknown Category',
-          downloadAll: 'Download all',
-          refresh: 'Refresh',
-          refreshing: 'Refreshing missing models.'
-        }
-      }
-    }
-  },
+  messages: { en: enMessages },
   missingWarn: false,
   fallbackWarn: false
 })
@@ -106,7 +104,6 @@ function makeGroup(
 function mountCard(
   props: Partial<{
     missingModelGroups: MissingModelGroup[]
-    showNodeIdBadge: boolean
   }> = {},
   onLocateModel?: (nodeId: string) => void
 ) {
@@ -114,7 +111,6 @@ function mountCard(
   return render(MissingModelCard, {
     props: {
       missingModelGroups: [makeGroup()],
-      showNodeIdBadge: false,
       ...props,
       ...(onLocateModel ? { onLocateModel } : {})
     },
@@ -124,62 +120,70 @@ function mountCard(
   })
 }
 
+function getRows() {
+  return screen.queryAllByTestId('model-row')
+}
+
 describe('MissingModelCard', () => {
   beforeEach(() => {
     mockIsCloud.value = true
   })
 
   describe('Rendering & Props', () => {
-    it('renders directory name in category header', () => {
-      const { container } = mountCard({
+    it('passes the model directory to rows', () => {
+      mockIsCloud.value = false
+      mountCard({
         missingModelGroups: [makeGroup({ directory: 'loras' })]
       })
-      expect(container.textContent).toContain('loras')
-    })
-
-    it('renders translated unknown category when directory is null', () => {
-      const { container } = mountCard({
-        missingModelGroups: [makeGroup({ directory: null })]
-      })
-      expect(container.textContent).toContain('Unknown Category')
-    })
-
-    it('renders model count in category header', () => {
-      const { container } = mountCard({
-        missingModelGroups: [
-          makeGroup({ modelNames: ['a.safetensors', 'b.safetensors'] })
-        ]
-      })
-      expect(container.textContent).toContain('(2)')
+      expect(getRows()[0].getAttribute('data-directory')).toBe('loras')
     })
 
     it('renders correct number of MissingModelRow components', () => {
-      const { container } = mountCard({
+      mountCard({
         missingModelGroups: [
           makeGroup({
             modelNames: ['a.safetensors', 'b.safetensors', 'c.safetensors']
           })
         ]
       })
-      // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
-      expect(container.querySelectorAll('.model-row')).toHaveLength(3)
+      expect(getRows()).toHaveLength(3)
     })
 
-    it('renders multiple groups', () => {
-      const { container } = mountCard({
+    it('flattens multiple groups into rows', () => {
+      mockIsCloud.value = false
+      mountCard({
         missingModelGroups: [
           makeGroup({ directory: 'checkpoints' }),
           makeGroup({ directory: 'loras' })
         ]
       })
-      expect(container.textContent).toContain('checkpoints')
-      expect(container.textContent).toContain('loras')
+      expect(getRows()).toHaveLength(2)
+    })
+
+    it('sorts rows by model type order in cloud', () => {
+      mountCard({
+        missingModelGroups: [
+          makeGroup({ directory: null, modelNames: ['unknown.safetensors'] }),
+          makeGroup({ directory: 'loras', modelNames: ['lora.safetensors'] }),
+          makeGroup({
+            directory: 'checkpoints',
+            modelNames: ['checkpoint.safetensors']
+          })
+        ]
+      })
+
+      expect(
+        getRows().map((row) => row.getAttribute('data-model-name'))
+      ).toEqual([
+        'checkpoint.safetensors',
+        'lora.safetensors',
+        'unknown.safetensors'
+      ])
     })
 
     it('renders zero rows when missingModelGroups is empty', () => {
-      const { container } = mountCard({ missingModelGroups: [] })
-      // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
-      expect(container.querySelectorAll('.model-row')).toHaveLength(0)
+      mountCard({ missingModelGroups: [] })
+      expect(getRows()).toHaveLength(0)
     })
 
     it('hides bulk actions in cloud', () => {
@@ -191,31 +195,21 @@ describe('MissingModelCard', () => {
         screen.queryByTestId('missing-model-actions')
       ).not.toBeInTheDocument()
     })
-
-    it('passes props correctly to MissingModelRow children', () => {
-      const { container } = mountCard({ showNodeIdBadge: true })
-      // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
-      const row = container.querySelector('.model-row')
-      expect(row).not.toBeNull()
-      expect(row!.getAttribute('data-show-node-id-badge')).toBe('true')
-      expect(row!.getAttribute('data-is-asset-supported')).toBe('true')
-      expect(row!.getAttribute('data-directory')).toBe('checkpoints')
-    })
   })
 
   describe('Asset Unsupported Group', () => {
-    it('shows "Import Not Supported" header for unsupported groups', () => {
+    it('does not show the unsupported group header in cloud', () => {
       const { container } = mountCard({
         missingModelGroups: [makeGroup({ isAssetSupported: false })]
       })
-      expect(container.textContent).toContain('Import Not Supported')
+      expect(container.textContent).not.toContain('Import Not Supported')
     })
 
-    it('shows info notice for unsupported groups', () => {
+    it('does not show the unsupported group notice in cloud', () => {
       const { container } = mountCard({
         missingModelGroups: [makeGroup({ isAssetSupported: false })]
       })
-      expect(container.textContent).toContain(
+      expect(container.textContent).not.toContain(
         'Cloud environment does not support model imports'
       )
     })
@@ -251,13 +245,12 @@ describe('MissingModelCard (OSS)', () => {
   })
 
   it('shows directory name instead of "Import Not Supported" for unsupported groups', () => {
-    const { container } = mountCard({
+    mountCard({
       missingModelGroups: [
         makeGroup({ directory: 'checkpoints', isAssetSupported: false })
       ]
     })
-    expect(container.textContent).toContain('checkpoints')
-    expect(container.textContent).not.toContain('Import Not Supported')
+    expect(getRows()[0].getAttribute('data-directory')).toBe('checkpoints')
   })
 
   it('hides info notice for unsupported groups', () => {
@@ -269,61 +262,39 @@ describe('MissingModelCard (OSS)', () => {
     )
   })
 
-  it('renders unknown category for null directory in OSS', () => {
+  it('passes null directory for unknown category rows in OSS', () => {
     const { container } = mountCard({
       missingModelGroups: [
         makeGroup({ directory: null, isAssetSupported: false })
       ]
     })
-    expect(container.textContent).toContain('Unknown Category')
+    expect(getRows()[0].hasAttribute('data-directory')).toBe(false)
     expect(container.textContent).not.toContain('Import Not Supported')
   })
 
-  it('shows bulk actions when one model is downloadable', () => {
+  it('shows Download all at the bottom when one model is downloadable', () => {
     mountCard({
       missingModelGroups: [makeGroup({ withDownloadUrls: true })]
     })
 
-    expect(screen.getByRole('button', { name: /Download all/ })).toBeVisible()
-    expect(screen.getByRole('button', { name: 'Refresh' })).toBeVisible()
+    const actions = screen.getByTestId('missing-model-actions')
+    expect(actions).toBeVisible()
+    expect(
+      within(actions).getByRole('button', { name: /Download all/ })
+    ).toBeVisible()
+    expect(
+      within(actions).queryByRole('button', { name: 'Refresh' })
+    ).not.toBeInTheDocument()
   })
 
-  it('hides bulk actions when no model is downloadable', () => {
+  it('hides Download all when no model is downloadable', () => {
     mountCard()
 
     expect(
       screen.queryByRole('button', { name: /Download all/ })
     ).not.toBeInTheDocument()
     expect(
-      screen.queryByRole('button', { name: 'Refresh' })
+      screen.queryByTestId('missing-model-actions')
     ).not.toBeInTheDocument()
   })
-
-  it('refreshes missing models from the action bar', async () => {
-    mountCard({
-      missingModelGroups: [makeGroup({ withDownloadUrls: true })]
-    })
-    const store = useMissingModelStore()
-
-    await userEvent.click(screen.getByRole('button', { name: 'Refresh' }))
-
-    expect(store.refreshMissingModels).toHaveBeenCalled()
-  })
-
-  it('keeps the Refresh button focusable and announces refresh progress', async () => {
-    mountCard({
-      missingModelGroups: [makeGroup({ withDownloadUrls: true })]
-    })
-    const store = useMissingModelStore()
-
-    store.isRefreshingMissingModels = true
-    await nextTick()
-
-    const refreshButton = screen.getByRole('button', { name: 'Refresh' })
-    expect(refreshButton).toHaveAttribute('aria-disabled', 'true')
-    expect(refreshButton).toHaveAttribute('aria-busy', 'true')
-    expect(screen.getByRole('status')).toHaveTextContent(
-      'Refreshing missing models.'
-    )
-  })
 })

src/platform/missingModel/components/MissingModelCard.vue

@@ -1,9 +1,20 @@
 <template>
   <div class="px-4 pb-2">
+    <div class="flex flex-col gap-1 overflow-hidden py-2">
+      <MissingModelRow
+        v-for="row in sortedModelRows"
+        :key="row.key"
+        :model="row.model"
+        :directory="row.directory"
+        :is-asset-supported="row.isAssetSupported"
+        @locate-model="emit('locateModel', $event)"
+      />
+    </div>
+
     <div
       v-if="downloadableModels.length > 0"
       data-testid="missing-model-actions"
-      class="flex items-center gap-2 border-b border-interface-stroke py-2"
+      class="flex items-center pt-2"
     >
       <Button
         data-testid="missing-model-download-all"
@@ -15,100 +26,6 @@
         <i aria-hidden="true" class="icon-[lucide--download] size-4 shrink-0" />
         <span class="truncate">{{ downloadAllLabel }}</span>
       </Button>
-      <!-- Keep this focusable while refreshing so the live status remains discoverable. -->
-      <Button
-        data-testid="missing-model-refresh"
-        variant="secondary"
-        size="sm"
-        class="h-8 w-28 shrink-0 rounded-lg text-sm"
-        :aria-busy="missingModelStore.isRefreshingMissingModels"
-        :aria-disabled="missingModelStore.isRefreshingMissingModels"
-        @click="handleRefreshClick"
-      >
-        <DotSpinner
-          v-if="missingModelStore.isRefreshingMissingModels"
-          aria-hidden="true"
-          duration="1s"
-          :size="12"
-        />
-        <i
-          v-else
-          aria-hidden="true"
-          class="icon-[lucide--refresh-cw] size-4 shrink-0"
-        />
-        {{ t('rightSidePanel.missingModels.refresh') }}
-      </Button>
-      <span role="status" aria-live="polite" class="sr-only">
-        {{
-          missingModelStore.isRefreshingMissingModels
-            ? t('rightSidePanel.missingModels.refreshing')
-            : ''
-        }}
-      </span>
-    </div>
-
-    <!-- Category groups (by directory) -->
-    <div
-      v-for="group in missingModelGroups"
-      :key="`${group.isAssetSupported ? 'supported' : 'unsupported'}::${group.directory ?? '__unknown__'}`"
-      class="flex w-full flex-col border-t border-interface-stroke py-2 first:border-t-0 first:pt-0"
-    >
-      <!-- Category header -->
-      <div class="flex h-8 w-full items-center">
-        <p
-          class="min-w-0 flex-1 truncate text-sm font-medium"
-          :class="
-            (isCloud && !group.isAssetSupported) || group.directory === null
-              ? 'text-warning-background'
-              : 'text-destructive-background-hover'
-          "
-        >
-          <span v-if="isCloud && !group.isAssetSupported">
-            {{ t('rightSidePanel.missingModels.importNotSupported') }}
-            ({{ group.models.length }})
-          </span>
-          <span v-else>
-            <i
-              v-if="group.directory === null"
-              aria-hidden="true"
-              class="mr-1 icon-[lucide--triangle-alert] size-3.5 align-text-bottom"
-            />
-            {{
-              group.directory ??
-              t('rightSidePanel.missingModels.unknownCategory')
-            }}
-            ({{ group.models.length }})
-          </span>
-        </p>
-      </div>
-
-      <!-- Asset unsupported group notice -->
-      <div
-        v-if="isCloud && !group.isAssetSupported"
-        data-testid="missing-model-import-unsupported"
-        class="flex items-start gap-1.5 px-0.5 py-1 pl-2"
-      >
-        <i
-          aria-hidden="true"
-          class="mt-0.5 icon-[lucide--info] size-3.5 shrink-0 text-muted-foreground"
-        />
-        <span class="text-xs/tight text-muted-foreground">
-          {{ t('rightSidePanel.missingModels.customNodeDownloadDisabled') }}
-        </span>
-      </div>
-
-      <!-- Model rows -->
-      <div class="flex flex-col gap-1 overflow-hidden pl-2">
-        <MissingModelRow
-          v-for="model in group.models"
-          :key="model.name"
-          :model="model"
-          :directory="group.directory"
-          :show-node-id-badge="showNodeIdBadge"
-          :is-asset-supported="group.isAssetSupported"
-          @locate-model="emit('locateModel', $event)"
-        />
-      </div>
     </div>
   </div>
 </template>
@@ -120,15 +37,28 @@ import type { MissingModelGroup } from '@/platform/missingModel/types'
 import { isCloud } from '@/platform/distribution/types'
 import MissingModelRow from '@/platform/missingModel/components/MissingModelRow.vue'
 import Button from '@/components/ui/button/Button.vue'
-import DotSpinner from '@/components/common/DotSpinner.vue'
 import { downloadModel } from '@/platform/missingModel/missingModelDownload'
 import { getDownloadableModels } from '@/platform/missingModel/missingModelViewUtils'
 import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import { formatSize } from '@/utils/formatUtil'
 
-const { missingModelGroups, showNodeIdBadge } = defineProps<{
+interface MissingModelRowEntry {
+  key: string
+  model: MissingModelGroup['models'][number]
+  directory: string | null
+  isAssetSupported: boolean
+}
+
+const MODEL_TYPE_SORT_ORDER = [
+  'checkpoints',
+  'loras',
+  'vae',
+  'text_encoders',
+  'diffusion_models'
+] as const
+
+const { missingModelGroups } = defineProps<{
   missingModelGroups: MissingModelGroup[]
-  showNodeIdBadge: boolean
 }>()
 
 const emit = defineEmits<{
@@ -138,6 +68,19 @@ const emit = defineEmits<{
 const { t } = useI18n()
 const missingModelStore = useMissingModelStore()
 
+const sortedModelRows = computed(() =>
+  missingModelGroups
+    .flatMap((group) =>
+      group.models.map((model, index) => ({
+        key: getModelRowKey(group, model, index),
+        model,
+        directory: group.directory,
+        isAssetSupported: group.isAssetSupported
+      }))
+    )
+    .sort((a, b) => compareModelRows(a, b))
+)
+
 const downloadableModels = computed(() => {
   if (isCloud) return []
 
@@ -159,7 +102,33 @@ function downloadAllModels() {
   }
 }
 
-function handleRefreshClick() {
-  void missingModelStore.refreshMissingModels()
+function getModelRowKey(
+  group: MissingModelGroup,
+  model: MissingModelGroup['models'][number],
+  index: number
+) {
+  const supportKey = group.isAssetSupported ? 'supported' : 'unsupported'
+  return [
+    supportKey,
+    group.directory ?? '__unknown__',
+    model.name,
+    String(index)
+  ].join('::')
+}
+
+function compareModelRows(a: MissingModelRowEntry, b: MissingModelRowEntry) {
+  return (
+    getModelTypeSortIndex(a.directory) - getModelTypeSortIndex(b.directory) ||
+    (a.directory ?? '').localeCompare(b.directory ?? '') ||
+    a.model.name.localeCompare(b.model.name)
+  )
+}
+
+function getModelTypeSortIndex(directory: string | null) {
+  if (directory === null) return Number.MAX_SAFE_INTEGER
+  const index = MODEL_TYPE_SORT_ORDER.indexOf(
+    directory as (typeof MODEL_TYPE_SORT_ORDER)[number]
+  )
+  return index === -1 ? MODEL_TYPE_SORT_ORDER.length : index
 }
 </script>

src/platform/missingModel/components/MissingModelLibrarySelect.vue

@@ -1,113 +0,0 @@
-<template>
-  <div class="flex flex-col gap-2">
-    <div v-if="showDivider" class="flex items-center justify-center py-0.5">
-      <span class="text-xs font-bold text-muted-foreground">
-        {{ t('rightSidePanel.missingModels.or') }}
-      </span>
-    </div>
-
-    <Select
-      :model-value="modelValue"
-      :disabled="options.length === 0"
-      @update:model-value="handleSelect"
-    >
-      <SelectTrigger
-        size="md"
-        class="border-transparent bg-secondary-background text-xs hover:border-interface-stroke"
-      >
-        <SelectValue
-          :placeholder="t('rightSidePanel.missingModels.useFromLibrary')"
-        />
-      </SelectTrigger>
-
-      <SelectContent>
-        <template v-if="options.length > 4" #prepend>
-          <div class="px-1 pb-1.5">
-            <div
-              class="flex items-center gap-1.5 rounded-md border border-border-default px-2"
-            >
-              <i
-                aria-hidden="true"
-                class="icon-[lucide--search] size-3.5 shrink-0 text-muted-foreground"
-              />
-              <input
-                v-model="filterQuery"
-                type="text"
-                :aria-label="t('g.searchPlaceholder', { subject: '' })"
-                class="h-7 w-full border-none bg-transparent text-xs outline-none placeholder:text-muted-foreground"
-                :placeholder="t('g.searchPlaceholder', { subject: '' })"
-                @keydown.stop
-              />
-            </div>
-          </div>
-        </template>
-
-        <SelectItem
-          v-for="option in filteredOptions"
-          :key="option.value"
-          :value="option.value"
-          class="text-xs"
-        >
-          {{ option.name }}
-        </SelectItem>
-        <div
-          v-if="filteredOptions.length === 0"
-          role="status"
-          class="px-3 py-2 text-xs text-muted-foreground"
-        >
-          {{ t('g.noResultsFound') }}
-        </div>
-      </SelectContent>
-    </Select>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { useFuse } from '@vueuse/integrations/useFuse'
-import Select from '@/components/ui/select/Select.vue'
-import SelectContent from '@/components/ui/select/SelectContent.vue'
-import SelectTrigger from '@/components/ui/select/SelectTrigger.vue'
-import SelectValue from '@/components/ui/select/SelectValue.vue'
-import SelectItem from '@/components/ui/select/SelectItem.vue'
-
-const { options, showDivider = false } = defineProps<{
-  modelValue: string | undefined
-  options: { name: string; value: string }[]
-  showDivider?: boolean
-}>()
-
-const emit = defineEmits<{
-  select: [value: string]
-}>()
-
-const { t } = useI18n()
-
-const filterQuery = ref('')
-
-watch(
-  () => options.length,
-  (len) => {
-    if (len <= 4) filterQuery.value = ''
-  }
-)
-
-const { results: fuseResults } = useFuse(filterQuery, () => options, {
-  fuseOptions: {
-    keys: ['name'],
-    threshold: 0.4,
-    ignoreLocation: true
-  },
-  matchAllWhenSearchEmpty: true
-})
-
-const filteredOptions = computed(() => fuseResults.value.map((r) => r.item))
-
-function handleSelect(value: unknown) {
-  if (typeof value === 'string') {
-    filterQuery.value = ''
-    emit('select', value)
-  }
-}
-</script>

src/platform/missingModel/components/MissingModelRow.test.ts

@@ -0,0 +1,442 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { render, screen, waitFor } from '@testing-library/vue'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
+import type {
+  UploadModelDialogContext,
+  UploadModelSuccess
+} from '@/platform/assets/composables/useUploadModelWizard'
+import type { MissingModelViewModel } from '@/platform/missingModel/types'
+import type * as MissingModelDownload from '@/platform/missingModel/missingModelDownload'
+import type * as GraphTraversalUtil from '@/utils/graphTraversalUtil'
+import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
+
+const mockIsCloud = vi.hoisted(() => ({ value: true }))
+const mockShowUploadDialog = vi.hoisted(() => vi.fn())
+const mockCopyToClipboard = vi.hoisted(() => vi.fn())
+const mockDownloadModel = vi.hoisted(() => vi.fn())
+const mockRootGraph = vi.hoisted<{
+  value: Record<string, never> | null
+}>(() => ({ value: null }))
+const mockGetNodeByExecutionId = vi.hoisted(() => vi.fn())
+const mockApiListeners = vi.hoisted(
+  () => new Map<string, (event: CustomEvent) => void>()
+)
+type UploadModelContextResolver = () => UploadModelDialogContext | undefined
+const mockUploadContext = vi.hoisted(() => ({
+  resolver: undefined as UploadModelContextResolver | undefined
+}))
+const mockUploadCallbacks = vi.hoisted(() => ({
+  onUploadSuccess: undefined as
+    | ((result: UploadModelSuccess) => Promise<unknown> | unknown)
+    | undefined
+}))
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    get rootGraph() {
+      return mockRootGraph.value
+    }
+  }
+}))
+
+vi.mock('@/scripts/api', () => ({
+  api: {
+    addEventListener: vi.fn(
+      (event: string, handler: (event: CustomEvent) => void) => {
+        mockApiListeners.set(event, handler)
+      }
+    ),
+    apiURL: vi.fn((path: string) => path),
+    fetchApi: vi.fn()
+  }
+}))
+
+vi.mock('@/utils/graphTraversalUtil', async () => {
+  const actual = await vi.importActual<typeof GraphTraversalUtil>(
+    '@/utils/graphTraversalUtil'
+  )
+  return {
+    ...actual,
+    getActiveGraphNodeIds: vi.fn(() => new Set()),
+    getNodeByExecutionId: mockGetNodeByExecutionId
+  }
+})
+
+vi.mock('@/platform/distribution/types', () => ({
+  get isCloud() {
+    return mockIsCloud.value
+  }
+}))
+
+vi.mock('@/platform/assets/composables/useModelUpload', () => ({
+  useModelUpload: (
+    onUploadSuccess?: (
+      result: UploadModelSuccess
+    ) => Promise<unknown> | unknown,
+    uploadContext?: UploadModelDialogContext | UploadModelContextResolver
+  ) => {
+    mockUploadCallbacks.onUploadSuccess = onUploadSuccess
+    mockUploadContext.resolver =
+      typeof uploadContext === 'function' ? uploadContext : () => uploadContext
+
+    return {
+      isUploadButtonEnabled: { value: true },
+      showUploadDialog: mockShowUploadDialog
+    }
+  }
+}))
+
+vi.mock('@/composables/useCopyToClipboard', () => ({
+  useCopyToClipboard: () => ({
+    copyToClipboard: mockCopyToClipboard
+  })
+}))
+
+vi.mock('@/platform/missingModel/missingModelDownload', async () => {
+  const actual = await vi.importActual<typeof MissingModelDownload>(
+    '@/platform/missingModel/missingModelDownload'
+  )
+  return {
+    ...actual,
+    downloadModel: mockDownloadModel,
+    fetchModelMetadata: vi.fn().mockResolvedValue({
+      fileSize: null,
+      gatedRepoUrl: null
+    })
+  }
+})
+
+import MissingModelRow from './MissingModelRow.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: { en: enMessages },
+  missingWarn: false,
+  fallbackWarn: false
+})
+
+const TransitionCollapseStub = {
+  name: 'TransitionCollapse',
+  template: '<div><slot /></div>'
+}
+
+function makeModel(
+  refs: MissingModelViewModel['referencingNodes']
+): MissingModelViewModel {
+  return {
+    name: 'model.safetensors',
+    representative: {
+      nodeId: refs[0]?.nodeId,
+      nodeType: 'CheckpointLoaderSimple',
+      widgetName: 'ckpt_name',
+      isAssetSupported: true,
+      name: 'model.safetensors',
+      directory: 'checkpoints',
+      url: 'https://example.com/model.safetensors',
+      isMissing: true
+    },
+    referencingNodes: refs
+  }
+}
+
+function renderRow(
+  model: MissingModelViewModel,
+  onLocateModel = vi.fn(),
+  isAssetSupported = true,
+  directory: string | null = 'checkpoints'
+) {
+  const pinia = createPinia()
+  setActivePinia(pinia)
+
+  render(MissingModelRow, {
+    props: {
+      model,
+      directory,
+      isAssetSupported,
+      onLocateModel
+    },
+    global: {
+      plugins: [pinia, i18n],
+      stubs: {
+        TransitionCollapse: TransitionCollapseStub
+      }
+    }
+  })
+
+  return { onLocateModel }
+}
+
+describe('MissingModelRow', () => {
+  beforeEach(() => {
+    mockIsCloud.value = true
+    mockShowUploadDialog.mockClear()
+    mockCopyToClipboard.mockClear()
+    mockDownloadModel.mockClear()
+    mockRootGraph.value = null
+    mockGetNodeByExecutionId.mockReset()
+    mockUploadContext.resolver = undefined
+    mockUploadCallbacks.onUploadSuccess = undefined
+  })
+
+  it('opens the model import dialog from the cloud row', async () => {
+    const user = userEvent.setup()
+    renderRow(makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }]))
+
+    expect(screen.queryByRole('textbox')).not.toBeInTheDocument()
+
+    await user.click(screen.getByRole('button', { name: 'Import' }))
+
+    expect(mockShowUploadDialog).toHaveBeenCalledTimes(1)
+    expect(mockUploadContext.resolver?.()).toEqual({
+      kind: 'missing-model-resolution',
+      missingModelName: 'model.safetensors',
+      requiredModelType: 'checkpoints',
+      replacementTargets: [
+        {
+          nodeId: '1',
+          nodeLabel: 'CheckpointLoaderSimple',
+          widgetName: 'ckpt_name'
+        }
+      ]
+    })
+  })
+
+  it('shows row progress as soon as the model import starts', async () => {
+    renderRow(makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }]))
+    const store = useMissingModelStore()
+
+    await mockUploadCallbacks.onUploadSuccess?.({
+      filename: 'downloaded-model.safetensors',
+      modelType: 'checkpoints',
+      taskId: 'task-1',
+      status: 'processing'
+    })
+    await nextTick()
+
+    expect(
+      store.importTaskIds['supported::checkpoints::model.safetensors']
+    ).toBe('task-1')
+    expect(
+      screen.getByRole('progressbar', { name: 'Importing...' })
+    ).toBeInTheDocument()
+    expect(screen.getByRole('status')).toHaveTextContent('Importing...')
+    expect(screen.getByText('downloaded-model.safetensors')).toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'Import' })).toBeNull()
+  })
+
+  it('applies the completed imported model to every referencing node', async () => {
+    const graph = {}
+    const firstWidget = {
+      name: 'ckpt_name',
+      value: 'old-first.safetensors',
+      callback: vi.fn()
+    }
+    const secondWidget = {
+      name: 'ckpt_name',
+      value: 'old-second.safetensors',
+      callback: vi.fn()
+    }
+    const firstSetDirtyCanvas = vi.fn()
+    const secondSetDirtyCanvas = vi.fn()
+    mockRootGraph.value = graph
+    mockGetNodeByExecutionId.mockImplementation((_graph, nodeId) => {
+      if (nodeId === '1') {
+        return {
+          widgets: [firstWidget],
+          graph: { setDirtyCanvas: firstSetDirtyCanvas }
+        }
+      }
+      if (nodeId === '2') {
+        return {
+          widgets: [secondWidget],
+          graph: { setDirtyCanvas: secondSetDirtyCanvas }
+        }
+      }
+      return null
+    })
+
+    renderRow(
+      makeModel([
+        { nodeId: '1', widgetName: 'ckpt_name' },
+        { nodeId: '2', widgetName: 'ckpt_name' }
+      ])
+    )
+
+    await mockUploadCallbacks.onUploadSuccess?.({
+      filename: 'client-name.safetensors',
+      modelType: 'checkpoints',
+      taskId: 'task-1',
+      status: 'processing'
+    })
+    await nextTick()
+
+    const handler = mockApiListeners.get('asset_download')
+    expect(handler).toBeDefined()
+    handler!(
+      new CustomEvent('asset_download', {
+        detail: {
+          task_id: 'task-1',
+          asset_name: 'server-name.safetensors',
+          bytes_total: 100,
+          bytes_downloaded: 100,
+          progress: 1,
+          status: 'completed'
+        }
+      })
+    )
+
+    await waitFor(() => {
+      expect(firstWidget.value).toBe('server-name.safetensors')
+      expect(secondWidget.value).toBe('server-name.safetensors')
+    })
+    expect(firstWidget.callback).toHaveBeenCalledWith('server-name.safetensors')
+    expect(secondWidget.callback).toHaveBeenCalledWith(
+      'server-name.safetensors'
+    )
+    expect(firstSetDirtyCanvas).toHaveBeenCalledWith(true, true)
+    expect(secondSetDirtyCanvas).toHaveBeenCalledWith(true, true)
+  })
+
+  it('locates the parent row directly when a cloud model has one reference', async () => {
+    const user = userEvent.setup()
+    const { onLocateModel } = renderRow(
+      makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }])
+    )
+
+    await user.click(screen.getByRole('button', { name: 'model.safetensors' }))
+
+    expect(onLocateModel).toHaveBeenCalledWith('1')
+  })
+
+  it('moves locate actions to expanded child rows when a cloud model has multiple references', async () => {
+    const user = userEvent.setup()
+    const { onLocateModel } = renderRow(
+      makeModel([
+        { nodeId: '1', widgetName: 'ckpt_name' },
+        { nodeId: '2', widgetName: 'ckpt_name' }
+      ])
+    )
+
+    expect(screen.getByText('2')).toBeInTheDocument()
+    expect(screen.queryAllByTestId('missing-model-locate')).toHaveLength(0)
+
+    await user.click(
+      screen.getByRole('button', { name: 'Show referencing nodes' })
+    )
+
+    const locateButtons = screen.getAllByTestId('missing-model-locate')
+    expect(locateButtons).toHaveLength(2)
+
+    await user.click(locateButtons[1])
+
+    expect(onLocateModel).toHaveBeenCalledWith('2')
+  })
+
+  it('locates the parent row directly when an OSS model has one reference', async () => {
+    mockIsCloud.value = false
+    const user = userEvent.setup()
+    const { onLocateModel } = renderRow(
+      makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }])
+    )
+
+    await user.click(screen.getByRole('button', { name: 'model.safetensors' }))
+
+    expect(onLocateModel).toHaveBeenCalledWith('1')
+  })
+
+  it('does not show the library selector in OSS rows', () => {
+    mockIsCloud.value = false
+
+    renderRow(makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }]))
+
+    expect(
+      screen.getByPlaceholderText('Paste Model URL (Civitai or Hugging Face)')
+    ).toBeInTheDocument()
+  })
+
+  it('shows model type metadata below the model name', () => {
+    renderRow(makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }]))
+
+    expect(screen.getByText('checkpoints')).toBeInTheDocument()
+  })
+
+  it('shows downloadable model size beside the model type metadata', async () => {
+    mockIsCloud.value = false
+    const model = makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }])
+    model.representative.url =
+      'https://huggingface.co/comfy/test/resolve/main/model.safetensors'
+
+    renderRow(model, vi.fn(), false)
+    const store = useMissingModelStore()
+    store.fileSizes[model.representative.url] = 14 * 1024 ** 3
+    await nextTick()
+
+    expect(screen.getByText('checkpoints · 14 GB')).toBeInTheDocument()
+    expect(screen.getByTestId('missing-model-download')).toHaveTextContent(
+      'Download'
+    )
+  })
+
+  it('shows unknown category metadata for models without a directory', () => {
+    renderRow(
+      makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }]),
+      vi.fn(),
+      true,
+      null
+    )
+
+    expect(screen.getByText('Unknown')).toBeInTheDocument()
+  })
+
+  it('moves locate actions to expanded child rows when an OSS model has multiple references', async () => {
+    mockIsCloud.value = false
+    const user = userEvent.setup()
+    const { onLocateModel } = renderRow(
+      makeModel([
+        { nodeId: '1', widgetName: 'ckpt_name' },
+        { nodeId: '2', widgetName: 'ckpt_name' }
+      ])
+    )
+
+    expect(screen.getByText('2')).toBeInTheDocument()
+    expect(screen.queryAllByTestId('missing-model-locate')).toHaveLength(0)
+
+    await user.click(
+      screen.getByRole('button', { name: 'Show referencing nodes' })
+    )
+
+    const locateButtons = screen.getAllByTestId('missing-model-locate')
+    expect(locateButtons).toHaveLength(2)
+
+    await user.click(locateButtons[1])
+
+    expect(onLocateModel).toHaveBeenCalledWith('2')
+  })
+
+  it('shows the OSS download action in the row for downloadable models', async () => {
+    mockIsCloud.value = false
+    const user = userEvent.setup()
+    const model = makeModel([{ nodeId: '1', widgetName: 'ckpt_name' }])
+    model.representative.url =
+      'https://huggingface.co/comfy/test/resolve/main/model.safetensors'
+
+    renderRow(model, vi.fn(), false)
+
+    await user.click(screen.getByTestId('missing-model-download'))
+
+    expect(mockDownloadModel).toHaveBeenCalledWith(
+      {
+        name: 'model.safetensors',
+        url: 'https://huggingface.co/comfy/test/resolve/main/model.safetensors',
+        directory: 'checkpoints'
+      },
+      {}
+    )
+  })
+})

src/platform/missingModel/components/MissingModelRow.vue

@@ -1,72 +1,11 @@
 <template>
-  <div class="flex w-full flex-col pb-3">
-    <!-- Model header -->
-    <div class="flex h-8 w-full items-center gap-2">
-      <i
-        aria-hidden="true"
-        class="text-foreground icon-[lucide--file-check] size-4 shrink-0"
-      />
-
-      <div class="flex min-w-0 flex-1 items-center">
-        <p
-          class="text-foreground min-w-0 truncate text-sm font-medium"
-          :title="model.name"
-        >
-          {{ model.name }} ({{ model.referencingNodes.length }})
-        </p>
-
-        <Button
-          data-testid="missing-model-copy-name"
-          variant="textonly"
-          size="icon-sm"
-          class="size-8 shrink-0 hover:bg-transparent"
-          :aria-label="t('rightSidePanel.missingModels.copyModelName')"
-          :title="t('rightSidePanel.missingModels.copyModelName')"
-          @click="copyToClipboard(model.name)"
-        >
-          <i
-            aria-hidden="true"
-            class="icon-[lucide--copy] size-3.5 text-muted-foreground"
-          />
-        </Button>
-      </div>
-
+  <div class="mb-1 flex w-full flex-col gap-0.5 last:mb-0">
+    <div class="flex min-h-8 w-full items-center gap-1">
       <Button
-        v-if="!isCloud && model.representative.url && !isAssetSupported"
-        data-testid="missing-model-copy-url"
-        variant="secondary"
-        size="sm"
-        class="h-8 shrink-0 rounded-lg text-sm"
-        @click="copyToClipboard(toBrowsableUrl(model.representative.url!))"
-      >
-        {{ t('rightSidePanel.missingModels.copyUrl') }}
-      </Button>
-
-      <Button
-        variant="textonly"
-        size="icon-sm"
-        :aria-label="t('rightSidePanel.missingModels.confirmSelection')"
-        :disabled="!canConfirm"
-        :class="
-          cn(
-            'size-8 shrink-0 rounded-lg transition-colors',
-            canConfirm ? 'bg-primary/10 hover:bg-primary/15' : 'opacity-20'
-          )
-        "
-        @click="handleLibrarySelect"
-      >
-        <i
-          aria-hidden="true"
-          class="icon-[lucide--check] size-4"
-          :class="canConfirm ? 'text-primary' : 'text-foreground'"
-        />
-      </Button>
-
-      <Button
-        v-if="model.referencingNodes.length > 0"
+        v-if="hasMultipleReferences"
         data-testid="missing-model-expand"
         variant="textonly"
-        size="icon-sm"
+        size="unset"
         :aria-label="
           expanded
             ? t('rightSidePanel.missingModels.collapseNodes')
@@ -75,116 +14,240 @@
         :aria-expanded="expanded"
         :class="
           cn(
-            'size-8 shrink-0 transition-transform duration-200 hover:bg-transparent',
-            expanded && 'rotate-180'
+            'h-8 w-4 shrink-0 p-0 transition-transform duration-200 hover:bg-transparent',
+            expanded && 'rotate-90'
           )
         "
-        @click="toggleModelExpand(modelKey)"
+        @click="handleToggleExpand"
       >
         <i
           aria-hidden="true"
-          class="icon-[lucide--chevron-down] size-4 text-muted-foreground group-hover:text-base-foreground"
+          class="icon-[lucide--chevron-right] size-4 text-muted-foreground"
         />
       </Button>
+
+      <span class="flex min-w-0 flex-1 flex-col gap-0">
+        <span class="flex min-w-0 items-center gap-2">
+          <span class="flex min-w-0 items-center gap-2.5">
+            <button
+              v-if="hasMultipleReferences"
+              ref="modelLabelControl"
+              type="button"
+              class="m-0 inline max-w-full cursor-pointer appearance-none border-0 bg-transparent p-0 text-left text-sm/relaxed font-normal wrap-break-word text-base-foreground outline-none hover:text-base-foreground focus:outline-none focus-visible:underline focus-visible:ring-0 focus-visible:outline-none"
+              :title="displayModelName"
+              @click="handleToggleExpand"
+            >
+              {{ displayModelName }}
+            </button>
+            <button
+              v-else-if="!isUnknownCategory && primaryReference"
+              ref="modelLabelControl"
+              type="button"
+              class="m-0 inline max-w-full cursor-pointer appearance-none border-0 bg-transparent p-0 text-left text-sm/relaxed font-normal wrap-break-word text-base-foreground outline-none hover:text-base-foreground focus:outline-none focus-visible:underline focus-visible:ring-0 focus-visible:outline-none"
+              :title="displayModelName"
+              @click="handleLocatePrimary"
+            >
+              {{ displayModelName }}
+            </button>
+            <span
+              v-else
+              class="min-w-0 truncate text-sm/relaxed font-normal text-base-foreground"
+              :title="displayModelName"
+            >
+              {{ displayModelName }}
+            </span>
+            <span
+              v-if="hasMultipleReferences"
+              data-testid="missing-model-reference-count"
+              class="flex size-6 shrink-0 items-center justify-center rounded-md bg-secondary-background-selected text-xs font-bold text-muted-foreground"
+            >
+              {{ model.referencingNodes.length }}
+            </span>
+          </span>
+          <Button
+            variant="textonly"
+            size="icon-sm"
+            class="size-7 shrink-0 text-muted-foreground hover:bg-transparent hover:text-base-foreground"
+            :aria-label="linkLabel"
+            :title="linkLabel"
+            @click="copyModelLink"
+          >
+            <i aria-hidden="true" class="icon-[lucide--link] size-4" />
+          </Button>
+        </span>
+        <span
+          v-if="modelMetadataLabel"
+          class="text-2xs/none"
+          :class="
+            isUnknownCategory
+              ? 'text-warning-background'
+              : 'text-muted-foreground'
+          "
+        >
+          {{ modelMetadataLabel }}
+        </span>
+      </span>
+
+      <template v-if="isCloud">
+        <Button
+          v-if="!isCloudImportDownloadActive"
+          data-testid="missing-model-import"
+          variant="secondary"
+          size="sm"
+          class="h-8 shrink-0 rounded-lg text-sm"
+          @click="showUploadDialog"
+        >
+          {{ t('g.import') }}
+        </Button>
+        <div
+          v-else
+          ref="cloudProgress"
+          role="progressbar"
+          :aria-label="t('rightSidePanel.missingModels.importing')"
+          :aria-valuenow="cloudImportProgressPercent"
+          aria-valuemin="0"
+          aria-valuemax="100"
+          tabindex="-1"
+          class="flex h-8 w-16 shrink-0 items-center"
+        >
+          <span
+            class="block h-1.5 w-full overflow-hidden rounded-full bg-secondary-background-selected"
+          >
+            <span
+              class="block h-full rounded-full bg-primary-background transition-all duration-200 ease-linear"
+              :style="{ width: `${cloudImportProgressPercent}%` }"
+            />
+          </span>
+        </div>
+        <span
+          v-if="isCloudImportDownloadActive"
+          role="status"
+          aria-live="polite"
+          class="sr-only"
+        >
+          {{ t('rightSidePanel.missingModels.importing') }}
+        </span>
+      </template>
+
+      <template v-else>
+        <Button
+          v-if="showDownloadAction"
+          data-testid="missing-model-download"
+          variant="secondary"
+          size="sm"
+          class="h-8 shrink-0 rounded-lg text-sm"
+          :aria-label="`${t('g.download')} ${model.name}`"
+          @click="handleDownload"
+        >
+          {{ t('g.download') }}
+        </Button>
+        <Button
+          v-else-if="showConfirmAction"
+          variant="textonly"
+          size="icon-sm"
+          :aria-label="t('rightSidePanel.missingModels.confirmSelection')"
+          :disabled="!canConfirm"
+          :class="
+            cn(
+              'size-8 shrink-0 rounded-lg transition-colors',
+              canConfirm ? 'bg-primary/10 hover:bg-primary/15' : 'opacity-20'
+            )
+          "
+          @click="handleLibrarySelect"
+        >
+          <i
+            aria-hidden="true"
+            class="icon-[lucide--check] size-4"
+            :class="canConfirm ? 'text-primary' : 'text-foreground'"
+          />
+        </Button>
+      </template>
+
+      <Button
+        v-if="!hasMultipleReferences && !isUnknownCategory && primaryReference"
+        data-testid="missing-model-locate"
+        variant="textonly"
+        size="icon-sm"
+        :aria-label="t('rightSidePanel.missingModels.locateNode')"
+        class="size-8 shrink-0 text-muted-foreground hover:text-base-foreground"
+        @click="handleLocatePrimary"
+      >
+        <i aria-hidden="true" class="icon-[lucide--locate] size-4" />
+      </Button>
     </div>
 
-    <!-- Referencing nodes -->
     <TransitionCollapse>
-      <div
-        v-if="expanded"
-        class="mb-1 flex flex-col gap-0.5 overflow-hidden pl-6"
+      <ul
+        v-if="showReferenceList"
+        :class="
+          cn(
+            'm-0 list-none space-y-1 p-0',
+            (hasMultipleReferences || isUnknownCategory) && 'pl-5'
+          )
+        "
       >
-        <div
+        <li
           v-for="ref in model.referencingNodes"
           :key="`${String(ref.nodeId)}::${ref.widgetName}`"
-          class="flex h-7 items-center"
+          class="min-w-0"
         >
-          <span
-            v-if="showNodeIdBadge"
-            class="mr-1 shrink-0 rounded-md bg-secondary-background-selected px-2 py-0.5 font-mono text-xs font-bold text-muted-foreground"
-          >
-            #{{ ref.nodeId }}
-          </span>
-          <p class="min-w-0 flex-1 truncate text-xs text-muted-foreground">
-            {{ getNodeDisplayLabel(ref.nodeId, model.representative.nodeType) }}
-          </p>
-          <Button
-            data-testid="missing-model-locate"
-            variant="textonly"
-            size="icon-sm"
-            :aria-label="t('rightSidePanel.missingModels.locateNode')"
-            class="mr-1 size-6 shrink-0 text-muted-foreground hover:text-base-foreground"
-            @click="emit('locateModel', String(ref.nodeId))"
-          >
-            <i aria-hidden="true" class="icon-[lucide--locate] size-3" />
-          </Button>
-        </div>
-      </div>
+          <div class="flex min-w-0 items-center gap-2">
+            <button
+              type="button"
+              class="m-0 inline max-w-full cursor-pointer appearance-none border-0 bg-transparent p-0 text-left text-sm/relaxed font-normal wrap-break-word text-muted-foreground outline-none hover:text-base-foreground focus:outline-none focus-visible:underline focus-visible:ring-0 focus-visible:outline-none"
+              @click="emit('locateModel', String(ref.nodeId))"
+            >
+              {{
+                getNodeDisplayLabel(ref.nodeId, model.representative.nodeType)
+              }}
+            </button>
+            <Button
+              data-testid="missing-model-locate"
+              variant="textonly"
+              size="icon-sm"
+              :aria-label="t('rightSidePanel.missingModels.locateNode')"
+              class="ml-auto size-8 shrink-0 text-muted-foreground hover:text-base-foreground"
+              @click="emit('locateModel', String(ref.nodeId))"
+            >
+              <i aria-hidden="true" class="icon-[lucide--locate] size-4" />
+            </Button>
+          </div>
+        </li>
+      </ul>
     </TransitionCollapse>
 
-    <!-- Status card -->
-    <TransitionCollapse>
-      <MissingModelStatusCard
-        v-if="selectedLibraryModel[modelKey]"
-        :model-name="selectedLibraryModel[modelKey]"
-        :is-download-active="isDownloadActive"
-        :download-status="downloadStatus"
-        :category-mismatch="importCategoryMismatch[modelKey]"
-        @cancel="cancelLibrarySelect(modelKey)"
-      />
-    </TransitionCollapse>
+    <template v-if="!isCloud">
+      <TransitionCollapse>
+        <MissingModelStatusCard
+          v-if="selectedLibraryModel[modelKey]"
+          :model-name="selectedLibraryModel[modelKey]"
+          :is-download-active="isDownloadActive"
+          :download-status="downloadStatus"
+          :category-mismatch="importCategoryMismatch[modelKey]"
+          @cancel="cancelLibrarySelect(modelKey)"
+        />
+      </TransitionCollapse>
 
-    <!-- Input area -->
-    <TransitionCollapse>
-      <div
-        v-if="!selectedLibraryModel[modelKey]"
-        class="mt-1 flex flex-col gap-1"
-      >
-        <div v-if="isAssetSupported" class="flex w-full flex-col py-1">
-          <MissingModelUrlInput
-            :model-key="modelKey"
-            :directory="directory"
-            :type-mismatch="typeMismatch"
-          />
-        </div>
+      <TransitionCollapse>
         <div
-          v-else-if="!isCloud && downloadable"
-          class="flex w-full items-start py-1"
+          v-if="!selectedLibraryModel[modelKey]"
+          class="mt-1 flex flex-col gap-1"
         >
-          <Button
-            data-testid="missing-model-download"
-            variant="secondary"
-            size="md"
-            class="flex w-full flex-1"
-            :aria-label="`${t('g.download')} ${model.name}`"
-            @click="handleDownload"
-          >
-            <i
-              aria-hidden="true"
-              class="text-foreground mr-1 icon-[lucide--download] size-4 shrink-0"
+          <div v-if="isAssetSupported" class="flex w-full flex-col py-1">
+            <MissingModelUrlInput
+              :model-key="modelKey"
+              :directory="directory"
+              :type-mismatch="typeMismatch"
             />
-            <span class="text-foreground min-w-0 truncate text-sm">
-              {{ downloadLabel }}
-            </span>
-          </Button>
+          </div>
         </div>
-
-        <TransitionCollapse>
-          <MissingModelLibrarySelect
-            v-if="!urlInputs[modelKey]"
-            :model-value="getComboValue(model.representative)"
-            :options="comboOptions"
-            :show-divider="isAssetSupported || downloadable"
-            @select="handleComboSelect(modelKey, $event)"
-          />
-        </TransitionCollapse>
-      </div>
-    </TransitionCollapse>
+      </TransitionCollapse>
+    </template>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted } from 'vue'
+import { computed, nextTick, onMounted, useTemplateRef, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useI18n } from 'vue-i18n'
 import { cn } from '@comfyorg/tailwind-utils'
@@ -192,14 +255,14 @@ import Button from '@/components/ui/button/Button.vue'
 import TransitionCollapse from '@/components/rightSidePanel/layout/TransitionCollapse.vue'
 import MissingModelStatusCard from '@/platform/missingModel/components/MissingModelStatusCard.vue'
 import MissingModelUrlInput from '@/platform/missingModel/components/MissingModelUrlInput.vue'
-import MissingModelLibrarySelect from '@/platform/missingModel/components/MissingModelLibrarySelect.vue'
 import type { MissingModelViewModel } from '@/platform/missingModel/types'
+import type { UploadModelDialogContext } from '@/platform/assets/composables/useUploadModelWizard'
 
+import { useModelUpload } from '@/platform/assets/composables/useModelUpload'
 import {
   useMissingModelInteractions,
   getModelStateKey,
-  getNodeDisplayLabel,
-  getComboValue
+  getNodeDisplayLabel
 } from '@/platform/missingModel/composables/useMissingModelInteractions'
 import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import { useCopyToClipboard } from '@/composables/useCopyToClipboard'
@@ -215,7 +278,6 @@ import { formatSize } from '@/utils/formatUtil'
 const { model, directory, isAssetSupported } = defineProps<{
   model: MissingModelViewModel
   directory: string | null
-  showNodeIdBadge: boolean
   isAssetSupported: boolean
 }>()
 
@@ -231,21 +293,123 @@ const modelKey = computed(() =>
 )
 
 const downloadStatus = computed(() => getDownloadStatus(modelKey.value))
-const comboOptions = computed(() => getComboOptions(model.representative))
 const canConfirm = computed(() => isSelectionConfirmable(modelKey.value))
-const expanded = computed(() => isModelExpanded(modelKey.value))
 const typeMismatch = computed(() => getTypeMismatch(modelKey.value, directory))
+const isUnknownCategory = computed(() => directory === null)
 const isDownloadActive = computed(
   () =>
     downloadStatus.value?.status === 'running' ||
     downloadStatus.value?.status === 'created'
 )
+const isCloudImportDownloadActive = computed(
+  () => isCloud && isDownloadActive.value
+)
+const cloudImportProgressPercent = computed(() =>
+  Math.round((downloadStatus.value?.progress ?? 0) * 100)
+)
+const hasMultipleReferences = computed(() => model.referencingNodes.length > 1)
+const primaryReference = computed(() => model.referencingNodes[0])
+const linkLabel = computed(() =>
+  model.representative.url
+    ? t('rightSidePanel.missingModels.copyUrl')
+    : t('rightSidePanel.missingModels.copyModelName')
+)
 
 const store = useMissingModelStore()
-const { selectedLibraryModel, importCategoryMismatch, urlInputs } =
-  storeToRefs(store)
+const { selectedLibraryModel, importCategoryMismatch } = storeToRefs(store)
+const cloudProgress = useTemplateRef<HTMLElement>('cloudProgress')
+const modelLabelControl = useTemplateRef<HTMLButtonElement>('modelLabelControl')
+
+const expanded = computed(
+  () =>
+    store.modelExpandState[modelKey.value] ??
+    (isUnknownCategory.value && hasMultipleReferences.value)
+)
+const showReferenceList = computed(
+  () =>
+    (isUnknownCategory.value && model.referencingNodes.length === 1) ||
+    (hasMultipleReferences.value && expanded.value)
+)
+
+const displayModelName = computed(() => {
+  if (!isCloudImportDownloadActive.value) return model.name
+
+  return (
+    downloadStatus.value?.assetName ??
+    selectedLibraryModel.value[modelKey.value] ??
+    model.name
+  )
+})
+
+const downloadable = computed(() => {
+  const rep = model.representative
+  return !!(
+    !isAssetSupported &&
+    rep.url &&
+    rep.directory &&
+    isModelDownloadable({
+      name: rep.name,
+      url: rep.url,
+      directory: rep.directory
+    })
+  )
+})
+
+const showDownloadAction = computed(
+  () =>
+    !isCloud &&
+    downloadable.value &&
+    !selectedLibraryModel.value[modelKey.value]
+)
+const showConfirmAction = computed(
+  () => !isCloud && !!selectedLibraryModel.value[modelKey.value]
+)
+
+const downloadSizeLabel = computed(() => {
+  if (!showDownloadAction.value) return undefined
+
+  const url = model.representative.url
+  const size = url ? store.fileSizes[url] : undefined
+  return size ? formatSize(size) : undefined
+})
+const modelTypeLabel = computed(
+  () => directory ?? t('rightSidePanel.missingModels.unknownCategory')
+)
+const modelMetadataLabel = computed(() =>
+  [modelTypeLabel.value, downloadSizeLabel.value].filter(Boolean).join(' · ')
+)
+
+const missingModelUploadContext = computed<
+  UploadModelDialogContext | undefined
+>(() => {
+  if (!directory) return undefined
+
+  return {
+    kind: 'missing-model-resolution',
+    missingModelName: model.name,
+    requiredModelType: directory,
+    replacementTargets: model.referencingNodes.map((ref) => ({
+      nodeId: String(ref.nodeId),
+      nodeLabel: getNodeDisplayLabel(ref.nodeId, model.representative.nodeType),
+      widgetName: ref.widgetName
+    }))
+  }
+})
+
+const { showUploadDialog } = useModelUpload(
+  (result) => {
+    handleUploadedModelImport(modelKey.value, result)
+
+    if (result.status === 'success') {
+      handleLibrarySelect()
+    }
+  },
+  () => missingModelUploadContext.value
+)
 
 onMounted(() => {
+  if (isCloud) return
+
   const url = model.representative.url
   if (url && !store.fileSizes[url]) {
     fetchModelMetadata(url)
@@ -263,27 +427,6 @@ onMounted(() => {
   }
 })
 
-const downloadable = computed(() => {
-  const rep = model.representative
-  return !!(
-    !isAssetSupported &&
-    rep.url &&
-    rep.directory &&
-    isModelDownloadable({
-      name: rep.name,
-      url: rep.url,
-      directory: rep.directory
-    })
-  )
-})
-
-const downloadLabel = computed(() => {
-  const base = t('g.download')
-  const url = model.representative.url
-  const size = url ? store.fileSizes[url] : undefined
-  return size ? `${base} (${formatSize(size)})` : base
-})
-
 function handleDownload() {
   const rep = model.representative
   if (rep.url && rep.directory) {
@@ -296,18 +439,51 @@ function handleDownload() {
   }
 }
 
+function handleLocatePrimary() {
+  const ref = primaryReference.value
+  if (ref) emit('locateModel', String(ref.nodeId))
+}
+
+function copyModelLink() {
+  const url = model.representative.url
+  copyToClipboard(url ? toBrowsableUrl(url) : model.name)
+}
+
 const {
-  toggleModelExpand,
-  isModelExpanded,
-  getComboOptions,
-  handleComboSelect,
   isSelectionConfirmable,
   cancelLibrarySelect,
   confirmLibrarySelect,
   getTypeMismatch,
-  getDownloadStatus
+  getDownloadStatus,
+  handleUploadedModelImport
 } = useMissingModelInteractions()
 
+function handleToggleExpand() {
+  store.modelExpandState[modelKey.value] = !expanded.value
+}
+
+watch(
+  () => downloadStatus.value?.status,
+  (status) => {
+    if (!isCloud || status !== 'completed') return
+    const completedAssetName = downloadStatus.value?.assetName
+    if (completedAssetName) {
+      selectedLibraryModel.value[modelKey.value] = completedAssetName
+    }
+    handleLibrarySelect()
+  },
+  { immediate: true }
+)
+
+watch(isCloudImportDownloadActive, async (isActive, wasActive) => {
+  await nextTick()
+  if (isActive) {
+    cloudProgress.value?.focus()
+  } else if (wasActive) {
+    modelLabelControl.value?.focus()
+  }
+})
+
 function handleLibrarySelect() {
   confirmLibrarySelect(
     modelKey.value,

src/platform/missingModel/components/MissingModelStatusCard.vue

@@ -3,7 +3,6 @@
     aria-live="polite"
     class="bg-foreground/5 relative mt-1 overflow-hidden rounded-lg border border-interface-stroke p-2"
   >
-    <!-- Progress bar fill -->
     <div
       v-if="isDownloadActive"
       class="absolute inset-y-0 left-0 bg-primary/10 transition-all duration-200 ease-linear"
@@ -65,7 +64,7 @@
             }}
           </template>
           <template v-else>
-            {{ t('rightSidePanel.missingModels.usingFromLibrary') }}
+            {{ t('rightSidePanel.missingModels.readyToApply') }}
           </template>
         </span>
       </div>

src/platform/missingModel/composables/useMissingModelInteractions.test.ts

@@ -1,6 +1,10 @@
 import { createPinia, setActivePinia } from 'pinia'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createApp } from 'vue'
+import type { App } from 'vue'
+import { createI18n } from 'vue-i18n'
 
+import enMessages from '@/locales/en/main.json' with { type: 'json' }
 import type { MissingModelCandidate } from '@/platform/missingModel/types'
 
 const mockGetNodeByExecutionId = vi.fn()
@@ -10,29 +14,16 @@ const mockGetAssetMetadata = vi.fn()
 const mockUploadAssetAsync = vi.fn()
 const mockTrackDownload = vi.fn()
 const mockInvalidateModelsForCategory = vi.fn()
-const mockGetAssetDisplayName = vi.fn((a: { name: string }) => a.name)
-const mockGetAssetFilename = vi.fn((a: { name: string }) => a.name)
-const mockGetAssets = vi.fn()
 const mockUpdateModelsForNodeType = vi.fn()
 const mockGetAllNodeProviders = vi.fn()
 const mockDownloadList = vi.fn(
   (): Array<{ taskId: string; status: string }> => []
 )
 
-vi.mock('@/i18n', () => ({
-  st: vi.fn((_key: string, fallback: string) => fallback)
-}))
-
 vi.mock('@/platform/distribution/types', () => ({
   isCloud: false
 }))
 
-vi.mock('vue-i18n', () => ({
-  useI18n: () => ({
-    t: (key: string) => key
-  })
-}))
-
 vi.mock('@/scripts/app', () => ({
   app: {
     rootGraph: null
@@ -55,7 +46,6 @@ vi.mock('@/renderer/core/canvas/canvasStore', () => ({
 
 vi.mock('@/stores/assetsStore', () => ({
   useAssetsStore: () => ({
-    getAssets: mockGetAssets,
     updateModelsForNodeType: mockUpdateModelsForNodeType,
     invalidateModelsForCategory: mockInvalidateModelsForCategory,
     updateModelsForTag: vi.fn()
@@ -84,11 +74,6 @@ vi.mock('@/platform/assets/services/assetService', () => ({
   }
 }))
 
-vi.mock('@/platform/assets/utils/assetMetadataUtils', () => ({
-  getAssetDisplayName: (a: { name: string }) => mockGetAssetDisplayName(a),
-  getAssetFilename: (a: { name: string }) => mockGetAssetFilename(a)
-}))
-
 vi.mock('@/platform/assets/importSources/civitaiImportSource', () => ({
   civitaiImportSource: {
     type: 'civitai',
@@ -112,7 +97,6 @@ vi.mock('@/platform/assets/utils/importSourceUtil', () => ({
 import { app } from '@/scripts/app'
 import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import {
-  getComboValue,
   getModelStateKey,
   getNodeDisplayLabel,
   useMissingModelInteractions
@@ -133,17 +117,54 @@ function makeCandidate(
 }
 
 describe('useMissingModelInteractions', () => {
+  const mountedApps: App<Element>[] = []
+
+  function setupWithI18n<T>(factory: () => T): T {
+    let result: T | undefined
+    const host = document.createElement('div')
+    const app = createApp({
+      setup() {
+        result = factory()
+        return () => null
+      }
+    })
+    app.use(
+      createI18n({
+        legacy: false,
+        locale: 'en',
+        messages: { en: enMessages }
+      })
+    )
+    app.mount(host)
+    mountedApps.push(app)
+
+    if (result === undefined) {
+      throw new Error('Composable setup did not run')
+    }
+    return result
+  }
+
+  function setupMissingModelInteractions(): ReturnType<
+    typeof useMissingModelInteractions
+  > {
+    return setupWithI18n(() => useMissingModelInteractions())
+  }
+
   beforeEach(() => {
     setActivePinia(createPinia())
     vi.resetAllMocks()
-    mockGetAssetDisplayName.mockImplementation((a: { name: string }) => a.name)
-    mockGetAssetFilename.mockImplementation((a: { name: string }) => a.name)
     mockDownloadList.mockImplementation(
       (): Array<{ taskId: string; status: string }> => []
     )
     ;(app as { rootGraph: unknown }).rootGraph = null
   })
 
+  afterEach(() => {
+    for (const app of mountedApps.splice(0)) {
+      app.unmount()
+    }
+  })
+
   describe('getModelStateKey', () => {
     it('returns key with supported prefix when asset is supported', () => {
       expect(getModelStateKey('model.safetensors', 'checkpoints', true)).toBe(
@@ -184,101 +205,31 @@ describe('useMissingModelInteractions', () => {
     })
   })
 
-  describe('getComboValue', () => {
-    it('returns undefined when node is not found', () => {
-      ;(app as { rootGraph: unknown }).rootGraph = {}
-      mockGetNodeByExecutionId.mockReturnValue(null)
-
-      const result = getComboValue(makeCandidate())
-      expect(result).toBeUndefined()
-    })
-
-    it('returns undefined when widget is not found', () => {
-      ;(app as { rootGraph: unknown }).rootGraph = {}
-      mockGetNodeByExecutionId.mockReturnValue({
-        widgets: [{ name: 'other_widget', value: 'test' }]
-      })
-
-      const result = getComboValue(makeCandidate())
-      expect(result).toBeUndefined()
-    })
-
-    it('returns string value directly', () => {
-      ;(app as { rootGraph: unknown }).rootGraph = {}
-      mockGetNodeByExecutionId.mockReturnValue({
-        widgets: [{ name: 'ckpt_name', value: 'v1-5.safetensors' }]
-      })
-
-      expect(getComboValue(makeCandidate())).toBe('v1-5.safetensors')
-    })
-
-    it('returns stringified number value', () => {
-      ;(app as { rootGraph: unknown }).rootGraph = {}
-      mockGetNodeByExecutionId.mockReturnValue({
-        widgets: [{ name: 'ckpt_name', value: 42 }]
-      })
-
-      expect(getComboValue(makeCandidate())).toBe('42')
-    })
-
-    it('returns undefined for unexpected types', () => {
-      ;(app as { rootGraph: unknown }).rootGraph = {}
-      mockGetNodeByExecutionId.mockReturnValue({
-        widgets: [{ name: 'ckpt_name', value: { complex: true } }]
-      })
-
-      expect(getComboValue(makeCandidate())).toBeUndefined()
-    })
-
-    it('returns undefined when nodeId is null', () => {
-      const result = getComboValue(makeCandidate({ nodeId: undefined }))
-      expect(result).toBeUndefined()
-    })
-  })
-
   describe('toggleModelExpand / isModelExpanded', () => {
     it('starts collapsed by default', () => {
-      const { isModelExpanded } = useMissingModelInteractions()
+      const { isModelExpanded } = setupMissingModelInteractions()
       expect(isModelExpanded('key1')).toBe(false)
     })
 
     it('toggles to expanded', () => {
       const { toggleModelExpand, isModelExpanded } =
-        useMissingModelInteractions()
+        setupMissingModelInteractions()
       toggleModelExpand('key1')
       expect(isModelExpanded('key1')).toBe(true)
     })
 
     it('toggles back to collapsed', () => {
       const { toggleModelExpand, isModelExpanded } =
-        useMissingModelInteractions()
+        setupMissingModelInteractions()
       toggleModelExpand('key1')
       toggleModelExpand('key1')
       expect(isModelExpanded('key1')).toBe(false)
     })
   })
 
-  describe('handleComboSelect', () => {
-    it('sets selectedLibraryModel in store', () => {
-      const store = useMissingModelStore()
-      const { handleComboSelect } = useMissingModelInteractions()
-
-      handleComboSelect('key1', 'model_v2.safetensors')
-      expect(store.selectedLibraryModel['key1']).toBe('model_v2.safetensors')
-    })
-
-    it('does not set value when undefined', () => {
-      const store = useMissingModelStore()
-      const { handleComboSelect } = useMissingModelInteractions()
-
-      handleComboSelect('key1', undefined)
-      expect(store.selectedLibraryModel['key1']).toBeUndefined()
-    })
-  })
-
   describe('isSelectionConfirmable', () => {
     it('returns false when no selection exists', () => {
-      const { isSelectionConfirmable } = useMissingModelInteractions()
+      const { isSelectionConfirmable } = setupMissingModelInteractions()
       expect(isSelectionConfirmable('key1')).toBe(false)
     })
 
@@ -290,7 +241,7 @@ describe('useMissingModelInteractions', () => {
         { taskId: 'task-123', status: 'running' }
       ])
 
-      const { isSelectionConfirmable } = useMissingModelInteractions()
+      const { isSelectionConfirmable } = setupMissingModelInteractions()
       expect(isSelectionConfirmable('key1')).toBe(false)
     })
 
@@ -299,7 +250,7 @@ describe('useMissingModelInteractions', () => {
       store.selectedLibraryModel['key1'] = 'model.safetensors'
       store.importCategoryMismatch['key1'] = 'loras'
 
-      const { isSelectionConfirmable } = useMissingModelInteractions()
+      const { isSelectionConfirmable } = setupMissingModelInteractions()
       expect(isSelectionConfirmable('key1')).toBe(false)
     })
 
@@ -308,7 +259,7 @@ describe('useMissingModelInteractions', () => {
       store.selectedLibraryModel['key1'] = 'model.safetensors'
       mockDownloadList.mockReturnValue([])
 
-      const { isSelectionConfirmable } = useMissingModelInteractions()
+      const { isSelectionConfirmable } = setupMissingModelInteractions()
       expect(isSelectionConfirmable('key1')).toBe(true)
     })
   })
@@ -318,12 +269,14 @@ describe('useMissingModelInteractions', () => {
       const store = useMissingModelStore()
       store.selectedLibraryModel['key1'] = 'model.safetensors'
       store.importCategoryMismatch['key1'] = 'loras'
+      store.importTaskIds['key1'] = 'task-123'
 
-      const { cancelLibrarySelect } = useMissingModelInteractions()
+      const { cancelLibrarySelect } = setupMissingModelInteractions()
       cancelLibrarySelect('key1')
 
       expect(store.selectedLibraryModel['key1']).toBeUndefined()
       expect(store.importCategoryMismatch['key1']).toBeUndefined()
+      expect(store.importTaskIds['key1']).toBeUndefined()
     })
   })
 
@@ -347,6 +300,7 @@ describe('useMissingModelInteractions', () => {
 
       const store = useMissingModelStore()
       store.selectedLibraryModel['key1'] = 'new_model.safetensors'
+      store.importTaskIds['key1'] = 'task-123'
       store.setMissingModels([
         makeCandidate({ name: 'old_model.safetensors', nodeId: '10' }),
         makeCandidate({ name: 'old_model.safetensors', nodeId: '20' })
@@ -354,7 +308,7 @@ describe('useMissingModelInteractions', () => {
 
       const removeSpy = vi.spyOn(store, 'removeMissingModelByNameOnNodes')
 
-      const { confirmLibrarySelect } = useMissingModelInteractions()
+      const { confirmLibrarySelect } = setupMissingModelInteractions()
       confirmLibrarySelect(
         'key1',
         'old_model.safetensors',
@@ -372,6 +326,7 @@ describe('useMissingModelInteractions', () => {
         new Set(['10', '20'])
       )
       expect(store.selectedLibraryModel['key1']).toBeUndefined()
+      expect(store.importTaskIds['key1']).toBeUndefined()
     })
 
     it('does nothing when no selection exists', () => {
@@ -379,7 +334,7 @@ describe('useMissingModelInteractions', () => {
       const store = useMissingModelStore()
       const removeSpy = vi.spyOn(store, 'removeMissingModelByNameOnNodes')
 
-      const { confirmLibrarySelect } = useMissingModelInteractions()
+      const { confirmLibrarySelect } = setupMissingModelInteractions()
       confirmLibrarySelect('key1', 'model.safetensors', [], null)
 
       expect(removeSpy).not.toHaveBeenCalled()
@@ -391,7 +346,7 @@ describe('useMissingModelInteractions', () => {
       store.selectedLibraryModel['key1'] = 'new.safetensors'
       const removeSpy = vi.spyOn(store, 'removeMissingModelByNameOnNodes')
 
-      const { confirmLibrarySelect } = useMissingModelInteractions()
+      const { confirmLibrarySelect } = setupMissingModelInteractions()
       confirmLibrarySelect('key1', 'model.safetensors', [], null)
 
       expect(removeSpy).not.toHaveBeenCalled()
@@ -407,7 +362,7 @@ describe('useMissingModelInteractions', () => {
       const store = useMissingModelStore()
       store.selectedLibraryModel['key1'] = 'new.safetensors'
 
-      const { confirmLibrarySelect } = useMissingModelInteractions()
+      const { confirmLibrarySelect } = setupMissingModelInteractions()
       confirmLibrarySelect('key1', 'model.safetensors', [], 'checkpoints')
 
       expect(mockGetAllNodeProviders).toHaveBeenCalledWith('checkpoints')
@@ -421,7 +376,7 @@ describe('useMissingModelInteractions', () => {
       store.urlErrors['key1'] = 'old error'
       store.urlFetching['key1'] = true
 
-      const { handleUrlInput } = useMissingModelInteractions()
+      const { handleUrlInput } = setupMissingModelInteractions()
       handleUrlInput('key1', 'https://civitai.com/models/123')
 
       expect(store.urlInputs['key1']).toBe('https://civitai.com/models/123')
@@ -434,7 +389,7 @@ describe('useMissingModelInteractions', () => {
       const store = useMissingModelStore()
       const setTimerSpy = vi.spyOn(store, 'setDebounceTimer')
 
-      const { handleUrlInput } = useMissingModelInteractions()
+      const { handleUrlInput } = setupMissingModelInteractions()
       handleUrlInput('key1', '   ')
 
       expect(setTimerSpy).not.toHaveBeenCalled()
@@ -444,7 +399,7 @@ describe('useMissingModelInteractions', () => {
       const store = useMissingModelStore()
       const setTimerSpy = vi.spyOn(store, 'setDebounceTimer')
 
-      const { handleUrlInput } = useMissingModelInteractions()
+      const { handleUrlInput } = setupMissingModelInteractions()
       handleUrlInput('key1', 'https://civitai.com/models/123')
 
       expect(setTimerSpy).toHaveBeenCalledWith(
@@ -458,7 +413,7 @@ describe('useMissingModelInteractions', () => {
       const store = useMissingModelStore()
       const clearTimerSpy = vi.spyOn(store, 'clearDebounceTimer')
 
-      const { handleUrlInput } = useMissingModelInteractions()
+      const { handleUrlInput } = setupMissingModelInteractions()
       handleUrlInput('key1', 'https://civitai.com/models/123')
 
       expect(clearTimerSpy).toHaveBeenCalledWith('key1')
@@ -467,12 +422,12 @@ describe('useMissingModelInteractions', () => {
 
   describe('getTypeMismatch', () => {
     it('returns null when groupDirectory is null', () => {
-      const { getTypeMismatch } = useMissingModelInteractions()
+      const { getTypeMismatch } = setupMissingModelInteractions()
       expect(getTypeMismatch('key1', null)).toBeNull()
     })
 
     it('returns null when no metadata exists', () => {
-      const { getTypeMismatch } = useMissingModelInteractions()
+      const { getTypeMismatch } = setupMissingModelInteractions()
       expect(getTypeMismatch('key1', 'checkpoints')).toBeNull()
     })
 
@@ -480,7 +435,7 @@ describe('useMissingModelInteractions', () => {
       const store = useMissingModelStore()
       store.urlMetadata['key1'] = { name: 'model', tags: [] } as never
 
-      const { getTypeMismatch } = useMissingModelInteractions()
+      const { getTypeMismatch } = setupMissingModelInteractions()
       expect(getTypeMismatch('key1', 'checkpoints')).toBeNull()
     })
 
@@ -491,7 +446,7 @@ describe('useMissingModelInteractions', () => {
         tags: ['checkpoints']
       } as never
 
-      const { getTypeMismatch } = useMissingModelInteractions()
+      const { getTypeMismatch } = setupMissingModelInteractions()
       expect(getTypeMismatch('key1', 'checkpoints')).toBeNull()
     })
 
@@ -502,7 +457,7 @@ describe('useMissingModelInteractions', () => {
         tags: ['loras']
       } as never
 
-      const { getTypeMismatch } = useMissingModelInteractions()
+      const { getTypeMismatch } = setupMissingModelInteractions()
       expect(getTypeMismatch('key1', 'checkpoints')).toBe('loras')
     })
 
@@ -513,63 +468,14 @@ describe('useMissingModelInteractions', () => {
         tags: ['other', 'random']
       } as never
 
-      const { getTypeMismatch } = useMissingModelInteractions()
+      const { getTypeMismatch } = setupMissingModelInteractions()
       expect(getTypeMismatch('key1', 'checkpoints')).toBeNull()
     })
   })
 
-  describe('getComboOptions', () => {
-    it('returns assets from assetsStore when the model is asset-supported', () => {
-      mockGetAssets.mockReturnValueOnce([
-        { name: 'modelA.safetensors' },
-        { name: 'modelB.safetensors' }
-      ])
-
-      const { getComboOptions } = useMissingModelInteractions()
-      const options = getComboOptions(makeCandidate({ isAssetSupported: true }))
-
-      expect(mockGetAssets).toHaveBeenCalledWith('CheckpointLoaderSimple')
-      expect(options).toEqual([
-        { name: 'modelA.safetensors', value: 'modelA.safetensors' },
-        { name: 'modelB.safetensors', value: 'modelB.safetensors' }
-      ])
-    })
-
-    it('returns widget options when the model is not asset-supported', () => {
-      ;(app as { rootGraph: unknown }).rootGraph = {}
-      mockGetNodeByExecutionId.mockReturnValue({
-        widgets: [
-          {
-            name: 'ckpt_name',
-            value: '',
-            options: { values: ['v1.safetensors', 'v2.safetensors'] }
-          }
-        ]
-      })
-
-      const { getComboOptions } = useMissingModelInteractions()
-      const options = getComboOptions(makeCandidate())
-
-      expect(options).toEqual([
-        { name: 'v1.safetensors', value: 'v1.safetensors' },
-        { name: 'v2.safetensors', value: 'v2.safetensors' }
-      ])
-    })
-
-    it('returns an empty array when the widget has no options.values', () => {
-      ;(app as { rootGraph: unknown }).rootGraph = {}
-      mockGetNodeByExecutionId.mockReturnValue({
-        widgets: [{ name: 'ckpt_name', value: '' }]
-      })
-
-      const { getComboOptions } = useMissingModelInteractions()
-      expect(getComboOptions(makeCandidate())).toEqual([])
-    })
-  })
-
   describe('getDownloadStatus', () => {
     it('returns null when no taskId is tracked for the key', () => {
-      const { getDownloadStatus } = useMissingModelInteractions()
+      const { getDownloadStatus } = setupMissingModelInteractions()
       expect(getDownloadStatus('key1')).toBeNull()
     })
 
@@ -581,7 +487,7 @@ describe('useMissingModelInteractions', () => {
         { taskId: 'task-42', status: 'created' }
       ])
 
-      const { getDownloadStatus } = useMissingModelInteractions()
+      const { getDownloadStatus } = setupMissingModelInteractions()
       expect(getDownloadStatus('key1')).toEqual({
         taskId: 'task-42',
         status: 'created'
@@ -608,7 +514,7 @@ describe('useMissingModelInteractions', () => {
         task: { task_id: 'task-99', status: 'created' }
       })
 
-      const { handleImport } = useMissingModelInteractions()
+      const { handleImport } = setupMissingModelInteractions()
       await handleImport('key1', 'checkpoints')
 
       expect(store.importTaskIds['key1']).toBe('task-99')
@@ -626,7 +532,7 @@ describe('useMissingModelInteractions', () => {
         task: { task_id: 'task-100', status: 'completed' }
       })
 
-      const { handleImport } = useMissingModelInteractions()
+      const { handleImport } = setupMissingModelInteractions()
       await handleImport('key1', 'checkpoints')
 
       expect(mockInvalidateModelsForCategory).toHaveBeenCalledWith(
@@ -641,7 +547,7 @@ describe('useMissingModelInteractions', () => {
         asset: { tags: ['models', 'loras'] }
       })
 
-      const { handleImport } = useMissingModelInteractions()
+      const { handleImport } = setupMissingModelInteractions()
       await handleImport('key1', 'checkpoints')
 
       expect(store.importCategoryMismatch['key1']).toBe('loras')
@@ -651,7 +557,7 @@ describe('useMissingModelInteractions', () => {
       const store = setupImportableState('key1')
       mockUploadAssetAsync.mockRejectedValueOnce(new Error('Upload boom'))
 
-      const { handleImport } = useMissingModelInteractions()
+      const { handleImport } = setupMissingModelInteractions()
       await handleImport('key1', 'checkpoints')
 
       expect(store.urlErrors['key1']).toBe('Upload boom')

src/platform/missingModel/composables/useMissingModelInteractions.ts

@@ -3,12 +3,9 @@ import { useI18n } from 'vue-i18n'
 import { resolveNodeDisplayName } from '@/utils/nodeTitleUtil'
 import { st } from '@/i18n'
 import { assetService } from '@/platform/assets/services/assetService'
-import {
-  getAssetDisplayName,
-  getAssetFilename
-} from '@/platform/assets/utils/assetMetadataUtils'
 import { civitaiImportSource } from '@/platform/assets/importSources/civitaiImportSource'
 import { huggingfaceImportSource } from '@/platform/assets/importSources/huggingfaceImportSource'
+import type { UploadModelSuccess } from '@/platform/assets/composables/useUploadModelWizard'
 import { validateSourceUrl } from '@/platform/assets/utils/importSourceUtil'
 import { useMissingModelStore } from '@/platform/missingModel/missingModelStore'
 import { useAssetsStore } from '@/stores/assetsStore'
@@ -16,12 +13,7 @@ import { useAssetDownloadStore } from '@/stores/assetDownloadStore'
 import { useModelToNodeStore } from '@/stores/modelToNodeStore'
 import { app } from '@/scripts/app'
 import { getNodeByExecutionId } from '@/utils/graphTraversalUtil'
-import type {
-  MissingModelCandidate,
-  MissingModelViewModel
-} from '@/platform/missingModel/types'
-import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
-import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
+import type { MissingModelViewModel } from '@/platform/missingModel/types'
 
 const importSources = [civitaiImportSource, huggingfaceImportSource]
 
@@ -58,33 +50,6 @@ export function getNodeDisplayLabel(
   })
 }
 
-function getModelComboWidget(
-  model: MissingModelCandidate
-): { node: LGraphNode; widget: IBaseWidget } | null {
-  if (model.nodeId == null) return null
-
-  const graph = app.rootGraph
-  if (!graph) return null
-  const node = getNodeByExecutionId(graph, String(model.nodeId))
-  if (!node) return null
-
-  const widget = node.widgets?.find((w) => w.name === model.widgetName)
-  if (!widget) return null
-
-  return { node, widget }
-}
-
-export function getComboValue(
-  model: MissingModelCandidate
-): string | undefined {
-  const result = getModelComboWidget(model)
-  if (!result) return undefined
-  const val = result.widget.value
-  if (typeof val === 'string') return val
-  if (typeof val === 'number') return String(val)
-  return undefined
-}
-
 export function useMissingModelInteractions() {
   const { t } = useI18n()
   const store = useMissingModelStore()
@@ -102,30 +67,6 @@ export function useMissingModelInteractions() {
     return store.modelExpandState[key] ?? false
   }
 
-  function getComboOptions(
-    model: MissingModelCandidate
-  ): { name: string; value: string }[] {
-    if (model.isAssetSupported && model.nodeType) {
-      const assets = assetsStore.getAssets(model.nodeType) ?? []
-      return assets.map((asset) => ({
-        name: getAssetDisplayName(asset),
-        value: getAssetFilename(asset)
-      }))
-    }
-
-    const result = getModelComboWidget(model)
-    if (!result) return []
-    const values = result.widget.options?.values
-    if (!Array.isArray(values)) return []
-    return values.map((v) => ({ name: String(v), value: String(v) }))
-  }
-
-  function handleComboSelect(key: string, value: string | undefined) {
-    if (value) {
-      store.selectedLibraryModel[key] = value
-    }
-  }
-
   function isSelectionConfirmable(key: string): boolean {
     if (!store.selectedLibraryModel[key]) return false
     if (store.importCategoryMismatch[key]) return false
@@ -143,6 +84,7 @@ export function useMissingModelInteractions() {
   function cancelLibrarySelect(key: string) {
     delete store.selectedLibraryModel[key]
     delete store.importCategoryMismatch[key]
+    delete store.importTaskIds[key]
   }
 
   /** Apply selected model to referencing nodes, removing only that model from the error list. */
@@ -189,6 +131,7 @@ export function useMissingModelInteractions() {
     }
 
     delete store.selectedLibraryModel[key]
+    delete store.importTaskIds[key]
     const nodeIdSet = new Set(referencingNodes.map((ref) => String(ref.nodeId)))
     store.removeMissingModelByNameOnNodes(modelName, nodeIdSet)
   }
@@ -307,6 +250,16 @@ export function useMissingModelInteractions() {
     }
   }
 
+  function handleUploadedModelImport(key: string, result: UploadModelSuccess) {
+    if (result.taskId) {
+      handleAsyncPending(key, result.taskId, result.modelType, result.filename)
+    } else if (result.status === 'success') {
+      handleAsyncCompleted(result.modelType)
+    }
+
+    store.selectedLibraryModel[key] = result.filename
+  }
+
   function handleSyncResult(
     key: string,
     tags: string[],
@@ -380,14 +333,13 @@ export function useMissingModelInteractions() {
   return {
     toggleModelExpand,
     isModelExpanded,
-    getComboOptions,
-    handleComboSelect,
     isSelectionConfirmable,
     cancelLibrarySelect,
     confirmLibrarySelect,
     handleUrlInput,
     getTypeMismatch,
     getDownloadStatus,
+    handleUploadedModelImport,
     handleImport
   }
 }