diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ca0674..a8d5892 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ version tags such as `v0.3.0`.
 ## Unreleased
 
 - Group Import Review candidates by normalized skill name, keep equivalent copies as locations of one Rust-qualified variant, require explicit selection when same-name variants differ, and submit at most one source per skill.
+- Keep mixed User/Remote import suggestions inside one content-equivalent variant and require an explicit classification choice instead of manufacturing duplicate variants.
 
 - Add explicit inbound user-skills Git updates through Check remote, reviewed
   repository-wide diffs, and preview-confirmed fast-forward apply.
diff --git a/apps/desktop/src/App.import-candidates.test.js b/apps/desktop/src/App.import-candidates.test.js
index 9fe7818..9cb91eb 100644
--- a/apps/desktop/src/App.import-candidates.test.js
+++ b/apps/desktop/src/App.import-candidates.test.js
@@ -13,6 +13,7 @@ import {
   selectedImportCandidates,
   selectImportCandidateVariant,
   toggleImportCandidateGroupSelection,
+  updateImportCandidateGroupType,
   visibleImportCandidates,
   workspaceSkillTabs
 } from './importCandidates.js';
@@ -150,64 +151,93 @@ test('normalizes grouped import candidate source paths', () => {
   ]);
 });
 
-test('normalizes Rust-owned import groups without inferring variant equivalence', () => {
+test('normalizes Rust-owned mixed type suggestions without splitting one content variant', () => {
   const group = normalizeImportCandidateGroup({
-    id: 'skill-hyperframes',
-    name: 'hyperframes',
+    id: 'skill-general-video',
+    name: 'general-video',
     description: 'Create product videos.',
     usage_count: 8,
-    requires_review: true,
-    selected_variant_id: null,
+    requires_review: false,
+    selected_variant_id: 'variant-shared',
     variants: [
       {
-        id: 'variant-user',
+        id: 'variant-shared',
+        requires_type_review: true,
+        selected_type: null,
+        suggested_types: ['user', 'remote'],
         candidate: {
-          name: 'hyperframes',
-          source_path: '/Users/example/.agents/skills/hyperframes',
+          name: 'general-video',
+          source_path: '/Users/example/.agents/skills/general-video',
           suggested_type: 'user',
-          import_status: 'importable'
+          import_status: 'importable',
+          is_selected: false
         },
         locations: [
           {
-            source_path: '/Users/example/.agents/skills/hyperframes',
-            real_path: '/Users/example/src/hyperframes',
-            is_symlink: true,
-            symlink_target_path: '/Users/example/src/hyperframes'
+            source_path: '/Users/example/.agents/skills/general-video',
+            real_path: '/Users/example/.agents/skills/general-video',
+            suggested_type: 'user',
+            suggestion_reason: 'inside ~/.agents/skills'
+          },
+          {
+            source_path: '/Users/example/.claude/skills/general-video',
+            real_path: '/Users/example/.claude/skills/general-video',
+            suggested_type: 'user',
+            suggestion_reason: 'Needs confirm'
           },
           {
-            source_path: '/Users/example/.cursor/skills/hyperframes',
-            real_path: '/Users/example/src/hyperframes',
+            source_path: '/Users/example/.cursor/skills/general-video',
+            real_path: '/Users/example/.claude/skills/general-video',
             is_symlink: true,
-            symlink_target_path: '/Users/example/src/hyperframes'
-          }
-        ]
-      },
-      {
-        id: 'variant-remote',
-        candidate: {
-          name: 'hyperframes',
-          source_path: '/Users/example/.codex/skills/hyperframes',
-          suggested_type: 'remote',
-          import_status: 'importable'
-        },
-        locations: [
+            symlink_target_path: '/Users/example/.claude/skills/general-video',
+            suggested_type: 'user',
+            suggestion_reason: 'Needs confirm'
+          },
           {
-            source_path: '/Users/example/.codex/skills/hyperframes',
-            real_path: '/Users/example/src/hyperframes',
+            source_path: '/Users/example/.codex/skills/general-video',
+            real_path: '/Users/example/.claude/skills/general-video',
             is_symlink: true,
-            symlink_target_path: '/Users/example/src/hyperframes'
+            symlink_target_path: '/Users/example/.claude/skills/general-video',
+            suggested_type: 'remote',
+            suggestion_reason: 'inside ~/.codex/skills'
           }
         ]
       }
     ]
   });
 
-  assert.equal(group.variants.length, 2);
-  assert.equal(importCandidateGroupLocationCount(group), 3);
-  assert.equal(group.requiresReview, true);
-  assert.equal(group.selectedVariantId, null);
+  assert.equal(group.variants.length, 1);
+  assert.equal(importCandidateGroupLocationCount(group), 4);
+  assert.equal(group.requiresReview, false);
+  assert.equal(group.selectedVariantId, 'variant-shared');
+  assert.equal(group.variants[0].requiresTypeReview, true);
+  assert.equal(group.variants[0].selectedType, null);
+  assert.deepEqual(group.variants[0].locations.map((location) => location.sourcePath), [
+    '/Users/example/.agents/skills/general-video',
+    '/Users/example/.claude/skills/general-video',
+    '/Users/example/.cursor/skills/general-video',
+    '/Users/example/.codex/skills/general-video'
+  ]);
+  assert.deepEqual(
+    group.variants[0].locations
+      .filter((location) => location.isSymlink)
+      .map((location) => location.symlinkTargetPath),
+    [
+      '/Users/example/.claude/skills/general-video',
+      '/Users/example/.claude/skills/general-video'
+    ]
+  );
   assert.equal(group.isSelected, false);
   assert.deepEqual(selectedImportCandidates([group]), []);
+
+  const classified = updateImportCandidateGroupType([group], group.id, 'remote');
+  assert.deepEqual(importRequestItems(selectedImportCandidates(classified)), [
+    {
+      source_path: '/Users/example/.agents/skills/general-video',
+      skill_type: 'remote',
+      deploy_back_to_source: true
+    }
+  ]);
 });
 
 test('variant review requires an explicit Rust variant choice and submits one primary', () => {
diff --git a/apps/desktop/src/cardLayout.test.js b/apps/desktop/src/cardLayout.test.js
index 63d7377..39a400f 100644
--- a/apps/desktop/src/cardLayout.test.js
+++ b/apps/desktop/src/cardLayout.test.js
@@ -442,9 +442,15 @@ test('import candidate groups disclose locations and use radio variant selection
   assert.match(groupSource, /aria-expanded=\{expanded\}/);
   assert.match(groupSource, /Found in \{locationCount\}/);
   assert.match(groupSource, /type="radio"/);
+  assert.match(groupSource, /group\.variants\.length > 1/);
   assert.match(groupSource, /name=\{`\$\{group\.id\}-variant`\}/);
   assert.match(groupSource, /onSelectVariant\(group, variant\)/);
   assert.match(groupSource, /Source: \{compactPath\(location\.symlinkTargetPath \|\| location\.realPath\)\}/);
+  assert.match(groupSource, /Mixed type suggestions/);
+  assert.match(groupSource, /Choose User or Remote before importing this skill/);
+  assert.match(groupSource, /selectedVariant\?\.selectedType === 'user'/);
+  assert.match(groupSource, /selectedVariant\?\.selectedType === 'remote'/);
+  assert.match(groupSource, /disabled=\{!canClassifyImportCandidateGroup\(group\)\}/);
   assert.match(disclosureRule, /display:\s*inline-flex;/);
   assert.match(locationRule, /grid-template-columns:\s*96px minmax\(0,\s*1fr\);/);
 });
diff --git a/apps/desktop/src/components/importReview.jsx b/apps/desktop/src/components/importReview.jsx
index b547937..25e5fee 100644
--- a/apps/desktop/src/components/importReview.jsx
+++ b/apps/desktop/src/components/importReview.jsx
@@ -3,13 +3,15 @@ import { ChevronDown, MapPin, Search } from 'lucide-react';
 import codexAppIcon from '../assets/codex-app-icon.png';
 import codexCliIcon from '../assets/codex-cli-icon.png';
 import {
+  canClassifyImportCandidateGroup,
   filterImportCandidateGroups,
   filterImportCandidateGroupsByQuery,
   importCandidateGroupLocationCount,
   importCandidateGroupStatus,
   importCandidateGroupTabs,
   isSelectableImportCandidateGroup,
-  selectedImportCandidate
+  selectedImportCandidate,
+  selectedImportCandidateVariant
 } from '../importCandidates.js';
 import {
   candidateImportSourcePaths,
@@ -352,6 +354,10 @@ function WorkspaceSkillTabs({ activeTab, tabs, onTabChange }) {
 function CandidateGroupCard({ group, onSelectVariant, onToggleSelected, onTypeChange }) {
   const [expanded, setExpanded] = useState(false);
   const candidate = selectedImportCandidate(group) || group.variants[0]?.candidate;
+  const selectedVariant = selectedImportCandidateVariant(group);
+  const needsTypeChoice = Boolean(
+    selectedVariant?.requiresTypeReview && !selectedVariant.selectedType
+  );
   const status = importCandidateGroupStatus(group);
   const locationCount = importCandidateGroupLocationCount(group);
   const disclosureId = `${group.id}-locations`;
@@ -378,8 +384,12 @@ function CandidateGroupCard({ group, onSelectVariant, onToggleSelected, onTypeCh
           {status.system ? <Badge tone="slate">System</Badge> : null}
           {status.conflict ? <Badge tone="red">Conflict</Badge> : null}
           {group.requiresReview && !group.selectedVariantId ? <Badge tone="amber">Needs review</Badge> : null}
+          {needsTypeChoice ? <Badge tone="amber">Mixed type suggestions</Badge> : null}
         </div>
         <small>{group.description || 'No description in SKILL.md'}</small>
+        {needsTypeChoice ? (
+          <p className="candidateTypeReviewNote">Choose User or Remote before importing this skill.</p>
+        ) : null}
         <button
           aria-controls={disclosureId}
           aria-expanded={expanded}
@@ -398,23 +408,29 @@ function CandidateGroupCard({ group, onSelectVariant, onToggleSelected, onTypeCh
               const selected = group.selectedVariantId === variant.id;
               return (
                 <div className={`candidateVariant ${selected ? 'selected' : ''}`} key={variant.id}>
-                  <label className="candidateVariantChoice">
-                    <input
-                      checked={selected}
-                      disabled={!importable}
-                      name={`${group.id}-variant`}
-                      type="radio"
-                      value={variant.id}
-                      onChange={() => onSelectVariant(group, variant)}
-                    />
-                    <span>
-                      Variant {variantIndex + 1}
-                      {selected ? ' · selected for import' : ''}
-                    </span>
-                  </label>
+                  {group.variants.length > 1 ? (
+                    <label className="candidateVariantChoice">
+                      <input
+                        checked={selected}
+                        disabled={!importable}
+                        name={`${group.id}-variant`}
+                        type="radio"
+                        value={variant.id}
+                        onChange={() => onSelectVariant(group, variant)}
+                      />
+                      <span>
+                        Variant {variantIndex + 1}
+                        {selected ? ' · selected for import' : ''}
+                      </span>
+                    </label>
+                  ) : null}
                   <div className="candidateVariantMeta">
                     <Badge tone="slate">
-                      {variant.candidate.skillType === 'user' ? 'User suggestion' : 'Remote suggestion'}
+                      {variant.requiresTypeReview
+                        ? 'Mixed type suggestions'
+                        : variant.suggestedTypes[0] === 'remote'
+                          ? 'Remote suggestion'
+                          : 'User suggestion'}
                     </Badge>
                     <Badge tone={variant.candidate.conflict ? 'red' : 'slate'}>
                       {variant.candidate.conflict || variant.candidate.importStatus}
@@ -427,6 +443,10 @@ function CandidateGroupCard({ group, onSelectVariant, onToggleSelected, onTypeCh
                       {location.isSymlink ? (
                         <small>Source: {compactPath(location.symlinkTargetPath || location.realPath)}</small>
                       ) : null}
+                      <small className="candidateLocationSuggestion">
+                        {location.suggestedType === 'remote' ? 'Remote suggestion' : 'User suggestion'}
+                        {location.suggestionReason ? ` · ${location.suggestionReason}` : ''}
+                      </small>
                     </div>
                   ))}
                   {variant.candidate.conflict ? <p>{variant.candidate.conflict}</p> : null}
@@ -443,16 +463,16 @@ function CandidateGroupCard({ group, onSelectVariant, onToggleSelected, onTypeCh
 
       <div className="candidateTypeSwitch" role="group" aria-label={`${group.name} type`}>
         <button
-          className={candidate?.skillType === 'user' ? 'active' : ''}
-          disabled={!isSelectableImportCandidateGroup(group)}
+          className={selectedVariant?.selectedType === 'user' ? 'active' : ''}
+          disabled={!canClassifyImportCandidateGroup(group)}
           type="button"
           onClick={() => onTypeChange(group, 'user')}
         >
           User
         </button>
         <button
-          className={candidate?.skillType === 'remote' ? 'active' : ''}
-          disabled={!isSelectableImportCandidateGroup(group)}
+          className={selectedVariant?.selectedType === 'remote' ? 'active' : ''}
+          disabled={!canClassifyImportCandidateGroup(group)}
           type="button"
           onClick={() => onTypeChange(group, 'remote')}
         >
diff --git a/apps/desktop/src/importCandidates.js b/apps/desktop/src/importCandidates.js
index 5c16dad..9959dd0 100644
--- a/apps/desktop/src/importCandidates.js
+++ b/apps/desktop/src/importCandidates.js
@@ -40,7 +40,9 @@ export function normalizeImportCandidateLocation(location = {}) {
     sourceRoot: location.sourceRoot || location.source_root || '',
     realPath: location.realPath || location.real_path || '',
     isSymlink: Boolean(location.isSymlink ?? location.is_symlink),
-    symlinkTargetPath: location.symlinkTargetPath || location.symlink_target_path || ''
+    symlinkTargetPath: location.symlinkTargetPath || location.symlink_target_path || '',
+    suggestedType: location.suggestedType || location.suggested_type || '',
+    suggestionReason: location.suggestionReason || location.suggestion_reason || ''
   };
 }
 
@@ -51,15 +53,24 @@ export function normalizeImportCandidateGroup(group) {
     const locationCopies = locations
       .map((location) => location.sourcePath)
       .filter((path) => path && path !== candidate.sourcePath);
+    const suggestedTypes = variant.suggestedTypes || variant.suggested_types || [candidate.suggestedType];
+    const requiresTypeReview = Boolean(variant.requiresTypeReview ?? variant.requires_type_review);
+    const selectedType = variant.selectedType ?? variant.selected_type ?? (
+      requiresTypeReview ? null : suggestedTypes[0] || candidate.suggestedType
+    );
     return {
       id: variant.id || `variant-${index}-${candidate.sourcePath}`,
       candidate: {
         ...candidate,
+        skillType: selectedType || candidate.skillType,
         additionalSourcePaths: [...new Set([...candidate.additionalSourcePaths, ...locationCopies])]
       },
       locations: locations.length > 0
         ? locations
-        : [normalizeImportCandidateLocation(candidate)]
+        : [normalizeImportCandidateLocation(candidate)],
+      suggestedTypes,
+      requiresTypeReview,
+      selectedType
     };
   });
   const selectedVariantId = group.selectedVariantId || group.selected_variant_id || null;
@@ -73,7 +84,7 @@ export function normalizeImportCandidateGroup(group) {
     requiresReview: Boolean(group.requiresReview ?? group.requires_review),
     selectedVariantId,
     variants,
-    isSelected: Boolean(selectedVariant?.candidate.isSelected)
+    isSelected: Boolean(selectedVariant?.candidate.isSelected && selectedVariant.selectedType)
   };
 }
 
@@ -97,12 +108,28 @@ export function normalizeImportCandidateGroups(groups = [], candidates = []) {
 }
 
 export function selectedImportCandidate(group) {
-  return group.variants.find((variant) => variant.id === group.selectedVariantId)?.candidate || null;
+  const variant = selectedImportCandidateVariant(group);
+  return variant
+    ? { ...variant.candidate, skillType: variant.selectedType || variant.candidate.skillType }
+    : null;
+}
+
+export function selectedImportCandidateVariant(group) {
+  return group.variants.find((variant) => variant.id === group.selectedVariantId) || null;
+}
+
+export function canClassifyImportCandidateGroup(group) {
+  const variant = selectedImportCandidateVariant(group);
+  return Boolean(
+    variant
+    && variant.candidate.importStatus === 'importable'
+    && !variant.candidate.conflict
+  );
 }
 
 export function isSelectableImportCandidateGroup(group) {
-  const candidate = selectedImportCandidate(group);
-  return Boolean(candidate && candidate.importStatus === 'importable' && !candidate.conflict);
+  const variant = selectedImportCandidateVariant(group);
+  return Boolean(canClassifyImportCandidateGroup(group) && variant.selectedType);
 }
 
 export function toggleImportCandidateGroup(groups, groupId) {
@@ -118,7 +145,11 @@ export function selectImportCandidateVariant(groups, groupId, variantId) {
     if (!variant || variant.candidate.importStatus !== 'importable' || variant.candidate.conflict) {
       return group;
     }
-    return { ...group, selectedVariantId: variantId, isSelected: true };
+    return {
+      ...group,
+      selectedVariantId: variantId,
+      isSelected: Boolean(variant.selectedType)
+    };
   });
 }
 
@@ -126,8 +157,13 @@ export function updateImportCandidateGroupType(groups, groupId, skillType) {
   return groups.map((group) => group.id === groupId
     ? {
         ...group,
+        isSelected: canClassifyImportCandidateGroup(group),
         variants: group.variants.map((variant) => variant.id === group.selectedVariantId
-          ? { ...variant, candidate: { ...variant.candidate, skillType } }
+          ? {
+              ...variant,
+              selectedType: skillType,
+              candidate: { ...variant.candidate, skillType }
+            }
           : variant)
       }
     : group);
@@ -190,11 +226,14 @@ export function filterImportCandidateGroupsByQuery(groups = [], query = '') {
         variant.candidate.importStatus,
         variant.candidate.conflict,
         variant.candidate.suggestionReason,
+        ...variant.suggestedTypes,
         ...variant.locations.flatMap((location) => [
           location.sourcePath,
           location.sourceRoot,
           location.realPath,
-          location.symlinkTargetPath
+          location.symlinkTargetPath,
+          location.suggestedType,
+          location.suggestionReason
         ])
       ])
     ].filter(Boolean).join(' ').toLowerCase();
diff --git a/apps/desktop/src/previewData.js b/apps/desktop/src/previewData.js
index 10bb254..b04d53a 100644
--- a/apps/desktop/src/previewData.js
+++ b/apps/desktop/src/previewData.js
@@ -56,49 +56,58 @@ export const previewImportCandidates = [
 
 export const previewImportCandidateGroups = [
   {
-    id: 'skill-release-helper',
-    name: 'release-helper',
-    description: 'Prepare release notes and verify project release assets.',
+    id: 'skill-general-video',
+    name: 'general-video',
+    description: 'Create product videos with an editable composition workflow.',
     usageCount: 6,
-    requiresReview: true,
-    selectedVariantId: null,
+    requiresReview: false,
+    selectedVariantId: 'variant-general-video',
     variants: [
       {
-        id: 'variant-release-user',
-        candidate: previewImportCandidates[0],
+        id: 'variant-general-video',
+        requiresTypeReview: true,
+        selectedType: null,
+        suggestedTypes: ['user', 'remote'],
+        candidate: {
+          ...previewImportCandidates[0],
+          name: 'general-video',
+          sourcePath: '~/.agents/skills/general-video',
+          isSelected: false
+        },
         locations: [
           {
-            sourcePath: '~/.agents/skills/release-helper',
+            sourcePath: '~/.agents/skills/general-video',
             sourceRoot: '~/.agents/skills',
-            realPath: '~/Library/Application Support/SkillFixtures/release-helper',
-            isSymlink: true,
-            symlinkTargetPath: '~/Library/Application Support/SkillFixtures/release-helper'
+            realPath: '~/.agents/skills/general-video',
+            isSymlink: false,
+            suggestedType: 'user',
+            suggestionReason: 'inside ~/.agents/skills'
+          },
+          {
+            sourcePath: '~/.claude/skills/general-video',
+            sourceRoot: '~/.claude/skills',
+            realPath: '~/.claude/skills/general-video',
+            isSymlink: false,
+            suggestedType: 'user',
+            suggestionReason: 'Needs confirm'
           },
           {
-            sourcePath: '~/Projects/demo-app/.cursor/skills/release-helper',
-            sourceRoot: '~/Projects/demo-app/.cursor/skills',
-            realPath: '~/Library/Application Support/SkillFixtures/release-helper',
+            sourcePath: '~/.cursor/skills/general-video',
+            sourceRoot: '~/.cursor/skills',
+            realPath: '~/.claude/skills/general-video',
             isSymlink: true,
-            symlinkTargetPath: '~/Library/Application Support/SkillFixtures/release-helper'
-          }
-        ]
-      },
-      {
-        id: 'variant-release-remote',
-        candidate: {
-          ...previewImportCandidates[0],
-          sourcePath: '~/.codex/skills/release-helper',
-          sourceRoot: '~/.codex/skills',
-          suggestedType: 'remote',
-          skillType: 'remote',
-          suggestionReason: 'inside ~/.codex/skills'
-        },
-        locations: [
+            symlinkTargetPath: '~/.claude/skills/general-video',
+            suggestedType: 'user',
+            suggestionReason: 'Needs confirm'
+          },
           {
-            sourcePath: '~/.codex/skills/release-helper',
+            sourcePath: '~/.codex/skills/general-video',
             sourceRoot: '~/.codex/skills',
-            realPath: '~/.codex/skills/release-helper',
-            isSymlink: false
+            realPath: '~/.claude/skills/general-video',
+            isSymlink: true,
+            symlinkTargetPath: '~/.claude/skills/general-video',
+            suggestedType: 'remote',
+            suggestionReason: 'inside ~/.codex/skills'
           }
         ]
       }
diff --git a/apps/desktop/src/styles.css b/apps/desktop/src/styles.css
index ab87849..7d15a94 100644
--- a/apps/desktop/src/styles.css
+++ b/apps/desktop/src/styles.css
@@ -6501,6 +6501,12 @@ dd {
   margin: 7px 0;
 }
 
+.candidateTypeReviewNote {
+  margin: 2px 0 0;
+  color: var(--skillbox-amber-text);
+  font-size: 12px;
+}
+
 .candidateLocation {
   display: grid;
   min-width: 0;
@@ -6528,6 +6534,11 @@ dd {
   white-space: nowrap;
 }
 
+.candidateLocation .candidateLocationSuggestion {
+  color: var(--skillbox-text-secondary);
+  white-space: normal;
+}
+
 .candidatePath span,
 .candidateSymlinkSource span {
   color: var(--skillbox-text-secondary);
diff --git a/crates/skillbox-core/src/import.rs b/crates/skillbox-core/src/import.rs
index faacc99..877ae50 100644
--- a/crates/skillbox-core/src/import.rs
+++ b/crates/skillbox-core/src/import.rs
@@ -159,6 +159,9 @@ fn build_import_candidate_group(
                 id: variant_id,
                 candidate: variant_candidate,
                 locations: vec![location],
+                suggested_types: Vec::new(),
+                requires_type_review: false,
+                selected_type: None,
             },
         ));
     }
@@ -178,6 +181,22 @@ fn build_import_candidate_group(
                 .skip(1)
                 .map(|location| location.source_path.clone())
                 .collect();
+            variant.suggested_types =
+                variant
+                    .locations
+                    .iter()
+                    .fold(Vec::new(), |mut suggested_types, location| {
+                        if !suggested_types.contains(&location.suggested_type) {
+                            suggested_types.push(location.suggested_type);
+                        }
+                        suggested_types
+                    });
+            variant.requires_type_review = variant.suggested_types.len() > 1;
+            variant.selected_type = if variant.requires_type_review {
+                None
+            } else {
+                variant.suggested_types.first().copied()
+            };
             variant
         })
         .collect::<Vec<_>>();
@@ -193,7 +212,8 @@ fn build_import_candidate_group(
     let selected_variant_id =
         (importable_variant_ids.len() == 1).then(|| importable_variant_ids[0].clone());
     for variant in &mut variants {
-        variant.candidate.is_selected = selected_variant_id.as_deref() == Some(&variant.id);
+        variant.candidate.is_selected =
+            selected_variant_id.as_deref() == Some(&variant.id) && variant.selected_type.is_some();
     }
 
     let name = variants
@@ -239,10 +259,9 @@ fn import_candidate_variant_signature(candidate: &ImportCandidate) -> String {
         }
     };
     format!(
-        "{}\n{}\n{:?}\n{:?}\n{}\n{}",
+        "{}\n{}\n{:?}\n{}\n{}",
         candidate.name.to_ascii_lowercase(),
         candidate.content_hash,
-        candidate.suggested_type,
         candidate.import_status,
         candidate.conflict.as_deref().unwrap_or_default(),
         source_identity,
@@ -256,6 +275,8 @@ fn import_candidate_location(candidate: &ImportCandidate) -> ImportCandidateLoca
         real_path: candidate.real_path.clone(),
         is_symlink: candidate.is_symlink,
         symlink_target_path: candidate.symlink_target_path.clone(),
+        suggested_type: candidate.suggested_type,
+        suggestion_reason: candidate.suggestion_reason.clone(),
     }
 }
 
diff --git a/crates/skillbox-core/src/tests.rs b/crates/skillbox-core/src/tests.rs
index f0582e6..b742174 100644
--- a/crates/skillbox-core/src/tests.rs
+++ b/crates/skillbox-core/src/tests.rs
@@ -9960,45 +9960,75 @@ fn scan_import_candidates_keeps_same_skill_md_with_different_assets_separate() {
 }
 
 #[test]
-fn scan_import_candidates_groups_runtime_aliases_by_skill_with_explicit_variants() {
-    let root = temp_dir("candidate-runtime-alias-group");
+fn scan_import_candidates_groups_mixed_type_suggestions_without_splitting_content() {
+    let root = temp_dir("candidate-mixed-type-suggestion-group");
     let agents_root = root.join("home/.agents/skills");
+    let claude_root = root.join("home/.claude/skills");
     let codex_root = root.join("home/.codex/skills");
     let cursor_root = root.join("home/.cursor/skills");
-    let shared_source = agents_root.join("hyperframes");
+    let agents_source = agents_root.join("general-video");
+    let claude_source = claude_root.join("general-video");
     let managed_root = root.join("SkillBox");
-    make_skill(&shared_source, "hyperframes", "Create product videos");
+    make_skill(&agents_source, "general-video", "Create product videos");
+    make_skill(&claude_source, "general-video", "Create product videos");
     fs::create_dir_all(&codex_root).unwrap();
     fs::create_dir_all(&cursor_root).unwrap();
-    symlink_dir(&shared_source, &codex_root.join("hyperframes")).unwrap();
-    symlink_dir(&shared_source, &cursor_root.join("hyperframes")).unwrap();
+    symlink_dir(&claude_source, &codex_root.join("general-video")).unwrap();
+    symlink_dir(&claude_source, &cursor_root.join("general-video")).unwrap();
 
-    let scan =
-        scan_import_candidates(&[agents_root, codex_root, cursor_root], &managed_root).unwrap();
+    let scan = scan_import_candidates(
+        &[agents_root, claude_root, cursor_root, codex_root],
+        &managed_root,
+    )
+    .unwrap();
 
     assert_eq!(scan.groups.len(), 1);
     let group = &scan.groups[0];
-    assert_eq!(group.name, "hyperframes");
-    assert_eq!(group.variants.len(), 2);
+    assert_eq!(group.name, "general-video");
+    assert_eq!(group.variants.len(), 1);
+    assert_eq!(group.variants[0].locations.len(), 4);
+    assert_eq!(group.variants[0].candidate.source_path, agents_source);
+    assert!(!group.requires_review);
     assert_eq!(
-        group
-            .variants
-            .iter()
-            .map(|variant| variant.locations.len())
-            .sum::<usize>(),
-        3
+        group.selected_variant_id.as_deref(),
+        Some(group.variants[0].id.as_str())
     );
-    assert!(group.requires_review);
-    assert!(group.selected_variant_id.is_none());
+    assert!(group.variants[0].requires_type_review);
     assert_eq!(
-        group
-            .variants
+        group.variants[0].suggested_types,
+        vec![SkillKind::User, SkillKind::Remote]
+    );
+    assert_eq!(group.variants[0].selected_type, None);
+    assert!(!group.variants[0].candidate.is_selected);
+    assert_eq!(
+        group.variants[0]
+            .locations
             .iter()
-            .flat_map(|variant| &variant.locations)
             .filter(|location| location.is_symlink)
             .count(),
         2
     );
+    assert_eq!(
+        group.variants[0]
+            .locations
+            .iter()
+            .filter(|location| location.suggested_type == SkillKind::Remote)
+            .count(),
+        1
+    );
+    assert_eq!(
+        group.variants[0]
+            .locations
+            .iter()
+            .map(|location| location.source_path.clone())
+            .collect::<Vec<_>>(),
+        vec![
+            root.join("home/.agents/skills/general-video"),
+            root.join("home/.claude/skills/general-video"),
+            root.join("home/.cursor/skills/general-video"),
+            root.join("home/.codex/skills/general-video"),
+        ]
+    );
 }
 
 #[test]
diff --git a/crates/skillbox-core/src/types.rs b/crates/skillbox-core/src/types.rs
index 74c5018..57797a3 100644
--- a/crates/skillbox-core/src/types.rs
+++ b/crates/skillbox-core/src/types.rs
@@ -1067,6 +1067,8 @@ pub struct ImportCandidateLocation {
     pub real_path: PathBuf,
     pub is_symlink: bool,
     pub symlink_target_path: Option<PathBuf>,
+    pub suggested_type: SkillKind,
+    pub suggestion_reason: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
@@ -1074,6 +1076,9 @@ pub struct ImportCandidateVariant {
     pub id: String,
     pub candidate: ImportCandidate,
     pub locations: Vec<ImportCandidateLocation>,
+    pub suggested_types: Vec<SkillKind>,
+    pub requires_type_review: bool,
+    pub selected_type: Option<SkillKind>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
diff --git a/docs/architecture.md b/docs/architecture.md
index 1d393ce..b7b8c7b 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -132,7 +132,7 @@ cargo run -p skillbox-cli --offline -- <command>
 - workspace registry 的发现、手动添加、扫描统计和 forget 操作。
 - runtime profile registry、structured frontmatter preservation 和部署 compatibility 判定。
 - user/remote skill 导入。
-- import candidates 扫描、类型推断、整目录快照去重和冲突检测。Rust 按规范化 skill name 生成稳定 group/variant ids；严格等价副本成为同一 variant 的 locations，同名但快照、类型、状态或冲突不同的来源仍是同卡片内的独立 variants。React 只展示 Rust 结果并提交明确选中的 variant primary，core 同时拒绝一次请求为同名 skill 提交多个来源。
+- import candidates 扫描、类型推断、整目录快照去重和冲突检测。Rust 按规范化 skill name 生成稳定 group/variant ids；严格等价副本成为同一 variant 的 locations，同名但快照、状态或冲突不同的来源仍是同卡片内的独立 variants。User/Remote 建议是 location 级分类建议，不参与内容 identity；Rust 对混合建议返回显式 type-review 状态。React 只展示 Rust 结果并提交明确选中的 variant primary 与分类，core 同时拒绝一次请求为同名 skill 提交多个来源。
 - preview-confirmed symlink 部署和部署索引。
 - import backup 与 source 替换为 symlink。
 - GitHub install preview/apply, GitHub-only remote source search, manual binding, update check, version listing, diff preview, update/rollback apply, and operation logging.
@@ -272,7 +272,7 @@ Preview 会在 working-tree write 前检查 incoming add/rename/type-change 与
 
 GitHub remote source 可以是仓库中的 skill 子目录，也可以是根目录包含 `SKILL.md` 的 standalone repository。后者在 metadata 中显式记录为 `root: true`，preview、install、update 和 deploy 共用同一份清理后的 repository worktree snapshot；Git checkout 的 `.git` metadata 不进入 managed store，逃逸 source root 的 symlink 在 copy 边界被拒绝。
 
-重复候选只在名称、`SKILL.md` hash、推断类型、状态、冲突结果和完整导入快照均一致时合并；快照忽略顶层 `.git`，并覆盖其它路径、文件内容、Unix mode 与 symlink target。相同 canonical source 的 runtime symlink 和不同真实路径的相同完整快照可成为一个 variant 的 locations；已 imported aliases 仍必须解析到同一 managed `real_path`。primary 来源沿扫描 root 顺序选择。Calls 使用 Rust 的按 skill 去重 aggregate，不把 locations 或 variants 直接相加。其它位置仅用于 review/search，不会在本次操作中被修改。多个 material variants 不预选，必须显式单选；导入只备份所选 primary、替换其 managed symlink 并写入 import record。
+重复候选只在名称、`SKILL.md` hash、状态、冲突结果和完整导入快照均一致时合并；快照忽略顶层 `.git`，并覆盖其它路径、文件内容、Unix mode 与 symlink target。推断 User/Remote 类型不属于内容 identity：同一 variant 可保留不同 location 的建议与原因，混合建议不预选分类，必须显式选择 User 或 Remote。相同 canonical source 的 runtime symlink 和不同真实路径的相同完整快照可成为一个 variant 的 locations；已 imported aliases 仍必须解析到同一 managed `real_path`。primary 来源沿扫描 root 顺序选择。Calls 使用 Rust 的按 skill 去重 aggregate，不把 locations 或 variants 直接相加。其它位置仅用于 review/search，不会在本次操作中被修改。多个 material variants 不预选，必须显式单选；导入只备份所选 primary、替换其 managed symlink 并写入 import record。
 
 ## 当前状态与目标状态
 
diff --git a/docs/implementation-status.md b/docs/implementation-status.md
index 7599ff5..fc3567d 100644
--- a/docs/implementation-status.md
+++ b/docs/implementation-status.md
@@ -29,7 +29,7 @@
 - Added shared desktop diff rendering and remote skill workflow normalization helpers for source binding and version change previews.
 - Implemented SQLite-backed workspace registry for global and project-local skills roots, including `.codex/skills`, `.agents/skills`, `.claude/skills`, scan-time auto registration, imported skill counts, preview-confirmed single-root project initialization, manual add/forget, Rust CLI compatibility commands, Tauri commands, and a searchable desktop Workspaces page with type filters and per-workspace skill review/import.
 - Implemented import records and import revert in Rust core, Rust CLI, Tauri commands, and Skill Detail UI, including backup restoration, conservative legacy reconciliation, multi-workspace blocking, and warning/danger confirmation states.
-- Implemented Rust-owned Import Review groups with stable skill/variant identities, full-snapshot-equivalent locations, explicit selection for materially different same-name variants, group-level Calls/search/tab counts, and one-primary-only import enforcement that preserves existing revert guarantees.
+- Implemented Rust-owned Import Review groups with stable content/status variant identities, full-snapshot-equivalent locations, location-level User/Remote advice with explicit mixed-suggestion confirmation, explicit selection for materially different same-name variants, group-level Calls/search/tab counts, and one-primary-only import enforcement that preserves existing revert guarantees.
 - Added signed macOS app update checks and user-confirmed install/restart through the Tauri updater plugin, plus release workflow assets for updater archives, signatures, and `latest.json`.
 - Added daily macOS updater metadata checks with a SQLite-backed successful-result cache, a sidebar Update reminder, one-click metadata recheck plus signed install/restart, and retry-safe pending updates without automatic downloads.
 - Added ordered, transactional Rust SQLite migrations, consistent pre-migration backups for existing databases, schema version tracking, and integrity validation.
diff --git a/docs/workflows.md b/docs/workflows.md
index 4d8b382..c8015b0 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -49,11 +49,11 @@ Claude、OpenClaw、Cursor、Claude Code、Copilot 等需要通过 agent adapter
 
 - 扫描 import candidates。
 - 根据路径和内容推断类型：当前 `.agents/skills` 倾向 user，`.codex/skills` 倾向 remote，`.system` 默认不选中，包含 GitHub 来源信息的未知目录倾向 remote。
-- 对名称、`SKILL.md` hash、推断类型、状态、冲突结果以及完整导入快照都一致的实体副本进行分组；快照忽略顶层 `.git`，但覆盖其它文件、Unix mode、目录和 symlink。仅 `SKILL.md` 相同而脚本、权限或资源不同的候选保持分离。
+- 对名称、`SKILL.md` hash、状态、冲突结果以及完整导入快照都一致的实体副本进行分组；推断类型仅作为 location 级分类建议，不参与等价 identity。快照忽略顶层 `.git`，但覆盖其它文件、Unix mode、目录和 symlink。仅 `SKILL.md` 相同而脚本、权限或资源不同的候选保持分离。
 - 已 imported 的多个 runtime symlink 只有解析到同一个 managed `real_path` 时才作为 alias 合并。
-- Rust 先按规范化 skill name 输出一组，再按完整目录快照、推断类型、状态和冲突划分 variants。等价副本是一个 variant 的 locations；同名但有实质差异的来源仍在同一张卡片内，并标记 `Needs review`。
-- Import Review 默认折叠 locations；展开后显示每个路径、symlink source、类型建议、状态和冲突。搜索匹配任一 variant/location，tab、Select all 和结果摘要按 group 计数。
-- 只有唯一安全 importable variant 时才预选。多个 material variants 必须由用户用 radio 明确选择一个，User/Remote 只作用于该 variant。Desktop 只提交所选 primary `source_path`，core 拒绝同一批次为同名 skill 提交多个来源；其它 locations 不会被修改。
+- Rust 先按规范化 skill name 输出一组，再按完整目录快照、状态和冲突划分 variants。等价副本是一个 variant 的 locations；User/Remote 类型建议不参与内容 identity。同名但有实质差异的来源仍在同一张卡片内，并标记 `Needs review`。
+- Import Review 默认折叠 locations；展开后显示每个路径、symlink source、location 级类型建议、状态和冲突。搜索匹配任一 variant/location，tab、Select all 和结果摘要按 group 计数。
+- 只有唯一安全 importable variant 时才预选。多个 material variants 必须由用户用 radio 明确选择一个；一个 variant 内的类型建议混合时显示 `Mixed type suggestions`，并在导入前要求明确选择 User 或 Remote。Desktop 只提交所选 primary `source_path` 和分类，core 拒绝同一批次为同名 skill 提交多个来源；其它 locations 不会被修改。
 - agent adapter 引入后，候选项还应携带 `agent_id`、原生格式和 target scope。
 - 检查 managed target 是否冲突。
 - user skill 复制到 `~/.skillbox/user-skills/<name>`。