zen-fs-config 0.5.36 → 0.5.38

package/dist/{backend-registry-7QGFWLM7.mjs → backend-registry-LELIKPQ4.mjs}

@@ -9,7 +9,7 @@ import {
   registerBackend,
   unregisterBackend,
   wrapZenFSFileSystem
-} from "./chunk-UDEOYFWS.mjs";
+} from "./chunk-4RP2AXAB.mjs";
 export {
   createBackend,
   getAccountFields,

package/dist/{chunk-UDEOYFWS.mjs → chunk-4RP2AXAB.mjs}

@@ -137,7 +137,9 @@ registerBackend("InMemory", async (options) => {
     { key: "maxSize", label: "Max Size (bytes)", type: "text", placeholder: "104857600" },
     { key: "label", label: "Label", type: "text", placeholder: "zen-fs-config-1" }
   ],
-  defaultOptions: { maxSize: "", label: "" }
+  defaultOptions: { maxSize: "", label: "" },
+  // identity = store label (maxSize is just client-side capacity tuning)
+  identityFields: ["label"]
 });
 registerBackend("IndexedDB", async (options) => {
   const { IndexedDB } = await import("@zenfs/dom");
@@ -151,7 +153,9 @@ registerBackend("IndexedDB", async (options) => {
   fields: [
     { key: "storeName", label: "Store Name", type: "text", placeholder: "zen-fs-config" }
   ],
-  defaultOptions: { storeName: "" }
+  defaultOptions: { storeName: "" },
+  // identity = IndexedDB store name
+  identityFields: ["storeName"]
 });
 var _memCache = /* @__PURE__ */ new Map();
 function _cacheGet(key) {
@@ -260,7 +264,10 @@ registerBackend("GitHub", async (options) => {
     { key: "baseUrl", label: "API URL", type: "text", placeholder: "https://api.github.com" }
   ],
   defaultOptions: { owner: "", repo: "", branch: "main", token: "", baseUrl: "" },
-  accountFields: ["token", "owner", "baseUrl"]
+  accountFields: ["token", "owner", "baseUrl"],
+  // identity = the Git repo location (token is auth, but included so that
+  // same-repo different-credential backends are still treated as distinct)
+  identityFields: ["owner", "repo", "branch", "baseUrl"]
 });
 registerBackend("Gitee", async (options) => {
   const _gt = await importOptionalBackend("zen-fs-gitee");
@@ -290,7 +297,9 @@ registerBackend("Gitee", async (options) => {
     { key: "baseUrl", label: "API URL", type: "text", placeholder: "https://gitee.com/api/v5" }
   ],
   defaultOptions: { owner: "", repo: "", branch: "master", token: "", baseUrl: "" },
-  accountFields: ["token", "owner", "baseUrl"]
+  accountFields: ["token", "owner", "baseUrl"],
+  // identity = the Git repo location
+  identityFields: ["owner", "repo", "branch", "baseUrl"]
 });
 registerBackend("RemoteStorage", async (options) => {
   const _rs = await importOptionalBackend("zen-fs-remotestoragejs");
@@ -317,7 +326,11 @@ registerBackend("RemoteStorage", async (options) => {
     { key: "basePath", label: "Base Path", type: "text", placeholder: "/zen-fs-config/" }
   ],
   defaultOptions: { href: "", token: "", basePath: "/" },
-  accountFields: ["href", "token"]
+  accountFields: ["href", "token"],
+  // identity = the RemoteStorage account + subtree. Client tuning (persistCache,
+  // cacheFile, preciseMtime, headers, timeout) is intentionally excluded so two
+  // connections to the same endpoint with different tuning are deduplicated.
+  identityFields: ["href", "token", "basePath"]
 });
 
 export {

package/dist/index.d.mts

@@ -81,8 +81,10 @@ declare function purgeMtimeSidecars(fs: PurgeableFS$1, options?: PurgeMtimeOptio
  * metadata that keep real (empty) directories alive, and deleting them would
  * lose directory structure.
  *
- * The intentional `.keep` under `/.meta/` (used to keep the backends directory
- * alive) is protected and never deleted — see `protectedDirs`.
+ * The intentional `.keep` placeholder at `/.meta/backends/.keep` (used to keep
+ * the backends directory alive) is protected and never deleted — see
+ * `protectedDirs`. Any other `.keep` (including `/.meta/.keep`, which some older
+ * builds leaked into the local primary) is treated as a leak and purged.
  */
 /** Minimal async FS surface needed for the purge. */
 interface PurgeableFS {
@@ -98,9 +100,10 @@ interface PurgeKeepOptions {
     /** Report what would be deleted without unlinking anything. */
     dryRun?: boolean;
     /**
-     * Directories (and their subtrees) whose `.keep` files are NEVER deleted.
-     * Defaults to `['/.meta']` to protect the intentional backends placeholder
-     * that keeps `/.meta/backends` alive.
+     * Exact paths (or directories and their subtrees) whose `.keep` files are
+     * NEVER deleted. Defaults to `['/.meta/backends/.keep']` to protect the
+     * single intentional placeholder that keeps `/.meta/backends` alive. A leaked
+     * `.keep` elsewhere (e.g. `/.meta/.keep`, `/docs/.keep`) is still purged.
      */
     protectedDirs?: string[];
 }
@@ -664,6 +667,21 @@ interface BackendMetadata {
      * Fields not listed here are considered "storage location" fields.
      */
     accountFields?: string[];
+    /**
+     * Option keys that uniquely identify the backend's STORAGE ENDPOINT.
+     * Two descriptors of the same `type` whose `identityFields` values match are
+     * considered the SAME replica (e.g. same RemoteStorage `href`+`token`, or
+     * same Gitee `owner`+`repo`+`branch`) and are deduplicated — even if they
+     * differ in client-side tuning options such as `basePath`, `persistCache`,
+     * `maxSize`, etc.
+     *
+     * When omitted, dedup falls back to the FULL options blob (legacy behavior),
+     * so only types that declare `identityFields` gain the connection-aware
+     * dedup. At minimum include the endpoint-identifying fields; auth/credential
+     * fields may be included or omitted depending on whether same-location
+     * different-credential backends should be treated as distinct.
+     */
+    identityFields?: string[];
 }
 declare function registerBackend(type: string, factory: BackendFactory, metadata?: BackendMetadata): void;
 declare function unregisterBackend(type: string): boolean;

package/dist/index.d.ts

@@ -81,8 +81,10 @@ declare function purgeMtimeSidecars(fs: PurgeableFS$1, options?: PurgeMtimeOptio
  * metadata that keep real (empty) directories alive, and deleting them would
  * lose directory structure.
  *
- * The intentional `.keep` under `/.meta/` (used to keep the backends directory
- * alive) is protected and never deleted — see `protectedDirs`.
+ * The intentional `.keep` placeholder at `/.meta/backends/.keep` (used to keep
+ * the backends directory alive) is protected and never deleted — see
+ * `protectedDirs`. Any other `.keep` (including `/.meta/.keep`, which some older
+ * builds leaked into the local primary) is treated as a leak and purged.
  */
 /** Minimal async FS surface needed for the purge. */
 interface PurgeableFS {
@@ -98,9 +100,10 @@ interface PurgeKeepOptions {
     /** Report what would be deleted without unlinking anything. */
     dryRun?: boolean;
     /**
-     * Directories (and their subtrees) whose `.keep` files are NEVER deleted.
-     * Defaults to `['/.meta']` to protect the intentional backends placeholder
-     * that keeps `/.meta/backends` alive.
+     * Exact paths (or directories and their subtrees) whose `.keep` files are
+     * NEVER deleted. Defaults to `['/.meta/backends/.keep']` to protect the
+     * single intentional placeholder that keeps `/.meta/backends` alive. A leaked
+     * `.keep` elsewhere (e.g. `/.meta/.keep`, `/docs/.keep`) is still purged.
      */
     protectedDirs?: string[];
 }
@@ -664,6 +667,21 @@ interface BackendMetadata {
      * Fields not listed here are considered "storage location" fields.
      */
     accountFields?: string[];
+    /**
+     * Option keys that uniquely identify the backend's STORAGE ENDPOINT.
+     * Two descriptors of the same `type` whose `identityFields` values match are
+     * considered the SAME replica (e.g. same RemoteStorage `href`+`token`, or
+     * same Gitee `owner`+`repo`+`branch`) and are deduplicated — even if they
+     * differ in client-side tuning options such as `basePath`, `persistCache`,
+     * `maxSize`, etc.
+     *
+     * When omitted, dedup falls back to the FULL options blob (legacy behavior),
+     * so only types that declare `identityFields` gain the connection-aware
+     * dedup. At minimum include the endpoint-identifying fields; auth/credential
+     * fields may be included or omitted depending on whether same-location
+     * different-credential backends should be treated as distinct.
+     */
+    identityFields?: string[];
 }
 declare function registerBackend(type: string, factory: BackendFactory, metadata?: BackendMetadata): void;
 declare function unregisterBackend(type: string): boolean;

package/dist/index.js

@@ -231,7 +231,9 @@ var init_backend_registry = __esm({
         { key: "maxSize", label: "Max Size (bytes)", type: "text", placeholder: "104857600" },
         { key: "label", label: "Label", type: "text", placeholder: "zen-fs-config-1" }
       ],
-      defaultOptions: { maxSize: "", label: "" }
+      defaultOptions: { maxSize: "", label: "" },
+      // identity = store label (maxSize is just client-side capacity tuning)
+      identityFields: ["label"]
     });
     registerBackend("IndexedDB", async (options) => {
       const { IndexedDB } = await import("@zenfs/dom");
@@ -245,7 +247,9 @@ var init_backend_registry = __esm({
       fields: [
         { key: "storeName", label: "Store Name", type: "text", placeholder: "zen-fs-config" }
       ],
-      defaultOptions: { storeName: "" }
+      defaultOptions: { storeName: "" },
+      // identity = IndexedDB store name
+      identityFields: ["storeName"]
     });
     _memCache = /* @__PURE__ */ new Map();
     OPTIONAL_BACKEND_GLOBALS = {
@@ -309,7 +313,10 @@ var init_backend_registry = __esm({
         { key: "baseUrl", label: "API URL", type: "text", placeholder: "https://api.github.com" }
       ],
       defaultOptions: { owner: "", repo: "", branch: "main", token: "", baseUrl: "" },
-      accountFields: ["token", "owner", "baseUrl"]
+      accountFields: ["token", "owner", "baseUrl"],
+      // identity = the Git repo location (token is auth, but included so that
+      // same-repo different-credential backends are still treated as distinct)
+      identityFields: ["owner", "repo", "branch", "baseUrl"]
     });
     registerBackend("Gitee", async (options) => {
       const _gt = await importOptionalBackend("zen-fs-gitee");
@@ -339,7 +346,9 @@ var init_backend_registry = __esm({
         { key: "baseUrl", label: "API URL", type: "text", placeholder: "https://gitee.com/api/v5" }
       ],
       defaultOptions: { owner: "", repo: "", branch: "master", token: "", baseUrl: "" },
-      accountFields: ["token", "owner", "baseUrl"]
+      accountFields: ["token", "owner", "baseUrl"],
+      // identity = the Git repo location
+      identityFields: ["owner", "repo", "branch", "baseUrl"]
     });
     registerBackend("RemoteStorage", async (options) => {
       const _rs = await importOptionalBackend("zen-fs-remotestoragejs");
@@ -366,7 +375,11 @@ var init_backend_registry = __esm({
         { key: "basePath", label: "Base Path", type: "text", placeholder: "/zen-fs-config/" }
       ],
       defaultOptions: { href: "", token: "", basePath: "/" },
-      accountFields: ["href", "token"]
+      accountFields: ["href", "token"],
+      // identity = the RemoteStorage account + subtree. Client tuning (persistCache,
+      // cacheFile, preciseMtime, headers, timeout) is intentionally excluded so two
+      // connections to the same endpoint with different tuning are deduplicated.
+      identityFields: ["href", "token", "basePath"]
     });
   }
 });
@@ -1135,7 +1148,7 @@ function isKeepFile(fileName) {
   return fileName === ".keep";
 }
 var S_IFDIR2 = 16384;
-var DEFAULT_PROTECTED_DIRS = ["/.meta"];
+var DEFAULT_PROTECTED_DIRS = ["/.meta/backends/.keep"];
 function isDirectory2(stat) {
   return typeof stat.mode === "number" && (stat.mode & S_IFDIR2) === S_IFDIR2;
 }
@@ -1346,8 +1359,22 @@ function sortKeysDeep(obj) {
   }
   return sorted;
 }
+function identityOptions(type, options) {
+  const meta = getBackendMetadata(type);
+  const fields = meta?.identityFields;
+  if (!fields || fields.length === 0) {
+    log2.warn(`[DEDUP-DIAG] identityOptions(${type}): NO identityFields -> falling back to FULL options (dedup will be key-sensitive to tuning fields)`);
+    return options ?? {};
+  }
+  const subset = {};
+  for (const f of fields) {
+    if (options && options[f] !== void 0) subset[f] = options[f];
+  }
+  log2.log(`[DEDUP-DIAG] identityOptions(${type}): identityFields=${JSON.stringify(fields)} identitySubset=${JSON.stringify(subset)}`);
+  return subset;
+}
 function backendDedupKey(desc) {
-  return `${desc.type}:${stableOptionsKey(desc.options)}`;
+  return `${desc.type}:${stableOptionsKey(identityOptions(desc.type, desc.options))}`;
 }
 function backendAgeRank(b) {
   if (typeof b.createdAt === "number") return b.createdAt;
@@ -2382,18 +2409,22 @@ var ConfigRepo = class {
       const duplicates = [];
       for (const item of items) {
         const key = backendDedupKey(item.desc);
+        log2.log(`[DEDUP-DIAG] item id=${item.desc.id} type=${item.desc.type} dedupKey=${key} mtime=${item.mtime} rawOptions=${JSON.stringify(item.desc.options)}`);
         const existing = seen.get(key);
         if (existing) {
           if (item.mtime < existing.mtime) {
+            log2.log(`[DEDUP-DIAG] DUPLICATE: new id=${item.desc.id} (older) keeps key, dropping existing=${existing.desc.id}`);
             duplicates.push(existing.desc.id);
             seen.set(key, item);
           } else {
+            log2.log(`[DEDUP-DIAG] DUPLICATE: new id=${item.desc.id} dropped, kept=${existing.desc.id}`);
             duplicates.push(item.desc.id);
           }
         } else {
           seen.set(key, item);
         }
       }
+      log2.log(`[DEDUP-DIAG] dedup summary: keptKeys=${[...seen.keys()].length} duplicates=${JSON.stringify(duplicates)}`);
       if (duplicates.length > 0) {
         log2.log(
           `[ConfigRepo] readAllBackendDescriptors: removing ${duplicates.length} duplicate(s): ${duplicates.join(", ")}`
@@ -2403,10 +2434,13 @@ var ConfigRepo = class {
           for (const [replicaId, replica] of this.replicaBackends) {
             try {
               await replica.instance.unlink(descPath);
-            } catch {
+              log2.log(`[DEDUP-DIAG] removed dup ${dupId} from replica ${replicaId}`);
+            } catch (e) {
+              log2.log(`[DEDUP-DIAG] remove dup ${dupId} from replica ${replicaId} failed/skipped: ${String(e)}`);
             }
             await this.unlinkVersionSidecar(replica.instance, descPath);
           }
+          log2.log(`[DEDUP-DIAG] replicaBackends available during removal: ${[...this.replicaBackends.keys()].join(",") || "(none)"}`);
           try {
             await this.deleteFile(descPath);
           } catch {
@@ -2415,7 +2449,8 @@ var ConfigRepo = class {
         }
       }
       return Array.from(seen.values()).map((i) => i.desc);
-    } catch {
+    } catch (e) {
+      log2.error(`[DEDUP-DIAG] readAllBackendDescriptors threw, returning []:`, e);
       return [];
     }
   }
@@ -3019,6 +3054,7 @@ async function createConfigRepo(appId, options = {}) {
     log2.log(`[createConfigRepo] Migration complete`);
   }
   let allBackends = await tempRepo.readAllBackendDescriptors();
+  log2.log(`[DEDUP-DIAG] createConfigRepo after readAllBackendDescriptors: allBackends=${allBackends.map((b) => b.id).join(",")}`);
   if (options.backendInfo) {
     const replicaId = options.primaryBackendId || `${options.backendInfo.type}-replica`;
     const hasReplica = allBackends.some((b) => b.id === replicaId);

package/dist/index.mjs

@@ -9,7 +9,7 @@ import {
   registerBackend,
   unregisterBackend,
   wrapZenFSFileSystem
-} from "./chunk-UDEOYFWS.mjs";
+} from "./chunk-4RP2AXAB.mjs";
 
 // src/config-repo.ts
 import {
@@ -351,7 +351,7 @@ function registerFolderBackend() {
       const pathMod = await import("path");
       const dir = options.path;
       const store = new FolderStore({ path: dir, label: options.label, fs, pathMod });
-      return (await import("./backend-registry-7QGFWLM7.mjs")).wrapZenFSFileSystem({ backend: FolderBackend, path: dir, label: options.label });
+      return (await import("./backend-registry-LELIKPQ4.mjs")).wrapZenFSFileSystem({ backend: FolderBackend, path: dir, label: options.label });
     },
     {
       type: "Folder",
@@ -693,7 +693,7 @@ function isKeepFile(fileName) {
   return fileName === ".keep";
 }
 var S_IFDIR2 = 16384;
-var DEFAULT_PROTECTED_DIRS = ["/.meta"];
+var DEFAULT_PROTECTED_DIRS = ["/.meta/backends/.keep"];
 function isDirectory2(stat) {
   return typeof stat.mode === "number" && (stat.mode & S_IFDIR2) === S_IFDIR2;
 }
@@ -904,8 +904,22 @@ function sortKeysDeep(obj) {
   }
   return sorted;
 }
+function identityOptions(type, options) {
+  const meta = getBackendMetadata(type);
+  const fields = meta?.identityFields;
+  if (!fields || fields.length === 0) {
+    log2.warn(`[DEDUP-DIAG] identityOptions(${type}): NO identityFields -> falling back to FULL options (dedup will be key-sensitive to tuning fields)`);
+    return options ?? {};
+  }
+  const subset = {};
+  for (const f of fields) {
+    if (options && options[f] !== void 0) subset[f] = options[f];
+  }
+  log2.log(`[DEDUP-DIAG] identityOptions(${type}): identityFields=${JSON.stringify(fields)} identitySubset=${JSON.stringify(subset)}`);
+  return subset;
+}
 function backendDedupKey(desc) {
-  return `${desc.type}:${stableOptionsKey(desc.options)}`;
+  return `${desc.type}:${stableOptionsKey(identityOptions(desc.type, desc.options))}`;
 }
 function backendAgeRank(b) {
   if (typeof b.createdAt === "number") return b.createdAt;
@@ -1940,18 +1954,22 @@ var ConfigRepo = class {
       const duplicates = [];
       for (const item of items) {
         const key = backendDedupKey(item.desc);
+        log2.log(`[DEDUP-DIAG] item id=${item.desc.id} type=${item.desc.type} dedupKey=${key} mtime=${item.mtime} rawOptions=${JSON.stringify(item.desc.options)}`);
         const existing = seen.get(key);
         if (existing) {
           if (item.mtime < existing.mtime) {
+            log2.log(`[DEDUP-DIAG] DUPLICATE: new id=${item.desc.id} (older) keeps key, dropping existing=${existing.desc.id}`);
             duplicates.push(existing.desc.id);
             seen.set(key, item);
           } else {
+            log2.log(`[DEDUP-DIAG] DUPLICATE: new id=${item.desc.id} dropped, kept=${existing.desc.id}`);
             duplicates.push(item.desc.id);
           }
         } else {
           seen.set(key, item);
         }
       }
+      log2.log(`[DEDUP-DIAG] dedup summary: keptKeys=${[...seen.keys()].length} duplicates=${JSON.stringify(duplicates)}`);
       if (duplicates.length > 0) {
         log2.log(
           `[ConfigRepo] readAllBackendDescriptors: removing ${duplicates.length} duplicate(s): ${duplicates.join(", ")}`
@@ -1961,10 +1979,13 @@ var ConfigRepo = class {
           for (const [replicaId, replica] of this.replicaBackends) {
             try {
               await replica.instance.unlink(descPath);
-            } catch {
+              log2.log(`[DEDUP-DIAG] removed dup ${dupId} from replica ${replicaId}`);
+            } catch (e) {
+              log2.log(`[DEDUP-DIAG] remove dup ${dupId} from replica ${replicaId} failed/skipped: ${String(e)}`);
             }
             await this.unlinkVersionSidecar(replica.instance, descPath);
           }
+          log2.log(`[DEDUP-DIAG] replicaBackends available during removal: ${[...this.replicaBackends.keys()].join(",") || "(none)"}`);
           try {
             await this.deleteFile(descPath);
           } catch {
@@ -1973,7 +1994,8 @@ var ConfigRepo = class {
         }
       }
       return Array.from(seen.values()).map((i) => i.desc);
-    } catch {
+    } catch (e) {
+      log2.error(`[DEDUP-DIAG] readAllBackendDescriptors threw, returning []:`, e);
       return [];
     }
   }
@@ -2577,6 +2599,7 @@ async function createConfigRepo(appId, options = {}) {
     log2.log(`[createConfigRepo] Migration complete`);
   }
   let allBackends = await tempRepo.readAllBackendDescriptors();
+  log2.log(`[DEDUP-DIAG] createConfigRepo after readAllBackendDescriptors: allBackends=${allBackends.map((b) => b.id).join(",")}`);
   if (options.backendInfo) {
     const replicaId = options.primaryBackendId || `${options.backendInfo.type}-replica`;
     const hasReplica = allBackends.some((b) => b.id === replicaId);

package/dist/zen-fs-config.js

@@ -24544,7 +24544,9 @@ var ZenFSConfig = (() => {
           { key: "maxSize", label: "Max Size (bytes)", type: "text", placeholder: "104857600" },
           { key: "label", label: "Label", type: "text", placeholder: "zen-fs-config-1" }
         ],
-        defaultOptions: { maxSize: "", label: "" }
+        defaultOptions: { maxSize: "", label: "" },
+        // identity = store label (maxSize is just client-side capacity tuning)
+        identityFields: ["label"]
       });
       registerBackend("IndexedDB", async (options) => {
         const { IndexedDB: IndexedDB2 } = await Promise.resolve().then(() => (init_dist5(), dist_exports2));
@@ -24558,7 +24560,9 @@ var ZenFSConfig = (() => {
         fields: [
           { key: "storeName", label: "Store Name", type: "text", placeholder: "zen-fs-config" }
         ],
-        defaultOptions: { storeName: "" }
+        defaultOptions: { storeName: "" },
+        // identity = IndexedDB store name
+        identityFields: ["storeName"]
       });
       _memCache = /* @__PURE__ */ new Map();
       OPTIONAL_BACKEND_GLOBALS = {
@@ -24622,7 +24626,10 @@ var ZenFSConfig = (() => {
           { key: "baseUrl", label: "API URL", type: "text", placeholder: "https://api.github.com" }
         ],
         defaultOptions: { owner: "", repo: "", branch: "main", token: "", baseUrl: "" },
-        accountFields: ["token", "owner", "baseUrl"]
+        accountFields: ["token", "owner", "baseUrl"],
+        // identity = the Git repo location (token is auth, but included so that
+        // same-repo different-credential backends are still treated as distinct)
+        identityFields: ["owner", "repo", "branch", "baseUrl"]
       });
       registerBackend("Gitee", async (options) => {
         const _gt = await importOptionalBackend("zen-fs-gitee");
@@ -24652,7 +24659,9 @@ var ZenFSConfig = (() => {
           { key: "baseUrl", label: "API URL", type: "text", placeholder: "https://gitee.com/api/v5" }
         ],
         defaultOptions: { owner: "", repo: "", branch: "master", token: "", baseUrl: "" },
-        accountFields: ["token", "owner", "baseUrl"]
+        accountFields: ["token", "owner", "baseUrl"],
+        // identity = the Git repo location
+        identityFields: ["owner", "repo", "branch", "baseUrl"]
       });
       registerBackend("RemoteStorage", async (options) => {
         const _rs = await importOptionalBackend("zen-fs-remotestoragejs");
@@ -24679,7 +24688,11 @@ var ZenFSConfig = (() => {
           { key: "basePath", label: "Base Path", type: "text", placeholder: "/zen-fs-config/" }
         ],
         defaultOptions: { href: "", token: "", basePath: "/" },
-        accountFields: ["href", "token"]
+        accountFields: ["href", "token"],
+        // identity = the RemoteStorage account + subtree. Client tuning (persistCache,
+        // cacheFile, preciseMtime, headers, timeout) is intentionally excluded so two
+        // connections to the same endpoint with different tuning are deduplicated.
+        identityFields: ["href", "token", "basePath"]
       });
     }
   });
@@ -27068,7 +27081,7 @@ var ZenFSConfig = (() => {
     return fileName === ".keep";
   }
   var S_IFDIR3 = 16384;
-  var DEFAULT_PROTECTED_DIRS = ["/.meta"];
+  var DEFAULT_PROTECTED_DIRS = ["/.meta/backends/.keep"];
   function isDirectory4(stat5) {
     return typeof stat5.mode === "number" && (stat5.mode & S_IFDIR3) === S_IFDIR3;
   }
@@ -27279,8 +27292,22 @@ var ZenFSConfig = (() => {
     }
     return sorted;
   }
+  function identityOptions(type, options) {
+    const meta = getBackendMetadata(type);
+    const fields = meta?.identityFields;
+    if (!fields || fields.length === 0) {
+      log6.warn(`[DEDUP-DIAG] identityOptions(${type}): NO identityFields -> falling back to FULL options (dedup will be key-sensitive to tuning fields)`);
+      return options ?? {};
+    }
+    const subset = {};
+    for (const f of fields) {
+      if (options && options[f] !== void 0) subset[f] = options[f];
+    }
+    log6.log(`[DEDUP-DIAG] identityOptions(${type}): identityFields=${JSON.stringify(fields)} identitySubset=${JSON.stringify(subset)}`);
+    return subset;
+  }
   function backendDedupKey(desc) {
-    return `${desc.type}:${stableOptionsKey(desc.options)}`;
+    return `${desc.type}:${stableOptionsKey(identityOptions(desc.type, desc.options))}`;
   }
   function backendAgeRank(b) {
     if (typeof b.createdAt === "number") return b.createdAt;
@@ -28315,18 +28342,22 @@ var ZenFSConfig = (() => {
         const duplicates = [];
         for (const item of items) {
           const key = backendDedupKey(item.desc);
+          log6.log(`[DEDUP-DIAG] item id=${item.desc.id} type=${item.desc.type} dedupKey=${key} mtime=${item.mtime} rawOptions=${JSON.stringify(item.desc.options)}`);
           const existing = seen.get(key);
           if (existing) {
             if (item.mtime < existing.mtime) {
+              log6.log(`[DEDUP-DIAG] DUPLICATE: new id=${item.desc.id} (older) keeps key, dropping existing=${existing.desc.id}`);
               duplicates.push(existing.desc.id);
               seen.set(key, item);
             } else {
+              log6.log(`[DEDUP-DIAG] DUPLICATE: new id=${item.desc.id} dropped, kept=${existing.desc.id}`);
               duplicates.push(item.desc.id);
             }
           } else {
             seen.set(key, item);
           }
         }
+        log6.log(`[DEDUP-DIAG] dedup summary: keptKeys=${[...seen.keys()].length} duplicates=${JSON.stringify(duplicates)}`);
         if (duplicates.length > 0) {
           log6.log(
             `[ConfigRepo] readAllBackendDescriptors: removing ${duplicates.length} duplicate(s): ${duplicates.join(", ")}`
@@ -28336,10 +28367,13 @@ var ZenFSConfig = (() => {
             for (const [replicaId, replica] of this.replicaBackends) {
               try {
                 await replica.instance.unlink(descPath);
-              } catch {
+                log6.log(`[DEDUP-DIAG] removed dup ${dupId} from replica ${replicaId}`);
+              } catch (e) {
+                log6.log(`[DEDUP-DIAG] remove dup ${dupId} from replica ${replicaId} failed/skipped: ${String(e)}`);
               }
               await this.unlinkVersionSidecar(replica.instance, descPath);
             }
+            log6.log(`[DEDUP-DIAG] replicaBackends available during removal: ${[...this.replicaBackends.keys()].join(",") || "(none)"}`);
             try {
               await this.deleteFile(descPath);
             } catch {
@@ -28348,7 +28382,8 @@ var ZenFSConfig = (() => {
           }
         }
         return Array.from(seen.values()).map((i) => i.desc);
-      } catch {
+      } catch (e) {
+        log6.error(`[DEDUP-DIAG] readAllBackendDescriptors threw, returning []:`, e);
         return [];
       }
     }
@@ -28952,6 +28987,7 @@ var ZenFSConfig = (() => {
       log6.log(`[createConfigRepo] Migration complete`);
     }
     let allBackends = await tempRepo.readAllBackendDescriptors();
+    log6.log(`[DEDUP-DIAG] createConfigRepo after readAllBackendDescriptors: allBackends=${allBackends.map((b) => b.id).join(",")}`);
     if (options.backendInfo) {
       const replicaId = options.primaryBackendId || `${options.backendInfo.type}-replica`;
       const hasReplica = allBackends.some((b) => b.id === replicaId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-fs-config",
-  "version": "0.5.36",
+  "version": "0.5.38",
   "description": "Distributed config management library built on ZenFS, zen-fs-cache, and zen-fs-sync",
   "main": "dist/index.js",
   "module": "dist/index.mjs",