fix(versions): scope VLM custom filter per-page to prevent cross-page leak

Store the originating page type alongside VLM data in sessionStorage;
validate it on every page load before applying the filter or showing
the indicator. Stale data is auto-cleaned on mismatch.

This prevents the 'View all local versions' custom filter from leaking
into the checkpoints (or embeddings) page, which caused an empty grid.

locales/de.json

@@ -430,6 +430,8 @@
             "help": "Wenn aktiviert, überspringt LoRA Manager den Download einer Modellversion, wenn der Download-Verlaufsdienst diese spezifische Version als bereits heruntergeladen erfasst hat. Gilt für alle Download-Abläufe."
         },
         "layoutSettings": {
+            "groupByModel": "Nach Modell gruppieren",
+            "groupByModelHelp": "Wenn aktiviert, wird nur die neueste Version jedes Civitai-Modells als einzelne Karte angezeigt. Ältere Versionen werden ausgeblendet.",
             "displayDensity": "Anzeige-Dichte",
             "displayDensityOptions": {
                 "default": "Standard",

locales/en.json

@@ -430,6 +430,8 @@
             "help": "When enabled, versions downloaded before will be skipped."
         },
         "layoutSettings": {
+            "groupByModel": "Group by Model",
+            "groupByModelHelp": "When enabled, only the latest version of each Civitai model is shown as a single card. Older versions are hidden.",
             "displayDensity": "Display Density",
             "displayDensityOptions": {
                 "default": "Default",
@@ -1463,7 +1465,7 @@
                     "resumeModelUpdates": "Resume updates for this model",
                     "ignoreModelUpdates": "Ignore updates for this model",
                     "viewLocalVersions": "View all local versions",
-                    "viewLocalTooltip": "Coming soon"
+                    "viewLocalTooltip": "Show all local versions of this model on the main page"
                 },
                 "filters": {
                     "label": "Base filter",

locales/es.json

@@ -430,6 +430,8 @@
             "help": "Cuando está habilitado, LoRA Manager omitirá la descarga de una versión de modelo si el servicio de historial de descargas registra esa versión exacta como ya descargada. Aplica a todos los flujos de descarga."
         },
         "layoutSettings": {
+            "groupByModel": "Agrupar por modelo",
+            "groupByModelHelp": "Cuando está activado, solo se muestra la versión más reciente de cada modelo de Civitai como una tarjeta única. Las versiones anteriores están ocultas.",
             "displayDensity": "Densidad de visualización",
             "displayDensityOptions": {
                 "default": "Predeterminado",

locales/fr.json

@@ -430,6 +430,8 @@
             "help": "Lorsque activé, LoRA Manager ignorera le téléchargement d'une version de modèle si le service d'historique des téléchargements enregistre cette version exacte comme déjà téléchargée. S'applique à tous les flux de téléchargement."
         },
         "layoutSettings": {
+            "groupByModel": "Grouper par modèle",
+            "groupByModelHelp": "Lorsque activé, seule la version la plus récente de chaque modèle Civitai s'affiche sous forme de carte unique. Les versions plus anciennes sont masquées.",
             "displayDensity": "Densité d'affichage",
             "displayDensityOptions": {
                 "default": "Par défaut",

locales/he.json

@@ -430,6 +430,8 @@
             "help": "כאשר מופעל, LoRA Manager ידלג על הורדת גרסת מודל אם שירות היסטוריית ההורדות רושם את הגרסה המדויקת הזו ככבר שהורדה. חל על כל תהליכי ההורדה."
         },
         "layoutSettings": {
+            "groupByModel": "קיבוץ לפי דגם",
+            "groupByModelHelp": "כאשר מופעל, רק הגרסה העדכנית ביותר של כל דגם Civitai מוצגת ככרטיס בודד. גרסאות ישנות יותר מוסתרות.",
             "displayDensity": "צפיפות תצוגה",
             "displayDensityOptions": {
                 "default": "ברירת מחדל",

locales/ja.json

@@ -430,6 +430,8 @@
             "help": "有効にすると、ダウンロード履歴サービスがそのバージョンが既にダウンロード済みと記録している場合、LoRA Managerはそのモデルバージョンのダウンロードをスキップします。すべてのダウンロードフローに適用されます。"
         },
         "layoutSettings": {
+            "groupByModel": "モデルでグループ化",
+            "groupByModelHelp": "有効にすると、各Civitaiモデルの最新バージョンのみが1枚のカードとして表示され、古いバージョンは非表示になります。",
             "displayDensity": "表示密度",
             "displayDensityOptions": {
                 "default": "デフォルト",

locales/ko.json

@@ -430,6 +430,8 @@
             "help": "활성화하면 다운로드 기록 서비스가 해당 버전이 이미 다운로드되었음을 기록한 경우 LoRA Manager는 해당 모델 버전 다운로드를 건너뜁니다. 모든 다운로드 플로우에 적용됩니다."
         },
         "layoutSettings": {
+            "groupByModel": "모델별 그룹화",
+            "groupByModelHelp": "활성화하면 각 Civitai 모델의 최신 버전만 단일 카드로 표시되며, 이전 버전은 숨겨집니다.",
             "displayDensity": "표시 밀도",
             "displayDensityOptions": {
                 "default": "기본",

locales/ru.json

@@ -430,6 +430,8 @@
             "help": "Если включено, LoRA Manager будет пропускать загрузку версии модели, если сервис истории загрузок записал, что эта конкретная версия уже загружена. Применяется ко всем потокам загрузки."
         },
         "layoutSettings": {
+            "groupByModel": "Группировать по модели",
+            "groupByModelHelp": "При включении отображается только последняя версия каждой модели Civitai в виде одной карточки. Старые версии скрыты.",
             "displayDensity": "Плотность отображения",
             "displayDensityOptions": {
                 "default": "По умолчанию",

locales/zh-CN.json

@@ -430,6 +430,8 @@
             "help": "启用后，如果下载历史服务记录显示该版本已下载，LoRA Manager 将跳过下载该模型版本。适用于所有下载流程。"
         },
         "layoutSettings": {
+            "groupByModel": "按模型分组",
+            "groupByModelHelp": "开启后，每个 Civitai 模型仅显示最新版本的单张卡片，旧版本将被隐藏。",
             "displayDensity": "显示密度",
             "displayDensityOptions": {
                 "default": "默认",

locales/zh-TW.json

@@ -430,6 +430,8 @@
             "help": "啟用後，如果下載歷史服務記錄顯示該版本已下載，LoRA Manager 將跳過下載該模型版本。適用於所有下載流程。"
         },
         "layoutSettings": {
+            "groupByModel": "按模型分組",
+            "groupByModelHelp": "啟用後，每個 Civitai 模型僅顯示最新版本的單張卡片，舊版本將被隱藏。",
             "displayDensity": "顯示密度",
             "displayDensityOptions": {
                 "default": "預設",

py/routes/handlers/model_handlers.py

@@ -233,6 +233,8 @@ class ModelListingHandler:
         start_time = time.perf_counter()
         try:
             params = self._parse_common_params(request)
+            # group_by_model is meaningless for excluded view; strip it
+            params.pop("group_by_model", None)
             result = await self._service.get_excluded_paginated_data(**params)
 
             format_start = time.perf_counter()
@@ -366,6 +368,19 @@ class ModelListingHandler:
             request.query.get("name_pattern_use_regex", "false").lower() == "true"
         )
 
+        # Group-by-model flag: deduplicate versions sharing the same civitai modelId
+        group_by_model = (
+            request.query.get("group_by_model", "false").lower() == "true"
+        )
+
+        # View-local-versions filter: show all local versions of a specific model
+        civitai_model_id = request.query.get("civitai_model_id")
+        if civitai_model_id is not None:
+            try:
+                civitai_model_id = int(civitai_model_id)
+            except (TypeError, ValueError):
+                civitai_model_id = None
+
         return {
             "page": page,
             "page_size": page_size,
@@ -389,6 +404,8 @@ class ModelListingHandler:
             "name_pattern_include": name_pattern_include,
             "name_pattern_exclude": name_pattern_exclude,
             "name_pattern_use_regex": name_pattern_use_regex,
+            "group_by_model": group_by_model,
+            "civitai_model_id": civitai_model_id,
             **self._parse_specific_params(request),
         }
 

py/services/base_model_service.py

@@ -104,6 +104,30 @@ class BaseModelService(ABC):
         fetch_duration = time.perf_counter() - t0
         initial_count = len(sorted_data)
 
+        # Optionally filter by civitai model ID (shows all local versions of a specific model)
+        civitai_model_id = kwargs.get("civitai_model_id")
+        if civitai_model_id is not None:
+            sorted_data = [
+                item for item in sorted_data
+                if self._extract_model_id(item) == civitai_model_id
+            ]
+
+        # Optionally group by civitai modelId, showing only the latest version per model
+        dedup_lost = 0
+        if kwargs.get("group_by_model") and civitai_model_id is None:
+            dedup_map = {}  # modelId -> (item, version_id)
+            standalone = []
+            for item in sorted_data:
+                mid = self._extract_model_id(item)
+                if mid is None:
+                    standalone.append(item)
+                    continue
+                vid = self._extract_version_id(item) or 0
+                if mid not in dedup_map or vid > dedup_map[mid][1]:
+                    dedup_map[mid] = (item, vid)
+            dedup_lost = len(sorted_data) - (len(dedup_map) + len(standalone))
+            sorted_data = [entry[0] for entry in dedup_map.values()] + standalone
+
         t1 = time.perf_counter()
         if hash_filters:
             filtered_data = await self._apply_hash_filters(sorted_data, hash_filters)
@@ -172,7 +196,7 @@ class BaseModelService(ABC):
         overall_duration = time.perf_counter() - overall_start
         logger.debug(
             "%s.get_paginated_data took %.3fs (fetch: %.3fs, filter: %.3fs, update_filter: %.3fs, pagination: %.3fs, annotate: %.3fs). "
-            "Counts: initial=%d, post_filter=%d, final=%d",
+            "Counts: initial=%d, dedup=%d, post_filter=%d, final=%d",
             self.__class__.__name__,
             overall_duration,
             fetch_duration,
@@ -181,6 +205,7 @@ class BaseModelService(ABC):
             pagination_duration,
             annotate_duration,
             initial_count,
+            dedup_lost,
             post_filter_count,
             final_count,
         )

py/services/settings_manager.py

@@ -106,6 +106,7 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
     "backup_auto_enabled": True,
     "backup_retention_count": 5,
     "use_new_license_icons": True,
+    "group_by_model": False,
 }
 
 

static/js/api/baseModelApi.js

@@ -1,7 +1,7 @@
 import { state, getCurrentPageState } from '../state/index.js';
 import { showToast } from '../utils/uiHelpers.js';
 import { translate } from '../utils/i18nHelpers.js';
-import { getStorageItem, getSessionItem, saveMapToStorage } from '../utils/storageHelpers.js';
+import { getStorageItem, getSessionItem, removeSessionItem, saveMapToStorage } from '../utils/storageHelpers.js';
 import {
     getCompleteApiConfig,
     getCurrentModelType,
@@ -1271,6 +1271,12 @@ export class BaseModelApiClient {
 
         params.append('recursive', pageState.searchOptions.recursive ? 'true' : 'false');
 
+        // Pass group-by-model mode to backend (skip when showing all versions of a specific model)
+        const vlmModelId = getSessionItem('vlm_model_id');
+        if (state.global.settings.group_by_model && !vlmModelId) {
+            params.append('group_by_model', 'true');
+        }
+
         if (!isExcludedView && pageState.filters) {
             if (pageState.filters.tags && Object.keys(pageState.filters.tags).length > 0) {
                 Object.entries(pageState.filters.tags).forEach(([tag, state]) => {
@@ -1352,6 +1358,24 @@ export class BaseModelApiClient {
     }
 
     _addModelSpecificParams(params, pageState) {
+        // Check for View Local Versions filter (takes priority over recipe filters)
+        const vlmModelId = getSessionItem('vlm_model_id');
+        const vlmPageType = getSessionItem('vlm_page_type');
+        if (vlmModelId && vlmPageType === this.modelType) {
+            params.append('civitai_model_id', vlmModelId);
+            const vlmBaseModel = getSessionItem('vlm_base_model');
+            if (vlmBaseModel) {
+                params.append('base_model', vlmBaseModel);
+            }
+            return;
+        } else if (vlmModelId && vlmPageType !== this.modelType) {
+            // Stale VLM data from a different page type — clean up
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+        }
+
         if (this.modelType === 'loras') {
             const filterLoraHash = getSessionItem('recipe_to_lora_filterLoraHash');
             const filterLoraHashes = getSessionItem('recipe_to_lora_filterLoraHashes');

static/js/api/loraApi.js

@@ -9,6 +9,13 @@ export class LoraApiClient extends BaseModelApiClient {
      * Add LoRA-specific parameters to query
      */
     _addModelSpecificParams(params, pageState) {
+        // Let parent handle View Local Versions filter first
+        super._addModelSpecificParams(params, pageState);
+        // If VLM filter was applied, skip recipe-specific filters
+        if (params.has('civitai_model_id')) {
+            return;
+        }
+
         const filterLoraHash = getSessionItem('recipe_to_lora_filterLoraHash');
         const filterLoraHashes = getSessionItem('recipe_to_lora_filterLoraHashes');
 

static/js/components/controls/CheckpointsControls.js

@@ -95,6 +95,17 @@ export class CheckpointsControls extends PageControls {
      * Clear checkpoint custom filter and reload
      */
     async clearCustomFilter() {
+        // Check for View Local Versions filter first
+        const vlmModelId = getSessionItem('vlm_model_id');
+        if (vlmModelId) {
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+            window.location.reload();
+            return;
+        }
+
         removeSessionItem('recipe_to_checkpoint_filterHash');
         removeSessionItem('recipe_to_checkpoint_filterHashes');
         removeSessionItem('filterCheckpointRecipeName');
@@ -106,14 +117,4 @@ export class CheckpointsControls extends PageControls {
 
         await resetAndReload();
     }
-
-    /**
-     * Helper to truncate text with ellipsis
-     * @param {string} text
-     * @param {number} maxLength
-     * @returns {string}
-     */
-    _truncateText(text, maxLength) {
-        return text.length > maxLength ? `${text.substring(0, maxLength - 3)}...` : text;
-    }
 }

static/js/components/controls/LorasControls.js

@@ -112,6 +112,17 @@ export class LorasControls extends PageControls {
      * Clear the custom filter and reload the page
      */
     async clearCustomFilter() {
+        // Check for View Local Versions filter first (handles VLM and reloads)
+        const vlmModelId = getSessionItem('vlm_model_id');
+        if (vlmModelId) {
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+            window.location.reload();
+            return;
+        }
+
         console.log("Clearing custom filter...");
         // Remove filter parameters from session storage
         removeSessionItem('recipe_to_lora_filterLoraHash');
@@ -134,16 +145,6 @@ export class LorasControls extends PageControls {
         await resetAndReload();
     }
     
-    /**
-     * Helper to truncate text with ellipsis
-     * @param {string} text - Text to truncate
-     * @param {number} maxLength - Maximum length before truncating
-     * @returns {string} - Truncated text
-     */
-    _truncateText(text, maxLength) {
-        return text.length > maxLength ? text.substring(0, maxLength - 3) + '...' : text;
-    }
-    
     /**
      * Initialize the alphabet bar component
      */

static/js/components/controls/PageControls.js

@@ -1,6 +1,6 @@
 // PageControls.js - Manages controls for both LoRAs and Checkpoints pages
 import { state, getCurrentPageState, setCurrentPageType } from '../../state/index.js';
-import { getStorageItem, setStorageItem, getSessionItem, setSessionItem } from '../../utils/storageHelpers.js';
+import { getStorageItem, setStorageItem, getSessionItem, setSessionItem, removeSessionItem } from '../../utils/storageHelpers.js';
 import { showToast, openCivitaiByMetadata } from '../../utils/uiHelpers.js';
 import { performModelUpdateCheck } from '../../utils/updateCheckHelpers.js';
 import { sidebarManager } from '../SidebarManager.js';
@@ -129,6 +129,9 @@ export class PageControls {
             clearFilterBtn.addEventListener('click', () => this.clearCustomFilter());
         }
         
+        // Check for View Local Versions filter
+        this.checkVlmFilter();
+
         // Page-specific event listeners
         this.initPageSpecificListeners();
     }
@@ -459,15 +462,70 @@ export class PageControls {
         this.api.toggleBulkMode();
     }
     
+    /**
+     * Clear custom filter
+     */
+    /**
+     * Check for View Local Versions filter in sessionStorage (page-type-scoped)
+     */
+    checkVlmFilter() {
+        const vlmModelId = getSessionItem('vlm_model_id');
+        const vlmPageType = getSessionItem('vlm_page_type');
+
+        // Only show VLM indicator when it belongs to the current page type
+        if (vlmModelId && vlmPageType !== this.pageType) {
+            // Stale VLM data from a different page — clean up
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+            return;
+        }
+
+        const vlmModelName = getSessionItem('vlm_model_name');
+        const vlmBaseModel = getSessionItem('vlm_base_model');
+
+        if (vlmModelId && vlmModelName) {
+            const indicator = document.getElementById('customFilterIndicator');
+            const filterText = indicator?.querySelector('.customFilterText');
+
+            if (indicator && filterText) {
+                indicator.classList.remove('hidden');
+
+                const prefix = vlmBaseModel
+                    ? 'Showing same-base versions from'
+                    : 'Showing all versions from';
+                const displayText = `${prefix}: ${vlmModelName}`;
+
+                filterText.textContent = this._truncateText(displayText, 40);
+                filterText.setAttribute('title', displayText);
+            }
+        }
+    }
+
     /**
      * Clear custom filter
      */
     async clearCustomFilter() {
+        // Check for View Local Versions filter first
+        const vlmModelId = getSessionItem('vlm_model_id');
+        if (vlmModelId) {
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+
+            // Full page reload to restore initial state (mirrors the "set" action)
+            window.location.reload();
+            return;
+        }
+
+        // Otherwise delegate to subclass for recipe filters
         if (!this.api) {
             console.error('API methods not registered');
             return;
         }
-        
+
         try {
             await this.api.clearCustomFilter();
         } catch (error) {
@@ -475,6 +533,14 @@ export class PageControls {
             showToast('toast.controls.clearFilterFailed', { message: error.message }, 'error');
         }
     }
+
+    /**
+     * Truncate text with ellipsis
+     */
+    _truncateText(text, maxLength) {
+        if (!text) return '';
+        return text.length > maxLength ? `${text.substring(0, maxLength - 3)}...` : text;
+    }
     
     /**
      * Initialize the favorites filter button state

static/js/components/shared/ModelModal.js

@@ -752,6 +752,7 @@ export async function showModelModal(model, modelType) {
         modelId: civitaiModelId,
         currentVersionId: civitaiVersionId,
         currentBaseModel: modelWithFullData.base_model,
+        modelName: model.model_name,
         onUpdateStatusChange: handleUpdateStatusChange,
     });
     setupEditableFields(modelWithFullData.file_path, modelType);

static/js/components/shared/ModelVersionsTab.js

@@ -6,6 +6,7 @@ import { translate } from '../../utils/i18nHelpers.js';
 import { state } from '../../state/index.js';
 import { buildCivitaiModelUrl } from '../../utils/civitaiUtils.js';
 import { formatFileSize } from './utils.js';
+import { setSessionItem, removeSessionItem } from '../../utils/storageHelpers.js';
 
 const VIDEO_EXTENSIONS = ['.mp4', '.webm', '.mov', '.mkv'];
 const PREVIEW_PLACEHOLDER_URL = '/loras_static/images/no-preview.png';
@@ -744,7 +745,7 @@ function renderToolbar(record, toolbarState = {}) {
                 <button class="versions-toolbar-btn versions-toolbar-btn-primary" data-versions-action="toggle-model-ignore">
                     ${escapeHtml(ignoreText)}
                 </button>
-                <button class="versions-toolbar-btn versions-toolbar-btn-secondary" data-versions-action="view-local" title="${escapeHtml(translate('modals.model.versions.actions.viewLocalTooltip', {}, 'Coming soon'))}" disabled>
+                <button class="versions-toolbar-btn versions-toolbar-btn-secondary" data-versions-action="view-local" title="${escapeHtml(translate('modals.model.versions.actions.viewLocalTooltip', {}, 'Show all local versions of this model on the main page'))}">
                     ${escapeHtml(viewLocalText)}
                 </button>
             </div>
@@ -792,6 +793,7 @@ export function initVersionsTab({
     modelId,
     currentVersionId,
     currentBaseModel,
+    modelName,
     onUpdateStatusChange,
 }) {
     const pane = document.querySelector(`#${modalId} #versions-tab`);
@@ -1019,6 +1021,32 @@ export function initVersionsTab({
         render(controller.record);
     }
 
+    function handleViewLocalVersions() {
+        if (!controller.record || !modelId) {
+            return;
+        }
+        // Determine base model filter based on current display mode
+        const baseModelInfo = getCurrentVersionBaseModel(controller.record, normalizedCurrentVersionId);
+        const isFilteringActive =
+            displayMode === DISPLAY_FILTER_MODES.SAME_BASE &&
+            Boolean(baseModelInfo.normalized);
+
+        // Write filter params to sessionStorage (page-scoped)
+        setSessionItem('vlm_model_id', String(modelId));
+        setSessionItem('vlm_model_name', modelName || String(modelId));
+        setSessionItem('vlm_page_type', modelType);
+        if (isFilteringActive) {
+            // Use raw (non-normalized) base model for exact backend matching
+            setSessionItem('vlm_base_model', baseModelInfo.raw);
+        } else {
+            removeSessionItem('vlm_base_model');
+        }
+
+        // Close the modal and reload the page to show filtered cards
+        modalManager.closeModal(modalId);
+        window.location.reload();
+    }
+
     async function handleToggleVersionIgnore(button, versionId) {
         if (!controller.record) {
             return;
@@ -1348,6 +1376,10 @@ export function initVersionsTab({
                     event.preventDefault();
                     handleToggleVersionDisplayMode();
                     break;
+                case 'view-local':
+                    event.preventDefault();
+                    handleViewLocalVersions();
+                    break;
                 default:
                     break;
             }

static/js/managers/SettingsManager.js

@@ -905,6 +905,12 @@ export class SettingsManager {
             showVersionOnCardCheckbox.checked = state.global.settings.show_version_on_card !== false;
         }
 
+        // Set group by model
+        const groupByModelCheckbox = document.getElementById('groupByModel');
+        if (groupByModelCheckbox) {
+            groupByModelCheckbox.checked = !!state.global.settings.group_by_model;
+        }
+
         // Set model name display setting
         const modelNameDisplaySelect = document.getElementById('modelNameDisplay');
         if (modelNameDisplaySelect) {
@@ -2011,7 +2017,7 @@ export class SettingsManager {
                 }
             }
 
-            if (settingKey === 'show_only_sfw' || settingKey === 'blur_mature_content') {
+            if (settingKey === 'show_only_sfw' || settingKey === 'blur_mature_content' || settingKey === 'group_by_model') {
                 this.reloadContent();
             }
 
@@ -3046,6 +3052,10 @@ export class SettingsManager {
         const useNewLicenseIcons = state.global.settings.use_new_license_icons !== false;
         document.body.classList.toggle('use-new-license-icons', useNewLicenseIcons);
 
+        // Apply group-by-model mode
+        const groupByModel = !!state.global.settings.group_by_model;
+        document.body.classList.toggle('group-by-model', groupByModel);
+
     }
 }
 

static/js/state/index.js

@@ -54,6 +54,7 @@ const DEFAULT_SETTINGS_BASE = Object.freeze({
     backup_retention_count: 5,
     strip_lora_on_copy: false,
     use_new_license_icons: true,
+    group_by_model: false,
 });
 
 export function createDefaultSettings() {

templates/components/modals/settings_modal.html

@@ -536,6 +536,25 @@
                                 </div>
                             </div>
 
+                            <!-- Group by model toggle -->
+                            <div class="setting-item">
+                                <div class="setting-row">
+                                    <div class="setting-info">
+                                        <label for="groupByModel">
+                                        {{ t('settings.layoutSettings.groupByModel') }}
+                                        <i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.layoutSettings.groupByModelHelp') }}"></i>
+                                    </label>
+                                    </div>
+                                    <div class="setting-control">
+                                        <label class="toggle-switch">
+                                            <input type="checkbox" id="groupByModel"
+                                                   onchange="settingsManager.saveToggleSetting('groupByModel', 'group_by_model')">
+                                            <span class="toggle-slider"></span>
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+
                             <div class="setting-item">
                                 <div class="setting-row">
                                     <div class="setting-info">

tests/services/test_base_model_service.py

@@ -746,6 +746,128 @@ async def test_get_paginated_data_update_available_only_without_update_service()
     assert response["total_pages"] == 0
 
 
+@pytest.mark.asyncio
+async def test_get_paginated_data_group_by_model_dedup():
+    """group_by_model deduplicates items sharing the same civitai modelId,
+    keeping only the item with the highest version (civitai.id)."""
+    items = [
+        # Two versions of the same model (modelId=1)
+        {"model_name": "SameModel", "folder": "root", "civitai": {"modelId": 1, "id": 100}},
+        {"model_name": "SameModel", "folder": "root", "civitai": {"modelId": 1, "id": 200}},
+        # Another model with two versions
+        {"model_name": "AnotherModel", "folder": "root", "civitai": {"modelId": 2, "id": 50}},
+        {"model_name": "AnotherModel", "folder": "root", "civitai": {"modelId": 2, "id": 99}},
+        # A standalone item with no civitai metadata (no modelId)
+        {"model_name": "Standalone", "folder": "root"},
+    ]
+    repository = StubRepository(items)
+    filter_set = PassThroughFilterSet()
+    search_strategy = NoSearchStrategy()
+    settings = StubSettings({})
+
+    service = DummyService(
+        model_type="stub",
+        scanner=object(),
+        metadata_class=BaseModelMetadata,
+        cache_repository=repository,
+        filter_set=filter_set,
+        search_strategy=search_strategy,
+        settings_provider=settings,
+    )
+
+    # With group_by_model=True — modelId=1 keeps id=200, modelId=2 keeps id=99
+    response = await service.get_paginated_data(
+        page=1,
+        page_size=10,
+        sort_by="name:asc",
+        group_by_model=True,
+    )
+
+    names = {item["model_name"] for item in response["items"]}
+    assert names == {"SameModel", "AnotherModel", "Standalone"}
+    assert response["total"] == 3
+    # Verify the kept items have the highest version id
+    for item in response["items"]:
+        if item.get("civitai", {}).get("modelId") == 1:
+            assert item["civitai"]["id"] == 200
+        elif item.get("civitai", {}).get("modelId") == 2:
+            assert item["civitai"]["id"] == 99
+
+    # With group_by_model=False (default) — all 5 items pass through
+    response_all = await service.get_paginated_data(
+        page=1,
+        page_size=10,
+        sort_by="name:asc",
+    )
+
+    assert response_all["total"] == 5
+
+
+async def test_get_paginated_data_filters_by_civitai_model_id():
+    """civitai_model_id filter returns only items matching the given modelId,
+    and bypasses group_by_model dedup so all versions appear."""
+    items = [
+        # Two versions of modelId=1
+        {"model_name": "Model1_v1", "folder": "root", "civitai": {"modelId": 1, "id": 100}},
+        {"model_name": "Model1_v2", "folder": "root", "civitai": {"modelId": 1, "id": 200}},
+        # One version of modelId=2
+        {"model_name": "Model2", "folder": "root", "civitai": {"modelId": 2, "id": 50}},
+        # Standalone (no civitai data)
+        {"model_name": "Standalone", "folder": "root"},
+    ]
+    repository = StubRepository(items)
+    filter_set = PassThroughFilterSet()
+    search_strategy = NoSearchStrategy()
+    settings = StubSettings({})
+
+    service = DummyService(
+        model_type="stub",
+        scanner=object(),
+        metadata_class=BaseModelMetadata,
+        cache_repository=repository,
+        filter_set=filter_set,
+        search_strategy=search_strategy,
+        settings_provider=settings,
+    )
+
+    # Filter by modelId=1 — both versions should appear
+    response = await service.get_paginated_data(
+        page=1,
+        page_size=10,
+        sort_by="name:asc",
+        civitai_model_id=1,
+    )
+
+    names = {item["model_name"] for item in response["items"]}
+    assert names == {"Model1_v1", "Model1_v2"}
+    assert response["total"] == 2
+
+    # Filter by modelId=2 — single version
+    response2 = await service.get_paginated_data(
+        page=1,
+        page_size=10,
+        sort_by="name:asc",
+        civitai_model_id=2,
+    )
+
+    assert response2["total"] == 1
+    assert response2["items"][0]["model_name"] == "Model2"
+
+    # civitai_model_id + group_by_model=True — still shows all versions (no dedup)
+    response_dedup = await service.get_paginated_data(
+        page=1,
+        page_size=10,
+        sort_by="name:asc",
+        civitai_model_id=1,
+        group_by_model=True,
+    )
+
+    assert response_dedup["total"] == 2
+    # Verify both versions are present (dedup was skipped)
+    version_ids = {item["civitai"]["id"] for item in response_dedup["items"]}
+    assert version_ids == {100, 200}
+
+
 def test_model_filter_set_handles_include_and_exclude_tag_filters():
     settings = StubSettings({})
     filter_set = ModelFilterSet(settings)