From ca7e0cb52768fc1bcf26b2a368ea03d39e84fa87 Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Fri, 17 Jul 2026 13:38:07 +0000 Subject: [PATCH 001/271] Send the HF token as a header, not a URL query param The model config, vision-check, and embedding-check requests appended the Hugging Face token as ?hf_token=..., which leaks it into server access logs, proxy logs, and browser history for gated/private models. Send it via the existing X-Unsloth-HF-Token header (hubTokenHeader) instead, and read it on the backend through the standard get_hf_token dependency, matching the picker's template routes. Also drop two catch-block comments that just restated the code. --- studio/backend/routes/models.py | 6 +++--- .../src/features/training/api/models-api.ts | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/studio/backend/routes/models.py b/studio/backend/routes/models.py index b8526c75e7..92dac00347 100644 --- a/studio/backend/routes/models.py +++ b/studio/backend/routes/models.py @@ -1796,7 +1796,7 @@ def _get_model_size_bytes(model_name: str, hf_token: Optional[str] = None) -> Op @router.get("/config/{model_name:path}") async def get_model_config( model_name: str, - hf_token: Optional[str] = Query(None), + hf_token: Optional[str] = Depends(get_hf_token), current_subject: str = Depends(get_current_subject), ): """Get configuration for a specific model (wraps load_model_defaults).""" @@ -2517,7 +2517,7 @@ async def get_lora_base_model(lora_path: str, current_subject: str = Depends(get @router.get("/check-vision/{model_name:path}", response_model = VisionCheckResponse) async def check_vision_model( model_name: str, - hf_token: Optional[str] = Query(None), + hf_token: Optional[str] = Depends(get_hf_token), current_subject: str = Depends(get_current_subject), ): """ @@ -2549,7 +2549,7 @@ async def check_vision_model( @router.get("/check-embedding/{model_name:path}", response_model = EmbeddingCheckResponse) async def check_embedding_model( model_name: str, - hf_token: Optional[str] = Query(None), + hf_token: Optional[str] = Depends(get_hf_token), current_subject: str = Depends(get_current_subject), ): """ diff --git a/studio/frontend/src/features/training/api/models-api.ts b/studio/frontend/src/features/training/api/models-api.ts index e5fd8b043d..2ccc49f9e5 100644 --- a/studio/frontend/src/features/training/api/models-api.ts +++ b/studio/frontend/src/features/training/api/models-api.ts @@ -2,6 +2,7 @@ // Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 import { authFetch } from "@/features/auth"; +import { hubTokenHeader } from "@/features/hub"; interface VisionCheckResponse { model_name: string; @@ -98,10 +99,10 @@ export async function checkVisionModel( hfToken?: string | null, ): Promise { const encoded = encodeURIComponent(modelName); - const query = hfToken?.trim() ? `?hf_token=${encodeURIComponent(hfToken.trim())}` : ""; - const response = await authFetch(`/api/models/check-vision/${encoded}${query}`); + const response = await authFetch(`/api/models/check-vision/${encoded}`, { + headers: hubTokenHeader(hfToken?.trim() || null), + }); if (!response.ok) { - // If the check fails (e.g. network error), default to non-vision return false; } const data = (await response.json()) as VisionCheckResponse; @@ -114,10 +115,10 @@ export async function checkEmbeddingModel( hfToken?: string | null, ): Promise { const encoded = encodeURIComponent(modelName); - const query = hfToken?.trim() ? `?hf_token=${encodeURIComponent(hfToken.trim())}` : ""; - const response = await authFetch(`/api/models/check-embedding/${encoded}${query}`); + const response = await authFetch(`/api/models/check-embedding/${encoded}`, { + headers: hubTokenHeader(hfToken?.trim() || null), + }); if (!response.ok) { - // If the check fails (e.g. network error), default to non-embedding return false; } const data = (await response.json()) as EmbeddingCheckResponse; @@ -130,8 +131,10 @@ export async function getModelConfig( hfToken?: string, ): Promise { const encoded = encodeURIComponent(modelName); - const params = hfToken ? `?hf_token=${encodeURIComponent(hfToken)}` : ""; - const response = await authFetch(`/api/models/config/${encoded}${params}`, { signal }); + const response = await authFetch(`/api/models/config/${encoded}`, { + headers: hubTokenHeader(hfToken), + signal, + }); if (!response.ok) { throw new Error(`Failed to fetch model config (${response.status})`); } From 9259937b2ea487ac75f9d9421119208adac96a0b Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Fri, 17 Jul 2026 13:38:07 +0000 Subject: [PATCH 002/271] Cap chat_template_override size on the model load path The validate endpoint rejects chat templates over 65,536 bytes, but a direct LoadRequest caller could still submit an arbitrarily large template for llama to parse. Enforce the same byte limit on LoadRequest.chat_template_override. --- studio/backend/models/inference.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/studio/backend/models/inference.py b/studio/backend/models/inference.py index 3ae974448e..efd04f02e6 100644 --- a/studio/backend/models/inference.py +++ b/studio/backend/models/inference.py @@ -19,6 +19,10 @@ from pydantic import ( ) +# Redefined from picker/schemas.py so this core schema needn't import the picker package. +MAX_CHAT_TEMPLATE_BYTES = 65_536 + + class LoadRequest(BaseModel): """Request to load a model for inference""" @@ -56,6 +60,10 @@ class LoadRequest(BaseModel): def normalize_blank_chat_template_override(cls, value: Optional[str]) -> Optional[str]: if value is not None and value.strip() == "": return None + if value is not None and len(value.encode("utf-8")) > MAX_CHAT_TEMPLATE_BYTES: + raise ValueError( + f"Chat template exceeds the {MAX_CHAT_TEMPLATE_BYTES}-byte limit." + ) return value cache_type_kv: Optional[str] = Field( From bdc1629fea78a8931949bd8164fafe24e34277d5 Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Fri, 17 Jul 2026 13:38:07 +0000 Subject: [PATCH 003/271] Bound the protected key set during legacy config migration Protecting every just-migrated key during eviction meant a legacy store with more than MAX_ENTRIES entries could never be brought under budget, so enforceStorageBudget failed on every reload and the migration never completed. Cap the protected set to MAX_ENTRIES so an oversized legacy store migrates a bounded subset and marks itself complete. Also condense a few future-schema guard comments. --- .../model-config/per-model-config.ts | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/studio/frontend/src/features/model-picker/model-config/per-model-config.ts b/studio/frontend/src/features/model-picker/model-config/per-model-config.ts index 53a376e8b4..5c0cb97bad 100644 --- a/studio/frontend/src/features/model-picker/model-config/per-model-config.ts +++ b/studio/frontend/src/features/model-picker/model-config/per-model-config.ts @@ -139,8 +139,7 @@ function deleteOldestEvictableEntry( protectedKeys?: ReadonlySet, ): { key: string; value: StoredMap[string] } | null { for (const key of Object.keys(map)) { - // Never evict a future-schema entry an older client cannot interpret, - // matching the save/delete guards. + // Never evict a future-schema entry an older client can't interpret. if ( protectedKeys?.has(key) || storedConfigVersion(map[key]) > STORAGE_SCHEMA_VERSION @@ -271,11 +270,16 @@ function migrateLegacyLoadSettingsOnce(): void { localStorage.setItem(LEGACY_MIGRATION_FLAG, "1"); return; } - // Protect the just-migrated entries during eviction. If the budget cannot - // fit them (e.g. storage is full of future-schema records an older client - // cannot evict), leave the flag unset so migration retries once space frees - // up rather than marking it complete and dropping the migrated config. - if (!enforceStorageBudget(map, new Set(migratedKeys))) { + // Protect the just-migrated entries from eviction, but cap the protected set + // to MAX_ENTRIES: an oversized legacy store would otherwise deadlock the + // budget loop and never finish migrating. On failure the flag stays unset so + // migration retries once space frees. + const protectedKeys = new Set( + migratedKeys.length > MAX_ENTRIES + ? migratedKeys.slice(0, MAX_ENTRIES) + : migratedKeys, + ); + if (!enforceStorageBudget(map, protectedKeys)) { return; } if (writeMap(map)) { @@ -489,8 +493,7 @@ function loadPerModelConfig( if (!key) { return null; } - // Never apply a future-schema record an older client cannot interpret, - // matching the save/delete/evict guards. + // Never apply a future-schema record an older client can't interpret. if (storedConfigVersion(map[key]) > STORAGE_SCHEMA_VERSION) { return null; } @@ -548,8 +551,7 @@ export function deletePerModelConfig( ggufVariant?: string | null, ): boolean { const map = readMap(); - // Mirror savePerModelConfig: never let an older client destroy a - // future-schema entry it cannot interpret. + // Never let an older client destroy a future-schema entry it can't interpret. if (hasFutureConfigForModelVariant(map, modelId, ggufVariant)) { return false; } From 4895a7c67a28b766c22fd9a248493f84a96560fb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 17 Jul 2026 13:39:48 +0000 Subject: [PATCH 004/271] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- studio/backend/models/inference.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/studio/backend/models/inference.py b/studio/backend/models/inference.py index efd04f02e6..db509dd911 100644 --- a/studio/backend/models/inference.py +++ b/studio/backend/models/inference.py @@ -61,9 +61,7 @@ class LoadRequest(BaseModel): if value is not None and value.strip() == "": return None if value is not None and len(value.encode("utf-8")) > MAX_CHAT_TEMPLATE_BYTES: - raise ValueError( - f"Chat template exceeds the {MAX_CHAT_TEMPLATE_BYTES}-byte limit." - ) + raise ValueError(f"Chat template exceeds the {MAX_CHAT_TEMPLATE_BYTES}-byte limit.") return value cache_type_kv: Optional[str] = Field( From 709077c83c2e4e4f90dfef1e8f835e60aab456be Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Fri, 17 Jul 2026 13:44:07 +0000 Subject: [PATCH 005/271] Fast-path the chat-template size check on character count Reject an oversized chat_template_override on its character count (a lower bound on the UTF-8 byte length) before allocating the encoded bytes, so a multi-megabyte string is turned away without the intermediate encode. --- studio/backend/models/inference.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/studio/backend/models/inference.py b/studio/backend/models/inference.py index db509dd911..f290028a37 100644 --- a/studio/backend/models/inference.py +++ b/studio/backend/models/inference.py @@ -58,9 +58,15 @@ class LoadRequest(BaseModel): @field_validator("chat_template_override") @classmethod def normalize_blank_chat_template_override(cls, value: Optional[str]) -> Optional[str]: - if value is not None and value.strip() == "": + if value is None: return None - if value is not None and len(value.encode("utf-8")) > MAX_CHAT_TEMPLATE_BYTES: + # Reject on character count first (a lower bound on the UTF-8 byte length) + # so an oversized template is rejected before allocating the encoded bytes. + if len(value) > MAX_CHAT_TEMPLATE_BYTES: + raise ValueError(f"Chat template exceeds the {MAX_CHAT_TEMPLATE_BYTES}-byte limit.") + if value.strip() == "": + return None + if len(value.encode("utf-8")) > MAX_CHAT_TEMPLATE_BYTES: raise ValueError(f"Chat template exceeds the {MAX_CHAT_TEMPLATE_BYTES}-byte limit.") return value From 1c7bce427e5bcb8ccb3dece9e9fa3a572f6f0139 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 17 Jul 2026 07:38:46 -0700 Subject: [PATCH 006/271] Revert "Feat/model picker per model config (#6647)" This reverts commit 8cbdfbe355a83b6cc0706e2ed8ec1c737b71c3f3. --- studio/backend/hub/schemas/inventory.py | 1 - .../hub/services/models/cache_inventory.py | 74 +- studio/backend/main.py | 3 - studio/backend/picker/__init__.py | 2 - studio/backend/picker/routes/__init__.py | 6 - studio/backend/picker/routes/templates.py | 42 - studio/backend/picker/schemas.py | 32 - studio/backend/picker/service.py | 361 ------- .../tests/test_model_update_robustness.py | 46 - studio/backend/tests/test_picker_service.py | 162 --- studio/backend/utils/models/gguf_metadata.py | 79 -- studio/frontend/src/app/routes/__root.tsx | 7 + .../assistant-ui}/model-selector.tsx | 130 +-- .../model-selector/folder-browser.tsx | 79 +- .../model-selector/model-capabilities.ts | 0 .../model-selector/model-delete-action.tsx | 9 +- .../model-load-settings-action.tsx | 19 +- .../model-selector/model-update-action.tsx | 25 +- .../model-selector/model-usage.ts | 3 +- .../assistant-ui}/model-selector/pickers.tsx | 645 +++++------- .../model-selector/pill-tabs.tsx | 3 +- .../model-selector/recommended-fit.ts | 0 .../remembered-load-settings.ts | 69 ++ .../assistant-ui}/model-selector/row-meta.ts | 0 .../model-selector/source-tabs.ts | 0 .../assistant-ui}/model-selector/types.ts | 13 - .../src/features/chat/api/chat-adapter.ts | 50 +- .../frontend/src/features/chat/chat-page.tsx | 517 ++++------ .../src/features/chat/chat-settings-sheet.tsx | 957 +++++++++++++++--- .../chat/hooks/use-chat-model-runtime.ts | 105 +- .../hooks/use-staged-model-preparation.ts | 155 +++ studio/frontend/src/features/chat/index.ts | 18 - .../lib/apply-inference-status-to-store.ts | 5 + .../src/features/chat/shared-composer.tsx | 111 +- .../chat/stores/chat-runtime-store.ts | 186 +++- .../export/components/export-run-panel.tsx | 71 +- .../hub/catalog/models-catalog-rows.tsx | 41 +- .../hub/catalog/on-device-folders-dialog.tsx | 33 +- .../download-manager-controller.ts | 23 + .../features/hub/download-manager/index.ts | 1 + studio/frontend/src/features/hub/hub-page.tsx | 129 ++- studio/frontend/src/features/hub/index.ts | 58 +- .../src/features/hub/inventory/api.ts | 2 - .../src/features/hub/inventory/types.ts | 3 - .../src/features/hub/inventory/view-models.ts | 9 - .../model-picker/api/model-metadata.ts | 20 - .../features/model-picker/api/templates.ts | 51 - .../chat-template-editor-dialog.tsx | 191 ---- .../components/model-config-page.tsx | 742 -------------- .../components/numeric-value-input.tsx | 113 --- .../components/sidebar-model-config.tsx | 89 -- .../model-picker/hooks/use-model-defaults.ts | 176 ---- .../src/features/model-picker/index.ts | 30 - .../inventory/use-chat-picker-inventory.ts | 118 --- .../model-config/apply-per-model-config.ts | 85 -- .../model-config/model-identity.ts | 69 -- .../model-config/per-model-config.ts | 571 ----------- .../src/features/settings/tabs/chat-tab.tsx | 39 + .../features/settings/tabs/general-tab.tsx | 3 +- .../frontend/src/features/training/index.ts | 4 +- tests/studio/playwright_chat_ui.py | 14 +- .../test_studio_text_descender_clipping.py | 17 +- 62 files changed, 2133 insertions(+), 4483 deletions(-) delete mode 100644 studio/backend/picker/__init__.py delete mode 100644 studio/backend/picker/routes/__init__.py delete mode 100644 studio/backend/picker/routes/templates.py delete mode 100644 studio/backend/picker/schemas.py delete mode 100644 studio/backend/picker/service.py delete mode 100644 studio/backend/tests/test_picker_service.py rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector.tsx (86%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/folder-browser.tsx (88%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/model-capabilities.ts (100%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/model-delete-action.tsx (90%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/model-load-settings-action.tsx (66%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/model-update-action.tsx (82%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/model-usage.ts (93%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/pickers.tsx (89%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/pill-tabs.tsx (98%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/recommended-fit.ts (100%) create mode 100644 studio/frontend/src/components/assistant-ui/model-selector/remembered-load-settings.ts rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/row-meta.ts (100%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/source-tabs.ts (100%) rename studio/frontend/src/{features/model-picker/components => components/assistant-ui}/model-selector/types.ts (76%) create mode 100644 studio/frontend/src/features/chat/hooks/use-staged-model-preparation.ts delete mode 100644 studio/frontend/src/features/model-picker/api/model-metadata.ts delete mode 100644 studio/frontend/src/features/model-picker/api/templates.ts delete mode 100644 studio/frontend/src/features/model-picker/components/chat-template-editor-dialog.tsx delete mode 100644 studio/frontend/src/features/model-picker/components/model-config-page.tsx delete mode 100644 studio/frontend/src/features/model-picker/components/numeric-value-input.tsx delete mode 100644 studio/frontend/src/features/model-picker/components/sidebar-model-config.tsx delete mode 100644 studio/frontend/src/features/model-picker/hooks/use-model-defaults.ts delete mode 100644 studio/frontend/src/features/model-picker/index.ts delete mode 100644 studio/frontend/src/features/model-picker/inventory/use-chat-picker-inventory.ts delete mode 100644 studio/frontend/src/features/model-picker/model-config/apply-per-model-config.ts delete mode 100644 studio/frontend/src/features/model-picker/model-config/model-identity.ts delete mode 100644 studio/frontend/src/features/model-picker/model-config/per-model-config.ts diff --git a/studio/backend/hub/schemas/inventory.py b/studio/backend/hub/schemas/inventory.py index f81c9a3498..ef95efe2f2 100644 --- a/studio/backend/hub/schemas/inventory.py +++ b/studio/backend/hub/schemas/inventory.py @@ -160,7 +160,6 @@ class CachedRepoBase(BaseModel): repo_id: str size_bytes: int = 0 cache_path: Optional[str] = None - last_modified: Optional[float] = None partial: bool = False partial_transport: Optional[str] = None inventory_id: Optional[str] = None diff --git a/studio/backend/hub/services/models/cache_inventory.py b/studio/backend/hub/services/models/cache_inventory.py index ba3a266bfb..1f38af9381 100644 --- a/studio/backend/hub/services/models/cache_inventory.py +++ b/studio/backend/hub/services/models/cache_inventory.py @@ -31,7 +31,6 @@ from hub.services.models.common import ( _is_checkpoint_weight_name, _is_gguf_filename, _is_main_gguf_filename, - _is_mmproj_filename, _is_transformers_safetensors_weight_name, _local_inventory_id, _prefer_complete_larger, @@ -126,34 +125,6 @@ def _repo_has_gguf_files(repo_info) -> bool: return _repo_gguf_size_bytes(repo_info) > 0 -def _blob_mtime(file_obj) -> float: - ts = getattr(file_obj, "blob_last_modified", None) - if isinstance(ts, (int, float)) and ts > 0: - return float(ts) - blob_path = getattr(file_obj, "blob_path", None) - if blob_path: - try: - return float(Path(blob_path).stat().st_mtime) - except OSError: - pass - return 0.0 - - -def _repo_gguf_last_modified(repo_info) -> float: - latest = 0.0 - for revision in repo_info.revisions: - for f in revision.files: - if _is_main_gguf_filename(f.file_name): - latest = max(latest, _blob_mtime(f)) - return latest - - -def _repo_has_mmproj(repo_info) -> bool: - return any( - _is_mmproj_filename(f.file_name) for revision in repo_info.revisions for f in revision.files - ) - - def _cached_repo_file_name(file_obj) -> str: file_path = getattr(file_obj, "file_path", None) if file_path: @@ -295,7 +266,6 @@ def _scan_cached_gguf() -> list[dict]: continue key = repo_id.lower() existing = seen_lower.get(key) - last_modified = _repo_gguf_last_modified(repo_info) row = { "repo_id": repo_id, "size_bytes": max(total_size, variant_state_size), @@ -305,9 +275,6 @@ def _scan_cached_gguf() -> list[dict]: # per-variant detail lives on GgufVariantDetail. "partial_transport": None, } - last_modified = max(last_modified, (existing or {}).get("last_modified", 0.0)) - if last_modified > 0: - row["last_modified"] = last_modified row.update( _cache_inventory_fields( repo_id, @@ -316,12 +283,8 @@ def _scan_cached_gguf() -> list[dict]: requires_variant = True, ) ) - if _repo_has_mmproj(repo_info): - row["capabilities"]["supports_vision"] = True if _prefer_cache_row(row, existing): seen_lower[key] = row - elif last_modified > existing.get("last_modified", 0.0): - existing["last_modified"] = last_modified except Exception as e: repo_label = getattr(repo_info, "repo_id", "") logger.warning(f"Skipping cached GGUF repo {repo_label}: {e}") @@ -349,14 +312,13 @@ class _CachedNonGgufPayload(NamedTuple): size_bytes: int has_runnable_weights: bool model_format: ModelFormat - last_modified: float def _repo_non_gguf_model_payload(repo_info) -> _CachedNonGgufPayload: - all_weight_blobs: dict[str, tuple[int, float]] = {} - adapter_blobs: dict[str, tuple[int, float]] = {} - safetensors_blobs: dict[str, tuple[int, float]] = {} - checkpoint_blobs: dict[str, tuple[int, float]] = {} + all_weight_blobs: dict[str, int] = {} + adapter_blobs: dict[str, int] = {} + safetensors_blobs: dict[str, int] = {} + checkpoint_blobs: dict[str, int] = {} has_config = False has_adapter_config = False has_adapter_weights = False @@ -364,15 +326,12 @@ def _repo_non_gguf_model_payload(repo_info) -> _CachedNonGgufPayload: has_transformers_safetensors = False has_checkpoint = False - def _record_blob( - target: dict[str, tuple[int, float]], file_obj, rev_id: str, file_name: str - ) -> None: + def _record_blob(target: dict[str, int], file_obj, rev_id: str, file_name: str) -> None: blob_path = getattr(file_obj, "blob_path", None) size = int(file_obj.size_on_disk or 0) key = str(blob_path) if blob_path else f"{rev_id}:{file_name}" - value = (size, _blob_mtime(file_obj)) - target[key] = value - all_weight_blobs[key] = value + target[key] = size + all_weight_blobs[key] = size for revision in repo_info.revisions: rev_id = getattr(revision, "commit_hash", None) or str(id(revision)) @@ -416,19 +375,18 @@ def _repo_non_gguf_model_payload(repo_info) -> _CachedNonGgufPayload: or "unknown" ) if model_format == "adapter": - selected_blobs = adapter_blobs + size_bytes = sum(adapter_blobs.values()) elif model_format == "safetensors": - selected_blobs = safetensors_blobs + size_bytes = sum(safetensors_blobs.values()) elif model_format == "checkpoint": - selected_blobs = checkpoint_blobs + size_bytes = sum(checkpoint_blobs.values()) else: - selected_blobs = all_weight_blobs + size_bytes = sum(all_weight_blobs.values()) return _CachedNonGgufPayload( - size_bytes = sum(size for size, _mtime in selected_blobs.values()), + size_bytes = size_bytes, has_runnable_weights = model_format != "unknown", model_format = model_format, - last_modified = max((mtime for _size, mtime in selected_blobs.values()), default = 0.0), ) @@ -550,12 +508,6 @@ def _scan_cached_models() -> list[dict]: ), **_cached_model_local_metadata(repo_path), } - last_modified = max( - payload.last_modified, - (existing or {}).get("last_modified", 0.0), - ) - if last_modified > 0: - row["last_modified"] = last_modified row.update( _cache_inventory_fields( repo_id, @@ -565,8 +517,6 @@ def _scan_cached_models() -> list[dict]: ) if _prefer_cache_row(row, existing): seen_lower[key] = row - elif last_modified > existing.get("last_modified", 0.0): - existing["last_modified"] = last_modified except Exception as e: repo_label = getattr(repo_info, "repo_id", "") logger.warning(f"Skipping cached model repo {repo_label}: {e}") diff --git a/studio/backend/main.py b/studio/backend/main.py index bd0d26cf8f..e64048dc00 100644 --- a/studio/backend/main.py +++ b/studio/backend/main.py @@ -313,7 +313,6 @@ from hub.routes import ( inventory_router as hub_inventory_router, datasets_router as hub_datasets_router, ) -from picker.routes import templates_router as picker_templates_router from hub.schemas.downloads import TransportCapabilities from hub.utils.download_registry import ( get_download_transport_capabilities, @@ -746,7 +745,6 @@ _BODY_PROTECTED_PREFIXES = ( "/v1/completions", "/p/", "/api/inference", - "/api/picker", "/api/data-recipe", "/api/datasets", "/api/hub", @@ -977,7 +975,6 @@ app.include_router(rag_router, prefix = "/api/rag", tags = ["rag"]) app.include_router(training_history_router, prefix = "/api/train", tags = ["training-history"]) app.include_router(hub_inventory_router, prefix = "/api/hub", tags = ["hub"]) app.include_router(hub_datasets_router, prefix = "/api/hub/datasets", tags = ["hub"]) -app.include_router(picker_templates_router, prefix = "/api/picker", tags = ["picker"]) # Re-wrap client-error responses on the /v1/* surface into OpenAI/Anthropic # error envelopes; non-/v1 paths keep FastAPI's default {"detail": ...} shape. diff --git a/studio/backend/picker/__init__.py b/studio/backend/picker/__init__.py deleted file mode 100644 index 32014236c6..0000000000 --- a/studio/backend/picker/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-only -# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 diff --git a/studio/backend/picker/routes/__init__.py b/studio/backend/picker/routes/__init__.py deleted file mode 100644 index c0e988c8bb..0000000000 --- a/studio/backend/picker/routes/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-only -# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 - -from .templates import router as templates_router - -__all__ = ["templates_router"] diff --git a/studio/backend/picker/routes/templates.py b/studio/backend/picker/routes/templates.py deleted file mode 100644 index 03707669fa..0000000000 --- a/studio/backend/picker/routes/templates.py +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-only -# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 - -from __future__ import annotations - -import asyncio -from typing import Optional - -from fastapi import APIRouter, Body, Depends, Query - -from auth.authentication import get_current_subject -from hub.dependencies import get_hf_token - -from ..schemas import ( - ModelTemplateResponse, - ValidateChatTemplateRequest, - ValidateChatTemplateResponse, -) -from ..service import read_default_chat_template, validate_chat_template - -router = APIRouter() - - -@router.post("/validate-chat-template", response_model = ValidateChatTemplateResponse) -async def validate_chat_template_route( - body: ValidateChatTemplateRequest = Body(...), - current_subject: str = Depends(get_current_subject), -) -> ValidateChatTemplateResponse: - return await asyncio.to_thread(validate_chat_template, body.template) - - -@router.get("/chat-template/{model_name:path}", response_model = ModelTemplateResponse) -async def get_default_chat_template_route( - model_name: str, - gguf_variant: Optional[str] = Query(None), - hf_token: Optional[str] = Depends(get_hf_token), - current_subject: str = Depends(get_current_subject), -) -> ModelTemplateResponse: - template = await asyncio.to_thread( - read_default_chat_template, model_name, hf_token, gguf_variant - ) - return ModelTemplateResponse(model_name = model_name, chat_template = template) diff --git a/studio/backend/picker/schemas.py b/studio/backend/picker/schemas.py deleted file mode 100644 index b4f956188f..0000000000 --- a/studio/backend/picker/schemas.py +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-only -# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 - -from typing import Optional - -from pydantic import BaseModel, Field, field_validator - -# Mirror the frontend's 64 KiB chat-template contract (per-model-config.ts) at -# the API boundary so a direct caller cannot make Jinja parse an oversized -# template. MaxBodyMiddleware only caps the whole request body, not this field. -MAX_CHAT_TEMPLATE_BYTES = 65_536 - - -class ValidateChatTemplateRequest(BaseModel): - template: str = Field(default = "") - - @field_validator("template") - @classmethod - def _enforce_template_size(cls, value: str) -> str: - if len(value.encode("utf-8")) > MAX_CHAT_TEMPLATE_BYTES: - raise ValueError(f"Chat template exceeds the {MAX_CHAT_TEMPLATE_BYTES}-byte limit.") - return value - - -class ValidateChatTemplateResponse(BaseModel): - valid: bool - error: Optional[str] = None - - -class ModelTemplateResponse(BaseModel): - model_name: str - chat_template: Optional[str] = None diff --git a/studio/backend/picker/service.py b/studio/backend/picker/service.py deleted file mode 100644 index f5994dc550..0000000000 --- a/studio/backend/picker/service.py +++ /dev/null @@ -1,361 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-only -# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 - -from __future__ import annotations - -import json -import logging -import os -import re -from pathlib import Path -from typing import Optional - -from hub.services.models.folder_browser import ( - _build_browse_allowlist, - _is_path_inside_allowlist, -) -from hub.utils.gguf import iter_hf_cache_snapshots -from utils.models.gguf_metadata import read_gguf_chat_template -from utils.models.model_config import ( - _extract_quant_label, - _is_big_endian_gguf_path, - _is_mmproj, - _is_mtp_drafter, -) -from utils.paths.path_utils import ( - is_local_path, - normalize_path, - resolve_cached_repo_id_case, -) - -from .schemas import ValidateChatTemplateResponse - -logger = logging.getLogger(__name__) - -_VALID_REPO_ID = re.compile(r"^[A-Za-z0-9._-]+/[A-Za-z0-9._-]+$") - - -def _is_valid_repo_id(repo_id: str) -> bool: - return bool(_VALID_REPO_ID.fullmatch(repo_id)) - - -_TOKENIZER_CONFIG_PATHS = ("tokenizer_config.json", "LLM/tokenizer_config.json") -_JINJA_TEMPLATE_PATHS = ("chat_template.jinja", "LLM/chat_template.jinja") -_PROCESSOR_TEMPLATE_PATHS = ("chat_template.json", "LLM/chat_template.json") - - -def _leaf_inside_allowlist(path: Path, allow_roots: Optional[list[Path]]) -> bool: - # Block symlinked children from escaping the validated directory - # (realpath-checked). None = trusted caller (HF cache / remote download). - return allow_roots is None or _is_path_inside_allowlist(path, allow_roots) - - -def validate_chat_template(template: str) -> ValidateChatTemplateResponse: - text = (template or "").strip() - if not text: - return ValidateChatTemplateResponse(valid = True, error = None) - # Import Jinja lazily: it is optional at runtime (e.g. GGUF-only installs), - # so a missing dependency must not crash API startup through this module. - try: - from jinja2 import TemplateError - from jinja2.ext import Extension - from jinja2.sandbox import ImmutableSandboxedEnvironment - except ImportError: - return ValidateChatTemplateResponse(valid = True, error = None) - - class _GenerationTag(Extension): - # Accept Transformers' {% generation %}...{% endgeneration %} assistant - # mask tag so a pasted HF chat template validates (we only parse it). - tags = {"generation"} - - def parse(self, parser): - next(parser.stream) - return parser.parse_statements(["name:endgeneration"], drop_needle = True) - - try: - env = ImmutableSandboxedEnvironment( - trim_blocks = True, - lstrip_blocks = True, - extensions = ["jinja2.ext.loopcontrols", _GenerationTag], - ) - env.parse(text) - return ValidateChatTemplateResponse(valid = True, error = None) - except TemplateError as exc: - message = getattr(exc, "message", None) or str(exc) - lineno = getattr(exc, "lineno", None) - if lineno: - message = f"Line {lineno}: {message}" - return ValidateChatTemplateResponse(valid = False, error = message) - except Exception as exc: - return ValidateChatTemplateResponse(valid = False, error = str(exc)) - - -def _chat_template_from_tokenizer_config(config: dict) -> Optional[str]: - if not isinstance(config, dict): - return None - raw = config.get("chat_template") - if isinstance(raw, str) and raw.strip(): - return raw - if isinstance(raw, list): - fallback: Optional[str] = None - for entry in raw: - if not isinstance(entry, dict): - continue - template = entry.get("template") - if not isinstance(template, str): - continue - if entry.get("name") == "default": - return template - if fallback is None: - fallback = template - return fallback - return None - - -def _chat_template_from_jinja_file( - dir_path: Path, allow_roots: Optional[list[Path]] = None -) -> Optional[str]: - for rel in _JINJA_TEMPLATE_PATHS: - template_file = dir_path / rel - if not template_file.exists() or not _leaf_inside_allowlist(template_file, allow_roots): - continue - try: - template = template_file.read_text(encoding = "utf-8") - except Exception: - continue - if template.strip(): - return template - return None - - -def _chat_template_from_processor_payload(payload: object) -> Optional[str]: - # processor chat_template.json may be the template string itself or a - # {name: template} map, not only a tokenizer_config-shaped object. - if isinstance(payload, str): - return payload if payload.strip() else None - template = _chat_template_from_tokenizer_config(payload) # type: ignore[arg-type] - if template: - return template - if isinstance(payload, dict): - # Named-template map: prefer "default", else the first non-empty entry - # (mirrors the tokenizer-config list fallback). - default = payload.get("default") - if isinstance(default, str) and default.strip(): - return default - for value in payload.values(): - if isinstance(value, str) and value.strip(): - return value - return None - - -def _chat_template_from_processor_json( - dir_path: Path, allow_roots: Optional[list[Path]] = None -) -> Optional[str]: - for rel in _PROCESSOR_TEMPLATE_PATHS: - config_file = dir_path / rel - if not config_file.exists() or not _leaf_inside_allowlist(config_file, allow_roots): - continue - try: - payload = json.loads(config_file.read_text(encoding = "utf-8")) - except Exception: - continue - template = _chat_template_from_processor_payload(payload) - if template: - return template - return None - - -def _chat_template_from_tokenizer_dir( - dir_path: Path, allow_roots: Optional[list[Path]] = None -) -> Optional[str]: - jinja = _chat_template_from_jinja_file(dir_path, allow_roots) - if jinja: - return jinja - for rel in _TOKENIZER_CONFIG_PATHS: - config_file = dir_path / rel - if not config_file.exists() or not _leaf_inside_allowlist(config_file, allow_roots): - continue - try: - config = json.loads(config_file.read_text(encoding = "utf-8")) - except Exception: - continue - template = _chat_template_from_tokenizer_config(config) - if template: - return template - return _chat_template_from_processor_json(dir_path, allow_roots) - - -_GGUF_SCAN_MAX_DEPTH = 2 - - -def _iter_ggufs(dir_path: Path) -> list[Path]: - if dir_path == dir_path.parent: - return [] - root = str(dir_path) - found: list[Path] = [] - for current, dirs, files in os.walk(root, followlinks = False): - rel = os.path.relpath(current, root) - depth = 0 if rel == os.curdir else rel.count(os.sep) + 1 - if depth >= _GGUF_SCAN_MAX_DEPTH: - dirs[:] = [] - for name in files: - if not name.lower().endswith(".gguf") or _is_mmproj(name): - continue - path = Path(current) / name - try: - rel = path.relative_to(dir_path).as_posix() - except ValueError: - rel = name - quant = _extract_quant_label(rel) - if _is_mtp_drafter(rel) or _is_big_endian_gguf_path(rel, quant): - continue - found.append(path) - return found - - -def _variant_matches(relative_path: str, needle: str) -> bool: - quant = _extract_quant_label(relative_path).lower() - if quant == needle: - return True - prefix = f"{needle}-" - if not quant.startswith(prefix): - return False - suffix = quant[len(prefix) :] - if not suffix.endswith("bpw"): - return False - value = suffix[:-3] - return bool(value) and value.replace(".", "", 1).isdigit() - - -def _find_gguf_in_dir(dir_path: Path, gguf_variant: Optional[str]) -> Optional[Path]: - try: - ggufs = sorted(_iter_ggufs(dir_path)) - except OSError: - return None - if not ggufs: - return None - needle = (gguf_variant or "").strip().lower() - if needle: - for path in ggufs: - try: - relative = path.relative_to(dir_path).as_posix() - except ValueError: - relative = path.name - if _variant_matches(relative, needle): - return path - return None - try: - return max(ggufs, key = lambda path: path.stat().st_size) - except OSError: - return ggufs[0] - - -def _chat_template_from_dir( - dir_path: Path, - gguf_variant: Optional[str] = None, - allow_roots: Optional[list[Path]] = None, -) -> Optional[str]: - def from_gguf() -> Optional[str]: - gguf = _find_gguf_in_dir(dir_path, gguf_variant) - if gguf is None or not _leaf_inside_allowlist(gguf, allow_roots): - return None - return read_gguf_chat_template(str(gguf)) - - # Sidecar tokenizer files (chat_template.jinja / tokenizer_config.json) are - # the model author's maintained template and supersede the GGUF's embedded - # copy, which can be stale. The variant only selects which GGUF to fall back - # to, so keep tokenizer-first precedence whether or not a variant is given. - return _chat_template_from_tokenizer_dir(dir_path, allow_roots) or from_gguf() - - -def read_default_chat_template( - model_name: str, - hf_token: Optional[str] = None, - gguf_variant: Optional[str] = None, -) -> Optional[str]: - if not isinstance(model_name, str) or not model_name.strip(): - return None - name = model_name.strip() - - if is_local_path(name): - try: - target = Path(normalize_path(name)).expanduser() - allow_roots = _build_browse_allowlist() - if not _is_path_inside_allowlist(target, allow_roots): - logger.debug("Refused chat template read outside allowed folders: %s", name) - return None - if name.lower().endswith(".gguf"): - # Prefer a maintained sidecar template (chat_template.jinja / - # tokenizer_config.json) next to the file over the GGUF's embedded - # copy, matching the tokenizer-first precedence used for directory - # and variant selections. - sidecar = _chat_template_from_tokenizer_dir(target.parent, allow_roots) - if sidecar: - return sidecar - return read_gguf_chat_template(str(target)) - return _chat_template_from_dir(target, gguf_variant, allow_roots) - except Exception as exc: - logger.debug("Could not read local chat template for %s: %s", name, exc) - return None - - if not _is_valid_repo_id(name): - return None - - resolved = resolve_cached_repo_id_case(name) - - try: - # Resolve within each cached revision, newest first. A revision's - # maintained sidecar (chat_template.jinja / tokenizer_config.json) - # supersedes its own embedded GGUF copy, but a newer revision must not be - # overridden by an older revision's sidecar, so precedence stays - # per-snapshot rather than searching all sidecars globally first. - for snapshot in iter_hf_cache_snapshots(resolved): - template = _chat_template_from_dir(snapshot, gguf_variant) - if template: - return template - except Exception as exc: - logger.debug("Could not read cached chat template for %s: %s", resolved, exc) - - try: - from huggingface_hub import hf_hub_download - - def _download_text(rel: str) -> Optional[str]: - try: - path = hf_hub_download(resolved, rel, token = hf_token) - return Path(path).read_text(encoding = "utf-8") - except Exception: - return None - - for rel in _JINJA_TEMPLATE_PATHS: - template = _download_text(rel) - if template and template.strip(): - return template - - for rel in _TOKENIZER_CONFIG_PATHS: - raw = _download_text(rel) - if not raw: - continue - try: - config = json.loads(raw) - except Exception: - continue - template = _chat_template_from_tokenizer_config(config) - if template: - return template - - for rel in _PROCESSOR_TEMPLATE_PATHS: - raw = _download_text(rel) - if not raw: - continue - try: - payload = json.loads(raw) - except Exception: - continue - template = _chat_template_from_processor_payload(payload) - if template: - return template - - return None - except Exception as exc: - logger.debug("Could not fetch chat template for %s: %s", resolved, exc) - return None diff --git a/studio/backend/tests/test_model_update_robustness.py b/studio/backend/tests/test_model_update_robustness.py index 4c5822e662..edf55812e2 100644 --- a/studio/backend/tests/test_model_update_robustness.py +++ b/studio/backend/tests/test_model_update_robustness.py @@ -314,7 +314,6 @@ def test_cached_model_scan_keeps_local_safetensors_repo(monkeypatch, tmp_path): file_name = "model.safetensors", size_on_disk = 100, blob_path = str(repo_path / "blobs" / "modelsha"), - blob_last_modified = 3_000.0, ), ] ) @@ -337,51 +336,6 @@ def test_cached_model_scan_keeps_local_safetensors_repo(monkeypatch, tmp_path): assert rows[0]["repo_id"] == "Org/SafeTensorRepo" assert rows[0]["model_format"] == "safetensors" assert rows[0]["size_bytes"] == 100 - assert rows[0]["last_modified"] == 3_000.0 - - -def test_cached_gguf_scan_keeps_download_timestamp(monkeypatch, tmp_path): - repo_path = tmp_path / "models--Org--GgufRepo" - repo = SimpleNamespace( - repo_id = "Org/GgufRepo", - repo_type = "model", - repo_path = repo_path, - revisions = [ - SimpleNamespace( - files = [ - SimpleNamespace( - file_name = "model-Q4_K_M.gguf", - size_on_disk = 100, - blob_path = None, - blob_last_modified = 5_000.0, - ), - ] - ) - ], - ) - monkeypatch.setattr( - CI, - "all_hf_cache_scans", - lambda: [SimpleNamespace(repos = [repo])], - ) - monkeypatch.setattr( - CI.hf_cache_scan, - "is_gguf_repo_partial", - lambda *args, **kwargs: False, - ) - monkeypatch.setattr( - CI, - "_gguf_variant_state_summary", - lambda _repo_id: (False, 0), - ) - - rows = CI._scan_cached_gguf() - - assert len(rows) == 1 - assert rows[0]["repo_id"] == "Org/GgufRepo" - assert rows[0]["model_format"] == "gguf" - assert rows[0]["size_bytes"] == 100 - assert rows[0]["last_modified"] == 5_000.0 # ── hf_hub_download_with_xet_fallback force_download bypass (X2/F2) ─── diff --git a/studio/backend/tests/test_picker_service.py b/studio/backend/tests/test_picker_service.py deleted file mode 100644 index fc835bf019..0000000000 --- a/studio/backend/tests/test_picker_service.py +++ /dev/null @@ -1,162 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-only -# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 - -import json - -from picker.service import ( - _chat_template_from_dir, - _chat_template_from_tokenizer_config, - _chat_template_from_tokenizer_dir, - _find_gguf_in_dir, - _iter_ggufs, - read_default_chat_template, - validate_chat_template, -) - - -def test_iter_ggufs_skips_gguf_companions(tmp_path): - mtp_dir = tmp_path / "MTP" - mtp_dir.mkdir() - main = tmp_path / "model-Q8_0.gguf" - main.write_bytes(b"") - (tmp_path / "mmproj-F16.gguf").write_bytes(b"") - (tmp_path / "mtp-model-Q8_0.gguf").write_bytes(b"") - (mtp_dir / "model-Q8_0-MTP.gguf").write_bytes(b"") - (tmp_path / "model-Q8_0-be.gguf").write_bytes(b"") - - assert _iter_ggufs(tmp_path) == [main] - - -def test_find_gguf_in_dir_matches_quant_label(tmp_path): - mtp_dir = tmp_path / "MTP" - mtp_dir.mkdir() - main = tmp_path / "model-Q8_0.gguf" - main.write_bytes(b"") - (mtp_dir / "model-Q8_0-MTP.gguf").write_bytes(b"") - (tmp_path / "model-Q4_K_M.gguf").write_bytes(b"") - - assert _find_gguf_in_dir(tmp_path, "Q8_0") == main - assert _find_gguf_in_dir(tmp_path, "Q4_K") is None - - -def test_find_gguf_in_dir_without_variant_prefers_largest_model(tmp_path): - smaller = tmp_path / "a-model-Q4_K_M.gguf" - larger = tmp_path / "z-model-Q8_0.gguf" - smaller.write_bytes(b"0") - larger.write_bytes(b"00") - - assert _find_gguf_in_dir(tmp_path, None) == larger - - -def test_find_gguf_in_dir_matches_bpw_variant_base_label(tmp_path): - target = tmp_path / "model-IQ4_XS-3.53bpw.gguf" - target.write_bytes(b"") - (tmp_path / "model-Q4_K_M.gguf").write_bytes(b"") - - assert _find_gguf_in_dir(tmp_path, "IQ4_XS") == target - assert _find_gguf_in_dir(tmp_path, "IQ4_XS-3.53bpw") == target - assert _find_gguf_in_dir(tmp_path, "Q4_K") is None - - -def test_validate_chat_template_accepts_valid_and_empty(): - assert validate_chat_template("{{ messages[0].content }}").valid is True - assert validate_chat_template("").valid is True - assert validate_chat_template(" ").valid is True - - -def test_validate_chat_template_reports_syntax_error_with_line(): - result = validate_chat_template("{% if %}{% endif %}") - assert result.valid is False - assert result.error is not None - assert result.error.startswith("Line ") - - -def test_chat_template_from_tokenizer_config_reads_string(): - assert _chat_template_from_tokenizer_config({"chat_template": "HELLO"}) == "HELLO" - assert _chat_template_from_tokenizer_config({"chat_template": " "}) is None - assert _chat_template_from_tokenizer_config({}) is None - - -def test_chat_template_from_tokenizer_config_prefers_named_default(): - config = { - "chat_template": [ - {"name": "tool_use", "template": "TOOL"}, - {"name": "default", "template": "DEFAULT"}, - ] - } - assert _chat_template_from_tokenizer_config(config) == "DEFAULT" - - -def test_chat_template_from_tokenizer_config_falls_back_to_first_entry(): - config = { - "chat_template": [ - {"name": "tool_use", "template": "TOOL"}, - {"name": "other", "template": "OTHER"}, - ] - } - assert _chat_template_from_tokenizer_config(config) == "TOOL" - - -def test_chat_template_from_tokenizer_dir_prefers_jinja_file(tmp_path): - (tmp_path / "chat_template.jinja").write_text("FROM_JINJA", encoding = "utf-8") - (tmp_path / "tokenizer_config.json").write_text( - json.dumps({"chat_template": "FROM_CONFIG"}), encoding = "utf-8" - ) - assert _chat_template_from_tokenizer_dir(tmp_path) == "FROM_JINJA" - - -def test_chat_template_from_tokenizer_dir_reads_tokenizer_config(tmp_path): - (tmp_path / "tokenizer_config.json").write_text( - json.dumps({"chat_template": "FROM_CONFIG"}), encoding = "utf-8" - ) - assert _chat_template_from_tokenizer_dir(tmp_path) == "FROM_CONFIG" - - -def test_chat_template_from_dir_without_variant_prefers_tokenizer(tmp_path): - (tmp_path / "tokenizer_config.json").write_text( - json.dumps({"chat_template": "FROM_CONFIG"}), encoding = "utf-8" - ) - assert _chat_template_from_dir(tmp_path) == "FROM_CONFIG" - - -def test_chat_template_from_dir_with_variant_still_prefers_tokenizer(tmp_path, monkeypatch): - (tmp_path / "tokenizer_config.json").write_text( - json.dumps({"chat_template": "FROM_CONFIG"}), encoding = "utf-8" - ) - (tmp_path / "model-Q4_K_M.gguf").write_bytes(b"") - monkeypatch.setattr("picker.service.read_gguf_chat_template", lambda _path: "FROM_GGUF") - # Selecting a variant must not flip precedence to the embedded GGUF template. - assert _chat_template_from_dir(tmp_path, "Q4_K_M") == "FROM_CONFIG" - - -def test_chat_template_from_dir_with_variant_falls_back_to_gguf(tmp_path, monkeypatch): - (tmp_path / "model-Q4_K_M.gguf").write_bytes(b"") - monkeypatch.setattr("picker.service.read_gguf_chat_template", lambda _path: "FROM_GGUF") - # With no tokenizer sidecar, the embedded GGUF template is still the fallback. - assert _chat_template_from_dir(tmp_path, "Q4_K_M") == "FROM_GGUF" - - -def test_chat_template_from_dir_returns_none_when_absent(tmp_path): - assert _chat_template_from_dir(tmp_path) is None - - -def test_read_default_chat_template_direct_gguf_prefers_sidecar(tmp_path, monkeypatch): - gguf = tmp_path / "model-Q4_K_M.gguf" - gguf.write_bytes(b"") - (tmp_path / "tokenizer_config.json").write_text( - json.dumps({"chat_template": "FROM_CONFIG"}), encoding = "utf-8" - ) - monkeypatch.setattr("picker.service._build_browse_allowlist", lambda: [tmp_path]) - monkeypatch.setattr("picker.service.read_gguf_chat_template", lambda _path: "FROM_GGUF") - # A directly selected .gguf file must prefer a maintained sidecar template - # over its embedded copy, matching directory/variant precedence. - assert read_default_chat_template(str(gguf)) == "FROM_CONFIG" - - -def test_read_default_chat_template_direct_gguf_falls_back_to_embedded(tmp_path, monkeypatch): - gguf = tmp_path / "model-Q4_K_M.gguf" - gguf.write_bytes(b"") - monkeypatch.setattr("picker.service._build_browse_allowlist", lambda: [tmp_path]) - monkeypatch.setattr("picker.service.read_gguf_chat_template", lambda _path: "FROM_GGUF") - # With no sidecar next to the file, the embedded GGUF template is the fallback. - assert read_default_chat_template(str(gguf)) == "FROM_GGUF" diff --git a/studio/backend/utils/models/gguf_metadata.py b/studio/backend/utils/models/gguf_metadata.py index 5e25ce1927..c24ec28e1d 100644 --- a/studio/backend/utils/models/gguf_metadata.py +++ b/studio/backend/utils/models/gguf_metadata.py @@ -50,8 +50,6 @@ _CACHE_MAX_ENTRIES = 4096 # keyed by (file cache key, wanted key). None = key absent / file unreadable. _BOOL_CACHE: Dict[Tuple[_CacheKey, str], Optional[bool]] = {} -_STRING_CACHE: Dict[Tuple[_CacheKey, str], Optional[str]] = {} - # Native training context length (``{arch}.context_length``). None = absent / # unreadable. Lets the UI show the real context ceiling before a model loads. _CONTEXT_CACHE: Dict[_CacheKey, Optional[int]] = {} @@ -355,83 +353,6 @@ def _read_gguf_bool(path: str, wanted_key: str) -> Optional[bool]: return result -def _parse_gguf_string(path: str, wanted_key: str) -> Optional[str]: - try: - with open(path, "rb") as f: - head = f.read(24) - if len(head) < 24: - return None - magic, _version, _tcount, kv_count = struct.unpack(" 1 << 20: - break - kbytes = f.read(klen) - if len(kbytes) < klen: - break - key = kbytes.decode("utf-8", "replace") - vt_bytes = f.read(4) - if len(vt_bytes) < 4: - break - vtype = struct.unpack(" 1 << 22: - break - sbytes = f.read(slen) - if len(sbytes) < slen: - break - return sbytes.decode("utf-8", "replace") - if not _skip_gguf_value(f, vtype): - break - except (struct.error, UnicodeDecodeError): - break - except OSError as e: - logger.debug(f"_parse_gguf_string: cannot open {path}: {e}") - return None - except Exception as e: - logger.debug(f"_parse_gguf_string: parse failure on {path}: {e}") - return None - return None - - -def _read_gguf_string(path: str, wanted_key: str) -> Optional[str]: - fkey = _cache_key(path) - if fkey is None: - return None - ckey = (fkey, wanted_key) - with _CACHE_LOCK: - if ckey in _STRING_CACHE: - return _STRING_CACHE[ckey] - result = _parse_gguf_string(path, wanted_key) - with _CACHE_LOCK: - while len(_STRING_CACHE) >= _CACHE_MAX_ENTRIES: - try: - _STRING_CACHE.pop(next(iter(_STRING_CACHE))) - except StopIteration: - break - _STRING_CACHE[ckey] = result - return result - - -def read_gguf_chat_template(path: str) -> Optional[str]: - template = _read_gguf_string(path, "tokenizer.chat_template") - if isinstance(template, str) and template.strip(): - return template - return None - - def read_mmproj_audio_capability(path: str) -> Optional[bool]: """``clip.has_audio_encoder`` from an mmproj GGUF (e.g. Gemma 4's gemma4ua): ``True``/``False`` if present, ``None`` if absent/unreadable. diff --git a/studio/frontend/src/app/routes/__root.tsx b/studio/frontend/src/app/routes/__root.tsx index 6c2505f1ca..ba56ce7525 100644 --- a/studio/frontend/src/app/routes/__root.tsx +++ b/studio/frontend/src/app/routes/__root.tsx @@ -195,6 +195,9 @@ function RootLayout() { chatRuntime.setActiveThreadId(null); chatRuntime.setActiveProjectId(null); chatRuntime.setIncognito(false); + // Detach the staging UI but keep any in-flight download running, like Hub. + if (chatRuntime.pendingSelection) + chatRuntime.abandonStagedModel({ keepDownload: true }); void navigate({ to: "/chat", search: { new: crypto.randomUUID() }, @@ -217,6 +220,10 @@ function RootLayout() { chatRuntime.setActiveProjectId(null); chatRuntime.setActiveThreadId(null); chatRuntime.setIncognito(false); + // Leaving chat must not kill an in-flight download: detach the staging UI + // but keep the transfer running in the manager, like a Hub download. + if (chatRuntime.pendingSelection) + chatRuntime.abandonStagedModel({ keepDownload: true }); }, [isChatRoute]); return ( diff --git a/studio/frontend/src/features/model-picker/components/model-selector.tsx b/studio/frontend/src/components/assistant-ui/model-selector.tsx similarity index 86% rename from studio/frontend/src/features/model-picker/components/model-selector.tsx rename to studio/frontend/src/components/assistant-ui/model-selector.tsx index 7efcf69162..6bfd1276ac 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector.tsx +++ b/studio/frontend/src/components/assistant-ui/model-selector.tsx @@ -3,7 +3,6 @@ "use client"; -import { Input } from "@/components/ui/input"; import { Popover, PopoverContent, @@ -11,7 +10,7 @@ import { } from "@/components/ui/popover"; import { TooltipProvider } from "@/components/ui/tooltip"; import { usePlatformStore } from "@/config/env"; -import { isCustomProviderType } from "@/features/chat"; +import { isCustomProviderType } from "@/features/chat/external-providers"; import { ChevronDownStandardIcon } from "@/lib/chevron-icons"; import { cn } from "@/lib/utils"; import { @@ -34,11 +33,7 @@ import { useRef, useState, } from "react"; -import { - type PerModelConfig, - resolveInitialConfig, -} from "../model-config/per-model-config"; -import { ModelConfigPage } from "./model-config-page"; +import { Input } from "../ui/input"; import { HubModelPicker, hasDownloadedModels } from "./model-selector/pickers"; import { PillTabs } from "./model-selector/pill-tabs"; import { @@ -50,7 +45,6 @@ import type { ExternalModelOption, LoraModelOption, ModelOption, - ModelPickTarget, ModelSelectorChangeMeta, } from "./model-selector/types"; @@ -128,10 +122,6 @@ interface ModelSelectorProps { value?: string; defaultValue?: string; activeGgufVariant?: string | null; - activeModelConfig?: PerModelConfig | null; - activeGgufContextLength?: number | null; - selectedConfig?: PerModelConfig | null; - selectedGgufVariant?: string | null; onValueChange?: (value: string, meta: ModelSelectorChangeMeta) => void; onEject?: () => void; onFoldersChange?: () => void; @@ -295,8 +285,7 @@ function saveLastHubSection(section: HubSection): void { // when they have downloads, else Recommended. function defaultHubSection(): HubSection { return ( - loadLastHubSection() ?? - (hasDownloadedModels() ? "downloaded" : "recommended") + loadLastHubSection() ?? (hasDownloadedModels() ? "downloaded" : "recommended") ); } @@ -319,11 +308,6 @@ function ModelSelectorContent({ loraModels, externalModels, value, - activeGgufVariant, - activeModelConfig, - activeGgufContextLength, - selectedConfig, - selectedGgufVariant, onSelect, onEject, onFoldersChange, @@ -339,11 +323,6 @@ function ModelSelectorContent({ loraModels: LoraModelOption[]; externalModels: ExternalModelOption[]; value?: string; - activeGgufVariant?: string | null; - activeModelConfig?: PerModelConfig | null; - activeGgufContextLength?: number | null; - selectedConfig?: PerModelConfig | null; - selectedGgufVariant?: string | null; onSelect: (id: string, meta: ModelSelectorChangeMeta) => void; onEject?: () => void; onFoldersChange?: () => void; @@ -412,10 +391,6 @@ function ModelSelectorContent({ const effectiveHubSection: HubSection = hubSection === "connected" && !hasExternal ? "recommended" : hubSection; - const [configTarget, setConfigTarget] = useState( - null, - ); - // The picker below remounts on each open, but this tab state does not, so a // persisted selection that lands in lora/external after async load would // reopen on Hub. Re-derive the default tab on the open edge. @@ -427,9 +402,6 @@ function ModelSelectorContent({ // user has downloads, else their last section. setHubSection(wantsConnectedDefault ? "connected" : defaultHubSection()); } - if (!open && wasOpen.current) { - setConfigTarget(null); - } wasOpen.current = open; }, [ open, @@ -480,29 +452,6 @@ function ModelSelectorContent({ } } - const visibleConfigTarget = open ? configTarget : null; - const openConfigPage = (id: string, meta: ModelSelectorChangeMeta) => { - const leaf = id.includes("/") ? id.slice(id.lastIndexOf("/") + 1) : id; - setConfigTarget({ - id, - displayName: meta.ggufVariant ? `${leaf} · ${meta.ggufVariant}` : leaf, - ggufVariant: meta.ggufVariant ?? null, - isGguf: meta.isGguf ?? Boolean(meta.ggufVariant), - meta, - }); - }; - const handlePick = (id: string, meta: ModelSelectorChangeMeta) => { - if (meta.source === "external") { - onSelect(id, meta); - return; - } - const resolved = resolveInitialConfig(id, meta.ggufVariant); - onSelect(id, { - ...meta, - ...(resolved.remembered ? { config: resolved.config } : {}), - }); - }; - return ( @@ -533,42 +477,6 @@ function ModelSelectorContent({ skipDelayDuration={0} disableHoverableContent={true} > - {visibleConfigTarget ? ( - setConfigTarget(null)} - onRun={(config) => - onSelect(visibleConfigTarget.id, { - ...visibleConfigTarget.meta, - config, - forceReload: true, - }) - } - loadedConfig={ - value === visibleConfigTarget.id && - (activeGgufVariant ?? null) === - (visibleConfigTarget.ggufVariant ?? null) - ? (activeModelConfig ?? null) - : null - } - loadedContextLength={ - value === visibleConfigTarget.id && - (activeGgufVariant ?? null) === - (visibleConfigTarget.ggufVariant ?? null) - ? (activeGgufContextLength ?? null) - : null - } - initialConfig={ - value === visibleConfigTarget.id && - (selectedGgufVariant ?? null) === - (visibleConfigTarget.ggufVariant ?? null) - ? (selectedConfig ?? null) - : null - } - /> - ) : ( - <> {tabs.length > 1 ? ( ) : null} + {/* Hub renders Eject inline as the last list row; other tabs keep the + footer button. */} {effectiveTab !== "hub" && hasSelection && onEject ? ( -
+
) : null} - - )} ); @@ -658,10 +565,6 @@ export function ModelSelector({ value, defaultValue, activeGgufVariant, - activeModelConfig, - activeGgufContextLength, - selectedConfig, - selectedGgufVariant, onValueChange, onEject, onFoldersChange, @@ -790,11 +693,6 @@ export function ModelSelector({ loraModels={loraModels} externalModels={externalModels} value={selected} - activeGgufVariant={activeGgufVariant} - activeModelConfig={activeModelConfig} - activeGgufContextLength={activeGgufContextLength} - selectedConfig={selectedConfig} - selectedGgufVariant={selectedGgufVariant} onSelect={handleSelect} onEject={onEject ? handleEject : undefined} onFoldersChange={onFoldersChange} diff --git a/studio/frontend/src/features/model-picker/components/model-selector/folder-browser.tsx b/studio/frontend/src/components/assistant-ui/model-selector/folder-browser.tsx similarity index 88% rename from studio/frontend/src/features/model-picker/components/model-selector/folder-browser.tsx rename to studio/frontend/src/components/assistant-ui/model-selector/folder-browser.tsx index 023f586781..16cc8a1956 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector/folder-browser.tsx +++ b/studio/frontend/src/components/assistant-ui/model-selector/folder-browser.tsx @@ -14,7 +14,10 @@ import { DialogTitle, } from "@/components/ui/dialog"; import { Spinner } from "@/components/ui/spinner"; -import { type BrowseFoldersResponse, browseFolders } from "@/features/chat"; +import { + type BrowseFoldersResponse, + browseFolders, +} from "@/features/chat/api/chat-api"; import { ChevronUpStandardIcon } from "@/lib/chevron-icons"; import { cn } from "@/lib/utils"; import { Folder02Icon } from "@hugeicons/core-free-icons"; @@ -87,43 +90,47 @@ export function FolderBrowser({ const [error, setError] = useState(null); const abortRef = useRef(null); - function navigate( - target: string | undefined, - hidden: boolean, - opts?: { fallbackOnError?: boolean }, - ) { - abortRef.current?.abort(); - const ctrl = new AbortController(); - abortRef.current = ctrl; - setLoading(true); - setError(null); - // Forward the signal so cancelled navigation aborts the backend - // enumeration, not just the response. - browseFolders(target, hidden, ctrl.signal) - .then((res) => { - if (ctrl.signal.aborted) return; - setData(res); - setPath(res.current); - }) - .catch((err) => { - if (ctrl.signal.aborted) return; - // Surface the error; if the first request (e.g. a bad initialPath) - // fails, fall back to HOME so the modal stays navigable. - const message = err instanceof Error ? err.message : String(err); - setError(message); - if (opts?.fallbackOnError && target !== undefined) { - // Re-issue without a target -> backend defaults to HOME. - // Don't recurse if HOME itself fails (allowlist always has HOME). - queueMicrotask(() => navigate(undefined, hidden)); - } - }) - .finally(() => { - if (!ctrl.signal.aborted) setLoading(false); - }); - } + const navigate = useCallback( + ( + target: string | undefined, + hidden: boolean, + opts?: { fallbackOnError?: boolean }, + ) => { + abortRef.current?.abort(); + const ctrl = new AbortController(); + abortRef.current = ctrl; + setLoading(true); + setError(null); + // Forward the signal so cancelled navigation aborts the backend + // enumeration, not just the response. + browseFolders(target, hidden, ctrl.signal) + .then((res) => { + if (ctrl.signal.aborted) return; + setData(res); + setPath(res.current); + }) + .catch((err) => { + if (ctrl.signal.aborted) return; + // Surface the error; if the first request (e.g. a bad initialPath) + // fails, fall back to HOME so the modal stays navigable. + const message = err instanceof Error ? err.message : String(err); + setError(message); + if (opts?.fallbackOnError && target !== undefined) { + // Re-issue without a target -> backend defaults to HOME. + // Don't recurse if HOME itself fails (allowlist always has HOME). + queueMicrotask(() => navigate(undefined, hidden)); + } + }) + .finally(() => { + if (!ctrl.signal.aborted) setLoading(false); + }); + }, + [], + ); // Fetch only on closed -> open; later navigation is driven by `navigate()`, // so `path` is deliberately kept out of the dependency list. + // eslint-disable-next-line react-hooks/exhaustive-deps useEffect(() => { if (!open) return; // fallbackOnError: recover into HOME if initialPath is bad, rather than @@ -140,7 +147,7 @@ export function FolderBrowser({ const crumbs = useMemo( () => (data?.current ? splitBreadcrumb(data.current) : []), - [data], + [data?.current], ); return ( diff --git a/studio/frontend/src/features/model-picker/components/model-selector/model-capabilities.ts b/studio/frontend/src/components/assistant-ui/model-selector/model-capabilities.ts similarity index 100% rename from studio/frontend/src/features/model-picker/components/model-selector/model-capabilities.ts rename to studio/frontend/src/components/assistant-ui/model-selector/model-capabilities.ts diff --git a/studio/frontend/src/features/model-picker/components/model-selector/model-delete-action.tsx b/studio/frontend/src/components/assistant-ui/model-selector/model-delete-action.tsx similarity index 90% rename from studio/frontend/src/features/model-picker/components/model-selector/model-delete-action.tsx rename to studio/frontend/src/components/assistant-ui/model-selector/model-delete-action.tsx index 09bb43abdc..4de96d3648 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector/model-delete-action.tsx +++ b/studio/frontend/src/components/assistant-ui/model-selector/model-delete-action.tsx @@ -1,12 +1,12 @@ // SPDX-License-Identifier: AGPL-3.0-only // Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 -import { DeleteConfirmDialog } from "@/features/hub"; -import { toast } from "@/lib/toast"; +import { DeleteConfirmDialog } from "@/features/hub/catalog/download-card"; import { cn } from "@/lib/utils"; import { Delete02Icon } from "@hugeicons/core-free-icons"; import { HugeiconsIcon } from "@hugeicons/react"; -import { type ReactNode, useCallback, useState } from "react"; +import { useCallback, useState, type ReactNode } from "react"; +import { toast } from "@/lib/toast"; interface ModelDeleteActionProps { ariaLabel: string; @@ -63,8 +63,7 @@ export function ModelDeleteAction({ disabled={disabled} className={cn( "shrink-0 rounded-md p-1.5 text-muted-foreground/60 transition-colors hover:bg-destructive/10 hover:text-destructive", - disabled && - "cursor-not-allowed opacity-40 hover:bg-transparent hover:text-muted-foreground/60", + disabled && "cursor-not-allowed opacity-40 hover:bg-transparent hover:text-muted-foreground/60", buttonClassName, )} > diff --git a/studio/frontend/src/features/model-picker/components/model-selector/model-load-settings-action.tsx b/studio/frontend/src/components/assistant-ui/model-selector/model-load-settings-action.tsx similarity index 66% rename from studio/frontend/src/features/model-picker/components/model-selector/model-load-settings-action.tsx rename to studio/frontend/src/components/assistant-ui/model-selector/model-load-settings-action.tsx index e1d48b5a08..58510762d4 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector/model-load-settings-action.tsx +++ b/studio/frontend/src/components/assistant-ui/model-selector/model-load-settings-action.tsx @@ -6,16 +6,24 @@ import { TooltipContent, TooltipTrigger, } from "@/components/ui/tooltip"; +import { useChatRuntimeStore } from "@/features/chat/stores/chat-runtime-store"; import { cn } from "@/lib/utils"; import { Settings02Icon } from "@hugeicons/core-free-icons"; import { HugeiconsIcon } from "@hugeicons/react"; +/** Gear button on a downloaded quant row. Stages the model into the Run + * settings sidebar (always, regardless of the Load-on-selection toggle) so the + * user can set load options, then click Load model. */ export function ModelLoadSettingsAction({ ariaLabel, - onConfigure, + repoId, + quant, + maxContext, }: { ariaLabel: string; - onConfigure: () => void; + repoId: string; + quant: string; + maxContext?: number | null; }) { return ( @@ -24,7 +32,12 @@ export function ModelLoadSettingsAction({ type="button" onClick={(e) => { e.stopPropagation(); - onConfigure(); + useChatRuntimeStore.getState().stageModel({ + id: repoId, + ggufVariant: quant, + isDownloaded: true, + contextLength: maxContext ?? null, + }); }} aria-label={ariaLabel} className={cn( diff --git a/studio/frontend/src/features/model-picker/components/model-selector/model-update-action.tsx b/studio/frontend/src/components/assistant-ui/model-selector/model-update-action.tsx similarity index 82% rename from studio/frontend/src/features/model-picker/components/model-selector/model-update-action.tsx rename to studio/frontend/src/components/assistant-ui/model-selector/model-update-action.tsx index b13ed33d04..db7628777a 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector/model-update-action.tsx +++ b/studio/frontend/src/components/assistant-ui/model-selector/model-update-action.tsx @@ -1,20 +1,12 @@ // SPDX-License-Identifier: AGPL-3.0-only // Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 -import { - UpdateConfirmDialog, - ggufVariantsMatch, - subscribeJobListeners, -} from "@/features/hub"; +import { subscribeJobListeners } from "@/features/hub/download-manager"; +import { UpdateConfirmDialog } from "@/features/hub/catalog/download-card"; +import { ggufVariantsMatch } from "@/features/hub/lib/model-identity"; import { cn } from "@/lib/utils"; import { RefreshCw } from "lucide-react"; -import { - type ReactNode, - useCallback, - useEffect, - useRef, - useState, -} from "react"; +import { useCallback, useEffect, useRef, useState, type ReactNode } from "react"; import { toast } from "sonner"; interface ModelUpdateActionProps { @@ -50,10 +42,10 @@ export function ModelUpdateAction({ }: ModelUpdateActionProps) { const [open, setOpen] = useState(false); + // Refresh the caller when this repo+variant's download finishes so the "update available" cue + // clears. A ref keeps the subscription stable across renders. const onUpdatedRef = useRef(onUpdated); - useEffect(() => { - onUpdatedRef.current = onUpdated; - }, [onUpdated]); + onUpdatedRef.current = onUpdated; useEffect(() => { return subscribeJobListeners("model", repoId, { onComplete: (completedVariant) => { @@ -91,8 +83,7 @@ export function ModelUpdateAction({ disabled={disabled} className={cn( "shrink-0 rounded-md p-1.5 text-muted-foreground/60 transition-colors hover:bg-amber-500/10 hover:text-amber-700 dark:hover:bg-amber-500/15 dark:hover:text-amber-300", - disabled && - "cursor-not-allowed opacity-40 hover:bg-transparent hover:text-muted-foreground/60", + disabled && "cursor-not-allowed opacity-40 hover:bg-transparent hover:text-muted-foreground/60", buttonClassName, )} > diff --git a/studio/frontend/src/features/model-picker/components/model-selector/model-usage.ts b/studio/frontend/src/components/assistant-ui/model-selector/model-usage.ts similarity index 93% rename from studio/frontend/src/features/model-picker/components/model-selector/model-usage.ts rename to studio/frontend/src/components/assistant-ui/model-selector/model-usage.ts index c6665e7658..dbcd4b9a1b 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector/model-usage.ts +++ b/studio/frontend/src/components/assistant-ui/model-selector/model-usage.ts @@ -40,8 +40,7 @@ export function loadedAt(times: ModelLoadTimes, id: string): number { export function useModelLoadTimes(currentValue?: string): ModelLoadTimes { const [times, setTimes] = useState(() => readLoadTimes()); useEffect(() => { - if (!currentValue) return; - queueMicrotask(() => setTimes(recordModelLoaded(currentValue))); + if (currentValue) setTimes(recordModelLoaded(currentValue)); }, [currentValue]); return times; } diff --git a/studio/frontend/src/features/model-picker/components/model-selector/pickers.tsx b/studio/frontend/src/components/assistant-ui/model-selector/pickers.tsx similarity index 89% rename from studio/frontend/src/features/model-picker/components/model-selector/pickers.tsx rename to studio/frontend/src/components/assistant-ui/model-selector/pickers.tsx index 1569ca0581..8e06181585 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector/pickers.tsx +++ b/studio/frontend/src/components/assistant-ui/model-selector/pickers.tsx @@ -10,46 +10,49 @@ import { TooltipTrigger, } from "@/components/ui/tooltip"; import { usePlatformStore } from "@/config/env"; -import { ApiProviderLogo } from "@/features/chat"; +import { ApiProviderLogo } from "@/features/chat/api-provider-logo"; import { type ScanFolderInfo, addScanFolder, deleteCachedModel, deleteFineTunedModel, + listCachedGguf, + listCachedModels, listGgufVariants, + listLocalModels, listRecommendedFolders, listScanFolders, removeScanFolder, -} from "@/features/chat"; -import { useChatRuntimeStore } from "@/features/chat"; +} from "@/features/chat/api/chat-api"; +import { useChatRuntimeStore } from "@/features/chat/stores/chat-runtime-store"; import type { CachedGgufRepo, CachedModelRepo, - GgufVariantDetail, LocalModelInfo, -} from "@/features/chat"; +} from "@/features/chat/api/chat-api"; +import type { GgufVariantDetail } from "@/features/chat/types/api"; +import { DotTag } from "@/features/hub/catalog/dot-tag"; import { - DotTag, type HubOption, HubOptionMenu, - TrainIcon, - TransportConflictDialog, - useHubInfiniteScroll, -} from "@/features/hub"; +} from "@/features/hub/catalog/hub-option-menu"; +import { TransportConflictDialog } from "@/features/hub/catalog/transport-conflict-dialog"; +import { TrainIcon } from "@/features/hub/components/train-icon"; +import { useHubInfiniteScroll } from "@/features/hub/hooks/use-hub-infinite-scroll"; import { type HfModelResult, type HfSortKey, useHubModelSearch, -} from "@/features/hub"; +} from "@/features/hub/hooks/use-hub-model-search"; +import { useOnlineStatus } from "@/features/hub/hooks/use-online-status"; +import { isHiddenModelId } from "@/features/hub/lib/hidden-models"; +import { classifyUnslothSupport } from "@/features/hub/lib/unsloth-support"; +import { useHfTokenStore } from "@/features/hub/stores/hf-token-store"; import { - classifyUnslothSupport, downloadManager, - isHiddenModelId, jobKeyOf, useDownloadManagerStore, - useHfTokenStore, - useOnlineStatus, -} from "@/features/hub"; +} from "@/features/hub/download-manager"; import { useDebouncedValue, useGpuInfo } from "@/hooks"; import { extractParamLabel } from "@/lib/model-size"; import { toast } from "@/lib/toast"; @@ -82,7 +85,6 @@ import { useRef, useState, } from "react"; -import { useChatPickerInventory } from "../../inventory/use-chat-picker-inventory"; import { FolderBrowser } from "./folder-browser"; import { type ModelCapabilities, @@ -90,8 +92,8 @@ import { hasAnyCapability, } from "./model-capabilities"; import { ModelDeleteAction } from "./model-delete-action"; -import { ModelLoadSettingsAction } from "./model-load-settings-action"; import { ModelUpdateAction } from "./model-update-action"; +import { ModelLoadSettingsAction } from "./model-load-settings-action"; import { type ModelLoadTimes, loadedAt, @@ -657,7 +659,6 @@ function GgufVariantExpander({ parentOptionKey, onNavigatePastStart, onNavigatePastEnd, - onConfigure, sourceOverride, variantActions, onDevice = false, @@ -673,7 +674,6 @@ function GgufVariantExpander({ parentOptionKey?: string; onNavigatePastStart?: () => void; onNavigatePastEnd?: () => void; - onConfigure?: (id: string, meta: ModelSelectorChangeMeta) => void; sourceOverride?: ModelSelectorChangeMeta["source"]; /** Update/delete actions for cached variant rows. Omitted by browse-only * expanders (Recommended, etc.) that don't manage on-disk variants. */ @@ -715,11 +715,8 @@ function GgufVariantExpander({ useEffect(() => { let canceled = false; - queueMicrotask(() => { - if (canceled) return; - setLoading(true); - setError(null); - }); + setLoading(true); + setError(null); listGgufVariants(repoId, hfToken) .then((res) => { @@ -747,7 +744,7 @@ function GgufVariantExpander({ }, [repoId, refreshKey, hfToken]); // Covers Unix absolute (/), Windows drive (C:\, D:/), UNC (\\server), relative (./, ../), tilde (~/) - const isLocalPath = /^(\/|\.{1,2}[\\/]|~[\\/]|[A-Za-z]:[\\/]|\\\\)/.test( + const isLocalPath = /^(\/|\.{1,2}[\\\/]|~[\\\/]|[A-Za-z]:[\\\/]|\\\\)/.test( repoId, ); @@ -756,7 +753,8 @@ function GgufVariantExpander({ // Only seed the staged context for picks whose weights are already on // disk. The staging effect short-circuits on a known contextLength // (pendingHasContext) before starting the download, so attaching it to an - // undownloaded quant from a partially cached repo would skip the download. + // undownloaded quant from a partially cached repo would skip the download + // entirely (and, with Load on selection, never load). const isAvailable = isLocalPath || downloaded === true; onSelect(repoId, { source: sourceOverride ?? (isLocalPath ? "local" : "hub"), @@ -989,8 +987,7 @@ function GgufVariantExpander({ This will update{" "} {repoId} ({v.quant}) - - {"."} + {"."} ) } @@ -1003,20 +1000,12 @@ function GgufVariantExpander({ onUpdated={() => setRefreshKey((key) => key + 1)} /> )} - {v.downloaded && onConfigure && ( + {v.downloaded && ( - onConfigure(repoId, { - source: sourceOverride ?? (isLocalPath ? "local" : "hub"), - isLora: false, - ggufVariant: v.quant, - isDownloaded: true, - expectedBytes, - contextLength: nativeContext, - isGguf: true, - }) - } + repoId={repoId} + quant={v.quant} + maxContext={nativeContext} /> )} {v.downloaded && onDeleteVariant && ( @@ -1220,19 +1209,6 @@ function localPathTooltip(name: string, path: string): ReactNode { ); } -function localModelMeta(isGguf = false): ModelSelectorChangeMeta { - return { - source: "local", - isLora: false, - isDownloaded: true, - ...(isGguf ? { isGguf: true } : {}), - }; -} - -function localDirectGgufMeta(): ModelSelectorChangeMeta { - return localModelMeta(true); -} - /** Hugging Face address for an online/Hub row, or undefined when the repo id is * missing so the row shows no (empty) address line on hover. */ function hubRepoUrl(id: string | null | undefined): string | undefined { @@ -1243,7 +1219,9 @@ function hubRepoUrl(id: string | null | undefined): string | undefined { /** Whether a local model is an MLX build (name hint). MLX runs on Mac only, so * callers gate visibility on the host being a Mac. */ function localModelIsMlx(m: LocalModelInfo): boolean { - return isMlxId(m.id) || isMlxId(m.display_name) || isMlxId(m.model_id ?? ""); + return ( + isMlxId(m.id) || isMlxId(m.display_name) || isMlxId(m.model_id ?? "") + ); } /** Whether a local model matches the format toggle (GGUF detected by name/path). */ @@ -1267,7 +1245,6 @@ export function HubModelPicker({ onFoldersChange, onBrowseHub, onModelsChange, - onConfigure, deleteDisabled = false, section = "downloaded", sectionToggle, @@ -1284,12 +1261,12 @@ export function HubModelPicker({ /** Open the full Hub page to browse more models. */ onBrowseHub?: () => void; onModelsChange?: (deletedModel?: DeletedModelRef) => void; - onConfigure?: (id: string, meta: ModelSelectorChangeMeta) => void; deleteDisabled?: boolean; /** Section shown when not searching. Search spans all sections. */ section?: "downloaded" | "recommended" | "custom" | "connected"; /** Section toggle rendered under the search bar. */ sectionToggle?: ReactNode; + /** Eject the loaded model. Rendered as the last list row when set. */ onEject?: () => void; }) { const gpu = useGpuInfo(); @@ -1390,14 +1367,12 @@ export function HubModelPicker({ const setFitOnDeviceOnly = useChatRuntimeStore((s) => s.setFitOnDeviceOnly); // Repos the user clicked to collapse while expand-by-default is on. Kept in // memory only, so it resets on reload (and when the setting is toggled). - const [collapsedGgufState, setCollapsedGgufState] = useState<{ - expandQuantizations: boolean; - value: Set; - }>(() => ({ expandQuantizations, value: new Set() })); - const collapsedGguf = - collapsedGgufState.expandQuantizations === expandQuantizations - ? collapsedGgufState.value - : new Set(); + const [collapsedGguf, setCollapsedGguf] = useState>( + () => new Set(), + ); + useEffect(() => { + setCollapsedGguf(new Set()); + }, [expandQuantizations]); const isGgufExpanded = useCallback( (id: string) => expandQuantizations ? !collapsedGguf.has(id) : expandedGguf === id, @@ -1408,15 +1383,11 @@ export function HubModelPicker({ const toggleGgufExpanded = useCallback( (id: string) => { if (expandQuantizations) { - setCollapsedGgufState((prev) => { - const current = - prev.expandQuantizations === expandQuantizations - ? prev.value - : new Set(); - const next = new Set(current); + setCollapsedGguf((prev) => { + const next = new Set(prev); if (next.has(id)) next.delete(id); else next.add(id); - return { expandQuantizations, value: next }; + return next; }); } else { setExpandedGguf((prev) => (prev === id ? null : id)); @@ -1476,37 +1447,15 @@ export function HubModelPicker({ }); }, []); - const pickerInventory = useChatPickerInventory({ enabled: true }); - const { cachedGguf, cachedModels, cachedReady, refreshInventory } = - pickerInventory; - const lmStudioModels = useMemo( - () => - sortLmStudio( - pickerInventory.localModels.filter((m) => m.source === "lmstudio"), - ), - [pickerInventory.localModels], - ); - const localDirModels = useMemo( - () => pickerInventory.localModels.filter((m) => m.source === "models_dir"), - [pickerInventory.localModels], - ); - const customFolderModels = useMemo( - () => pickerInventory.localModels.filter((m) => m.source === "custom"), - [pickerInventory.localModels], - ); - useEffect(() => { - _cachedGgufCache = cachedGguf; - _cachedModelsCache = cachedModels; - _lmStudioCache = lmStudioModels; - _localDirCache = localDirModels; - _customFolderCache = customFolderModels; - }, [ - cachedGguf, - cachedModels, - lmStudioModels, - localDirModels, - customFolderModels, - ]); + // Cached (downloaded) repos -- module-level cache avoids flashing an + // empty "Downloaded" section when the popover re-mounts. + const [cachedGguf, setCachedGguf] = + useState(_cachedGgufCache); + const [cachedModels, setCachedModels] = + useState(_cachedModelsCache); + const alreadyCached = + _cachedGgufCache.length > 0 || _cachedModelsCache.length > 0; + const [cachedReady, setCachedReady] = useState(alreadyCached); const [updateConflictKey, setUpdateConflictKey] = useState( null, ); @@ -1530,6 +1479,16 @@ export function HubModelPicker({ setUpdateConflictKey(null); }, [updateConflictKey]); + // LM Studio local models -- module-level cache, same pattern as above. + const [lmStudioModels, setLmStudioModels] = + useState(_lmStudioCache); + // Models found under the local models directory (./models), so they stay + // selectable on the On Device tab after leaving the Fine-tuned tab. + const [localDirModels, setLocalDirModels] = + useState(_localDirCache); + const [customFolderModels, setCustomFolderModels] = + useState(_customFolderCache); + // Custom scan folders management const [scanFolders, setScanFolders] = useState(_scanFoldersCache); @@ -1541,8 +1500,22 @@ export function HubModelPicker({ const [recommendedFolders, setRecommendedFolders] = useState([]); const refreshLocalModelsList = useCallback(() => { - void pickerInventory.refreshInventory(); - }, [pickerInventory.refreshInventory]); + listLocalModels() + .then((res) => { + const lm = sortLmStudio( + res.models.filter((m) => m.source === "lmstudio"), + ); + _lmStudioCache = lm; + setLmStudioModels(lm); + const ld = res.models.filter((m) => m.source === "models_dir"); + _localDirCache = ld; + setLocalDirModels(ld); + const cf = res.models.filter((m) => m.source === "custom"); + _customFolderCache = cf; + setCustomFolderModels(cf); + }) + .catch(() => {}); + }, []); const refreshScanFolders = useCallback(() => { listScanFolders() @@ -1621,37 +1594,39 @@ export function HubModelPicker({ ); const refreshCachedLists = useCallback(() => { - void pickerInventory.refreshInventory(); - }, [pickerInventory.refreshInventory]); + listCachedGguf() + .then((v) => { + _cachedGgufCache = v; + setCachedGguf(v); + }) + .catch(() => {}); + listCachedModels(hfToken || undefined) + .then((v) => { + _cachedModelsCache = v; + setCachedModels(v); + }) + .catch(() => {}); + refreshLocalModelsList(); + }, [hfToken, refreshLocalModelsList]); // Updates run as managed downloads (Downloads panel: progress + Cancel), not a blocking // call. The worker pulls only changed blobs, so the cached copy stays usable until done. - const startManagedUpdate = useCallback( - (repoId: string, variant: string, expectedBytes: number) => { - return downloadManager - .requestStart({ - kind: "model", - repoId, - variant, - expectedBytes, - }) - .then((outcome) => { - if (outcome === "conflict") { - setUpdateConflictKey(jobKeyOf("model", repoId, variant)); - } else if (outcome === "busy") { - // A sibling variant/snapshot for this repo is already downloading, - // so this update did not start. Say so instead of closing the - // dialog as if it began and leaving the cached copy stale. - toast.info("A download for this model is already in progress", { - description: "Try updating again once it finishes.", - }); - } else if (outcome === "error") { - throw new Error("Failed to start update"); - } - }); - }, - [], - ); + const startManagedUpdate = useCallback((repoId: string, variant: string, expectedBytes: number) => { + return downloadManager + .requestStart({ + kind: "model", + repoId, + variant, + expectedBytes, + }) + .then((outcome) => { + if (outcome === "conflict") { + setUpdateConflictKey(jobKeyOf("model", repoId, variant)); + } else if (outcome === "error") { + throw new Error("Failed to start update"); + } + }); + }, []); const updateGgufVariant = useCallback( (repoId: string, quant: string, expectedBytes: number) => @@ -1660,15 +1635,36 @@ export function HubModelPicker({ ); useEffect(() => { + // Always refresh LM Studio + custom folder models (not gated by alreadyCached). + refreshLocalModelsList(); refreshScanFolders(); listRecommendedFolders() .then(setRecommendedFolders) .catch(() => {}); - }, [refreshScanFolders]); - useEffect(() => { - void refreshInventory(); - }, [refreshInventory]); + // Always refetch cached GGUF/model lists. The module-level caches render + // instantly with stale data (no spinner flash), but newly downloaded + // repos need a fresh backend hit. cachedReady=alreadyCached initially, + // so the background refresh is invisible when we already had data. + let done = 0; + const check = () => { + if (++done >= 2) setCachedReady(true); + }; + listCachedGguf() + .then((v) => { + _cachedGgufCache = v; + setCachedGguf(v); + }) + .catch(() => {}) + .finally(check); + listCachedModels(hfToken || undefined) + .then((v) => { + _cachedModelsCache = v; + setCachedModels(v); + }) + .catch(() => {}) + .finally(check); + }, [hfToken, refreshLocalModelsList, refreshScanFolders]); // Hide downloaded models from the recommended list. Case-insensitive // since the HF cache lowercases repo IDs. @@ -1705,8 +1701,7 @@ export function HubModelPicker({ // Chat-only keeps runnable formats: GGUF anywhere, plus MLX/safetensors // on Mac (matches the empty Recommended view so search stays consistent). .filter( - (id) => - !chatOnly || isRecommendableFormat(id, isKnownGgufRepo(id), isMac), + (id) => !chatOnly || isRecommendableFormat(id, isKnownGgufRepo(id), isMac), ) .filter((id) => !/-FP8[-.]|FP8-Dynamic/i.test(id)); // Sort: GGUFs first, then hub models @@ -2057,8 +2052,7 @@ export function HubModelPicker({ // Chat-only keeps runnable formats: GGUF anywhere, plus MLX/safetensors // on Mac (matches the empty Recommended view so search stays consistent). .filter( - (id) => - !chatOnly || isRecommendableFormat(id, isKnownGgufRepo(id), isMac), + (id) => !chatOnly || isRecommendableFormat(id, isKnownGgufRepo(id), isMac), ) .filter((id) => !/-FP8[-.]|FP8-Dynamic/i.test(id)) .filter((id) => @@ -2514,7 +2508,6 @@ export function HubModelPicker({ onDevice={true} onHasVision={(v) => reportVision(c.repo_id, v)} onSelect={onSelect} - onConfigure={onConfigure} hfToken={hfToken || undefined} parentOptionKey={optionKey} onNavigatePastStart={() => hubModelList.focusOption(optionKey)} @@ -2524,6 +2517,7 @@ export function HubModelPicker({ variantActions={{ onUpdate: (quant, expectedBytes) => updateGgufVariant(c.repo_id, quant, expectedBytes), + // Can't update the model that's live in memory under itself. updateDisabled: loadedModelId === c.repo_id, onDelete: async (quant) => { await deleteCachedModel(c.repo_id, quant); @@ -2568,19 +2562,6 @@ export function HubModelPicker({ className={downloadedRowButtonClassName} />
- {onConfigure && ( - - onConfigure(c.repo_id, { - source: "hub", - isLora: false, - isDownloaded: true, - isGguf: false, - }) - } - /> - )} + {/* Clear space for the floating Eject pill when scrolled to the end, so + its gap above the last row matches its gap below (applies to every + section, including Recommended). */}
- + Custom Folders
@@ -3160,70 +3140,54 @@ export function HubModelPicker({ ); return (
-
-
- { - if (isDirectGguf) { - onSelect(m.id, localDirectGgufMeta()); - } else if (isGguf) { - toggleGgufExpanded(m.id); - } else { - onSelect(m.id, localModelMeta()); + { + if (isDirectGguf) { + onSelect(m.id, { + source: "local", + isLora: false, + isDownloaded: true, + // Mark GGUF so "Load on selection = off" stages + // through Run settings (matches LM Studio path). + isGguf: true, + }); + } else if (isGguf) { + toggleGgufExpanded(m.id); + } else { + onSelect(m.id, { + source: "local", + isLora: false, + isDownloaded: true, + }); + } + }} + onArrowDownIntoChildren={ + isGguf && !isDirectGguf && isGgufExpanded(m.id) + ? () => { + const focused = + focusFirstChildOption(optionKey); + return focused; } - }} - onArrowDownIntoChildren={ - isGguf && - !isDirectGguf && - isGgufExpanded(m.id) - ? () => { - const focused = - focusFirstChildOption(optionKey); - return focused; - } - : undefined - } - vramStatus={null} - /> -
- {isDirectGguf && onConfigure && ( - - onConfigure(m.id, localDirectGgufMeta()) - } - /> - )} - {!isGguf && onConfigure && ( - - onConfigure(m.id, localModelMeta()) - } - /> - )} -
+ : undefined + } + vramStatus={null} + /> {isGguf && !isDirectGguf && isGgufExpanded(m.id) && ( hubModelList.focusOption(optionKey) @@ -3234,9 +3198,7 @@ export function HubModelPicker({ gpuGb={ gpu.available ? gpu.memoryTotalGb : undefined } - systemRamGb={ - gpu.systemRamAvailableGb || undefined - } + systemRamGb={gpu.systemRamAvailableGb || undefined} /> )}
@@ -3271,68 +3233,52 @@ export function HubModelPicker({ const optionKey = makeModelOptionKey("lm-studio", m.id); return (
-
-
- { - if (isGgufFile) { - onSelect(m.id, localDirectGgufMeta()); - } else if (isGguf) { - toggleGgufExpanded(m.id); - } else { - onSelect(m.id, localModelMeta()); + { + if (isGgufFile) { + onSelect(m.id, { + source: "local", + isLora: false, + isDownloaded: true, + isGguf: true, + }); + } else if (isGguf) { + toggleGgufExpanded(m.id); + } else { + onSelect(m.id, { + source: "local", + isLora: false, + isDownloaded: true, + }); + } + }} + onArrowDownIntoChildren={ + isGguf && !isGgufFile && isGgufExpanded(m.id) + ? () => { + const focused = + focusFirstChildOption(optionKey); + return focused; } - }} - onArrowDownIntoChildren={ - isGguf && !isGgufFile && isGgufExpanded(m.id) - ? () => { - const focused = - focusFirstChildOption(optionKey); - return focused; - } - : undefined - } - vramStatus={null} - /> -
- {isGgufFile && onConfigure && ( - - onConfigure(m.id, localDirectGgufMeta()) - } - /> - )} - {!isGguf && onConfigure && ( - - onConfigure(m.id, localModelMeta()) - } - /> - )} -
+ : undefined + } + vramStatus={null} + /> {isGguf && !isGgufFile && isGgufExpanded(m.id) && ( hubModelList.focusOption(optionKey) @@ -3343,9 +3289,7 @@ export function HubModelPicker({ gpuGb={ gpu.available ? gpu.memoryTotalGb : undefined } - systemRamGb={ - gpu.systemRamAvailableGb || undefined - } + systemRamGb={gpu.systemRamAvailableGb || undefined} /> )}
@@ -3374,64 +3318,48 @@ export function HubModelPicker({ const optionKey = makeModelOptionKey("local-dir", m.id); return (
-
-
- { - if (isGgufFile) { - onSelect(m.id, localDirectGgufMeta()); - } else if (isGguf) { - toggleGgufExpanded(m.id); - } else { - onSelect(m.id, localModelMeta()); - } - }} - onArrowDownIntoChildren={ - isGguf && !isGgufFile && isGgufExpanded(m.id) - ? () => focusFirstChildOption(optionKey) - : undefined - } - vramStatus={null} - /> -
- {isGgufFile && onConfigure && ( - - onConfigure(m.id, localDirectGgufMeta()) - } - /> + - onConfigure(m.id, localModelMeta()) - } - /> + selected={value === m.id} + optionProps={hubModelList.getOptionProps( + optionKey, + value === m.id, )} -
+ onClick={() => { + if (isGgufFile) { + onSelect(m.id, { + source: "local", + isLora: false, + isDownloaded: true, + isGguf: true, + }); + } else if (isGguf) { + toggleGgufExpanded(m.id); + } else { + onSelect(m.id, { + source: "local", + isLora: false, + isDownloaded: true, + }); + } + }} + onArrowDownIntoChildren={ + isGguf && !isGgufFile && isGgufExpanded(m.id) + ? () => focusFirstChildOption(optionKey) + : undefined + } + vramStatus={null} + /> {isGguf && !isGgufFile && isGgufExpanded(m.id) && ( hubModelList.focusOption(optionKey) @@ -3442,9 +3370,7 @@ export function HubModelPicker({ gpuGb={ gpu.available ? gpu.memoryTotalGb : undefined } - systemRamGb={ - gpu.systemRamAvailableGb || undefined - } + systemRamGb={gpu.systemRamAvailableGb || undefined} /> )}
@@ -3514,7 +3440,6 @@ export function HubModelPicker({ @@ -3526,9 +3451,7 @@ export function HubModelPicker({ gpuGb={ gpu.available ? gpu.memoryTotalGb : undefined } - systemRamGb={ - gpu.systemRamAvailableGb || undefined - } + systemRamGb={gpu.systemRamAvailableGb || undefined} variantActions={{ onDelete: async (quant) => { await deleteCachedModel(id, quant); @@ -3588,14 +3511,10 @@ export function HubModelPicker({ } }} vramStatus={ - isKnownGgufRepo(id) - ? null - : (vram?.status ?? null) + isKnownGgufRepo(id) ? null : (vram?.status ?? null) } vramEst={isKnownGgufRepo(id) ? undefined : vram?.est} - gpuGb={ - gpu.available ? gpu.memoryTotalGb : undefined - } + gpuGb={gpu.available ? gpu.memoryTotalGb : undefined} onArrowDownIntoChildren={ expandedGguf === id ? () => { @@ -3610,7 +3529,6 @@ export function HubModelPicker({ @@ -3622,9 +3540,7 @@ export function HubModelPicker({ gpuGb={ gpu.available ? gpu.memoryTotalGb : undefined } - systemRamGb={ - gpu.systemRamAvailableGb || undefined - } + systemRamGb={gpu.systemRamAvailableGb || undefined} variantActions={{ onDelete: async (quant) => { await deleteCachedModel(id, quant); @@ -3704,7 +3620,6 @@ export function HubModelPicker({ @@ -3716,9 +3631,7 @@ export function HubModelPicker({ gpuGb={ gpu.available ? gpu.memoryTotalGb : undefined } - systemRamGb={ - gpu.systemRamAvailableGb || undefined - } + systemRamGb={gpu.systemRamAvailableGb || undefined} variantActions={{ onDelete: async (quant) => { await deleteCachedModel(id, quant); @@ -3743,6 +3656,8 @@ export function HubModelPicker({ )}
+ {/* Floating eject pill: overlaid on the list bottom, outside the scroll + so the edge fade never touches it. Only the pill catches clicks. */} {onEject ? (
- {canConfigure && onConfigure && ( - onConfigure(adapter.id, selectionMeta)} - /> - )} {canDelete && ( loraModelList.focusOption(optionKey)} onNavigatePastEnd={() => diff --git a/studio/frontend/src/features/model-picker/components/model-selector/pill-tabs.tsx b/studio/frontend/src/components/assistant-ui/model-selector/pill-tabs.tsx similarity index 98% rename from studio/frontend/src/features/model-picker/components/model-selector/pill-tabs.tsx rename to studio/frontend/src/components/assistant-ui/model-selector/pill-tabs.tsx index fbc1d5ac91..e6da8a7b74 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector/pill-tabs.tsx +++ b/studio/frontend/src/components/assistant-ui/model-selector/pill-tabs.tsx @@ -78,8 +78,7 @@ export function PillTabs({ onValueChange(tabs[next].value); e.currentTarget.parentElement ?.querySelectorAll('button[role="tab"]') - .item(next) - ?.focus(); + [next]?.focus(); }} onClick={() => onValueChange(tab.value)} className={cn( diff --git a/studio/frontend/src/features/model-picker/components/model-selector/recommended-fit.ts b/studio/frontend/src/components/assistant-ui/model-selector/recommended-fit.ts similarity index 100% rename from studio/frontend/src/features/model-picker/components/model-selector/recommended-fit.ts rename to studio/frontend/src/components/assistant-ui/model-selector/recommended-fit.ts diff --git a/studio/frontend/src/components/assistant-ui/model-selector/remembered-load-settings.ts b/studio/frontend/src/components/assistant-ui/model-selector/remembered-load-settings.ts new file mode 100644 index 0000000000..ec75b17f20 --- /dev/null +++ b/studio/frontend/src/components/assistant-ui/model-selector/remembered-load-settings.ts @@ -0,0 +1,69 @@ +// SPDX-License-Identifier: AGPL-3.0-only +// Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 + +// Per-model pre-load inference settings, persisted in localStorage so the load +// dialog can offer "Remember settings for ". + +const KEY = "unsloth_load_settings"; + +export interface RememberedLoadSettings { + contextLength: number | null; + kvCacheDtype: string | null; + speculativeType: string | null; + specDraftNMax: number | null; + tensorParallel: boolean; +} + +// Storage key for a pick's remembered settings. The remembered knobs are +// VRAM-budget driven (context override, KV-cache dtype, tensor-parallel), so the +// right values differ per quant. An HF repo collapses all its GGUF variants into +// one `id`, so fold the variant in to scope settings per quant. Local .gguf +// paths key by their file path (already file-specific); native drag-drop files +// key by display label, so same-named files in different folders share an entry. +export function rememberedLoadSettingsKey(selection: { + id: string; + ggufVariant?: string | null; +}): string { + return selection.ggufVariant + ? `${selection.id}::${selection.ggufVariant}` + : selection.id; +} + +function readAll(): Record { + try { + return JSON.parse(localStorage.getItem(KEY) ?? "{}"); + } catch { + return {}; + } +} + +function writeAll(all: Record) { + try { + localStorage.setItem(KEY, JSON.stringify(all)); + } catch { + // Ignore quota / unavailable storage. + } +} + +export function loadRememberedLoadSettings( + key: string, +): RememberedLoadSettings | null { + return readAll()[key] ?? null; +} + +export function saveRememberedLoadSettings( + key: string, + settings: RememberedLoadSettings, +) { + const all = readAll(); + all[key] = settings; + writeAll(all); +} + +export function clearRememberedLoadSettings(key: string) { + const all = readAll(); + if (key in all) { + delete all[key]; + writeAll(all); + } +} diff --git a/studio/frontend/src/features/model-picker/components/model-selector/row-meta.ts b/studio/frontend/src/components/assistant-ui/model-selector/row-meta.ts similarity index 100% rename from studio/frontend/src/features/model-picker/components/model-selector/row-meta.ts rename to studio/frontend/src/components/assistant-ui/model-selector/row-meta.ts diff --git a/studio/frontend/src/features/model-picker/components/model-selector/source-tabs.ts b/studio/frontend/src/components/assistant-ui/model-selector/source-tabs.ts similarity index 100% rename from studio/frontend/src/features/model-picker/components/model-selector/source-tabs.ts rename to studio/frontend/src/components/assistant-ui/model-selector/source-tabs.ts diff --git a/studio/frontend/src/features/model-picker/components/model-selector/types.ts b/studio/frontend/src/components/assistant-ui/model-selector/types.ts similarity index 76% rename from studio/frontend/src/features/model-picker/components/model-selector/types.ts rename to studio/frontend/src/components/assistant-ui/model-selector/types.ts index dae072236b..6a86515267 100644 --- a/studio/frontend/src/features/model-picker/components/model-selector/types.ts +++ b/studio/frontend/src/components/assistant-ui/model-selector/types.ts @@ -2,7 +2,6 @@ // Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 import type { ReactNode } from "react"; -import type { PerModelConfig } from "../../model-config/per-model-config"; export interface ModelOption { id: string; @@ -37,18 +36,6 @@ export interface ModelSelectorChangeMeta { /** Direct local .gguf file picked without a variant (custom folder / LM * Studio). Marks it as a GGUF source for the deferred-load staging flow. */ isGguf?: boolean; - config?: PerModelConfig; - forceReload?: boolean; - /** Native path token so an active-model reload can reopen a file-picked GGUF. */ - nativePathToken?: string; -} - -export interface ModelPickTarget { - id: string; - displayName: string; - ggufVariant?: string | null; - isGguf: boolean; - meta: ModelSelectorChangeMeta; } export interface DeletedModelRef { diff --git a/studio/frontend/src/features/chat/api/chat-adapter.ts b/studio/frontend/src/features/chat/api/chat-adapter.ts index d3bdcb6898..0bf46e7343 100644 --- a/studio/frontend/src/features/chat/api/chat-adapter.ts +++ b/studio/frontend/src/features/chat/api/chat-adapter.ts @@ -2,7 +2,10 @@ // Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 import { getAuthToken } from "@/features/auth"; -import { resolveInitialConfig } from "@/features/model-picker"; +import { + loadRememberedLoadSettings, + rememberedLoadSettingsKey, +} from "@/components/assistant-ui/model-selector/remembered-load-settings"; import { projectHasSources } from "@/features/rag/api/rag-api"; import { apiUrl } from "@/lib/api-base"; import { parseParamCountB } from "@/lib/model-size"; @@ -1517,25 +1520,27 @@ async function autoLoadSmallestModel(): Promise<{ return false; } const currentStore = useChatRuntimeStore.getState(); - const { config } = resolveInitialConfig(candidate.id, candidate.ggufVariant); + const remembered = loadRememberedLoadSettings( + rememberedLoadSettingsKey({ + id: candidate.id, + ggufVariant: candidate.ggufVariant, + }), + ); const effectiveMaxSeqLength = resolveLoadMaxSeqLength({ modelId: candidate.id, ggufVariant: candidate.ggufVariant, isGguf: candidate.kind === "gguf", - customContextLength: config.customContextLength, + customContextLength: remembered?.contextLength ?? null, ggufContextLength: null, currentCheckpoint: currentStore.params.checkpoint, activeGgufVariant: currentStore.activeGgufVariant, - maxSeqLength: config.maxSeqLength ?? candidate.maxSeqLength, + maxSeqLength: candidate.maxSeqLength, presetSource: currentStore.activePresetSource, }); const effectiveSpeculativeType = - config.speculativeType ?? specSettings.speculativeType; + remembered?.speculativeType ?? specSettings.speculativeType; const effectiveSpecDraftNMax = - config.specDraftNMax ?? specSettings.specDraftNMax; - const effectiveChatTemplateOverride = config.chatTemplateOverride?.trim() - ? config.chatTemplateOverride - : null; + remembered?.specDraftNMax ?? specSettings.specDraftNMax; if ( !(await canAutoLoad({ model_path: candidate.id, @@ -1558,18 +1563,12 @@ async function autoLoadSmallestModel(): Promise<{ is_lora: false, gguf_variant: candidate.ggufVariant, trust_remote_code: trustRemoteCode, - chat_template_override: effectiveChatTemplateOverride, - cache_type_kv: config.kvCacheDtype, + cache_type_kv: remembered?.kvCacheDtype ?? null, speculative_type: effectiveSpeculativeType, spec_draft_n_max: effectiveSpecDraftNMax, - tensor_parallel: config.tensorParallel, + tensor_parallel: remembered?.tensorParallel ?? false, }); - // Only persist the global preference when the value came from the global - // settings. A per-model config's choice must stay load-local, or autoloading - // a remembered model on startup would rewrite the global default. - if (config.speculativeType == null) { - saveSpeculativeType(effectiveSpeculativeType); - } + saveSpeculativeType(effectiveSpeculativeType); useChatRuntimeStore .getState() .setCheckpoint(candidate.id, candidate.ggufVariant ?? undefined); @@ -1579,9 +1578,6 @@ async function autoLoadSmallestModel(): Promise<{ ); store.setParams({ ...store.params, - ...(candidate.kind === "gguf" - ? {} - : { maxSeqLength: effectiveMaxSeqLength }), maxTokens: candidate.kind === "gguf" ? loadResp.context_length ?? 131072 @@ -1618,11 +1614,8 @@ async function autoLoadSmallestModel(): Promise<{ tensorParallel: loadResp.tensor_parallel ?? false, loadedTensorParallel: loadResp.tensor_parallel ?? false, defaultChatTemplate: loadResp.chat_template ?? null, - chatTemplateOverride: effectiveChatTemplateOverride, - loadedChatTemplateOverride: effectiveChatTemplateOverride, - // Retain the saved requested context so re-saving the config keeps the - // override; null stays null (auto/VRAM-fit). - customContextLength: config.customContextLength, + chatTemplateOverride: null, + loadedChatTemplateOverride: null, loadedIsMultimodal: isMultimodalResponse(loadResp), loadedIsDiffusion: loadResp.is_diffusion ?? false, ...resolveLoadedSpeculativeSettings(loadResp), @@ -1641,9 +1634,8 @@ async function autoLoadSmallestModel(): Promise<{ tensorParallel: loadResp.tensor_parallel ?? false, loadedTensorParallel: loadResp.tensor_parallel ?? false, defaultChatTemplate: loadResp.chat_template ?? null, - chatTemplateOverride: effectiveChatTemplateOverride, - loadedChatTemplateOverride: effectiveChatTemplateOverride, - customContextLength: null, + chatTemplateOverride: null, + loadedChatTemplateOverride: null, ...resolveLoadedSpeculativeSettings(loadResp), loadedIsMultimodal: isMultimodalResponse(loadResp), loadedIsDiffusion: loadResp.is_diffusion ?? false, diff --git a/studio/frontend/src/features/chat/chat-page.tsx b/studio/frontend/src/features/chat/chat-page.tsx index 731a551c53..380ce0e0ab 100644 --- a/studio/frontend/src/features/chat/chat-page.tsx +++ b/studio/frontend/src/features/chat/chat-page.tsx @@ -2,18 +2,16 @@ // Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 import { - applyModelLoadConfigToRuntime, - currentRuntimePerModelConfig, type DeletedModelRef, type ExternalModelOption, type LoraModelOption, type ModelOption, ModelSelector, - type ModelSelectorChangeMeta, - type PerModelConfig, - resolveInitialConfig, - SidebarModelConfig, -} from "@/features/model-picker"; +} from "@/components/assistant-ui/model-selector"; +import { + loadRememberedLoadSettings, + rememberedLoadSettingsKey, +} from "@/components/assistant-ui/model-selector/remembered-load-settings"; import { ProjectComposer, Thread } from "@/components/assistant-ui/thread"; import { CopyableErrorChip } from "@/components/ui/copyable-error-chip"; import { @@ -29,10 +27,10 @@ import { } from "@/components/ui/resizable"; import { useSidebar } from "@/components/ui/sidebar"; import { Tooltip, TooltipContent } from "@/components/ui/tooltip"; +import { useLatestRef } from "@/features/hub/hooks/use-latest-ref"; import { DOWNLOAD_KIND, downloadManager, - useRepoDownload, } from "@/features/hub/download-manager"; import { type NativeIntent, @@ -95,6 +93,7 @@ import { renameChatItem, useChatSidebarItems, } from "./hooks/use-chat-sidebar-items"; +import { useStagedModelPreparation } from "./hooks/use-staged-model-preparation"; import { clearTrainingCompareHandoff, getTrainingCompareHandoff, @@ -129,8 +128,10 @@ import { hasGgufSource, isDownloadableHubRepo, loadOptionalBool, + pendingSelectionMatches, useChatRuntimeStore, } from "./stores/chat-runtime-store"; +import type { PendingModelSelection } from "./stores/chat-runtime-store"; import { useChatPreferencesStore } from "./stores/chat-preferences-store"; import { useExternalProvidersStore } from "./stores/external-providers-store"; import { buildChatTourSteps } from "./tour"; @@ -384,7 +385,6 @@ type CompareModelSelection = { id: string; isLora: boolean; ggufVariant?: string; - config?: PerModelConfig; }; function modelMatchesDeleted( @@ -645,8 +645,6 @@ function GeneralCompareHeader({ loraModels, externalModels, value, - selectedConfig, - selectedGgufVariant, onValueChange, onFoldersChange, onModelsChange, @@ -657,11 +655,9 @@ function GeneralCompareHeader({ loraModels: LoraModelOption[]; externalModels: ExternalModelOption[]; value: string; - selectedConfig?: PerModelConfig | null; - selectedGgufVariant?: string | null; onValueChange: ( id: string, - meta: ModelSelectorChangeMeta, + meta: { isLora: boolean; ggufVariant?: string }, ) => void; onFoldersChange?: () => void; onModelsChange?: (deletedModel?: DeletedModelRef) => void; @@ -688,8 +684,6 @@ function GeneralCompareHeader({ loraModels={loraModels} externalModels={externalModels} value={value} - selectedConfig={selectedConfig} - selectedGgufVariant={selectedGgufVariant} onValueChange={onValueChange} onFoldersChange={onFoldersChange} onModelsChange={onModelsChange} @@ -817,14 +811,11 @@ const GeneralCompareContent = memo(function GeneralCompareContent({ loraModels={loraModels} externalModels={externalModels} value={model1.id} - selectedConfig={model1.config} - selectedGgufVariant={model1.ggufVariant} onValueChange={(id, meta) => setModel1({ id, isLora: meta.isLora, ggufVariant: meta.ggufVariant, - config: meta.config, }) } onFoldersChange={onFoldersChange} @@ -847,14 +838,11 @@ const GeneralCompareContent = memo(function GeneralCompareContent({ loraModels={loraModels} externalModels={externalModels} value={model2.id} - selectedConfig={model2.config} - selectedGgufVariant={model2.ggufVariant} onValueChange={(id, meta) => setModel2({ id, isLora: meta.isLora, ggufVariant: meta.ggufVariant, - config: meta.config, }) } onFoldersChange={onFoldersChange} @@ -1248,13 +1236,6 @@ export function validateChatSearch(search: Record): ChatSearch }; } -type PendingHubAutoLoad = { - selection: SelectedModelInput; - contextKey: string; - originCheckpoint: string; - originGgufVariant: string | null; -}; - // `search` comes from RootLayout (not useSearch) so ChatPage stays mounted off-route // (keeping an in-flight generation alive), frozen to the last /chat search. `active` // is false off-route: close body-portaled surfaces and stop route-specific listeners @@ -1267,6 +1248,30 @@ export function ChatPage({ const settingsOpen = useChatRuntimeStore((s) => s.settingsPanelOpen); const setSettingsOpen = useChatRuntimeStore((s) => s.setSettingsPanelOpen); + // Deferred-load staging: downloads a staged GGUF (if needed) and reads its + // header context so the sheet can show the context slider before the load. + // autoLoad picks instead load the cached file as soon as the download ends; + // selectModel is defined below, so the load runs through a ref. + const autoLoadStagedRef = useRef< + ((pending: PendingModelSelection) => void) | null + >(null); + const stagedDownload = useStagedModelPreparation({ + onAutoLoad: (pending) => autoLoadStagedRef.current?.(pending), + }); + // Abandon a staged pick: the store action cancels its in-flight download and + // reverts the edited knobs, so nothing lingers after the user walks away. + const abandonStaged = useCallback(() => { + useChatRuntimeStore.getState().abandonStagedModel(); + }, []); + // Detach a staged pick on navigation without cancelling its download: the + // transfer keeps running in the manager and lands in cache, like Hub. + const detachStaged = useCallback(() => { + useChatRuntimeStore.getState().abandonStagedModel({ keepDownload: true }); + }, []); + // Tracks whether the chat page is still mounted, so a staged-load failure that + // resolves after the user left chat doesn't resurrect the abandoned pick. + const mountedRef = useRef(true); + useEffect(() => () => void (mountedRef.current = false), []); const incognito = useChatRuntimeStore((s) => s.incognito); const setIncognito = useChatRuntimeStore((s) => s.setIncognito); const incognitoLabel = incognito @@ -1358,9 +1363,6 @@ export function ChatPage({ const ggufContextLength = useChatRuntimeStore( (state) => state.ggufContextLength, ); - const ggufNativeContextLength = useChatRuntimeStore( - (state) => state.ggufNativeContextLength, - ); const contextUsage = useChatRuntimeStore((state) => state.contextUsage); const modelsFromStore = useChatRuntimeStore((state) => state.models); const lorasFromStore = useChatRuntimeStore((state) => state.loras); @@ -1438,82 +1440,37 @@ export function ChatPage({ refreshRef.current = refresh; selectModelRef.current = selectModel; }, [refresh, selectModel]); - const rememberedConfigFor = useCallback( - (selection: { - id: string; - ggufVariant?: string | null; - source?: string; - }) => { - if (selection.source === "external") return null; - const resolved = resolveInitialConfig(selection.id, selection.ggufVariant); - return resolved.remembered ? resolved.config : null; - }, - [], - ); + // Load a cached autoLoad pick once its download finishes. The sheet was never + // opened, so on a load failure just drop the orphaned staged knobs. The knobs + // were already seeded on stage, so keepSpeculative only when a config was + // saved -- otherwise the standing speculative preference should win. + autoLoadStagedRef.current = (pending) => { + const remembered = loadRememberedLoadSettings( + rememberedLoadSettingsKey(pending), + ); + void selectModel({ + ...pending, + isDownloaded: true, + forceReload: true, + keepSpeculative: remembered != null, + throwOnError: true, + }).catch(() => { + const store = useChatRuntimeStore.getState(); + // selectModel only clears pendingSelection on success, so a failed + // auto-load leaves our staged pick (and its edited load knobs) behind. + // Abandon it when it is still the active stage; otherwise just revert the + // settings if the stage was already cleared by something else. + if (pendingSelectionMatches(store.pendingSelection, pending)) { + store.abandonStagedModel(); + } else if (!store.pendingSelection) { + store.resetModelSettingsToLoaded(); + } + }); + }; const isExternalModel = useMemo( () => isExternalModelId(inferenceParams.checkpoint), [inferenceParams.checkpoint], ); - const runtimeCustomContextLength = useChatRuntimeStore( - (s) => s.customContextLength, - ); - const runtimeKvCacheDtype = useChatRuntimeStore((s) => s.kvCacheDtype); - const runtimeSpeculativeType = useChatRuntimeStore((s) => s.speculativeType); - const runtimeSpecDraftNMax = useChatRuntimeStore((s) => s.specDraftNMax); - const runtimeTensorParallel = useChatRuntimeStore((s) => s.tensorParallel); - const runtimeChatTemplateOverride = useChatRuntimeStore( - (s) => s.chatTemplateOverride, - ); - const activeModelConfig = useMemo(() => { - if (!inferenceParams.checkpoint || isExternalModel) return null; - const activeModelIsGguf = - activeGgufVariant != null || - ggufContextLength != null || - inferenceParams.checkpoint.toLowerCase().endsWith(".gguf"); - return { - customContextLength: runtimeCustomContextLength ?? null, - maxSeqLength: activeModelIsGguf ? null : inferenceParams.maxSeqLength, - kvCacheDtype: runtimeKvCacheDtype ?? null, - speculativeType: runtimeSpeculativeType ?? "auto", - specDraftNMax: runtimeSpecDraftNMax ?? null, - tensorParallel: runtimeTensorParallel ?? false, - chatTemplateOverride: runtimeChatTemplateOverride ?? null, - }; - }, [ - inferenceParams.checkpoint, - inferenceParams.maxSeqLength, - isExternalModel, - activeGgufVariant, - ggufContextLength, - runtimeCustomContextLength, - runtimeKvCacheDtype, - runtimeSpeculativeType, - runtimeSpecDraftNMax, - runtimeTensorParallel, - runtimeChatTemplateOverride, - ]); - const activeModelIsGguf = useMemo(() => { - const checkpoint = inferenceParams.checkpoint; - if (!checkpoint || isExternalModel) return false; - return ( - activeGgufVariant != null || - ggufContextLength != null || - checkpoint.toLowerCase().endsWith(".gguf") - ); - }, [ - inferenceParams.checkpoint, - isExternalModel, - activeGgufVariant, - ggufContextLength, - ]); - const activeModelIsLora = useMemo(() => { - const checkpoint = inferenceParams.checkpoint; - if (!checkpoint || isExternalModel) return false; - const model = modelsFromStore.find((entry) => entry.id === checkpoint); - if (model) return model.isLora; - const lora = lorasFromStore.find((entry) => entry.id === checkpoint); - return lora?.exportType === "lora"; - }, [inferenceParams.checkpoint, isExternalModel, modelsFromStore, lorasFromStore]); const reasoningEnabled = useChatRuntimeStore((s) => s.reasoningEnabled); const reasoningStyle = useChatRuntimeStore((s) => s.reasoningStyle); const reasoningEffort = useChatRuntimeStore((s) => s.reasoningEffort); @@ -1826,21 +1783,75 @@ export function ChatPage({ closeArtifactSurface(); }, [activeThreadId, closeArtifactSurface, selectedArtifact, view]); - const hasActiveModel = Boolean(inferenceParams.checkpoint); + // Abandon a staged (not-yet-loaded) pick when the chat context actually + // changes — switching threads, leaving single view, or starting a new chat / + // project — so a stale Load button can't resurface in a different context. + // New Chat keeps activeThreadId null and only bumps the `new` search nonce, so + // the key includes the route identity, not just the thread. Mirrors the + // incognito reset pattern. (Route exit is handled in __root.tsx, which runs + // after this unmounts.) Clear only on a real change, never on mount: staging + // from the Hub sets pendingSelection then navigates here, and clearing on + // mount would wipe it. Comparing the previous context (rather than a first-run + // flag) is also safe under StrictMode's double-invoke and component remounts. const chatContextKey = `${view.mode}|${activeThreadId ?? ""}|${search.new ?? ""}|${search.project ?? ""}`; - const [pendingHubAutoLoad, setPendingHubAutoLoad] = - useState(null); + const chatContextKeyRef = useLatestRef(chatContextKey); + const prevChatContextRef = useRef(null); + useEffect(() => { + const prev = prevChatContextRef.current; + prevChatContextRef.current = chatContextKey; + if (prev === null || prev === chatContextKey) return; + detachStaged(); + }, [chatContextKey, detachStaged]); + + const hasActiveModel = Boolean(inferenceParams.checkpoint); + // Load immediately, or — when "Load on selection" is off — stage the pick so + // its load options can be set first. Shared by the main selector, native + // drag-drop/picker, and the dropped-file chip (the Hub stages via the store). const stageOrLoad = useCallback( async (selection: SelectedModelInput) => { const store = useChatRuntimeStore.getState(); + // An un-cached HF repo (GGUF variant or a full non-GGUF snapshot) downloads + // through the manager first (global indicator), then auto-loads. Everything + // else -- cached picks, local/native files, LoRA, external -- loads now. const wantManagerDownload = isDownloadableHubRepo(selection) && !selection.isDownloaded; + if ( + (!hasGgufSource(selection) && !wantManagerDownload) || + (store.loadOnSelection && selection.isDownloaded) + ) { + // Detach any staged pick first so its edited knobs (e.g. a custom + // context length) don't leak into this immediate load -- resolveLoad + // reads customContextLength before checking the target is GGUF. Detach + // (not abandon) keeps its download running. + detachStaged(); + // Load-on-selection skips the sheet, so seed the saved knobs here the + // way the sheet's restore effect would; the switch would otherwise reset + // the remembered speculative choice (keepSpeculative below prevents it). + const remembered = hasGgufSource(selection) + ? loadRememberedLoadSettings(rememberedLoadSettingsKey(selection)) + : null; + if (remembered) store.applyRememberedLoadSettings(remembered); + await selectModel( + remembered ? { ...selection, keepSpeculative: true } : selection, + ); + return; + } + // Loads can't queue behind each other, but a download is independent: if + // the pick needs downloading, start it in the manager so it runs alongside + // the load. Nothing to download (already on device) just waits. if (store.modelLoading) { + // Both an uncached non-GGUF snapshot (wantManagerDownload) and an + // uncached remote GGUF quant download through the manager, so either can + // run in the background while another model loads. wantManagerDownload + // excludes GGUF by design, so the GGUF case is checked separately. const wantBackgroundDownload = wantManagerDownload || (selection.source === "hub" && hasGgufSource(selection) && !selection.isDownloaded); + // The model currently loading already downloads as part of its own load + // (the /load flow fetches before setting the checkpoint), so re-picking + // it must not kick off a second transfer against the same cache. const isLoadingThisPick = !!loadingModel && normalizeModelRef(loadingModel.id) === @@ -1851,6 +1862,11 @@ export function ChatPage({ description: "It's downloading as part of the load in progress.", }); } else if (wantBackgroundDownload) { + // Only claim the download started once a job is actually created. A + // transport conflict records state that is only resolvable from the + // Hub download card, so point the user there instead of showing a + // success toast for a transfer that never began; "busy" and "error" + // already surface their own toasts. const outcome = await downloadManager.requestStart({ kind: DOWNLOAD_KIND.MODEL, repoId: selection.id, @@ -1867,11 +1883,6 @@ export function ChatPage({ description: "An earlier partial download used a different transport. Open the Hub tab to resume or restart it.", }); - } else if (outcome === "busy") { - toast.info("Download already in progress", { - description: - "Another download for this model is still running. Reselect it once that finishes to load it.", - }); } } else { toast.info("Another model is already loading", { @@ -1880,118 +1891,23 @@ export function ChatPage({ } return; } - const wantManagerStage = - wantManagerDownload || - (selection.source === "hub" && - hasGgufSource(selection) && - !selection.isDownloaded); - if (wantManagerStage) { - setPendingHubAutoLoad({ - selection, - contextKey: chatContextKey, - originCheckpoint: store.params.checkpoint, - originGgufVariant: store.activeGgufVariant, - }); - return; - } - setPendingHubAutoLoad(null); - const previousConfig = currentRuntimePerModelConfig({ - includeMaxSeqLength: true, - }); - const hasAppliedConfig = applyModelLoadConfigToRuntime( - selection.config ?? rememberedConfigFor(selection), - ); - await selectModel({ - ...selection, - ...(hasAppliedConfig ? { keepSpeculative: true } : {}), - previousConfig, + // Detach the prior staged pick (keeping its download) before rebinding, so + // a second pick downloads alongside the first instead of cancelling it. + detachStaged(); + store.stageModel({ + id: selection.id, + isLora: selection.isLora, + ggufVariant: selection.ggufVariant, + isDownloaded: selection.isDownloaded, + expectedBytes: selection.expectedBytes, + nativePathToken: selection.nativePathToken, + isGguf: selection.isGguf, + isHubRepo: wantManagerDownload || undefined, + autoLoad: store.loadOnSelection, }); }, - [selectModel, loadingModel, rememberedConfigFor, chatContextKey], + [detachStaged, selectModel, loadingModel], ); - useRepoDownload({ - kind: DOWNLOAD_KIND.MODEL, - repoId: pendingHubAutoLoad?.selection.id ?? "__hub_autoload_idle__", - activeVariant: pendingHubAutoLoad?.selection.ggufVariant ?? null, - onComplete: (variant) => { - const pending = pendingHubAutoLoad; - if ( - !pending || - (pending.selection.ggufVariant ?? null) !== (variant ?? null) - ) { - return; - } - setPendingHubAutoLoad(null); - const store = useChatRuntimeStore.getState(); - if ( - !active || - pending.contextKey !== chatContextKey || - normalizeModelRef(pending.originCheckpoint) !== - normalizeModelRef(store.params.checkpoint) || - pending.originGgufVariant !== store.activeGgufVariant - ) { - return; - } - void stageOrLoad({ ...pending.selection, isDownloaded: true }); - }, - onError: (variant) => { - if ( - pendingHubAutoLoad && - (pendingHubAutoLoad.selection.ggufVariant ?? null) === (variant ?? null) - ) { - setPendingHubAutoLoad(null); - } - }, - onCancelled: (variant) => { - if ( - pendingHubAutoLoad && - (pendingHubAutoLoad.selection.ggufVariant ?? null) === (variant ?? null) - ) { - setPendingHubAutoLoad(null); - } - }, - }); - useEffect(() => { - const pending = pendingHubAutoLoad; - if (!pending) return; - let active = true; - void (async () => { - const outcome = await downloadManager.requestStart({ - kind: DOWNLOAD_KIND.MODEL, - repoId: pending.selection.id, - variant: pending.selection.ggufVariant ?? null, - expectedBytes: pending.selection.expectedBytes ?? 0, - }); - if (!active) return; - if (outcome === "started") { - toast.info("Downloading model", { - description: "It'll load automatically once the download finishes.", - }); - return; - } - if (outcome === "conflict") { - // Keep pendingHubAutoLoad bound so this surface's cleanup does not wipe - // the conflict just recorded by requestStart (which the toast points the - // user to); resolving it from the Hub completes the download and this - // surface's onComplete auto-loads, mirroring the "started" branch. - toast.info("Resume this download from the Hub", { - description: - "An earlier partial download used a different transport. Open the Hub tab to resume or restart it.", - }); - return; - } - if (outcome === "busy") { - toast.info("Download already in progress", { - description: - "Another download for this model is still running. Reselect it once that finishes to load it.", - }); - } - setPendingHubAutoLoad((current) => (current === pending ? null : current)); - })(); - return () => { - active = false; - }; - }, [pendingHubAutoLoad]); const loadNativeModelIntent = useCallback( async (intent: NativeIntent, loadingDescription: string) => { const label = @@ -2004,11 +1920,6 @@ export function ChatPage({ forceReload: true, throwOnError: true, }); - // Record when this file lease expires so a later reload can prompt - // re-selection instead of reusing a token the host has already pruned. - useChatRuntimeStore.setState({ - activeNativePathExpiresAtMs: intent.path.expiresAtMs ?? null, - }); useNativeIntentStore.getState().clearModelIntent(intent.id); }, [stageOrLoad], @@ -2054,20 +1965,28 @@ export function ChatPage({ const handleCheckpointChange = useCallback( ( value: string, - meta?: ModelSelectorChangeMeta, + meta?: { + source?: string; + isLora: boolean; + ggufVariant?: string; + isDownloaded?: boolean; + expectedBytes?: number; + isGguf?: boolean; + }, ) => { const store = useChatRuntimeStore.getState(); const currentCheckpoint = store.params.checkpoint; const currentVariant = store.activeGgufVariant; - if (!value) return; - setPendingHubAutoLoad(null); - const isSameLoadedModel = - value === currentCheckpoint && - (meta?.ggufVariant ?? null) === (currentVariant ?? null); - if (isSameLoadedModel && !meta?.forceReload) { + if ( + !value || + (value === currentCheckpoint && + (meta?.ggufVariant ?? null) === (currentVariant ?? null)) + ) return; - } if (meta?.source === "external" || isExternalModelId(value)) { + // Switching to an external model abandons any staged local pick: cancel + // its download too (setCheckpoint below only clears the pending + knobs). + abandonStaged(); const selectedExternal = parseExternalModelId(value); const selectedProvider = selectedExternal ? externalProvidersForChat.find( @@ -2239,17 +2158,19 @@ export function ChatPage({ source: meta?.source, isLora: meta?.isLora, ggufVariant: meta?.ggufVariant, - isDownloaded: meta?.isDownloaded || isSameLoadedModel, + isDownloaded: meta?.isDownloaded, expectedBytes: meta?.expectedBytes, isGguf: meta?.isGguf, - config: meta?.config, - nativePathToken: meta?.nativePathToken, - forceReload: isSameLoadedModel || undefined, }; + // "Load on selection" off: stage the model and open settings so its + // load knobs (tensor parallel, context length…) can be set, then it + // loads once via the sheet's Load button. The currently loaded model + // stays put until the user commits. await stageOrLoad(selection); })(); }, [ + abandonStaged, activeThreadId, externalProvidersForChat, modelsFromStore, @@ -2257,44 +2178,6 @@ export function ChatPage({ view, ], ); - const handleReloadActiveModel = useCallback( - (config: PerModelConfig) => { - const checkpoint = inferenceParams.checkpoint; - if (!checkpoint) return; - const runtime = useChatRuntimeStore.getState(); - const nativeToken = runtime.activeNativePathToken; - const nativeExpiry = runtime.activeNativePathExpiresAtMs; - // A file-picked GGUF is reachable only via its native path token, which - // the desktop host prunes after a TTL. Reusing an expired token makes the - // reload fail with an opaque error, so prompt the user to re-select the - // file instead. - if (nativeToken && nativeExpiry != null && Date.now() >= nativeExpiry) { - toast.error("This local model file's access has expired.", { - description: "Re-select the model file to reload it.", - }); - return; - } - handleCheckpointChange(checkpoint, { - source: "local", - isLora: activeModelIsLora, - ggufVariant: activeGgufVariant ?? undefined, - // Without the native token the reload validates the display label as a - // repo and fails. - nativePathToken: nativeToken ?? undefined, - isGguf: activeModelIsGguf, - isDownloaded: true, - config, - forceReload: true, - }); - }, - [ - inferenceParams.checkpoint, - activeGgufVariant, - activeModelIsLora, - activeModelIsGguf, - handleCheckpointChange, - ], - ); const handleEject = useCallback(() => { void (async () => { if (await ejectModel()) { @@ -2697,8 +2580,6 @@ export function ChatPage({ externalModels={externalModels} value={inferenceParams.checkpoint} activeGgufVariant={activeGgufVariant} - activeModelConfig={activeModelConfig} - activeGgufContextLength={ggufContextLength} onValueChange={handleCheckpointChange} onEject={handleEject} onFoldersChange={refreshLocalModels} @@ -2752,12 +2633,7 @@ export function ChatPage({ - loadNativeModelIntent( - pendingNativeModelIntent, - "Loading selected local GGUF model.", - ) - } + onLoad={(selection) => stageOrLoad(selection)} /> ) : null} {loadingModel && loadToastDismissed ? ( @@ -2914,22 +2790,13 @@ export function ChatPage({ open={active && settingsOpen} onOpenChange={(open) => { setSettingsOpen(open); + // Closing the sheet abandons a staged (not-yet-loaded) pick: cancel its + // download and revert the staged knobs so nothing lingers as a dirty + // edit (or a background download) on the loaded model. + if (!open) abandonStaged(); }} params={inferenceParams} onParamsChange={setInferenceParams} - modelConfig={ - view.mode !== "compare" && activeModelConfig && !modelLoading ? ( - - ) : null - } isExternalModel={isExternalModel} providerCapabilities={activeProviderCapabilities} activeExternalProvider={activeExternalProvider} @@ -2941,6 +2808,62 @@ export function ChatPage({ ); }} externalProviderType={activeExternalProviderType} + loadingModel={loadingModel} + onReloadModel={() => { + const state = useChatRuntimeStore.getState(); + if (state.params.checkpoint) { + selectModel({ + id: state.params.checkpoint, + ggufVariant: state.activeGgufVariant ?? undefined, + forceReload: true, + isDownloaded: true, + loadingDescription: "Reloading with updated chat template.", + }); + } + }} + onLoadPendingModel={() => { + const pending = useChatRuntimeStore.getState().pendingSelection; + if (!pending) return; + const keyAtLoad = chatContextKey; + // forceReload: the staged model isn't loaded yet, so bypass the + // same-checkpoint dedupe. keepSpeculative: honor the speculative mode + // set on the sidebar. + void selectModel({ + ...pending, + forceReload: true, + keepSpeculative: true, + throwOnError: true, + }).catch(() => { + // Recoverable failure (expired token, gated repo, OOM…): the pick is + // cleared only on success, so it normally stays staged with edited + // knobs intact — nothing to restore. + const store = useChatRuntimeStore.getState(); + // Still staged (this pick, or a newer one queued meanwhile): leave it. + if (store.pendingSelection) return; + // Cleared mid-load (sheet closed / switched chats). Re-stage only if + // the staged-load is still wanted: same chat context, sheet still + // open, page still mounted. + const stillWanted = + mountedRef.current && + store.settingsPanelOpen && + chatContextKeyRef.current === keyAtLoad; + if (stillWanted) { + store.setPendingSelection(pending); + } else { + // Abandoned (closed the sheet / switched chats / left chat): drop + // the orphaned staged knob edits so they don't linger as dirty + // settings over the loaded model. + store.resetModelSettingsToLoaded(); + } + }); + }} + stagedDownloadFraction={stagedDownload.progress?.fraction ?? null} + onCancelStagedDownload={() => + stagedDownload.cancelDownload( + useChatRuntimeStore.getState().pendingSelection?.ggufVariant ?? + null, + ) + } /> diff --git a/studio/frontend/src/features/chat/chat-settings-sheet.tsx b/studio/frontend/src/features/chat/chat-settings-sheet.tsx index a5768024b5..cedd298ecf 100644 --- a/studio/frontend/src/features/chat/chat-settings-sheet.tsx +++ b/studio/frontend/src/features/chat/chat-settings-sheet.tsx @@ -1,7 +1,19 @@ // SPDX-License-Identifier: AGPL-3.0-only // Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0 +import { + Alert, + AlertDescription, + AlertTitle, +} from "@/components/ui/alert"; import { Button } from "@/components/ui/button"; +import { Checkbox } from "@/components/ui/checkbox"; +import { + clearRememberedLoadSettings, + loadRememberedLoadSettings, + rememberedLoadSettingsKey, + saveRememberedLoadSettings, +} from "@/components/assistant-ui/model-selector/remembered-load-settings"; import { Dialog, DialogContent, @@ -17,7 +29,7 @@ import { DropdownMenuSeparator, DropdownMenuTrigger, } from "@/components/ui/dropdown-menu"; -import { InfoHint } from "@/components/ui/info-hint"; +import { Input } from "@/components/ui/input"; import { InputGroup, InputGroupAddon, @@ -38,22 +50,26 @@ import { SheetTitle, } from "@/components/ui/sheet"; import { Slider } from "@/components/ui/slider"; +import { Spinner } from "@/components/ui/spinner"; import { Switch } from "@/components/ui/switch"; import { Textarea } from "@/components/ui/textarea"; +import { InfoHint } from "@/components/ui/info-hint"; import { Tooltip, TooltipContent } from "@/components/ui/tooltip"; -import { NumericValueInput, snapToStep } from "@/features/model-picker"; -import { RetrievalSettingsSection } from "@/features/rag"; -import { useLlamaUpdateCheck } from "@/hooks/use-llama-update-check"; import { useIsMobile } from "@/hooks/use-mobile"; -import { ChevronDownStandardIcon } from "@/lib/chevron-icons"; -import { toast } from "@/lib/toast"; +import { useLlamaUpdateCheck } from "@/hooks/use-llama-update-check"; import { cn } from "@/lib/utils"; -import { Edit03Icon, LayoutAlignRightIcon } from "@hugeicons/core-free-icons"; +import { + ArrowTurnBackwardIcon, + Edit03Icon, + LayoutAlignRightIcon, +} from "@hugeicons/core-free-icons"; +import { ChevronDownStandardIcon } from "@/lib/chevron-icons"; import { HugeiconsIcon } from "@hugeicons/react"; import { Braces, ChevronDown, ExternalLink } from "lucide-react"; import { Tooltip as TooltipPrimitive } from "radix-ui"; import { Fragment, type ReactNode } from "react"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { toast } from "@/lib/toast"; import { OpenAICodeExecSection } from "./components/openai-code-exec-section"; import { PermissionModeDropdown } from "./permission-mode-select"; import { resyncInferenceStatusAfterServerModelChange } from "./hooks/use-chat-model-runtime"; @@ -61,8 +77,8 @@ import { type ExternalProviderConfig, getExternalProviderApiKey, parseExternalModelId, - supportsProviderPromptCacheTtl, supportsProviderPromptCaching, + supportsProviderPromptCacheTtl, } from "./external-providers"; import { BUILTIN_PRESETS, @@ -82,7 +98,12 @@ import { providerSupportsBuiltinCodeExecution, providerSupportsFastMode, } from "./provider-capabilities"; -import { useChatRuntimeStore } from "./stores/chat-runtime-store"; +import { + isPendingGguf, + pendingSelectionMatches, + useChatRuntimeStore, +} from "./stores/chat-runtime-store"; +import { RetrievalSettingsSection } from "@/features/rag/components/retrieval-settings-section"; import type { InferenceParams } from "./types/runtime"; export { defaultInferenceParams, type Preset } from "./presets/preset-policy"; @@ -105,7 +126,7 @@ function getPromptVariablesError(raw: string): string | null { return null; } } catch { - return 'Use valid JSON, for example { "env": "staging" }.'; + return "Use valid JSON, for example { \"env\": \"staging\" }."; } return "Variables must be a JSON object."; } @@ -114,6 +135,111 @@ function hasPromptVariableSyntax(prompt: string): boolean { return PROMPT_VARIABLE_PATTERN.test(prompt); } +/** + * Editable numeric value display, shared by every slider value and the Context + * Length input. An that looks like text (shows `displayValue ?? value`, + * so "Off"/"Max" labels render) until focus, when it swaps to the raw number, + * selects it, and accepts free text. Commits on blur/Enter, reverts on Escape. + * Clamping happens on commit so typing intermediate values isn't fought. + */ +function snapToStep( + value: number, + step: number, + min?: number, + max?: number, +): number { + const lo = min ?? Number.NEGATIVE_INFINITY; + const hi = max ?? Number.POSITIVE_INFINITY; + const clamped = Math.min(Math.max(value, lo), hi); + const stepStr = String(step); + const decimals = stepStr.includes(".") ? stepStr.split(".")[1].length : 0; + const base = Number.isFinite(lo) ? lo : 0; + const snapped = base + Math.round((clamped - base) / step) * step; + const reclamped = Math.min(Math.max(snapped, lo), hi); + return Number(reclamped.toFixed(decimals)); +} + +function NumericValueInput({ + value, + min, + max, + step, + onChange, + displayValue, + className, + ariaLabel, + size: sizeAttr, + disabled = false, +}: { + value: number; + min?: number; + max?: number; + step: number; + onChange: (v: number) => void; + displayValue?: string; + className?: string; + ariaLabel?: string; + size?: number; + disabled?: boolean; +}) { + const [focused, setFocused] = useState(false); + const [draft, setDraft] = useState(""); + const cancelBlurCommitRef = useRef(false); + + const commit = (raw: string) => { + const parsed = Number.parseFloat(raw); + if (!Number.isFinite(parsed)) { + return; + } + const final = snapToStep(parsed, step, min, max); + if (final !== value) { + onChange(final); + } + }; + + const displayed = focused ? draft : (displayValue ?? String(value)); + + return ( + { + cancelBlurCommitRef.current = false; + setDraft(String(value)); + setFocused(true); + // Defer select() so it runs after the value swap above. + const target = e.currentTarget; + requestAnimationFrame(() => target.select()); + }} + onBlur={() => { + if (cancelBlurCommitRef.current) { + cancelBlurCommitRef.current = false; + } else { + commit(draft); + } + setFocused(false); + }} + onChange={(e) => setDraft(e.target.value)} + onKeyDown={(e) => { + if (e.key === "Enter") { + e.currentTarget.blur(); + } else if (e.key === "Escape") { + cancelBlurCommitRef.current = true; + setDraft(String(value)); + e.currentTarget.blur(); + } + }} + className={cn("panel-number-input", className)} + /> + ); +} + function ParamSlider({ label, value, @@ -153,7 +279,6 @@ function ParamSlider({ displayValue={displayValue} ariaLabel={label} size={valueSize ?? 4} - className="panel-number-input" /> {labelHref ? ( @@ -324,7 +450,6 @@ interface ChatSettingsPanelProps { onOpenChange?: (open: boolean) => void; params: InferenceParams; onParamsChange: (params: InferenceParams) => void; - modelConfig?: ReactNode; isExternalModel?: boolean; /** * Sampling-param capabilities for the active external provider, or `null` for @@ -339,6 +464,21 @@ interface ChatSettingsPanelProps { * Max Tokens floor in the slider. */ externalProviderType?: string | null; + onReloadModel?: () => void; + /** The in-flight load (id + GGUF variant + native path token), or null when + * idle. Used to show a loading state for the staged pick only — not for an + * unrelated load or a cancel's background unload. */ + loadingModel?: { + id: string; + ggufVariant?: string | null; + nativePathToken?: string | null; + } | null; + /** Loads the staged `pendingSelection` (deferred "Load on selection" flow). */ + onLoadPendingModel?: () => void; + /** Download progress (0–1) for a staged GGUF being fetched, or null when idle. */ + stagedDownloadFraction?: number | null; + /** Cancels the in-flight staged download (paired with abandoning the stage). */ + onCancelStagedDownload?: () => void; } export function ChatSettingsPanel({ @@ -346,12 +486,16 @@ export function ChatSettingsPanel({ onOpenChange, params, onParamsChange, - modelConfig = null, isExternalModel = false, providerCapabilities = null, activeExternalProvider = null, onExternalProviderChange, externalProviderType = null, + onReloadModel, + loadingModel = null, + onLoadPendingModel, + stagedDownloadFraction, + onCancelStagedDownload, }: ChatSettingsPanelProps) { // Local models show every knob; providerCapabilities is only consulted when // isExternalModel. Unknown providers fall back to the OpenAI-compat shape via @@ -366,23 +510,55 @@ export function ChatSettingsPanel({ const showPresencePenalty = !isExternalModel || Boolean(providerCapabilities?.presencePenalty); const isMobile = useIsMobile(); - const isLoadedGguf = useChatRuntimeStore((s) => s.activeGgufVariant) != null; - const currentCheckpoint = params.checkpoint; - const ggufContextLength = useChatRuntimeStore((s) => s.ggufContextLength); - // Direct-file / custom-folder GGUFs load without a variant label but still - // report a GGUF context, so detect them via the context and the checkpoint - // suffix too (mirrors the chat page's activeModelIsGguf). Otherwise Max Tokens - // would fall back to params.maxSeqLength instead of the loaded GGUF context. - const isGguf = - isLoadedGguf || - ggufContextLength != null || - (currentCheckpoint?.toLowerCase().endsWith(".gguf") ?? false); - const ggufMaxContextLength = useChatRuntimeStore( - (s) => s.ggufMaxContextLength, + const pendingSelection = useChatRuntimeStore((s) => s.pendingSelection); + // "Loading" only when the in-flight load IS this staged pick (full id + GGUF + // variant + native token match), not an unrelated load or a cancel's + // background unload. The variant matters: a different quant of the same repo + // staged mid-load must not read as this one loading. + const stagedLoading = + loadingModel != null && + pendingSelectionMatches(pendingSelection, { + id: loadingModel.id, + ggufVariant: loadingModel.ggufVariant, + nativePathToken: loadingModel.nativePathToken, + }); + // Load settings are snapshotted at click time; lock them while loading. + const modelControlsDisabled = stagedLoading; + const abandonStagedModel = useChatRuntimeStore((s) => s.abandonStagedModel); + const resetModelSettingsToLoaded = useChatRuntimeStore( + (s) => s.resetModelSettingsToLoaded, ); - const customContextLength = useChatRuntimeStore((s) => s.customContextLength); + // A staged GGUF pick (deferred load) shows the GGUF load knobs so they can be + // set before the single load. + const pendingIsGguf = isPendingGguf(pendingSelection); + // Short, human-readable name for the staged pick (HF ids carry an org prefix; + // native picks are already a display label). Drives the "staged, not loaded" + // callout so it's obvious the selection hasn't loaded yet. + const stagedLabel = (() => { + const id = pendingSelection?.id ?? ""; + const slash = id.lastIndexOf("/"); + const base = slash >= 0 ? id.slice(slash + 1) : id; + return base || id; + })(); + const isLoadedGguf = + useChatRuntimeStore((s) => s.activeGgufVariant) != null; + // While a pick is staged the sheet configures *that* model, so its GGUF-ness + // (not the currently loaded model's) decides whether the GGUF-only controls + // show. Otherwise a staged non-GGUF Hub repo would inherit the loaded GGUF's + // context/KV/speculative controls. + const isGguf = pendingSelection != null ? pendingIsGguf : isLoadedGguf; + // The Model section (and Load button) shows for any staged pick, even when the + // currently active model is external. + const hasModelContent = + pendingSelection != null || + (!isExternalModel && (isGguf || Boolean(params.checkpoint))); const speculativeType = useChatRuntimeStore((s) => s.speculativeType); + const setSpeculativeType = useChatRuntimeStore((s) => s.setSpeculativeType); + const loadedSpeculativeType = useChatRuntimeStore( + (s) => s.loadedSpeculativeType, + ); const specFallbackReason = useChatRuntimeStore((s) => s.specFallbackReason); + // Only binary fallback states are solved by a newer prebuilt. const mtpUpdatable = specFallbackReason === "binary_no_mtp" || specFallbackReason === "binary_outdated"; @@ -404,27 +580,43 @@ export function ChatSettingsPanel({ `llama.cpp updated to ${result.tag ?? "the latest build"}.${reloadHint}`, ); } else { - toast.error( - `llama.cpp update failed: ${result.error ?? "unknown error"}`, - ); + toast.error(`llama.cpp update failed: ${result.error ?? "unknown error"}`); } }, [applyLlamaUpdate]); - const loadedEffectiveContext = customContextLength ?? ggufContextLength; - const showSpecFallback = - !isExternalModel && - isLoadedGguf && - specFallbackReason != null && - (speculativeType === "auto" || - speculativeType === "mtp" || - speculativeType === "mtp+ngram"); - const showContextVramWarning = - !isExternalModel && - isLoadedGguf && - ggufMaxContextLength != null && - loadedEffectiveContext != null && - loadedEffectiveContext > ggufMaxContextLength; - const showLoadedDiagnostics = showSpecFallback || showContextVramWarning; - const hasModelContent = showLoadedDiagnostics; + const specDraftNMax = useChatRuntimeStore((s) => s.specDraftNMax); + const setSpecDraftNMax = useChatRuntimeStore((s) => s.setSpecDraftNMax); + const loadedSpecDraftNMax = useChatRuntimeStore( + (s) => s.loadedSpecDraftNMax, + ); + const currentCheckpoint = params.checkpoint; + const ggufContextLength = useChatRuntimeStore((s) => s.ggufContextLength); + const ggufMaxContextLength = useChatRuntimeStore( + (s) => s.ggufMaxContextLength, + ); + const ggufNativeContextLength = useChatRuntimeStore( + (s) => s.ggufNativeContextLength, + ); + const kvCacheDtype = useChatRuntimeStore((s) => s.kvCacheDtype); + const setKvCacheDtype = useChatRuntimeStore((s) => s.setKvCacheDtype); + const applyRememberedLoadSettings = useChatRuntimeStore( + (s) => s.applyRememberedLoadSettings, + ); + const loadedKvCacheDtype = useChatRuntimeStore((s) => s.loadedKvCacheDtype); + const tensorParallel = useChatRuntimeStore((s) => s.tensorParallel); + const setTensorParallel = useChatRuntimeStore((s) => s.setTensorParallel); + const loadedTensorParallel = useChatRuntimeStore( + (s) => s.loadedTensorParallel, + ); + const chatTemplateOverride = useChatRuntimeStore( + (s) => s.chatTemplateOverride, + ); + const loadedChatTemplateOverride = useChatRuntimeStore( + (s) => s.loadedChatTemplateOverride, + ); + const customContextLength = useChatRuntimeStore((s) => s.customContextLength); + const setCustomContextLength = useChatRuntimeStore( + (s) => s.setCustomContextLength, + ); const setActivePresetSource = useChatRuntimeStore( (s) => s.setActivePresetSource, ); @@ -435,7 +627,49 @@ export function ChatSettingsPanel({ const setActivePreset = useChatRuntimeStore((s) => s.setActivePreset); const settingsHydrated = useChatRuntimeStore((s) => s.settingsHydrated); - const baseContext = ggufContextLength; + // A staged (not-yet-loaded) GGUF carries its own header context length on + // pendingSelection, so the slider can use the staged model's real ceiling + // without reading the loaded model's `ggufContextLength`. + const stagedContextLength = pendingSelection?.contextLength ?? null; + // "Remember settings next time" tick for a staged model. Seeds the store from + // the saved per-model settings on stage, so the sheet opens with what was used + // last time; the tick reflects whether a saved entry exists. + const [remember, setRemember] = useState(false); + // Keyed per quant: a different variant of the same repo has its own settings. + const pendingKey = pendingSelection + ? rememberedLoadSettingsKey(pendingSelection) + : null; + useEffect(() => { + if (!pendingKey) return; + const saved = loadRememberedLoadSettings(pendingKey); + setRemember(saved != null); + if (saved) applyRememberedLoadSettings(saved); + }, [pendingKey, applyRememberedLoadSettings]); + // While staging, the sheet reflects the STAGED model, so its header context + // takes precedence over the loaded model's (which may differ or be larger). + const baseContext = pendingIsGguf ? stagedContextLength : ggufContextLength; + const baseNativeContext = pendingIsGguf + ? stagedContextLength + : ggufNativeContextLength; + // Context controls render once we actually have a ceiling: for a staged GGUF, + // once its header metadata arrives (post-download); otherwise post-load. + const showContextControl = pendingIsGguf + ? stagedContextLength != null + : isLoadedGguf; + const stagedDownloading = + stagedDownloadFraction != null && stagedDownloadFraction < 1; + const ctxDisplayValue = customContextLength ?? baseContext ?? ""; + const ctxMaxValue = baseNativeContext ?? baseContext ?? null; + const kvDirty = kvCacheDtype !== loadedKvCacheDtype; + const ctxDirty = customContextLength !== null; + const specDirty = speculativeType !== loadedSpeculativeType; + const specDraftDirty = specDraftNMax !== loadedSpecDraftNMax; + const tpDirty = tensorParallel !== (loadedTensorParallel ?? false); + // A saved chat-template override is a reload-time setting too, so surface + // Apply for a template-only edit (otherwise it could never be applied). + const templateDirty = chatTemplateOverride !== loadedChatTemplateOverride; + const modelSettingsDirty = + kvDirty || ctxDirty || specDirty || specDraftDirty || tpDirty || templateDirty; const [presetNameInput, setPresetNameInput] = useState(activePreset); const [systemPromptEditorOpen, setSystemPromptEditorOpen] = useState(false); const [systemPromptDraft, setSystemPromptDraft] = useState(""); @@ -461,7 +695,8 @@ export function ChatSettingsPanel({ BUILTIN_PRESETS.find((preset) => preset.name === activePreset) ?? null, [activePreset], ); - const hasUnsavedPresetChanges = useMemo(() => { + const hasUnsavedPresetChanges = useMemo( + () => { if (activePresetDefinition == null) { return false; } @@ -469,7 +704,9 @@ export function ChatSettingsPanel({ return activePresetSource === "modified"; } return !isSamePresetConfig(activePresetDefinition.params, params); - }, [activePresetDefinition, activePresetSource, params]); + }, + [activePresetDefinition, activePresetSource, params], + ); const presetSaveState = useMemo( () => getPresetSaveState({ @@ -498,14 +735,6 @@ export function ChatSettingsPanel({ const externalSelection = currentCheckpoint ? parseExternalModelId(currentCheckpoint) : null; - const maxTokensMax = isExternalModel - ? getExternalMaxOutputTokens( - externalProviderType, - externalSelection?.modelId, - ) - : isGguf && baseContext - ? baseContext - : Math.max(64, params.maxSeqLength); const showOpenAICodeExecSection = activeExternalProvider != null && providerSupportsBuiltinCodeExecution( @@ -588,7 +817,8 @@ export function ChatSettingsPanel({ return; } const fallbackPreset = - BUILTIN_PRESETS.find((preset) => preset.name === "Default") ?? null; + BUILTIN_PRESETS.find((preset) => preset.name === "Default") ?? + null; const next = customPresets.filter((preset) => preset.name !== name); setCustomPresets(next); if (activePreset === name) { @@ -700,7 +930,7 @@ export function ChatSettingsPanel({ Run settings - + - )} + {hasModelContent && ( + +
+ {pendingSelection && ( + + + {stagedLoading + ? `Loading ${stagedLabel}…` + : `${stagedLabel} is staged, not loaded yet`} + + + {stagedLoading + ? "Applying your settings." + : "Set the options below, then choose Load model to load it."} + + + )} + {isGguf && ( + <> + {showContextControl && ( +
+
+ + Context Length + + { + setCustomContextLength( + v === (baseContext ?? 0) ? null : v, + ); + }} + ariaLabel="Context Length" + size={8} + disabled={modelControlsDisabled} + /> +
+ { + const snapped = Math.round(v); + setCustomContextLength( + snapped === (baseContext ?? 0) ? null : snapped, + ); + }} + className="panel-slider" + disabled={modelControlsDisabled} + /> + {ggufMaxContextLength != null && + typeof ctxDisplayValue === "number" && + ctxDisplayValue > ggufMaxContextLength && ( +

+ Exceeds estimated VRAM capacity ( + {ggufMaxContextLength.toLocaleString()} tokens). The + model may use system RAM. +

+ )}
- )} - {showContextVramWarning && ( -

- Context length exceeds the estimated VRAM capacity ( - {ggufMaxContextLength?.toLocaleString()} tokens). The - model may use system RAM. -

- )} -
- + )} +
+
+ + KV Cache Dtype + + + Lower KV cache precision to save VRAM at the cost of some + quality. f16/bf16 are full precision; q8_0/q5_1/q4_1 are + quantized. + +
+
+ +
+
+ {isGguf && ( + <> +
+
+ + Speculative Decoding + + + Faster generation with 0% accuracy hit. Auto picks + MTP / ngram-mod based on the model and platform. + Pick MTP, Ngram, or MTP+Ngram to force a specific + strategy on both GPU and CPU. + +
+
+ +
+
+ {specFallbackReason && + (speculativeType === "auto" || + speculativeType === "mtp" || + speculativeType === "mtp+ngram") && ( +
+

+ {specFallbackReason === "mla_mtp_disabled" + ? "MTP is disabled by default for this model architecture because it currently runs slower than standard decoding. Select MTP above to force it." + : specFallbackReason === "runtime_error" + ? "MTP could not start for this model on the installed llama.cpp build, so it is running without speculative decoding." + : specFallbackReason === "drafter_not_found" + ? "This model supports MTP, but its drafter file could not be downloaded, so MTP is off and it falls back to n-gram speculative decoding where the llama.cpp build supports it. Check your network connection or Hugging Face access, then reload the model to retry the drafter." + : "MTP is not available in the installed llama.cpp build, so this model is running without it." + + (llamaUpdateStatus?.update_available + ? " Update llama.cpp to enable it." + : "")} +

+ {mtpUpdatable && llamaUpdateStatus?.update_available && ( + + )} +
+ )} + {(speculativeType === "mtp" || + speculativeType === "mtp+ngram") && ( +
+
+ + Draft Tokens + + + Max MTP draft tokens per step + (--spec-draft-n-max). Lower = less wasted + draft decode; higher = bigger speedup when + acceptance stays high. Default: 2 on GPU, + 3 on CPU/Mac. + +
+ { + const raw = e.target.value; + if (raw === "") { + setSpecDraftNMax(null); + return; + } + const parsed = Number.parseInt(raw, 10); + if (Number.isFinite(parsed)) { + const clamped = Math.max(1, Math.min(16, parsed)); + setSpecDraftNMax(clamped); + } + }} + data-test-id="spec-draft-n-max-input" + aria-label="Speculative decoding draft tokens" + className="h-7 w-[88px] rounded-full border-border bg-background hover:bg-accent/50 dark:border-transparent dark:bg-white/[0.05] dark:hover:bg-white/[0.1] pl-3 py-0 text-[13px] font-medium text-nav-fg outline-none focus-visible:ring-0" + /> +
+ )} + + )} +
+
+ + Tensor Parallelism + + + No effect on a single GPU. On multi-GPU setups, improves + tokens/sec during generation when using dense models. MoE + models don't benefit and can be much slower. + +
+ +
+ + )} + {/* No persistent "enable custom code" toggle: it is consented per model + via the load-time review dialog. */} + {/* Apply/Reset belongs to the model-reload settings above (context + length, KV cache, speculative decoding). Render it here, before + the Chat Template row, so it never reads as attached to Chat + Template (which is edited via its own dialog). When a model is + staged (deferred load), Load/Cancel takes its place: there's + nothing loaded to "apply" against yet. */} + {pendingSelection ? ( +
+ {stagedDownloading && ( +

+ Downloading…{" "} + {Math.round((stagedDownloadFraction ?? 0) * 100)}% +

+ )} + + {stagedLoading ? ( + // Mid-load: nothing to load or abandon until it settles, so disable. + + ) : ( +
+ + +
+ )} +
+ ) : modelSettingsDirty ? ( +
+ + +
+ ) : null} + + + )}
- +
savePresetWithName(presetNameInput)} disabled={!(settingsHydrated && presetSaveState.canSubmit)} - variant={ - presetSaveState.isSaveReady ? "default" : "outline" - } + variant={presetSaveState.isSaveReady ? "default" : "outline"} size="sm" className={cn( "h-9 w-full rounded-full text-[13px] font-medium tracking-nav", @@ -908,8 +1456,7 @@ export function ChatSettingsPanel({ Prompt caching - Reuse compatible prompt prefixes for lower latency and - cost. + Reuse compatible prompt prefixes for lower latency and cost.
Anthropic exposes a 5 minute and a 1 hour ephemeral - cache pool. The 1 hour pool costs 2x base input on write - vs 1.25x for 5 minute, but reads stay 0.1x for both, so - a single read landing more than 5 minutes after the - write pays off the premium. + cache pool. The 1 hour pool costs 2x base input on + write vs 1.25x for 5 minute, but reads stay 0.1x for + both, so a single read landing more than 5 minutes + after the write pays off the premium.
`: the closer need not match the opener.""" + text = '## 1.0\n\n\n' + assert [e.version for e in changelog_module.parse_changelog(text)] == ["1.0", "9.9.9"] + + +@pytest.mark.parametrize("tag", ["details", "div", "table"]) +def test_type_6_blocks_run_until_a_blank_line(changelog_module, tag): + """`
` holds Markdown only after a blank line closes the block, so + a heading pressed against the opening tag is not a release.""" + packed = f"## 1.0\n\n<{tag}>\n## 9.9.9\n\n\n- note\n" + assert [e.version for e in changelog_module.parse_changelog(packed)] == ["1.0"] + spaced = f"## 1.0\n\n<{tag}>\n\n## 2.0\n\n- note\n" + assert [e.version for e in changelog_module.parse_changelog(spaced)] == ["1.0", "2.0"] + + +def test_a_tag_only_line_cannot_interrupt_a_paragraph(changelog_module): + """Type 7 blocks do not interrupt a paragraph, so prose followed by a bare + tag keeps the releases below it reachable.""" + text = "## 2.0\n\nSome prose.\n\n\n## 1.0\n\n- older\n" + assert [e.version for e in changelog_module.parse_changelog(text)] == ["2.0", "1.0"] + + +def test_preview_joins_an_indented_continuation_line(): + """Four spaces only start code outside a paragraph. Inside one the line is + a wrapped continuation, so it must not be dropped from the preview.""" + src = PREVIEW.read_text(encoding = "utf-8") + # Measured from the line's container, so an item's own indent does not count. + assert "!insideBlock && line.indent - line.column >= INDENTED_CODE_INDENT" in src + # A fence indented into a list item is a block, not a wrapped line. + assert "opensDeepFence" in src + + +def test_every_packaging_path_snapshots_the_changelog(): + """`python -m build` and `pip install .` must ship the offline copy too, + so the snapshot is made by the build backend rather than by build.sh.""" + pyproject = (REPO / "pyproject.toml").read_text(encoding = "utf-8") + assert 'build_py = "_changelog_build.build_py"' in pyproject + hook = (REPO / "_changelog_build.py").read_text(encoding = "utf-8") + assert "studio" in hook and "CHANGELOG.md" in hook + # The hook has to reach the sdist, or building from one loses the snapshot. + manifest = (REPO / "MANIFEST.in").read_text(encoding = "utf-8") + assert "include _changelog_build.py" in manifest + assert "include CHANGELOG.md" in manifest + + +def test_preview_code_spans_need_a_matching_closer(): + """A closer is a run of the same length, so ``Use `` `x` `` `` keeps the + inner backticks the expanded notes show.""" + src = CODE_SPANS.read_text(encoding = "utf-8") + assert "candidate === ticks" in src, "a closer is a run of the same length" + assert "stripPadding" in src, "one space of padding is dropped, as in Markdown" + + +def test_preview_skips_thematic_breaks(): + """`- - -` renders as a rule, so it must not take a preview slot.""" + src = PREVIEW.read_text(encoding = "utf-8") + assert "THEMATIC_BREAK" in src + assert "THEMATIC_BREAK.test(visible)" in src + + +def test_preview_keeps_quoted_examples_out_of_the_headlines(): + """A quoted list is example output, not a change, so it never competes + with the release's own bullets.""" + src = PREVIEW.read_text(encoding = "utf-8") + assert "quoted: boolean" in src + assert "if (!line.quoted)" in src, "quoted bullets never become headlines" + + +def test_notes_panel_keeps_the_link_when_the_lookup_fails(): + """Retry is not the only route: the changelog page can be reachable even + when the backend lookup is not.""" + src = PANEL.read_text(encoding = "utf-8") + error_branch = src[src.index('if (state === "error")') :] + retry = error_branch.index("update-release-notes-retry") + assert error_branch.index("{link}") > retry, "link sits beside retry" + + +def test_hook_waits_for_the_desktop_auth_token(): + """The desktop popup can render before auto-auth installs its token, so a + missing token must not be recorded as a failed lookup.""" + src = NOTES_HOOK.read_text(encoding = "utf-8") + assert "hasAuthToken()" in src and "AUTH_POLL_LIMIT" in src + + +def test_installed_layout_prefers_the_bundled_changelog(tmp_path): + """Installed, the levels above studio/ are site-packages. A stray + CHANGELOG.md left there by another package must not outrank the bundled + snapshot, so those levels are only searched in a source checkout.""" + site_packages = tmp_path / "site-packages" + package = site_packages / "studio/backend/utils" + package.mkdir(parents = True) + for name in ("changelog.py", "update_status.py"): + shutil.copy(BACKEND / "utils" / name, package / name) + for parent in (site_packages / "studio", package.parent, package): + (parent / "__init__.py").write_text("", encoding = "utf-8") + (site_packages / CHANGELOG.name).write_text("## 2.0\n\n- stray\n", encoding = "utf-8") + bundled = site_packages / "studio" / CHANGELOG.name + bundled.write_text("## 2.0\n\n- bundled\n", encoding = "utf-8") + + env = {**os.environ, "PYTHONPATH": str(site_packages)} + env.pop("UNSLOTH_CHANGELOG_PATH", None) + + def served() -> str: + # cwd is outside the checkout, so this imports the installed copy. + return subprocess.run( + [ + sys.executable, + "-c", + "from studio.backend.utils import changelog\n" + "print(changelog._read_local_changelog().text)", + ], + capture_output = True, + text = True, + env = env, + cwd = tmp_path, + check = True, + ).stdout + + assert "bundled" in served() and "stray" not in served() + + # A checkout marker there means it really is a repo root, so it wins again. + (site_packages / "pyproject.toml").write_text("", encoding = "utf-8") + assert "stray" in served() + + +def test_a_section_staged_as_a_comment_reads_as_unpublished( + changelog_module, tmp_path, monkeypatch +): + """Notes staged inside render as nothing, so the popup must say + no notes were published rather than show an empty surface.""" + monkeypatch.setenv(changelog_module.DISABLE_ENV_VAR, "1") + local = tmp_path / "CHANGELOG.md" + local.write_text("## 2.0\n\n\n\n## 1.0\n\n- shipped\n", encoding = "utf-8") + monkeypatch.setenv(changelog_module.CHANGELOG_PATH_ENV_VAR, str(local)) + changelog_module.reset_changelog_cache() + try: + staged = changelog_module.get_release_notes("2.0") + assert staged["matched"] is False and staged["markdown"] is None + assert changelog_module.get_release_notes("1.0")["matched"] is True + finally: + changelog_module.reset_changelog_cache() + + +@pytest.mark.parametrize( + "body,visible", + [ + ("- note", True), + ("", False), + ("```\n```", True), + ("
\n
", True), + (" ", False), + ], +) +def test_visibility_check_only_hides_comments(changelog_module, body, visible): + assert changelog_module._renders_visibly(body) is visible + + +@pytest.mark.parametrize( + "block", + [ + "", + "", + "", + ], +) +def test_processing_instructions_and_declarations_are_literal(changelog_module, block): + """Raw block types 3 to 5 render literally, like 
, so a heading inside
+    one is a sample and not a release."""
+    text = f"## 1.0\n\n{block}\n\n- real note\n"
+    assert [e.version for e in changelog_module.parse_changelog(text)] == ["1.0"]
+    assert "real note" in changelog_module.find_release_notes(text, "1.0").body
+
+
+def test_headings_need_a_space_or_tab_after_the_hashes(changelog_module):
+    """A non-breaking space pasted from rich text renders as ordinary text, so
+    the line must not end the release above it."""
+    text = "## 1.0\n\n- real note\n\n## 9.9.9\n\n- not a release\n"
+    assert [e.version for e in changelog_module.parse_changelog(text)] == ["1.0"]
+    assert changelog_module.find_release_notes(text, "9.9.9") is None
+    # A tab is valid and still opens a heading.
+    tabbed = "## 1.0\n\n- one\n\n##\t2.0\n\n- two\n"
+    assert [e.version for e in changelog_module.parse_changelog(tabbed)] == ["1.0", "2.0"]
+
+
+def test_preview_skips_every_raw_block_form():
+    """The extractor tracks the same block forms as the parser, so a sample
+    bullet inside one cannot become the collapsed headline."""
+    src = PREVIEW.read_text(encoding = "utf-8")
+    assert "RAW_BLOCKS" in src
+    assert "CDATA" in src and "[A-Za-z]" in src
+
+
+@pytest.mark.parametrize("banner", [WEB_BANNER, TAURI_BANNER])
+def test_expanded_popup_fits_a_short_viewport(banner):
+    """A window under roughly 430px high used to push the card's title and
+    dismiss control above the top of the screen."""
+    panel = PANEL.read_text(encoding = "utf-8")
+    # The notes region shrinks inside the capped card, so header and actions stay on screen.
+    assert "min-h-0 flex-1" in panel, "notes height must follow the viewport"
+    src = banner.read_text(encoding = "utf-8")
+    assert "max-h-[calc(100dvh_-_2rem)]" in src, "card is the backstop on tiny viewports"
+
+
+def test_relative_changelog_links_point_at_the_repository():
+    """CHANGELOG.md links are repository-relative. Rendered as-is they resolve
+    against Studio's origin, so the renderer blocks them."""
+    src = LINKS.read_text(encoding = "utf-8")
+    assert "https://github.com/unslothai/unsloth/blob/main/" in src
+    assert "https://raw.githubusercontent.com/unslothai/unsloth/main/" in src
+    # Absolute targets, fragments, fenced code and code spans stay untouched.
+    assert "ABSOLUTE" in src and "codeSpans" in src and "FENCE" in src
+    panel = PANEL.read_text(encoding = "utf-8")
+    assert "resolveChangelogLinks" in panel
+
+
+@pytest.mark.parametrize("query", ["latest", "main", "not-a-version", "abc"])
+def test_unparseable_versions_are_rejected(changelog_module, query):
+    """Sections are indexed only when their version parses, so a query that
+    cannot parse can never match and is a bad request, not an empty result."""
+    assert changelog_module.is_supported_version_query(query) is False
+
+
+@pytest.mark.parametrize("query", ["2026.7.5", "v2026.7.5", "2026.07.5", "1.0.0rc1"])
+def test_real_versions_are_still_accepted(changelog_module, query):
+    assert changelog_module.is_supported_version_query(query) is True
+
+
+def test_reference_style_images_resolve_to_the_raw_host():
+    """`![alt][arch]` with `[arch]: docs/arch.png` needs the raw file: the blob
+    URL is an HTML page, so the image would not load."""
+    src = LINKS.read_text(encoding = "utf-8")
+    assert "IMAGE_REFERENCE" in src
+    assert "imageLabels" in src
+
+
+def test_collapsed_notes_surface_is_hidden_when_nothing_previews():
+    """Notes that are only a fenced command block preview as nothing, and an
+    empty muted strip is worse than no strip."""
+    src = PANEL.read_text(encoding = "utf-8")
+    assert "preview?.items.length === 0" in src
+
+
+def test_a_fence_closer_accepts_only_spaces_and_tabs(changelog_module):
+    """A delimiter followed by a non-breaking space is code content, so it must
+    not close the block and let a sample heading through."""
+    text = "## 1.0\n\n```\n```\u00a0\n## 9.9.9\n```\n\n- real note\n"
+    assert [e.version for e in changelog_module.parse_changelog(text)] == ["1.0"]
+    plain = "## 1.0\n\n```\nx\n```\t\n\n## 2.0\n\n- two\n"
+    assert [e.version for e in changelog_module.parse_changelog(plain)] == ["1.0", "2.0"]
+    # The same rule in both frontend scanners.
+    for source in (PREVIEW, LINKS):
+        assert "/[^ \\t]/" in source.read_text(encoding = "utf-8")
+
+
+def test_code_spans_close_on_a_run_of_equal_length():
+    """`a``b [x](y.md)` is one code span, so the link inside it is literal."""
+    src = CODE_SPANS.read_text(encoding = "utf-8")
+    assert "candidate === ticks" in src, "closer length must match the opener"
+    # Shared, so the preview and the link resolver cannot drift apart.
+    assert "markdown-code-spans" in PREVIEW.read_text(encoding = "utf-8")
+    assert "markdown-code-spans" in LINKS.read_text(encoding = "utf-8")
+
+
+def test_preview_decodes_entities_like_the_renderer():
+    """Streamdown renders `AT&T` as AT&T, so the collapsed preview must
+    not show the raw entity."""
+    src = PREVIEW.read_text(encoding = "utf-8")
+    assert "NAMED_ENTITIES" in src and "decodeEntity" in src
+    # Decoded before code spans are restored, so code keeps the literal text.
+    assert src.index(".replace(ENTITY, decodeEntity)") < src.index(".replace(PARKED")
+
+
+def test_release_notes_request_refreshes_an_expired_token():
+    """A direct fetch cannot recover from a 401; authFetch refreshes first."""
+    src = NOTES_HOOK.read_text(encoding = "utf-8")
+    assert "authFetch(" in src
+    assert "getAuthToken" not in src
+
+
+def test_preview_handles_the_desktop_updater_line_endings():
+    """The updater body arrives with CRLF, which used to hide fences from the
+    extractor and promote a code sample to a headline."""
+    src = PREVIEW.read_text(encoding = "utf-8")
+    assert "LINE_ENDINGS" in src
+    assert "LINE_ENDINGS" in LINKS.read_text(encoding = "utf-8")
+
+
+def test_preview_renders_reference_links_as_text():
+    """`[text][label]` and `![alt][label]` render as a link and an image, so
+    the preview must not show their raw markup."""
+    src = PREVIEW.read_text(encoding = "utf-8")
+    assert "LINK_REFERENCE" in src and "IMAGE_REFERENCE" in src
+    # A definition line renders as nothing, so it is not a preview item.
+    assert "DEFINITION" in src
+
+
+def test_preview_treats_escaped_punctuation_as_literal():
+    """`\\*not italic\\*` keeps its stars and an escaped backtick does not open
+    a code span."""
+    assert "ESCAPE" in PREVIEW.read_text(encoding = "utf-8")
+    assert "escaped(" in CODE_SPANS.read_text(encoding = "utf-8")
+
+
+def test_link_resolver_skips_every_code_form():
+    """Indented code and code spans crossing a line render as code, so their
+    contents must not be rewritten."""
+    src = LINKS.read_text(encoding = "utf-8")
+    assert "INDENTED_CODE" in src
+    # Spans are scanned over the whole document, not line by line.
+    assert "codeSpans(masked)" in src
+    # A definition cannot interrupt a paragraph.
+    assert "definition.has(index)" in src
+
+
+def test_badge_links_resolve_both_targets():
+    """`[![alt](img)](link)` is the badge idiom: the outer link used to stay
+    relative because the label was not allowed to nest."""
+    assert "NESTED_LABEL" in LINKS.read_text(encoding = "utf-8")
+
+
+def test_in_flight_requests_are_identified_not_just_versioned():
+    """Two requests for the same version could resolve out of order and leave
+    the panel showing the older result."""
+    assert "requestIdRef" in NOTES_HOOK.read_text(encoding = "utf-8")
+
+
+def test_notes_repair_the_shared_previews_width_reset():
+    """MarkdownPreview clears max-width on every descendant, so a wide image
+    and the renderer's own link dialog escape the card."""
+    src = PANEL.read_text(encoding = "utf-8")
+    assert "[&_img]:max-w-full" in src
+    assert "[&_[data-streamdown=link-safety-modal]>*]:max-w-md" in src
+
+
+@pytest.mark.parametrize("banner", [WEB_BANNER, TAURI_BANNER])
+def test_only_the_notes_region_scrolls(banner):
+    """The dismiss control sits inside the card, so scrolling the card itself
+    carried it off screen on a short viewport."""
+    src = banner.read_text(encoding = "utf-8")
+    assert "flex max-h-[calc(100dvh_-_2rem)] flex-col overflow-hidden" in src
+    assert 'className="min-h-0 flex-1"' in src
+    panel = PANEL.read_text(encoding = "utf-8")
+    assert "max-h-64 min-h-0 flex-1 overflow-y-auto" in panel
+
+
+def test_a_comment_marker_in_prose_cannot_swallow_later_releases(changelog_module):
+    """A note that mentions `\n\n- note\n"
+    assert [e.version for e in changelog_module.parse_changelog(hidden)] == ["2.0"]
+
+
+def test_unmatched_backtick_runs_stay_linear(changelog_module):
+    """Rescanning the suffix for every opener was quadratic: a line of runs of
+    1, 2, 3 ... backticks, none of which ever closes, took 7.7s at 321 KB and
+    is reparsed on every popup request, so one malformed remote changelog could
+    tie up backend workers."""
+    line = "".join("`" * (i + 1) + "x" for i in range(800))
+    assert len(line) > 300_000
+    started = time.monotonic()
+    assert changelog_module._code_span_ranges(line) == []
+    assert time.monotonic() - started < 2.0
+
+
+def test_a_base_exception_releases_the_single_flight_flag(changelog_module, monkeypatch):
+    """The flag was cleared only after `except Exception`, so a BaseException
+    (KeyboardInterrupt, SystemExit, CancelledError) stranded it and every later
+    caller then waited out the full deadline for the life of the process."""
+    changelog_module.reset_changelog_cache()
+
+    def explode():
+        raise KeyboardInterrupt
+
+    monkeypatch.setattr(changelog_module, "_fetch_remote_changelog", explode)
+    with pytest.raises(KeyboardInterrupt):
+        changelog_module.get_remote_changelog()
+    assert changelog_module._remote_fetching is False
+    changelog_module.reset_changelog_cache()
+
+
+@pytest.mark.parametrize("marker", ["", ""])
+def test_an_empty_comment_does_not_swallow_later_releases(changelog_module, marker):
+    """`` and `` are complete comments in CommonMark: the closer
+    overlaps the opener. Searching for `-->` past the opener missed them, so an
+    empty comment used as a section marker hid every release below it."""
+    text = f"## 2.0\n\n- new stuff\n\n{marker}\n\n## 1.0\n\n- old stuff\n"
+    assert [e.version for e in changelog_module.parse_changelog(text)] == ["2.0", "1.0"]
+    assert changelog_module.find_release_notes(text, "1.0") is not None
+    assert "old stuff" not in changelog_module.find_release_notes(text, "2.0").body
+    # The frontend scanner has to agree, or the preview and the body disagree.
+    assert "!line.includes(COMMENT_CLOSE)" in PREVIEW.read_text(encoding = "utf-8")
+
+
+def test_an_unterminated_comment_still_hides_the_rest(changelog_module):
+    """The fix must not turn every `` or `
` is not a release.""" + for text in ( + "## 1.0\n\n## 9.9.9\n\n- note\n", + "## 1.0\n\n
\nx\n
## 9.9.9\n\n- note\n", + ): + assert [e.version for e in changelog_module.parse_changelog(text)] == ["1.0"] + + +def test_an_exact_heading_is_never_shadowed(changelog_module): + """PEP 440 says 1.0 == 1.0.0, so the normalised match used to win even + when the file had a section spelled exactly as asked.""" + text = "## 1.0.0\n\n- padded\n\n## 1.0\n\n- exact\n" + assert changelog_module.find_release_notes(text, "1.0").body == "- exact" + assert changelog_module.find_release_notes(text, "1.0.0").body == "- padded" + # Normalised matching still applies when there is no exact heading. + assert changelog_module.find_release_notes("## 2026.7.6\n\n- x\n", "2026.07.6") is not None + + +def test_setext_headings_are_release_boundaries(changelog_module): + """A version over a line of dashes is the same heading in setext form.""" + text = "2.0\n---\n\n- new\n\n1.0\n---\n\n- old\n" + assert [e.version for e in changelog_module.parse_changelog(text)] == ["2.0", "1.0"] + assert changelog_module.find_release_notes(text, "2.0").body == "- new" + # A rule between sections is still a rule, and a setext h1 is not a release. + assert [ + e.version + for e in changelog_module.parse_changelog("## 2.0\n\n- a\n\n---\n\n## 1.0\n\n- b\n") + ] == ["2.0", "1.0"] + + +def test_a_long_backtick_run_does_not_stall_the_parser(changelog_module): + """The code-span guard used to backtrack: 20k backticks took over a minute + and every request re-parsed the file.""" + import time + + text = "## 1.0\n\n- " + "`" * 20_000 + " " * 16_000 + assert len(line) < changelog_module.CHANGELOG_MAX_BYTES + started = time.monotonic() + visible, in_comment = changelog_module._strip_comments(line, False, False) + elapsed = time.monotonic() - started + # Roughly 40ms scanning forward against roughly 11s restarting each time. + assert elapsed < 2.0, f"comment stripping took {elapsed:.1f}s" + # Same result as before: the spans survive and the comments are gone. + assert in_comment is False + assert "`\n- See [docs](docs/a.md)\n") + assert repo in spanned + # A comment starting a line is a block: it hides down to the closer's line, that line included. + block = run_scanner("links", "\n") + assert repo not in block + closer = run_scanner("links", " See [docs](docs/a.md)\n") + assert repo not in closer + + +def test_a_bare_level_two_marker_ends_the_release(changelog_module, run_scanner): + """An ATX heading's opening sequence may be followed by the end of the line + (spec 0.31.2 section 4.2), so a bare `##` is an empty level-two heading. The + scanners required whitespace after the hashes, so everything below such a + line stayed inside the release above it and the popup showed unrelated notes + under that version.""" + text = "## 2.0\n\n- new thing\n\n##\n\n- SECRET: not part of 2.0\n" + entry = changelog_module.find_release_notes(text, "2.0") + assert "new thing" in entry.body + assert "SECRET" not in entry.body + # An empty heading has no version, so it ends a release without indexing one. + assert [e.version for e in changelog_module.parse_changelog(text)] == ["2.0"] + # Prose still needs a space or a tab: `##x` is a paragraph, not a heading. + prose = "## 2.0\n\n- new thing\n\n##x\n\n- still 2.0\n" + assert "still 2.0" in changelog_module.find_release_notes(prose, "2.0").body + # The preview agrees: an empty heading renders as nothing, so it ends the bullet. + preview = run_scanner("preview", "- new thing\n##\nUnrelated scratch notes\n") + assert preview_leads(preview) == ["new thing"] + + +def test_a_comment_between_bullets_closes_the_list(changelog_module, run_scanner): + """A comment is an HTML block (spec 0.31.2 section 4.6, type 2), so one + written at the margin under a bullet is not indented enough to continue that + item and closes the list. The scanners blanked the line before list tracking + saw it, which reads as a blank line and leaves the item open, so the release + heading below it looked like nested item content and the new release was + merged into the one above.""" + text = "## 1.0\n\n- old item\n\n ## 2.0\n\n- new item\n" + assert [e.version for e in changelog_module.parse_changelog(text)] == ["1.0", "2.0"] + assert "new item" not in changelog_module.find_release_notes(text, "1.0").body + assert "new item" in changelog_module.find_release_notes(text, "2.0").body + # At the item's content column the comment stays inside it, so the heading under it is nested. + nested = "## 1.0\n\n- old item\n \n ## 2.0\n\n- new item\n" + assert [e.version for e in changelog_module.parse_changelog(nested)] == ["1.0"] + # The link resolver reads the same column: list closed, four spaces is code, left untouched. + code = run_scanner("links", "- old item\n\n [guide](docs/a.md)\n") + assert "[guide](docs/a.md)" in code and "github.com" not in code + # Inside the item those four spaces are two columns in, so it is prose and the link resolves. + prose = run_scanner("links", "- old item\n \n [guide](docs/a.md)\n") + assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in prose + # The preview agrees: the fence is indented code, not a fence swallowing the bullet below. + preview = run_scanner( + "preview", + "- Details:\n\n ```\n - hidden sample\n- Real second item\n", + ) + assert preview_leads(preview) == ["Details:", "Real second item"] + + +def test_a_parenthesised_link_destination_still_resolves(run_scanner): + """A destination may hold parentheses while they balance (spec 0.31.2 + section 6.3), so `[x]((draft).md)` points at `(draft).md`. The resolver's + destination expression stopped at the first paren, matched an empty + destination and left the markdown alone, so the link resolved against + Studio's own origin instead of the repository.""" + leading = run_scanner("links", "[details]((draft).md)\n") + assert "https://github.com/unslothai/unsloth/blob/main/(draft).md" in leading + # An image resolves against the raw host the same way. + image = run_scanner("links", "![shield]((badge).png)\n") + assert "https://raw.githubusercontent.com/unslothai/unsloth/main/(badge).png" in image + # A pair in the middle of a path balances too. + middle = run_scanner("links", "[api](docs/(v2)/api.md)\n") + assert "https://github.com/unslothai/unsloth/blob/main/docs/(v2)/api.md" in middle + # An unbalanced paren makes the destination invalid, so `[x](a(b.md)` is plain text, not a link. + unbalanced = run_scanner("links", "[x](a(b.md)\n") + assert unbalanced == "[x](a(b.md)\n" + # One more closer balances the pair, and then it is a link again. + closed = run_scanner("links", "[x](a(b.md))\n") + assert "https://github.com/unslothai/unsloth/blob/main/a(b.md)" in closed + # Pairs nest, and one level was all the expression allowed, so a path with two stayed relative. + nested = run_scanner("links", "[x](((draft)).md)\n") + assert "https://github.com/unslothai/unsloth/blob/main/((draft)).md" in nested + deep = run_scanner("links", "![shot](((((v2))))).png)\n") + assert "https://raw.githubusercontent.com/unslothai/unsloth/main/((((v2))))" in deep + # The closer must still be there: an unbalanced run below a nested pair is not a link. + across = run_scanner("links", "[x](((a).md\n[y](docs/y.md)\n") + assert "https://github.com/unslothai/unsloth/blob/main/docs/y.md" in across + assert "[x](((a).md" in across + + +def test_a_fence_inside_a_container_still_hides_its_sample(run_scanner): + """A fence is measured from its container and not from the margin (spec + 0.31.2 section 4.5), so `> ~~~` and a fence three columns under a nested + bullet open one. Reading the margin instead never saw them, so the sample + inside was treated as prose and a relative link written in a code block was + rewritten into the text the reader sees verbatim.""" + quoted = run_scanner("links", "> ~~~\n> [guide](docs/a.md)\n> ~~~\n") + assert "[guide](docs/a.md)" in quoted and "github.com" not in quoted + nested = run_scanner("links", "- a\n - b\n ~~~\n [x](docs/x.md)\n ~~~\n") + assert "[x](docs/x.md)" in nested and "github.com" not in nested + # A longer closer is still a closer, so the pair is not something a code span hid. + uneven = run_scanner("links", "> ```\n> [guide](docs/a.md)\n> ````\n") + assert "[guide](docs/a.md)" in uneven and "github.com" not in uneven + # The fence ends with its container: a line outside the quote, or left of the item, is Markdown. + left = run_scanner("links", "> ~~~\n[guide](docs/a.md)\n") + assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in left + dedented = run_scanner("links", "- a\n ~~~\n[guide](docs/a.md)\n") + assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in dedented + # A document-level fence owns the quoted lines below, so the marker does not undo it. + document = run_scanner("links", "~~~\n> [guide](docs/a.md)\n~~~\n") + assert "[guide](docs/a.md)" in document and "github.com" not in document + # Four columns past the item's content column it is indented code, not a fence: still literal. + code = run_scanner("links", "- Details:\n\n ~~~\n [guide](docs/a.md)\n") + assert "[guide](docs/a.md)" in code and "github.com" not in code + + +def test_an_html_block_inside_a_container_is_literal_too(run_scanner): + """Type 1 and type 6 blocks are measured from their container the same way, + so a `
` under a nested bullet and a `
` inside a quote both
+    show their contents verbatim. Missing the opener treated the body as
+    Markdown and rewrote the literal examples in it."""
+    nested = run_scanner("links", "- a\n  - b\n    
\n    [x](docs/x.md)\n    
\n")
+    assert "[x](docs/x.md)" in nested and "github.com" not in nested
+    quoted = run_scanner("links", "> 
\n> [x](docs/x.md)\n> 
\n")
+    assert "[x](docs/x.md)" in quoted and "github.com" not in quoted
+    # The block ends with its container, so a line dedented out of the item is Markdown again.
+    dedented = run_scanner("links", "- a\n  - b\n    
\n[x](docs/x.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/x.md" in dedented
+    # Inside a quote a bare marker holds nothing, the blank line that ends a type 6 block.
+    blank = run_scanner("links", "> 
\n>\n> [x](docs/x.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/x.md" in blank
+
+
+def test_an_underline_left_of_an_item_is_lazy_text_of_it(changelog_module, run_scanner):
+    """A setext underline may never be a lazy continuation line (spec 0.31.2
+    section 4.3), so `===` written left of an open list item is read as more of
+    the item's paragraph rather than as a block that closes it. Rejecting every
+    underline-shaped line ended the list there, which promoted the nested
+    "## 2.0" below it to a document-level heading and indexed a release the
+    renderer never shows."""
+    nested = "## 1.0\n- old note\n===\n  ## 2.0\n- new\n"
+    assert [e.version for e in changelog_module.parse_changelog(nested)] == ["1.0"]
+    # A row of dashes is a thematic break, closing the item, so the heading is the next release.
+    broken = "## 1.0\n- old note\n---\n  ## 2.0\n"
+    assert [e.version for e in changelog_module.parse_changelog(broken)] == ["1.0", "2.0"]
+    # With no paragraph above it the underline opens one, so the blank line closes the item.
+    apart = "## 1.0\n- old note\n\n===\n  ## 2.0\n"
+    assert [e.version for e in changelog_module.parse_changelog(apart)] == ["1.0", "2.0"]
+    # The link scanner keeps the item open, so the four-space line is a paragraph and resolves.
+    resolved = run_scanner("links", "- Details:\n===\n\n    [guide](docs/a.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in resolved
+
+
+def test_a_quote_keeps_its_paragraph_to_itself(changelog_module, run_scanner):
+    """Lazy continuation runs the other way too: a marker written outside a
+    blockquote is not text of the quote's paragraph, so `2. item` under
+    `> quote` opens a list even though an ordered marker past 1 may not
+    interrupt a paragraph (spec 0.31.2 section 5.2). Lending the quote's
+    paragraph to the document left the list closed, so the heading indented to
+    the item's content column read as a release of its own."""
+    quoted = "## 1.0\n> quote\n2. item\n   ## 2.0\n- new\n"
+    assert [e.version for e in changelog_module.parse_changelog(quoted)] == ["1.0"]
+    # A quote holding a heading leaves no paragraph, nor does an empty one, so the list opens.
+    heading = "## 1.0\n> # inner\n2. item\n   ## 2.0\n"
+    assert [e.version for e in changelog_module.parse_changelog(heading)] == ["1.0"]
+    # An unquoted line the quote's paragraph swallows keeps it open, the marker still outside.
+    lazy = "## 1.0\n> quote\ntext\n2. item\n   ## 2.0\n"
+    assert [e.version for e in changelog_module.parse_changelog(lazy)] == ["1.0"]
+    # Under an ordinary paragraph the marker is its text, so no list opens and the heading is real.
+    prose = "## 1.0\nprose\n2. item\n   ## 2.0\n"
+    assert [e.version for e in changelog_module.parse_changelog(prose)] == ["1.0", "2.0"]
+    # The preview reads the marker as a bullet for the same reason.
+    assert preview_leads(run_scanner("preview", "> quote\n2. item\n")) == ["item"]
+
+
+def test_indented_code_before_an_ordered_marker_still_opens_a_list(changelog_module):
+    """An indented code block ends at the first line that is not indented enough
+    to continue it, and no paragraph is open for the marker below to continue,
+    so `2. item` opens a list whatever its start number. Reading it as text of
+    the code block instead would leave the list closed and index the heading at
+    the item's content column as a release."""
+    joined = "## 1.0\n\n    code\n2. item\n   ## 2.0\n- new\n"
+    assert [e.version for e in changelog_module.parse_changelog(joined)] == ["1.0"]
+    # A blank line between the two changes nothing: the list opens either way.
+    apart = "## 1.0\n\n    code\n\n2. item\n   ## 2.0\n- new\n"
+    assert [e.version for e in changelog_module.parse_changelog(apart)] == ["1.0"]
+    # Four columns past its container the marker is code, so no list opens and the heading stands.
+    inside = "## 1.0\n\n    code\n    - item\n  ## 2.0\n"
+    assert [e.version for e in changelog_module.parse_changelog(inside)] == ["1.0", "2.0"]
+
+
+def test_a_fence_written_as_an_item_first_content_opens_in_that_item(run_scanner):
+    """A block written straight after a list marker is the item's own first
+    content, measured from the column that content starts (spec 0.31.2 section
+    5.2), so "- ```md" opens a fence. Reading the whole line instead never saw
+    one, so the code sample below it was treated as prose: the resolver rewrote
+    a destination the reader sees verbatim, and the preview offered the info
+    string as a headline bullet."""
+    sample = run_scanner("links", "- ```md\n  [example](docs/a.md)\n  ```\n")
+    assert "[example](docs/a.md)" in sample and "github.com" not in sample
+    ordered = run_scanner("links", "1. ~~~\n   [example](docs/a.md)\n   ~~~\n")
+    assert "[example](docs/a.md)" in ordered and "github.com" not in ordered
+    # The preview agrees: an item of only a code block previews as nothing; the next is a bullet.
+    preview = run_scanner("preview", "- ```md\n  sample text\n  ```\n- Added tests\n")
+    assert preview_leads(preview) == ["Added tests"]
+    # One column further in it is indented code inside the item, so the link is prose and resolves.
+    padded = run_scanner("links", "-     ```\n  [example](docs/a.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in padded
+    # A marker the paragraph above swallows opens no item, so no fence: ordered items open at 1.
+    lazy = run_scanner("links", "Intro.\n2. ```\n[guide](docs/a.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in lazy
+
+
+def test_an_html_block_ends_with_the_item_it_was_written_in(changelog_module, run_scanner):
+    """An HTML block holds no lazy continuation line, so one opened on a list
+    item's continuation line ends where the item does, exactly as a fence there
+    does. Ending it only on a blank line let it run past the item and swallow
+    the next release heading, so those notes could never be found, and the
+    collapsed preview lost every bullet below it."""
+    text = "## 1.0\n\n- item\n\n  
\n## 2.0\n\n- new thing\n"
+    assert [e.version for e in changelog_module.parse_changelog(text)] == ["1.0", "2.0"]
+    assert "new thing" in changelog_module.find_release_notes(text, "2.0").body
+    # A raw block such as 
 is scoped the same way.
+    raw = "## 1.0\n\n- item\n\n  
\n## 2.0\n\n- new thing\n"
+    assert [e.version for e in changelog_module.parse_changelog(raw)] == ["1.0", "2.0"]
+    # At the item's content column the block holds the heading, which is nested and indexes nothing.
+    nested = "## 1.0\n\n- item\n\n  
\n  ## 2.0\n"
+    assert [e.version for e in changelog_module.parse_changelog(nested)] == ["1.0"]
+    # The preview reads it the same way: the bullet below the block is a bullet.
+    preview = run_scanner("preview", "- item\n\n  
\n- Added tests\n")
+    assert preview_leads(preview) == ["item", "Added tests"]
+    # An opener straight after a marker opens in that item, so the dedented heading is a release.
+    marked = "## 1.0\n\n- 
\n## 2.0\n\n- new thing\n"
+    assert [e.version for e in changelog_module.parse_changelog(marked)] == ["1.0", "2.0"]
+
+
+def test_a_comment_may_close_on_a_later_line_of_its_paragraph(run_scanner):
+    """A comment written mid-sentence is inline raw HTML belonging to the
+    paragraph around it, so its `-->` may arrive on a later line of that same
+    paragraph and everything between renders as nothing. Ending the comment at
+    its own line left a backtick inside it pairing with a real one below, which
+    hid a following link from the resolver, and left the collapsed preview
+    quoting text the popup body does not show."""
+    carried = run_scanner("links", "Note  see [d](docs/a.md) and `x`\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in carried
+    # Text inside the comment renders as nothing, so it is left alone.
+    inside = run_scanner("links", "Note  end\n")
+    assert "[c](docs/c.md)" in inside and "github.com" not in inside
+    # The preview hides it too, rather than quoting the comment at the reader.
+    preview = run_scanner(
+        "preview", "- Added X \n- Second\n"
+    )
+    assert preview_leads(preview) == ["Added X", "Second"]
+    # An opener cannot outlive its paragraph: with it closed the ` end [d](docs/a.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in broken
+    # A heading breaks into the paragraph, so it ends the comment's reach too.
+    headed = run_scanner("links", "Note  end [d](docs/a.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in headed
+    assert preview_leads(run_scanner("preview", "Note ` written on a line of
+    its own, and a wrapped line may open with emphasis. The guard asking whether
+    the closer is reachable read any line whose first character was punctuation
+    as the start of a new block, so neither shape counted as more of the
+    paragraph carrying the comment. The comment then never closed, and the
+    collapsed popup showed the author's internal note to the user."""
+    closer = run_scanner(
+        "preview",
+        "- DoRA training is available in Studio. \n",
+    )
+    assert preview_leads(closer) == ["DoRA training is available in Studio."]
+    # A continuation may open with emphasis, which is text and not a block.
+    starred = run_scanner(
+        "preview",
+        "- DoRA training is available. \n",
+    )
+    assert preview_leads(starred) == ["DoRA training is available."]
+    underscored = run_scanner(
+        "preview",
+        "- DoRA training is available. \n",
+    )
+    assert preview_leads(underscored) == ["DoRA training is available."]
+    # A real block still ends the paragraph, so the opener below one is text and hides nothing.
+    broken = run_scanner("links", "Note  [d](docs/a.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in broken
+    # So does a list item with content, which may interrupt a paragraph.
+    item = run_scanner("links", "Note  [d](docs/a.md)\n")
+    assert "https://github.com/unslothai/unsloth/blob/main/docs/a.md" in item
+
+
+def test_a_comment_written_as_an_item_first_content_is_a_block(changelog_module, run_scanner):
+    """A comment is an HTML block (spec 0.31.2 section 4.6, type 2), so one
+    written as a list item's first content opens inside that item, exactly as a
+    fence written there does. The scanners looked for the opener at the margin
+    of the line as written, so a marker in front of it hid the block: the
+    resolver rewrote a destination inside raw HTML, which Streamdown then shows
+    the reader as a literal URL, and the preview quoted the hidden note back at
+    them as though the bullet were Markdown."""
+    item = run_scanner("links", "-  AMD support, see [the guide](docs/amd.md)\n")
+    assert item == "-  AMD support, see [the guide](docs/amd.md)\n"
+    # Every marker opens an item, and a nested one is still an item.
+    for text in (
+        "*  see [the guide](docs/amd.md)\n",
+        "1.  see [the guide](docs/amd.md)\n",
+        "- outer\n  -  see [the guide](docs/amd.md)\n",
+    ):
+        assert "github.com" not in run_scanner("links", text)
+    # The multiline form hides lines to the closer, as a comment at the item's content column did.
+    multiline = run_scanner("links", "- \n")
+    assert "[a](docs/x.md)" in multiline and "github.com" not in multiline
+    # Still scoped to the item it was written in, so a line dedented out of it ends the block.
+    dedented = run_scanner("links", "-  hidden note\n- Real bullet\n")
+    assert preview_leads(preview) == ["Real bullet"]
+    # The parser agrees too: the item keeps its column, so a heading inside is nested, not indexed.
+    text = "## 1.0\n\n-