zen-fs-config 0.5.37 → 0.5.38

package/dist/index.js

@@ -1360,12 +1360,17 @@ function sortKeysDeep(obj) {
   return sorted;
 }
 function identityOptions(type, options) {
-  const fields = getBackendMetadata(type)?.identityFields;
-  if (!fields || fields.length === 0) return 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) {
@@ -2404,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(", ")}`
@@ -2425,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 {
@@ -2437,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 [];
     }
   }
@@ -3041,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

@@ -905,12 +905,17 @@ function sortKeysDeep(obj) {
   return sorted;
 }
 function identityOptions(type, options) {
-  const fields = getBackendMetadata(type)?.identityFields;
-  if (!fields || fields.length === 0) return 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) {
@@ -1949,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(", ")}`
@@ -1970,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 {
@@ -1982,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 [];
     }
   }
@@ -2586,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

@@ -27293,12 +27293,17 @@ var ZenFSConfig = (() => {
     return sorted;
   }
   function identityOptions(type, options) {
-    const fields = getBackendMetadata(type)?.identityFields;
-    if (!fields || fields.length === 0) return 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) {
@@ -28337,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(", ")}`
@@ -28358,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 {
@@ -28370,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 [];
       }
     }
@@ -28974,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.37",
+  "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",