@remnic/core 9.28.0 → 9.29.1

package/dist/{chunk-Q5VJUNXA.js → chunk-JMQUBRV6.js}

@@ -1,8 +1,3 @@
-import {
-  TombstoneStore,
-  buildRetiredFactTombstoneInputs,
-  collectRetiredMemoriesForRebuild
-} from "./chunk-2QMKMVHH.js";
 import {
   WEARABLES_DIR_NAME,
   escapeSegmentText,
@@ -14,6 +9,11 @@ import {
   unescapeSegmentText,
   unescapeSpeakerLabel
 } from "./chunk-UHVXE24Y.js";
+import {
+  TombstoneStore,
+  buildRetiredFactTombstoneInputs,
+  collectRetiredMemoriesForRebuild
+} from "./chunk-2QMKMVHH.js";
 import {
   computeSupersessionKey,
   normalizeSupersessionKey,
@@ -31,7 +31,7 @@ import {
 import {
   SPECULATIVE_TTL_DAYS,
   confidenceTier
-} from "./chunk-JQ7T5VDC.js";
+} from "./chunk-HUHX2OCX.js";
 import {
   appendLifecycleEventsSerialized,
   drainPendingLifecycleLedgerForSync,
@@ -42,22 +42,13 @@ import {
   readMaybeEncryptedLines,
   readMemoryActionEventRowsFromLines,
   serializeLifecycleAppendPayload
-} from "./chunk-FBZTWUK5.js";
+} from "./chunk-OFHFH655.js";
 import {
   namespaceIdentityFromToken
 } from "./chunk-EGGE52UU.js";
 import {
   withHeldFileLock
 } from "./chunk-WL5EBRDH.js";
-import {
-  inferMemoryStatus,
-  isArchivedMemoryPath,
-  toMemoryPathRel
-} from "./chunk-ILGC6JH6.js";
-import {
-  normalizeProjectionPreview,
-  normalizeProjectionTags
-} from "./chunk-SCU65EZI.js";
 import {
   rewriteProjectedEntityReferences,
   rewriteProjectedMemoryEntityReference
@@ -75,6 +66,15 @@ import {
   readProjectedMemoryTimeline,
   updateProjectedMemoryPath
 } from "./chunk-3CSX3ETE.js";
+import {
+  inferMemoryStatus,
+  isArchivedMemoryPath,
+  toMemoryPathRel
+} from "./chunk-ILGC6JH6.js";
+import {
+  normalizeProjectionPreview,
+  normalizeProjectionTags
+} from "./chunk-SCU65EZI.js";
 import {
   rotateMarkdownFileToArchive
 } from "./chunk-DM2T26WE.js";
@@ -153,7 +153,7 @@ import {
 } from "./chunk-P7FMDTKL.js";
 import {
   resolveNamespaceCapabilities
-} from "./chunk-RDQGLJRR.js";
+} from "./chunk-2XRE6FLM.js";
 import {
   isPathInsideStorageRoot
 } from "./chunk-FF4KLI5W.js";
@@ -1478,7 +1478,15 @@ function resolveHistoricalEntityCanonicalId(normalized, mappings) {
 var EntityCanonicalIdMigrationStateSchema = z.object({
   version: z.literal(ENTITY_CANONICAL_ID_MIGRATION_VERSION),
   complete: z.boolean(),
-  mappings: z.record(z.string().min(1))
+  mappings: z.record(z.string().min(1)),
+  /**
+   * Pairs the migration refused to resolve, PARKED rather than dropped.
+   * Deleting the record would strand the collision: once an operator removes
+   * the legacy file, no later scan can rediscover the mapping, so references
+   * still naming the legacy id would never be rewritten. Optional so a journal
+   * written by an older build still parses.
+   */
+  blocked: z.record(z.string().min(1)).optional()
 });
 async function fingerprintPath(filePath) {
   let fileStat;
@@ -1682,9 +1690,10 @@ async function readSafeEntityEntries(entitiesDir) {
   }
   return entries;
 }
-async function discoverMappings(deps, knownMappings = {}) {
+async function discoverMappings(deps, knownMappings = {}, blocked = /* @__PURE__ */ new Map()) {
   const mappings = {};
   const canonicalOwners = /* @__PURE__ */ new Map();
+  blocked.clear();
   const entityEntries = await readSafeEntityEntries(deps.entitiesDir);
   for (const entry of entityEntries) {
     if (!entry.endsWith(".md")) continue;
@@ -1710,18 +1719,20 @@ async function discoverMappings(deps, knownMappings = {}) {
     if (canonicalExists) {
       const canonicalContent2 = await deps.readStorageSecureFile(canonicalPath);
       if (entityContent !== canonicalContent2) {
-        throw new Error(`Cannot migrate legacy entity id ${legacyId}: ${canonicalId} already exists.`);
+        blocked.set(legacyId, canonicalId);
+        continue;
       }
     }
-    const previousOwner = canonicalOwners.get(canonicalId);
-    if (previousOwner !== void 0 && previousOwner !== legacyId) {
-      throw new Error(
-        `Cannot migrate legacy entity ids ${previousOwner} and ${legacyId}: both normalize to ${canonicalId}.`
-      );
-    }
-    canonicalOwners.set(canonicalId, legacyId);
+    canonicalOwners.set(canonicalId, [...canonicalOwners.get(canonicalId) ?? [], legacyId]);
     mappings[legacyId] = canonicalId;
   }
+  for (const [canonicalId, claimants] of canonicalOwners) {
+    if (claimants.length < 2) continue;
+    for (const legacyId of claimants) {
+      blocked.set(legacyId, canonicalId);
+      delete mappings[legacyId];
+    }
+  }
   return mappings;
 }
 async function rewriteReferences(deps, mappings, refreshLock) {
@@ -1923,7 +1934,16 @@ function mergeDiscoveredMappings(existing, discovered) {
   for (const [legacyId, canonicalId] of Object.entries(discovered)) {
     const previousMapping = merged[legacyId];
     if (previousMapping !== void 0 && previousMapping !== canonicalId) {
-      throw new Error(`Legacy entity id ${legacyId} changed canonical target during migration.`);
+      let hop = canonicalId;
+      const seen = /* @__PURE__ */ new Set();
+      while (hop !== void 0 && hop !== previousMapping && !seen.has(hop)) {
+        seen.add(hop);
+        hop = merged[hop];
+      }
+      if (hop !== previousMapping) {
+        throw new Error(`Legacy entity id ${legacyId} changed canonical target during migration.`);
+      }
+      continue;
     }
     if (previousMapping === void 0 && wouldCreateMappingCycle(merged, legacyId, canonicalId)) continue;
     const previousOwner = canonicalOwners.get(canonicalId);
@@ -1978,7 +1998,7 @@ async function migrateEntityFilePair(deps, legacyId, canonicalId, refreshMigrati
         deps.isEncryptedStorageFile(canonicalPath)
       ]);
       if (legacyContent !== canonicalContent2) {
-        throw new Error(`Cannot migrate legacy entity id ${legacyId}: ${canonicalId} already exists.`);
+        return { deferred: false, progressed: false, blocked: true };
       }
       if (legacyEncrypted && !canonicalEncrypted) {
         if (!await refreshMigrationLock() || !await refreshEntityLock()) {
@@ -2055,6 +2075,46 @@ async function migrateLegacyEntityCanonicalIds(deps) {
           mappings: {}
         };
       }
+      const blocked = /* @__PURE__ */ new Map();
+      const finish = () => {
+        if (blocked.size > 0) {
+          const pairs = [...blocked].map(([legacyId, canonicalId]) => `${legacyId} -> ${canonicalId}`).join(", ");
+          log.warn(
+            `entity canonical-id migration skipped ${blocked.size} unresolvable pair(s): ${pairs}. Both files were kept and the legacy id still resolves; merge or delete one side to migrate it.`
+          );
+        }
+        return deps.readMigrationFingerprint?.();
+      };
+      const pruneBlocked = async () => {
+        const current = state;
+        if (!current) return false;
+        let revived = false;
+        const parked = { ...current.blocked ?? {} };
+        const active = {};
+        for (const [legacyId, canonicalId] of Object.entries(current.mappings)) {
+          if (!blocked.has(legacyId)) active[legacyId] = canonicalId;
+        }
+        for (const [legacyId, canonicalId] of blocked) parked[legacyId] = canonicalId;
+        for (const [legacyId, canonicalId] of Object.entries(parked)) {
+          if (blocked.has(legacyId)) continue;
+          delete parked[legacyId];
+          if (active[legacyId] !== void 0) continue;
+          const legacyPath = deps.resolveEntityFilePath(legacyId);
+          if (legacyPath !== null && await fileExists(legacyPath)) continue;
+          active[legacyId] = canonicalId;
+          revived = true;
+        }
+        const collapsed = collapseMappings(active);
+        for (const [legacyId, canonicalId] of Object.entries(parked)) {
+          const moved = collapsed[canonicalId];
+          if (moved !== void 0 && moved !== legacyId) parked[legacyId] = moved;
+        }
+        const same = (a, b) => Object.keys(a).length === Object.keys(b).length && Object.entries(a).every(([key, value]) => b[key] === value);
+        if (same(collapsed, current.mappings) && same(parked, current.blocked ?? {})) return revived;
+        state = { ...current, mappings: collapsed, blocked: parked };
+        await writeState(deps, state);
+        return revived;
+      };
       const previousMappings = state.mappings;
       const collapsedMappings = collapseMappings(previousMappings);
       const mappingsChanged = Object.keys(collapsedMappings).length !== Object.keys(previousMappings).length || Object.entries(collapsedMappings).some(
@@ -2065,11 +2125,12 @@ async function migrateLegacyEntityCanonicalIds(deps) {
         if (!await lock.refresh()) throw new Error("Lost entity canonical-id migration lock.");
         const discoveredBefore = rejectMappingCycles(
           state.mappings,
-          await discoverMappings(deps, state.mappings)
+          await discoverMappings(deps, state.mappings, blocked)
         );
+        await pruneBlocked();
         const mergedBefore = collapseMappings(mergeDiscoveredMappings(state.mappings, discoveredBefore));
         if (state.complete && Object.keys(discoveredBefore).length === 0 && !mappingsChanged) {
-          if (Object.keys(state.mappings).length === 0) return deps.readMigrationFingerprint?.();
+          if (Object.keys(state.mappings).length === 0) return finish();
           const rewroteColdMemory2 = await rewriteKnownReferences(
             deps,
             state.mappings,
@@ -2079,7 +2140,7 @@ async function migrateLegacyEntityCanonicalIds(deps) {
           deps.invalidateAllMemoriesCache();
           if (rewroteColdMemory2) deps.invalidateColdMemoriesCache();
           deps.bumpMemoryStatusVersion();
-          return deps.readMigrationFingerprint?.();
+          return finish();
         }
         if (state.complete || Object.keys(discoveredBefore).length > 0 || Object.keys(mergedBefore).length !== Object.keys(state.mappings).length) {
           state = { ...state, complete: false, mappings: mergedBefore };
@@ -2089,11 +2150,12 @@ async function migrateLegacyEntityCanonicalIds(deps) {
           if (!await lock.refresh()) throw new Error("Lost entity canonical-id migration lock.");
           const discoveredAfter2 = rejectMappingCycles(
             state.mappings,
-            await discoverMappings(deps, state.mappings)
+            await discoverMappings(deps, state.mappings, blocked)
           );
-          if (Object.keys(discoveredAfter2).length === 0) {
+          const revivedInRescan = await pruneBlocked();
+          if (Object.keys(discoveredAfter2).length === 0 && !revivedInRescan) {
             await writeState(deps, { ...state, complete: true });
-            return deps.readMigrationFingerprint?.();
+            return finish();
           }
           state = {
             ...state,
@@ -2114,9 +2176,8 @@ async function migrateLegacyEntityCanonicalIds(deps) {
               canonicalId,
               () => lock.refresh()
             );
-            if (result.deferred) {
-              deferredMappings.push([legacyId, canonicalId]);
-            }
+            if (result.blocked) blocked.set(legacyId, canonicalId);
+            else if (result.deferred) deferredMappings.push([legacyId, canonicalId]);
             progressed ||= result.progressed;
           }
           if (deferredMappings.length === 0) break;
@@ -2128,6 +2189,7 @@ async function migrateLegacyEntityCanonicalIds(deps) {
           }
           pendingMappings = deferredMappings;
         }
+        await pruneBlocked();
         const rewroteColdMemory = await rewriteKnownReferences(
           deps,
           state.mappings,
@@ -2140,11 +2202,12 @@ async function migrateLegacyEntityCanonicalIds(deps) {
         if (!await lock.refresh()) throw new Error("Lost entity canonical-id migration lock.");
         const discoveredAfter = rejectMappingCycles(
           state.mappings,
-          await discoverMappings(deps, state.mappings)
+          await discoverMappings(deps, state.mappings, blocked)
         );
-        if (Object.keys(discoveredAfter).length === 0) {
+        const revivedAfterRewrite = await pruneBlocked();
+        if (Object.keys(discoveredAfter).length === 0 && !revivedAfterRewrite) {
           await writeState(deps, { ...state, complete: true });
-          return deps.readMigrationFingerprint?.();
+          return finish();
         }
         state = {
           ...state,
@@ -10568,4 +10631,4 @@ export {
   isValidBufferSurpriseEvent,
   StorageManager3 as StorageManager
 };
-//# sourceMappingURL=chunk-Q5VJUNXA.js.map
+//# sourceMappingURL=chunk-JMQUBRV6.js.map