@@ -5,14 +5,15 @@
 // only in this browser, so on upgrade an API load still used app defaults.
 
 import {
+  cachedRepoConfigId,
   isNativeFileLabel,
   isOllamaLinkPath,
-  isOllamaModelId,
   normalizeGgufVariantIdentity,
   normalizeModelIdentity,
   splitQuantSuffix,
 } from "../model-config/model-identity";
 import {
+  adoptCachedRepoConfig,
   isDefaultConfig,
   listPerModelConfigs,
 } from "../model-config/per-model-config";
@@ -24,8 +25,9 @@ import {
   toApiOverride,
 } from "./model-overrides";
 
-// Bumped when the filter below started admitting Ollama tags, so a completed v1 pass reruns.
-const DONE_FLAG = "unsloth_model_overrides_backfilled_v2";
+// Bumped whenever the filter below admits more, so a completed pass reruns: v2 for Ollama tags,
+// v3 for non-GGUF weights.
+const DONE_FLAG = "unsloth_model_overrides_backfilled_v3";
 
 function alreadyRan(): boolean {
   try {
@@ -79,15 +81,18 @@ export async function backfillModelOverrides(): Promise<void> {
   if (alreadyRan()) {
     return;
   }
+  // Uploaded under the path, a record an older build saved for a cached repo would outrank the repo's.
+  for (const entry of listPerModelConfigs()) {
+    adoptCachedRepoConfig(entry.modelId, entry.ggufVariant);
+  }
   const local = listPerModelConfigs().filter(
-    // A quant means GGUF, all auto-switch resolves; a .gguf and a reference have a null variant.
-    // A link sits in a dir the resolver skips, a bare file name is a label it never keys.
+    // Auto-switch resolves GGUF and non-GGUF weights alike. A link sits in a dir the resolver
+    // skips, a bare file name is a label it never keys, and a snapshot path still here is a record
+    // adoption declined.
     (entry) =>
-      (entry.ggufVariant != null ||
-        entry.modelId.toLowerCase().endsWith(".gguf") ||
-        isOllamaModelId(entry.modelId)) &&
       !isOllamaLinkPath(entry.modelId) &&
       !isNativeFileLabel(entry.modelId) &&
+      cachedRepoConfigId(entry.modelId, entry.ggufVariant) === null &&
       !isDefaultConfig(entry.config),
   );
   if (local.length === 0) {
 
@@ -53,7 +53,7 @@ const { backfillModelOverrides } = await import(
 const { setAuthFetchHandler } = await import("./helpers/store-stubs/auth.ts");
 
 const STORAGE_KEY = "unsloth_model_configs";
-const BACKFILL_FLAG = "unsloth_model_overrides_backfilled_v2";
+const BACKFILL_FLAG = "unsloth_model_overrides_backfilled_v3";
 const MODEL = "unsloth/Repo-GGUF";
 const VARIANT = "Q4_K_M";
 
@@ -347,6 +347,50 @@ test("the backfill offers an Ollama tag's settings even after the v1 pass ran",
   assert.deepEqual(puts, [ref.toLowerCase()]);
 });
 
+test("the backfill offers non-GGUF weights, keyed by repo id, after the v2 pass ran", async () => {
+  // A cached repo loads from its snapshot directory, which an older sidebar keyed it by. Uploaded
+  // under that path, the bare row would outrank the repo's and survive the picker's Forget.
+  store.clear();
+  store.set("unsloth_model_overrides_backfilled_v2", "1");
+  const folder = "/Users/u/.lmstudio/models/mlx-community/Qwen3.5-4B-MLX-4bit";
+  const snapshot = "/hf/models--mlx-community--Model-4bit/snapshots/abc";
+  const template = { chatTemplateOverride: "{{ messages }}" };
+  assert.ok(savePerModelConfig(folder, null, config(template)));
+  assert.ok(savePerModelConfig(snapshot, null, config({ mlxKvBits: 8 })));
+  // A newer build's record under the repo id makes adoption decline, and the path stays put.
+  const declined = "/hf/models--org--Newer/snapshots/def";
+  assert.ok(savePerModelConfig("org/Newer", null, config({ mlxKvBits: 4 })));
+  const map = readMap();
+  const newer = Object.keys(map).find((key) => key.includes("org/newer"));
+  assert.ok(newer);
+  map[newer].version = 99;
+  writeMap(map);
+  assert.ok(savePerModelConfig(declined, null, config({ mlxKvBits: 4 })));
+  // Identities the resolver never keys.
+  const link = "/home/u/.ollama/.studio_links/ab12/model-latest.gguf";
+  assert.ok(savePerModelConfig(link, null, config(template)));
+  assert.ok(savePerModelConfig("Model-Q4_K_M.gguf", null, config(template)));
+
+  const puts: unknown[] = [];
+  setAuthFetchHandler((_input, init) => {
+    if (init?.method === "PUT") {
+      puts.push(JSON.parse(String(init.body)).model_id);
+    }
+    return new Response(JSON.stringify({ overrides: {} }), { status: 200 });
+  });
+  try {
+    await backfillModelOverrides();
+  } finally {
+    setAuthFetchHandler(null);
+  }
+  assert.deepEqual(
+    new Set(puts),
+    new Set([folder, "mlx-community/model-4bit"]),
+  );
+  assert.equal(resolveInitialConfig(declined, null).config.mlxKvBits, 4);
+  assert.equal(store.get(BACKFILL_FLAG), "1");
+});
+
 test("an all-default config is still filtered out of the backfill", async () => {
   // The gate the case above walks through has to stay shut for everything else, or
   // every model the user ever opened is mirrored on first launch.