@anuma/sdk 9.1.5 → 9.1.6

package/dist/react/index.mjs

@@ -19,7 +19,7 @@ import {
   taskTypeHeader,
   validateEndpointOverride,
   withInternalFlowMarker
-} from "./chunk-7QX4J7KV.mjs";
+} from "./chunk-RSA3S6OA.mjs";
 import {
   BASE_URL,
   MCP_R2_DOMAIN,
@@ -14957,6 +14957,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);
@@ -14964,7 +14974,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,
@@ -14972,13 +14982,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);
@@ -14994,7 +15004,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));
@@ -15761,7 +15771,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";
@@ -19261,7 +19271,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,
@@ -19465,7 +19474,7 @@ async function tryConsolidate(trimmed, ctx, options, prepared) {
     content: m.content,
     similarity: m.similarity
   }));
-  const { consolidateMemory: doConsolidate } = await import("./consolidate-WLDYJF6J.mjs");
+  const { consolidateMemory: doConsolidate } = await import("./consolidate-WFTPBHDV.mjs");
   const decision = await doConsolidate(trimmed, candidates, consolidateOptions);
   if (decision.action === "create") return decision.fallbackReason ? null : { create: true };
   if (decision.action === "supersede" && decision.content) {
@@ -19500,7 +19509,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,
@@ -19528,6 +19536,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(
@@ -19535,6 +19547,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 ?? []
@@ -19547,6 +19562,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,
@@ -19559,10 +19575,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(
@@ -19589,9 +19605,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`
@@ -23004,16 +23020,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;
         }
@@ -36750,20 +36766,27 @@ function useSubscription(options = {}) {
 }
 
 // src/react/useTools.ts
-import { useCallback as useCallback18, useEffect as useEffect12, useRef as useRef9, useState as useState16 } from "react";
+import { useCallback as useCallback18, useEffect as useEffect12, useMemo as useMemo10, useRef as useRef9, useState as useState16 } from "react";
 function useTools(options) {
   const { getToken, baseUrl = BASE_URL, includeTools, autoFetch = true } = options;
-  const [tools, setTools] = useState16([]);
+  const [allTools, setAllTools] = useState16([]);
   const [checksum, setChecksum] = useState16(getToolsChecksum2);
   const [isLoading, setIsLoading] = useState16(false);
   const [error, setError] = useState16(null);
+  const includeToolsRef = useRef9(includeTools);
+  if (includeTools !== includeToolsRef.current && (includeTools === void 0 || includeToolsRef.current === void 0 || includeTools.length !== includeToolsRef.current.length || includeTools.some((name, i) => name !== includeToolsRef.current?.[i]))) {
+    includeToolsRef.current = includeTools;
+  }
+  const stableIncludeTools = includeToolsRef.current;
+  const tools = useMemo10(
+    () => filterServerTools(allTools, stableIncludeTools),
+    [allTools, stableIncludeTools]
+  );
   const getTokenRef = useRef9(getToken);
   const baseUrlRef = useRef9(baseUrl);
-  const includeToolsRef = useRef9(includeTools);
   useEffect12(() => {
     getTokenRef.current = getToken;
     baseUrlRef.current = baseUrl;
-    includeToolsRef.current = includeTools;
   });
   const fetchTools = useCallback18(async (forceRefresh = false) => {
     setIsLoading(true);
@@ -36774,8 +36797,7 @@ function useTools(options) {
         baseUrl: baseUrlRef.current,
         forceRefresh
       });
-      const filteredTools = filterServerTools(fetchedTools, includeToolsRef.current);
-      setTools(filteredTools);
+      setAllTools(fetchedTools);
       setChecksum(getToolsChecksum2());
     } catch (err) {
       setError(err instanceof Error ? err : new Error(String(err)));
@@ -36799,11 +36821,6 @@ function useTools(options) {
     },
     [refresh]
   );
-  useEffect12(() => {
-    if (tools.length > 0 && includeTools !== void 0) {
-      setTools((currentTools) => filterServerTools(currentTools, includeTools));
-    }
-  }, [includeTools, tools.length]);
   const hasFetchedRef = useRef9(false);
   useEffect12(() => {
     if (autoFetch && !hasFetchedRef.current) {
@@ -36830,7 +36847,7 @@ import {
   createElement as createElement4,
   useCallback as useCallback19,
   useContext as useContext5,
-  useMemo as useMemo10,
+  useMemo as useMemo11,
   useRef as useRef10,
   useState as useState17
 } from "react";
@@ -36967,7 +36984,7 @@ function UIInteractionProvider({
     },
     [pendingInteractions]
   );
-  const contextValue = useMemo10(
+  const contextValue = useMemo11(
     () => ({
       pendingInteractions,
       createInteraction,
@@ -36991,7 +37008,7 @@ function UIInteractionProvider({
 }
 
 // src/react/useVoice.ts
-import { useCallback as useCallback20, useMemo as useMemo11, useRef as useRef11, useState as useState18 } from "react";
+import { useCallback as useCallback20, useMemo as useMemo12, useRef as useRef11, useState as useState18 } from "react";
 function getOnDeviceSpeechRecognition() {
   if (typeof window === "undefined") return null;
   if (!/iPhone|iPad|iPod/.test(navigator.userAgent)) return null;
@@ -37195,7 +37212,7 @@ function useVoice(options) {
     },
     [recording, loadPipeline, options?.language]
   );
-  const nativeSpeechAvailable = useMemo11(() => getOnDeviceSpeechRecognition() !== null, []);
+  const nativeSpeechAvailable = useMemo12(() => getOnDeviceSpeechRecognition() !== null, []);
   const [isNativeListening, setIsNativeListening] = useState18(false);
   const nativeRecognitionRef = useRef11(null);
   const nativeTextRef = useRef11("");

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]);
   }
 });
@@ -29072,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);
@@ -29079,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,
@@ -29087,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);
@@ -29109,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));
@@ -29877,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";
@@ -33098,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,
@@ -33337,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,
@@ -33365,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(
@@ -33372,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 ?? []
@@ -33384,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,
@@ -33396,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(
@@ -33426,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`

package/dist/server/index.d.mts

@@ -5287,7 +5287,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;
     /**
@@ -5849,9 +5850,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.
@@ -6182,7 +6184,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/server/index.d.ts

@@ -5287,7 +5287,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;
     /**
@@ -5849,9 +5850,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.
@@ -6182,7 +6184,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