@anuma/sdk 9.1.4 → 9.1.6

package/dist/server/{chunk-AU3Z7NBC.mjs → chunk-QEROZ4VH.mjs}

@@ -710,6 +710,12 @@ function assertTransportMatchesEndpoint(transport, endpoint) {
     `endpointOverride "${endpoint}" is the other transport's endpoint, but transport is "${transport}". The request body is built for the transport, so this sends the wrong shape and 400s without retry.`
   );
 }
+var TIME_BUDGET_EXHAUSTED = {
+  kind: "terminal",
+  code: "time-budget-exhausted",
+  reason: "time budget exhausted"
+};
+var MAX_TIMER_DELAY_MS = 2147483647;
 var RETRYABLE_HTTP = /* @__PURE__ */ new Set([408, 409, 425, 429]);
 function isRetryableStatus(status) {
   return status >= 500 || RETRYABLE_HTTP.has(status);
@@ -765,7 +771,8 @@ async function callPortalJsonCompletion(req) {
   }
   const maxAttempts = Math.max(1, req.maxAttempts ?? 3);
   const startedAt = Date.now();
-  const overBudget = () => req.totalTimeoutMs !== void 0 && Date.now() - startedAt >= req.totalTimeoutMs;
+  const deadlineAt = req.totalTimeoutMs === void 0 ? void 0 : startedAt + req.totalTimeoutMs;
+  const overBudget = () => deadlineAt !== void 0 && Date.now() >= deadlineAt;
   let lastFailure;
   let reinforce = false;
   const giveUp = () => {
@@ -778,17 +785,11 @@ async function callPortalJsonCompletion(req) {
       lastFailure = { reason: "time-budget-exhausted", attempts: attempt - 1 };
       break;
     }
-    const attemptReq = req.totalTimeoutMs !== void 0 ? {
-      ...req,
-      timeoutMs: Math.max(
-        1,
-        Math.min(req.timeoutMs ?? 6e4, req.totalTimeoutMs - (Date.now() - startedAt))
-      ),
-      ...reinforce && { reinforceJsonContract: true }
-    } : reinforce ? { ...req, reinforceJsonContract: true } : req;
+    const attemptReq = reinforce ? { ...req, reinforceJsonContract: true } : req;
     const outcome = await attemptPortalJson(
       { ...attemptReq, transport },
-      endpoint
+      endpoint,
+      deadlineAt
     );
     if (outcome.kind === "ok") {
       req.onAttempt?.({ attempt, ok: true });
@@ -828,13 +829,38 @@ async function callPortalJsonCompletion(req) {
   }
   return giveUp();
 }
-async function attemptPortalJson(req, endpoint) {
+async function attemptPortalJson(req, endpoint, deadlineAt) {
+  const controller = new AbortController();
+  if (deadlineAt === void 0 || deadlineAt - Date.now() > MAX_TIMER_DELAY_MS) {
+    return requestPortalJson(req, endpoint, controller);
+  }
+  const remainingMs = deadlineAt - Date.now();
+  if (remainingMs <= 0) return TIME_BUDGET_EXHAUSTED;
+  let timer;
+  try {
+    const outcome = await Promise.race([
+      new Promise((resolve) => {
+        timer = setTimeout(() => {
+          resolve(TIME_BUDGET_EXHAUSTED);
+          controller.abort();
+        }, remainingMs);
+      }),
+      requestPortalJson(req, endpoint, controller, deadlineAt)
+    ]);
+    return Date.now() >= deadlineAt ? TIME_BUDGET_EXHAUSTED : outcome;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function requestPortalJson(req, endpoint, controller, deadlineAt) {
   const baseUrl = req.baseUrl ?? defaultBaseUrl();
   const fetchImpl = req.fetchFn ?? fetch;
-  const timeoutMs = req.timeoutMs ?? 6e4;
   const authHeaders = await resolvePortalAuthHeaders(req, req.tag);
+  const remainingMs = deadlineAt === void 0 ? Infinity : deadlineAt - Date.now();
+  if (controller.signal.aborted || remainingMs <= 0) return TIME_BUDGET_EXHAUSTED;
   if (authHeaders === null)
     return { kind: "terminal", code: "auth-unavailable", reason: "auth unavailable (no token)" };
+  const timeoutMs = Math.min(req.timeoutMs ?? 6e4, remainingMs);
   const usesPrefill = req.transport !== "responses" && req.model.startsWith("anthropic/");
   const prefill = usesPrefill ? "{" : "";
   const messages = [
@@ -844,7 +870,6 @@ async function attemptPortalJson(req, endpoint) {
   ];
   if (prefill) messages.push({ role: "assistant", content: prefill });
   const supportsJsonObjectFormat = supportsResponseFormat(req.model);
-  const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   const requestBody = req.transport === "responses" ? {
     model: req.model,

package/dist/server/{consolidate-B6OSCZU4.mjs → consolidate-PYED62LW.mjs}

@@ -4,7 +4,7 @@ import {
   notifyConsolidationFallback,
   requiresResponsesTransport,
   resolvePiiRedactor
-} from "./chunk-AU3Z7NBC.mjs";
+} from "./chunk-QEROZ4VH.mjs";
 import "./chunk-3RPGXXPZ.mjs";
 
 // src/lib/memory/consolidate.ts

package/dist/server/index.cjs

@@ -15742,7 +15742,8 @@ async function callPortalJsonCompletion(req) {
   }
   const maxAttempts = Math.max(1, req.maxAttempts ?? 3);
   const startedAt = Date.now();
-  const overBudget = () => req.totalTimeoutMs !== void 0 && Date.now() - startedAt >= req.totalTimeoutMs;
+  const deadlineAt = req.totalTimeoutMs === void 0 ? void 0 : startedAt + req.totalTimeoutMs;
+  const overBudget = () => deadlineAt !== void 0 && Date.now() >= deadlineAt;
   let lastFailure;
   let reinforce = false;
   const giveUp = () => {
@@ -15755,17 +15756,11 @@ async function callPortalJsonCompletion(req) {
       lastFailure = { reason: "time-budget-exhausted", attempts: attempt - 1 };
       break;
     }
-    const attemptReq = req.totalTimeoutMs !== void 0 ? {
-      ...req,
-      timeoutMs: Math.max(
-        1,
-        Math.min(req.timeoutMs ?? 6e4, req.totalTimeoutMs - (Date.now() - startedAt))
-      ),
-      ...reinforce && { reinforceJsonContract: true }
-    } : reinforce ? { ...req, reinforceJsonContract: true } : req;
+    const attemptReq = reinforce ? { ...req, reinforceJsonContract: true } : req;
     const outcome = await attemptPortalJson(
       { ...attemptReq, transport },
-      endpoint
+      endpoint,
+      deadlineAt
     );
     if (outcome.kind === "ok") {
       req.onAttempt?.({ attempt, ok: true });
@@ -15805,13 +15800,38 @@ async function callPortalJsonCompletion(req) {
   }
   return giveUp();
 }
-async function attemptPortalJson(req, endpoint) {
+async function attemptPortalJson(req, endpoint, deadlineAt) {
+  const controller = new AbortController();
+  if (deadlineAt === void 0 || deadlineAt - Date.now() > MAX_TIMER_DELAY_MS) {
+    return requestPortalJson(req, endpoint, controller);
+  }
+  const remainingMs = deadlineAt - Date.now();
+  if (remainingMs <= 0) return TIME_BUDGET_EXHAUSTED;
+  let timer;
+  try {
+    const outcome = await Promise.race([
+      new Promise((resolve) => {
+        timer = setTimeout(() => {
+          resolve(TIME_BUDGET_EXHAUSTED);
+          controller.abort();
+        }, remainingMs);
+      }),
+      requestPortalJson(req, endpoint, controller, deadlineAt)
+    ]);
+    return Date.now() >= deadlineAt ? TIME_BUDGET_EXHAUSTED : outcome;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function requestPortalJson(req, endpoint, controller, deadlineAt) {
   const baseUrl = req.baseUrl ?? defaultBaseUrl();
   const fetchImpl = req.fetchFn ?? fetch;
-  const timeoutMs = req.timeoutMs ?? 6e4;
   const authHeaders = await resolvePortalAuthHeaders(req, req.tag);
+  const remainingMs = deadlineAt === void 0 ? Infinity : deadlineAt - Date.now();
+  if (controller.signal.aborted || remainingMs <= 0) return TIME_BUDGET_EXHAUSTED;
   if (authHeaders === null)
     return { kind: "terminal", code: "auth-unavailable", reason: "auth unavailable (no token)" };
+  const timeoutMs = Math.min(req.timeoutMs ?? 6e4, remainingMs);
   const usesPrefill = req.transport !== "responses" && req.model.startsWith("anthropic/");
   const prefill = usesPrefill ? "{" : "";
   const messages = [
@@ -15821,7 +15841,6 @@ async function attemptPortalJson(req, endpoint) {
   ];
   if (prefill) messages.push({ role: "assistant", content: prefill });
   const supportsJsonObjectFormat = supportsResponseFormat(req.model);
-  const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   const requestBody = req.transport === "responses" ? {
     model: req.model,
@@ -16006,7 +16025,7 @@ function extractResponsesContent(body) {
   const text12 = root.output.filter((item) => asRecord(item)?.type === "message").flatMap((item) => Array.isArray(item.content) ? item.content : []).map((part) => asRecord(part)?.text).filter((t) => typeof t === "string").join("");
   return text12;
 }
-var RESPONSE_FORMAT_OK, RESPONSE_SCHEMA_OK, JSON_CONTRACT_REMINDER, RESPONSES_ONLY_MODEL_PREFIXES, CHAT_TO_RESPONSES_FIELDS, FOREIGN_ENDPOINT_SUFFIX, RETRYABLE_HTTP;
+var RESPONSE_FORMAT_OK, RESPONSE_SCHEMA_OK, JSON_CONTRACT_REMINDER, RESPONSES_ONLY_MODEL_PREFIXES, CHAT_TO_RESPONSES_FIELDS, FOREIGN_ENDPOINT_SUFFIX, TIME_BUDGET_EXHAUSTED, MAX_TIMER_DELAY_MS, RETRYABLE_HTTP;
 var init_portalLlm = __esm({
   "src/lib/memory/portalLlm.ts"() {
     "use strict";
@@ -16026,6 +16045,12 @@ var init_portalLlm = __esm({
       chat: "/responses",
       responses: "/chat/completions"
     };
+    TIME_BUDGET_EXHAUSTED = {
+      kind: "terminal",
+      code: "time-budget-exhausted",
+      reason: "time budget exhausted"
+    };
+    MAX_TIMER_DELAY_MS = 2147483647;
     RETRYABLE_HTTP = /* @__PURE__ */ new Set([408, 409, 425, 429]);
   }
 });
@@ -17323,15 +17348,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;
@@ -17343,10 +17369,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;
@@ -17389,7 +17415,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(
@@ -17407,6 +17433,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`);
@@ -29068,6 +29097,16 @@ async function updateVaultMemoryOp(ctx, id, opts) {
     const probe = await ctx.vaultMemoryCollection.find(id);
     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);
@@ -29075,7 +29114,7 @@ async function updateVaultMemoryOp(ctx, id, 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,
@@ -29083,13 +29122,13 @@ async function updateVaultMemoryOp(ctx, id, opts) {
     ) : opts.content;
     let stale = false;
     const record = probe;
-    const originalUpdatedAt = record.updatedAt.getTime();
     await ctx.database.write(async () => {
       await assertCanWrite2(ctx);
-      if (record.isDeleted || record.supersededBy || !isOwnedByCtxUser(ctx, record) || opts.freeFormOnly && isKinded(record)) {
+      if (record.isDeleted || record.supersededBy || !isOwnedByCtxUser(ctx, record) || opts.freeFormOnly && isKinded(record) || opts.expectedContent !== void 0 && record._getRaw("content") !== readStoredContent) {
         stale = true;
         return;
       }
+      const originalUpdatedAt = record.updatedAt.getTime();
       const nextKind = opts.kind !== void 0 ? opts.kind : record.kind;
       const nextLevel = levelAfter(record);
       assertValidKindLevel(nextKind, nextLevel);
@@ -29105,7 +29144,7 @@ async function updateVaultMemoryOp(ctx, id, opts) {
         replayedObservation = opts.observationSourceIds.every((id2) => observedSources.includes(id2));
       }
       await record.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));
@@ -29873,7 +29912,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";
@@ -31550,6 +31589,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(registry, ctx, maskInput) {
+  let byMask = registry.get(ctx);
+  if (!byMask) {
+    byMask = /* @__PURE__ */ new Map();
+    registry.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) {
@@ -32112,11 +32249,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;
@@ -32135,12 +32272,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,
@@ -32149,13 +32286,6 @@ async function preEmbedVaultMemories(vaultCtx, embeddingOptions, cache, options)
         uncachedVersions[i],
         uncachedTexts[i]
       );
-      updateVaultMemoryEmbeddingOp(
-        vaultCtx,
-        uncachedIds[i],
-        JSON.stringify(embeddings[i]),
-        currentModel
-      ).catch(() => {
-      });
     }
   }
 }
@@ -32297,10 +32427,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(
@@ -32314,13 +32441,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(() => {
-          });
         });
       }
     }
@@ -32512,9 +32632,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;
@@ -32587,7 +32708,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(
@@ -32603,13 +32729,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(() => {
-          });
         }
       }
     }
@@ -33014,7 +33133,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,
@@ -33253,7 +33371,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,
@@ -33281,6 +33398,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(
@@ -33288,6 +33409,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 ?? []
@@ -33300,6 +33424,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,
@@ -33312,10 +33437,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(
@@ -33342,9 +33467,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`
@@ -35190,6 +35315,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 },
@@ -36622,13 +36748,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) => {
@@ -36782,7 +36915,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 };
@@ -36799,6 +36932,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"],