@anuma/sdk 9.1.4 → 9.1.6

package/dist/expo/index.d.mts

@@ -3902,6 +3902,13 @@ interface RecencyOptions {
     noDateMultiplier?: number;
 }
 
+type VaultCorpusCache = WeakMap<VaultMemoryOperationsContext, Map<string, Promise<StoredVaultMemory[]>>>;
+type RowRequests = Map<EmbeddingOptions["maskInput"], Map<string, Promise<number[]>>>;
+interface VaultPreparation {
+    corpora: VaultCorpusCache;
+    rows: WeakMap<VaultMemoryOperationsContext, RowRequests>;
+}
+
 declare const DEFAULT_VAULT_CACHE_SIZE = 5000;
 /**
  * Create a VaultEmbeddingCache backed by an LRU with a default cap of
@@ -3919,6 +3926,7 @@ type VaultEmbeddingCache = Map<string, Float32Array>;
  * Options for the vault search tool.
  */
 interface MemoryVaultSearchOptions {
+    /** @internal */ vaultPreparation?: VaultPreparation;
     onCandidateCount?: (count: number) => void;
     /** Maximum number of results to return (default: 5) */
     limit?: number;
@@ -4441,6 +4449,7 @@ interface RankedMemory {
     updatedAt: Date;
 }
 interface RecallOptions {
+    /** @internal */ vaultPreparation?: VaultPreparation;
     /** Embedding cache shared with the rest of the turn, so the query is embedded once across lanes and the send. */
     embeddingCache?: Map<string, Float32Array>;
     /** Which kinds to search. Default: ['fact']. */
@@ -5660,7 +5669,8 @@ interface CreateVaultMemoryOptions {
     geohash?: string;
 }
 interface UpdateVaultMemoryOptions {
-    content: string;
+    content?: string;
+    expectedContent?: string;
     /** When true, the write is skipped (returns null) if the row carries a profile kind. */
     freeFormOnly?: boolean;
     /**
@@ -6264,9 +6274,10 @@ declare function ttlForType(factType: string | null, policy?: Partial<DecayPolic
  *     null `eventTimeEnd` is still ongoing, so this rule does not fire for it.
  *  4. Age fallback — `now - updatedAt > TTL(factType)` → archive. Durable types
  *     have Infinity TTL, so this never fires for them; null/unknown use medium.
- *     EXCEPTION: a `plan`/`ongoing_context` with a still-upcoming event
- *     (`eventTimeEnd >= now`) is kept — it must not age-archive before the event
- *     happens; only rule 3 (after it passes) may archive it.
+ *     EXCEPTION: a `plan` / `ongoing_context` with an upcoming event or an event
+ *     within the grace period (`eventTimeEnd >= now - pastEventGraceMs`) stays
+ *     active, even after its activity TTL expires. Rule 3 archives it after the
+ *     grace period ends.
  *  5. Otherwise → keep.
  *
  * @param m     Plaintext decay inputs for one row.
@@ -6597,7 +6608,9 @@ type MemoryCreate = Pick<CreateVaultMemoryOptions, "content" | "scope" | "factTy
  * `embedding` (with `embeddingModel`) only when you already have the new one.
  * @public
  */
-type MemoryUpdate = Pick<UpdateVaultMemoryOptions, "content" | "scope" | "factType" | "eventTime" | "embedding" | "embeddingModel" | "kind" | "kindValue" | "level">;
+type MemoryUpdate = Pick<UpdateVaultMemoryOptions, "scope" | "factType" | "eventTime" | "embedding" | "embeddingModel" | "kind" | "kindValue" | "level"> & {
+    content: string;
+};
 /**
  * Fact-only recall. Conversation chunks are message storage, not memory, so
  * the chunk-lane knobs are not part of this surface; nor is `folderId` (see

package/dist/expo/index.d.ts

@@ -3902,6 +3902,13 @@ interface RecencyOptions {
     noDateMultiplier?: number;
 }
 
+type VaultCorpusCache = WeakMap<VaultMemoryOperationsContext, Map<string, Promise<StoredVaultMemory[]>>>;
+type RowRequests = Map<EmbeddingOptions["maskInput"], Map<string, Promise<number[]>>>;
+interface VaultPreparation {
+    corpora: VaultCorpusCache;
+    rows: WeakMap<VaultMemoryOperationsContext, RowRequests>;
+}
+
 declare const DEFAULT_VAULT_CACHE_SIZE = 5000;
 /**
  * Create a VaultEmbeddingCache backed by an LRU with a default cap of
@@ -3919,6 +3926,7 @@ type VaultEmbeddingCache = Map<string, Float32Array>;
  * Options for the vault search tool.
  */
 interface MemoryVaultSearchOptions {
+    /** @internal */ vaultPreparation?: VaultPreparation;
     onCandidateCount?: (count: number) => void;
     /** Maximum number of results to return (default: 5) */
     limit?: number;
@@ -4441,6 +4449,7 @@ interface RankedMemory {
     updatedAt: Date;
 }
 interface RecallOptions {
+    /** @internal */ vaultPreparation?: VaultPreparation;
     /** Embedding cache shared with the rest of the turn, so the query is embedded once across lanes and the send. */
     embeddingCache?: Map<string, Float32Array>;
     /** Which kinds to search. Default: ['fact']. */
@@ -5660,7 +5669,8 @@ interface CreateVaultMemoryOptions {
     geohash?: string;
 }
 interface UpdateVaultMemoryOptions {
-    content: string;
+    content?: string;
+    expectedContent?: string;
     /** When true, the write is skipped (returns null) if the row carries a profile kind. */
     freeFormOnly?: boolean;
     /**
@@ -6264,9 +6274,10 @@ declare function ttlForType(factType: string | null, policy?: Partial<DecayPolic
  *     null `eventTimeEnd` is still ongoing, so this rule does not fire for it.
  *  4. Age fallback — `now - updatedAt > TTL(factType)` → archive. Durable types
  *     have Infinity TTL, so this never fires for them; null/unknown use medium.
- *     EXCEPTION: a `plan`/`ongoing_context` with a still-upcoming event
- *     (`eventTimeEnd >= now`) is kept — it must not age-archive before the event
- *     happens; only rule 3 (after it passes) may archive it.
+ *     EXCEPTION: a `plan` / `ongoing_context` with an upcoming event or an event
+ *     within the grace period (`eventTimeEnd >= now - pastEventGraceMs`) stays
+ *     active, even after its activity TTL expires. Rule 3 archives it after the
+ *     grace period ends.
  *  5. Otherwise → keep.
  *
  * @param m     Plaintext decay inputs for one row.
@@ -6597,7 +6608,9 @@ type MemoryCreate = Pick<CreateVaultMemoryOptions, "content" | "scope" | "factTy
  * `embedding` (with `embeddingModel`) only when you already have the new one.
  * @public
  */
-type MemoryUpdate = Pick<UpdateVaultMemoryOptions, "content" | "scope" | "factType" | "eventTime" | "embedding" | "embeddingModel" | "kind" | "kindValue" | "level">;
+type MemoryUpdate = Pick<UpdateVaultMemoryOptions, "scope" | "factType" | "eventTime" | "embedding" | "embeddingModel" | "kind" | "kindValue" | "level"> & {
+    content: string;
+};
 /**
  * Fact-only recall. Conversation chunks are message storage, not memory, so
  * the chunk-lane knobs are not part of this surface; nor is `folderId` (see

package/dist/expo/index.mjs

@@ -20,7 +20,7 @@ import {
   taskTypeHeader,
   validateEndpointOverride,
   withInternalFlowMarker
-} from "./chunk-XW3LYSDA.mjs";
+} from "./chunk-WRZTH4OS.mjs";
 import {
   BASE_URL,
   MCP_R2_DOMAIN,
@@ -923,15 +923,16 @@ async function refreshEncryptionKeyIfMatches(walletAddress, probeCiphertext, sig
   if (!parsed) {
     return false;
   }
+  const startEpoch = sessionEpoch;
   const cached = refreshCandidatesByAddress.get(walletAddress);
   if (cached) {
-    return tryCommitCandidatesIfProbeMatches(walletAddress, parsed, cached);
+    return tryCommitCandidatesIfProbeMatches(walletAddress, parsed, cached, startEpoch);
   }
   let derivePromise = pendingCandidateDerives.get(walletAddress);
   if (!derivePromise) {
     derivePromise = (async () => {
       const candidates2 = await deriveRefreshCandidates(signMessage, embeddedWalletSigner);
-      if (candidates2) {
+      if (candidates2 && sessionEpoch === startEpoch) {
         refreshCandidatesByAddress.set(walletAddress, candidates2);
       }
       return candidates2;
@@ -943,10 +944,10 @@ async function refreshEncryptionKeyIfMatches(walletAddress, probeCiphertext, sig
     pendingCandidateDerives.set(walletAddress, derivePromise);
   }
   const candidates = await derivePromise;
-  if (!candidates) {
+  if (!candidates || sessionEpoch !== startEpoch) {
     return false;
   }
-  return tryCommitCandidatesIfProbeMatches(walletAddress, parsed, candidates);
+  return tryCommitCandidatesIfProbeMatches(walletAddress, parsed, candidates, startEpoch);
 }
 function parsePrefixedCiphertext(probeCiphertext) {
   const version = probeCiphertext.startsWith("enc:v3:") ? "v3" : probeCiphertext.startsWith("enc:v2:") ? "v2" : null;
@@ -989,7 +990,7 @@ async function deriveRefreshCandidates(signMessage, embeddedWalletSigner) {
   }
   return { legacy: legacyKey, current: currentKey };
 }
-async function tryCommitCandidatesIfProbeMatches(walletAddress, parsed, candidates) {
+async function tryCommitCandidatesIfProbeMatches(walletAddress, parsed, candidates, startEpoch) {
   const candidateHex = parsed.version === "v2" ? candidates.legacy : candidates.current;
   const keyBytes = hexToBytes(candidateHex);
   const candidateCryptoKey = await crypto.subtle.importKey(
@@ -1007,6 +1008,9 @@ async function tryCommitCandidatesIfProbeMatches(walletAddress, parsed, candidat
     );
     return false;
   }
+  if (sessionEpoch !== startEpoch) {
+    return false;
+  }
   setStoredKey(walletAddress, { legacy: candidates.legacy, current: candidates.current });
   cryptoKeyCache.delete(`${walletAddress}:v2`);
   cryptoKeyCache.delete(`${walletAddress}:v3`);
@@ -13341,6 +13345,16 @@ async function updateVaultMemoryOp(ctx, id2, opts) {
     const probe = await ctx.vaultMemoryCollection.find(id2);
     if (probe.isDeleted || probe.supersededBy || !isOwnedByCtxUser(ctx, probe)) return null;
     if (opts.freeFormOnly && isKinded(probe)) return null;
+    const readStoredContent = probe._getRaw("content");
+    if (opts.expectedContent !== void 0) {
+      const current = await vaultMemoryToStored(
+        probe,
+        ctx.walletAddress,
+        ctx.signMessage,
+        ctx.embeddedWalletSigner
+      );
+      if (current.content !== opts.expectedContent) return null;
+    }
     const levelAfter = (current) => {
       if (opts.level !== void 0) return opts.level;
       if (opts.scope === void 0) return resolveMemoryLevel(current.level, current.scope);
@@ -13348,7 +13362,7 @@ async function updateVaultMemoryOp(ctx, id2, opts) {
     };
     assertValidKindLevel(opts.kind !== void 0 ? opts.kind : probe.kind, levelAfter(probe));
     const encryptedKindValue = await encryptKindValue(ctx, opts.kindValue);
-    const encryptedContent = ctx.walletAddress && ctx.signMessage ? await encryptVaultMemoryContent(
+    const encryptedContent = opts.content !== void 0 && ctx.walletAddress && ctx.signMessage ? await encryptVaultMemoryContent(
       opts.content,
       ctx.walletAddress,
       ctx.signMessage,
@@ -13356,13 +13370,13 @@ async function updateVaultMemoryOp(ctx, id2, opts) {
     ) : opts.content;
     let stale = false;
     const record2 = probe;
-    const originalUpdatedAt = record2.updatedAt.getTime();
     await ctx.database.write(async () => {
       await assertCanWrite2(ctx);
-      if (record2.isDeleted || record2.supersededBy || !isOwnedByCtxUser(ctx, record2) || opts.freeFormOnly && isKinded(record2)) {
+      if (record2.isDeleted || record2.supersededBy || !isOwnedByCtxUser(ctx, record2) || opts.freeFormOnly && isKinded(record2) || opts.expectedContent !== void 0 && record2._getRaw("content") !== readStoredContent) {
         stale = true;
         return;
       }
+      const originalUpdatedAt = record2.updatedAt.getTime();
       const nextKind = opts.kind !== void 0 ? opts.kind : record2.kind;
       const nextLevel = levelAfter(record2);
       assertValidKindLevel(nextKind, nextLevel);
@@ -13378,7 +13392,7 @@ async function updateVaultMemoryOp(ctx, id2, opts) {
         replayedObservation = opts.observationSourceIds.every((id3) => observedSources.includes(id3));
       }
       await record2.update((r) => {
-        r._setRaw("content", encryptedContent);
+        if (encryptedContent !== void 0) r._setRaw("content", encryptedContent);
         if (opts.level !== void 0) {
           r._setRaw("level", nextLevel);
           r._setRaw("scope", scopeForLevel(nextLevel));
@@ -14145,7 +14159,7 @@ function classifyDecay(m, now, policy) {
   if (m.source === "manual" || m.source === SOURCE_PHOTO) return "keep";
   if (isTimeSensitiveType(m.factType) && m.eventTimeEnd !== null) {
     if (m.eventTimeEnd < now - resolved.pastEventGraceMs) return "archive";
-    if (m.eventTimeEnd >= now) return "keep";
+    return "keep";
   }
   if (now - lastActivityAt(m) > ttlForType(m.factType, resolved)) return "archive";
   return "keep";
@@ -15635,6 +15649,104 @@ function validate(parsed, originalQuery) {
   return { mode, subQueries };
 }
 
+// src/lib/memoryVault/vaultPreparation.ts
+function createVaultPreparation() {
+  return { corpora: /* @__PURE__ */ new WeakMap(), rows: /* @__PURE__ */ new WeakMap() };
+}
+var pendingRows = /* @__PURE__ */ new WeakMap();
+function loadVaultCorpus(ctx, options, preparation) {
+  if (!preparation) return getAllVaultMemoriesOp(ctx, options);
+  const corpusCache = preparation.corpora;
+  let pending = corpusCache.get(ctx);
+  if (!pending) {
+    pending = /* @__PURE__ */ new Map();
+    corpusCache.set(ctx, pending);
+  }
+  const key = JSON.stringify(options ?? {});
+  let request = pending.get(key);
+  if (!request) {
+    const entries = pending;
+    request = getAllVaultMemoriesOp(ctx, options).catch((error) => {
+      entries.delete(key);
+      throw error;
+    });
+    pending.set(key, request);
+  }
+  return request;
+}
+function rowRequestsFor(registry2, ctx, maskInput) {
+  let byMask = registry2.get(ctx);
+  if (!byMask) {
+    byMask = /* @__PURE__ */ new Map();
+    registry2.set(ctx, byMask);
+  }
+  let requests = byMask.get(maskInput);
+  if (!requests) {
+    requests = /* @__PURE__ */ new Map();
+    byMask.set(maskInput, requests);
+  }
+  return requests;
+}
+function embedVaultRows(ctx, options, rows, preparation) {
+  const pending = rowRequestsFor(pendingRows, ctx, options.maskInput);
+  const prepared = preparation && rowRequestsFor(preparation.rows, ctx, options.maskInput);
+  const model = options.model ?? DEFAULT_API_EMBEDDING_MODEL;
+  const keys = rows.map(
+    (row) => JSON.stringify([
+      row.uniqueId,
+      row.updatedAt?.getTime(),
+      row.content,
+      model,
+      options.baseUrl,
+      options.timeoutMs,
+      options.tokenTimeoutMs,
+      options.totalTimeoutMs
+    ])
+  );
+  const missing = /* @__PURE__ */ new Map();
+  rows.forEach((row, index) => {
+    if (!pending.has(keys[index]) && !prepared?.has(keys[index])) missing.set(keys[index], row);
+  });
+  if (missing.size > 0) {
+    const entries = pending;
+    const batch = Promise.resolve().then(
+      () => generateEmbeddings(
+        [...missing.values()].map((row) => row.content),
+        options
+      )
+    );
+    [...missing].forEach(([key, row], index) => {
+      const request = batch.then((vectors) => {
+        const vector = vectors[index];
+        updateVaultMemoryEmbeddingOp(ctx, row.uniqueId, JSON.stringify(vector), model, {
+          content: row.content,
+          updatedAt: row.updatedAt?.getTime()
+        }).catch(() => {
+        });
+        return vector;
+      }).finally(() => {
+        entries.delete(key);
+        if (entries.size === 0) pendingRows.get(ctx)?.delete(options.maskInput);
+      });
+      pending.set(key, request);
+    });
+  }
+  return Promise.all(
+    keys.map((key) => {
+      const cached = prepared?.get(key);
+      if (cached) return cached;
+      const request = pending.get(key);
+      if (!prepared) return request;
+      const retained = request.catch((error) => {
+        prepared.delete(key);
+        throw error;
+      });
+      prepared.set(key, retained);
+      return retained;
+    })
+  );
+}
+
 // src/lib/memoryVault/vectorVersion.ts
 var vectorRowVersion = /* @__PURE__ */ new WeakMap();
 function contentFingerprint(content) {
@@ -16197,11 +16309,11 @@ async function rankComposite(originalQuery, originalQueryEmbedding, subQueries,
   return combined.slice(0, limit);
 }
 async function preEmbedVaultMemories(vaultCtx, embeddingOptions, cache, options) {
-  const memories = await getAllVaultMemoriesOp(vaultCtx, options);
+  const memories = await loadVaultCorpus(vaultCtx, options);
   const currentModel = embeddingOptions.model ?? DEFAULT_API_EMBEDDING_MODEL;
   const uncachedTexts = [];
   const uncachedKeys = [];
-  const uncachedIds = [];
+  const uncachedRows = [];
   const uncachedVersions = [];
   for (const m of memories) {
     const content = m.content;
@@ -16220,12 +16332,12 @@ async function preEmbedVaultMemories(vaultCtx, embeddingOptions, cache, options)
       }
       uncachedTexts.push(m.content);
       uncachedKeys.push(m.uniqueId);
-      uncachedIds.push(m.uniqueId);
+      uncachedRows.push(m);
       uncachedVersions.push(m.updatedAt);
     }
   }
   if (uncachedTexts.length > 0) {
-    const embeddings = await generateEmbeddings(uncachedTexts, embeddingOptions);
+    const embeddings = await embedVaultRows(vaultCtx, embeddingOptions, uncachedRows);
     for (let i = 0; i < uncachedKeys.length; i++) {
       cacheRowVector(
         cache,
@@ -16234,13 +16346,6 @@ async function preEmbedVaultMemories(vaultCtx, embeddingOptions, cache, options)
         uncachedVersions[i],
         uncachedTexts[i]
       );
-      updateVaultMemoryEmbeddingOp(
-        vaultCtx,
-        uncachedIds[i],
-        JSON.stringify(embeddings[i]),
-        currentModel
-      ).catch(() => {
-      });
     }
   }
 }
@@ -16382,10 +16487,7 @@ async function buildProjectedCorpus(query, vaultCtx, embeddingOptions, cache, qu
       let laneVecs;
       if (opts.embedStats) opts.embedStats.rowsEmbedded += laneRows.length;
       try {
-        laneVecs = await generateEmbeddings(
-          laneRows.map((m) => m.content),
-          embeddingOptions
-        );
+        laneVecs = await embedVaultRows(vaultCtx, embeddingOptions, laneRows);
       } catch (err) {
         laneEmbedFailed = true;
         getLogger().warn(
@@ -16399,13 +16501,6 @@ async function buildProjectedCorpus(query, vaultCtx, embeddingOptions, cache, qu
           cacheRowVector(cache, m.uniqueId, vec, m.updatedAt, m.content);
           resolvedThisCall.add(m.uniqueId);
           vectored.push({ uniqueId: m.uniqueId, embedding: vec, updatedAt: m.updatedAt });
-          updateVaultMemoryEmbeddingOp(
-            vaultCtx,
-            m.uniqueId,
-            JSON.stringify(vecs[i]),
-            currentModel
-          ).catch(() => {
-          });
         });
       }
     }
@@ -16597,9 +16692,10 @@ async function prepareVaultCandidates(query, vaultCtx, embeddingOptions, cache,
       };
     }
   } else {
-    const loaded = await getAllVaultMemoriesOp(
+    const loaded = await loadVaultCorpus(
       vaultCtx,
-      Object.keys(queryOpts).length > 0 ? queryOpts : void 0
+      Object.keys(queryOpts).length > 0 ? queryOpts : void 0,
+      searchOptions?.vaultPreparation
     );
     vaultSize = loaded.length;
     rowsDecrypted = loaded.length;
@@ -16672,7 +16768,12 @@ async function prepareVaultCandidates(query, vaultCtx, embeddingOptions, cache,
       let newEmbeddings;
       embedStats.rowsEmbedded += uncachedTexts.length;
       try {
-        newEmbeddings = await generateEmbeddings(uncachedTexts, embeddingOptions);
+        newEmbeddings = await embedVaultRows(
+          vaultCtx,
+          embeddingOptions,
+          uncachedIndices.map((index) => memories[index]),
+          searchOptions?.vaultPreparation
+        );
       } catch (err) {
         embeddingFailure = true;
         getLogger().warn(
@@ -16688,13 +16789,6 @@ async function prepareVaultCandidates(query, vaultCtx, embeddingOptions, cache,
             memories[uncachedIndices[j]].updatedAt,
             memories[uncachedIndices[j]].content
           );
-          updateVaultMemoryEmbeddingOp(
-            vaultCtx,
-            memories[uncachedIndices[j]].uniqueId,
-            JSON.stringify(newEmbeddings[j]),
-            currentModel
-          ).catch(() => {
-          });
         }
       }
     }
@@ -17098,7 +17192,6 @@ async function retainWithPersistence(content, ctx, options = {}) {
           const factTypeUpdate = pickFactTypeUpdate(existing, options.factType);
           const resurrect = resurrectFields(existing);
           const updated = await ctx.persistence.update(targetId, {
-            content: existing.content,
             freeFormOnly: true,
             proofCountIncrement: 1,
             observationSourceIds: options.sourceChunkIds,
@@ -17302,7 +17395,7 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
     content: m.content,
     similarity: m.similarity
   }));
-  const { consolidateMemory: doConsolidate } = await import("./consolidate-4CQJYKRK.mjs");
+  const { consolidateMemory: doConsolidate } = await import("./consolidate-HKL5EGZT.mjs");
   const decision = await doConsolidate(trimmed, candidates, consolidateOptions);
   if (decision.action === "create") return decision.fallbackReason ? null : { create: true };
   if (decision.action === "supersede" && decision.content) {
@@ -17337,7 +17430,6 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
     const factTypeUpdate = pickFactTypeUpdate(existing, options.factType);
     const resurrect = resurrectFields(existing);
     const updated = await ctx.persistence.update(decision.targetId, {
-      content: existing.content,
       freeFormOnly: true,
       proofCountIncrement: 1,
       observationSourceIds: options.sourceChunkIds,
@@ -17365,6 +17457,10 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
     };
   }
   if (decision.action === "update" && decision.targetId && decision.content) {
+    const expectedContent = candidates.find(
+      (candidate) => candidate.id === decision.targetId
+    )?.content;
+    if (expectedContent === void 0) return null;
     const existing = await ctx.persistence.get(decision.targetId);
     if (!existing || existing.supersededBy) {
       return abandonToRace(
@@ -17372,6 +17468,9 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
         `update: target ${decision.targetId} ${existing ? "superseded" : "deleted"} before the write`
       );
     }
+    if (existing.content !== expectedContent) {
+      return abandonToRace(options, `update: target ${decision.targetId} edited before the write`);
+    }
     const mergedSourceIds = unionStrings(
       existing.sourceChunkIds ?? [],
       options.sourceChunkIds ?? []
@@ -17384,6 +17483,7 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
     const resurrect = resurrectFields(existing);
     const updated = await ctx.persistence.update(decision.targetId, {
       content: decision.content,
+      expectedContent,
       freeFormOnly: true,
       proofCountIncrement: 1,
       observationSourceIds: options.sourceChunkIds,
@@ -17396,10 +17496,10 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
       ...factTypeUpdate !== void 0 && { factType: factTypeUpdate }
     });
     if (!updated) {
-      await assertMergeTargetGoneOrThrow(ctx, decision.targetId);
+      await assertMergeTargetGoneOrThrow(ctx, decision.targetId, expectedContent);
       return abandonToRace(
         options,
-        `update: target ${decision.targetId} deleted mid-write (consolidated rewrite lost)`
+        `update: target ${decision.targetId} changed mid-write (consolidated rewrite lost)`
       );
     }
     cacheRowVector(
@@ -17426,9 +17526,9 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
   );
   return null;
 }
-async function assertMergeTargetGoneOrThrow(ctx, targetId) {
+async function assertMergeTargetGoneOrThrow(ctx, targetId, expectedContent) {
   const stillExists = await (ctx.persistence.getFresh ? ctx.persistence.getFresh(targetId) : ctx.persistence.get(targetId));
-  if (stillExists && (stillExists.kind === null || stillExists.kind === void 0)) {
+  if (stillExists && (stillExists.kind === null || stillExists.kind === void 0) && (expectedContent === void 0 || stillExists.content === expectedContent)) {
     throw new RetainError(
       "merge-not-persisted",
       `retain: merge into memory ${targetId} failed to persist`
@@ -19235,6 +19335,7 @@ async function recall(query, ctx, options = {}) {
         },
         ...options.rrfK !== void 0 && { rrfK: options.rrfK },
         ...options.decryptLast !== void 0 && { decryptLast: options.decryptLast },
+        ...options.vaultPreparation && { vaultPreparation: options.vaultPreparation },
         ...subQueries && { subQueries },
         ...options.scopes && { scopes: options.scopes },
         ...options.folderId !== void 0 && { folderId: options.folderId },
@@ -20814,16 +20915,16 @@ function createRemoteMemoryPipeline(options) {
       create: (input) => write(createRow(input), 0),
       update: async (id2, patch) => {
         const existing = await get(id2);
-        if (!existing || patch.freeFormOnly && existing.kind !== null && existing.kind !== void 0)
+        if (!existing || patch.expectedContent !== void 0 && existing.content !== patch.expectedContent || patch.freeFormOnly && existing.kind !== null && existing.kind !== void 0)
           return null;
         const snapshot = snapshots.get(id2);
         const memory = {
           ...snapshot.memory,
-          content: patch.content,
+          content: patch.content ?? snapshot.memory.content,
           updated_at: patch.preserveUpdatedAt ? snapshot.memory.updated_at : Math.max(Date.now(), (snapshot.memory.topics_extracted_at ?? 0) + 1)
         };
         if (patch.scope !== void 0) memory.scope = patch.scope;
-        if (patch.embedding === void 0 && patch.content !== snapshot.memory.content) {
+        if (patch.embedding === void 0 && patch.content !== void 0 && patch.content !== snapshot.memory.content) {
           delete memory.embedding;
           delete memory.embedding_model;
         }
@@ -22825,13 +22926,20 @@ async function synthesizeProfile(ctx, options = {}) {
       }
     }
   }
+  const vaultPreparation = createVaultPreparation();
   const settled = await Promise.allSettled(
     facets.map(async (facet) => {
       const prior = previous?.sections.find((s) => s.key === facet.key);
       if (prior && !staleKeys.has(facet.key)) {
         return prior;
       }
-      return synthesizeFacet(facet, recallCtx, options, fallbackPriors.get(facet.key));
+      return synthesizeFacet(
+        facet,
+        recallCtx,
+        options,
+        fallbackPriors.get(facet.key),
+        vaultPreparation
+      );
     })
   );
   const sections = settled.map((r, i) => {
@@ -22985,7 +23093,7 @@ async function attributeFacts(ctx, candidates, facets) {
   }
   return keys;
 }
-async function synthesizeFacet(facet, ctx, options, prior) {
+async function synthesizeFacet(facet, ctx, options, prior, vaultPreparation) {
   const scopes = options.scopes ?? DEFAULT_SCOPES;
   const limit = options.limit ?? DEFAULT_FACET_RECALL_LIMIT;
   const factTypeWeights = { ...DEFAULT_PROFILE_FACT_TYPE_WEIGHTS, ...options.factTypeWeights };
@@ -23002,6 +23110,7 @@ async function synthesizeFacet(facet, ctx, options, prior) {
     };
   }
   const recalled = await recall(facet.query, ctx, {
+    vaultPreparation,
     scopes,
     limit: hasReviewGate ? RECALL_MAX_LIMIT : limit,
     types: ["fact"],