@anuma/sdk 7.0.7 → 7.1.1

package/dist/react/index.cjs

@@ -12292,6 +12292,11 @@ function parseTopics(value) {
 }
 
 // src/lib/db/entities/operations.ts
+async function assertCanWrite(ctx) {
+  if (ctx.canWrite && !await ctx.canWrite()) {
+    throw new Error("Memory source is no longer eligible");
+  }
+}
 function entityToStored(e) {
   return {
     uniqueId: e.id,
@@ -12432,6 +12437,7 @@ async function linkMemoryEntitiesOp(ctx, memoryId, entityInputs, options) {
   let skipped = false;
   let entities = [];
   await ctx.database.write(async () => {
+    await assertCanWrite(ctx);
     const {
       entities: byName,
       operations: entityOps,
@@ -12507,6 +12513,7 @@ async function replaceMemoryEntities(ctx, memoryId, entityInputs, options) {
   let skipped = false;
   let entities = [];
   await ctx.database.write(async () => {
+    await assertCanWrite(ctx);
     const vaultRow = await findVaultRowInWrite(ctx, memoryId);
     if (options.guarded && autoLinkBlocked(vaultRow)) {
       skipped = true;
@@ -12567,6 +12574,7 @@ async function unlinkMemoryEntitiesOp(ctx, memoryIds) {
   const links = await ctx.memoryEntityCollection.query(import_watermelondb11.Q.where("memory_id", import_watermelondb11.Q.oneOf(Array.from(memoryIds)))).fetch();
   if (links.length === 0) return;
   await ctx.database.write(async () => {
+    await assertCanWrite(ctx);
     await ctx.database.batch(...links.map((l) => l.prepareDestroyPermanently()));
   });
 }
@@ -12575,6 +12583,7 @@ async function unlinkAllMemoryEntitiesForUserOp(ctx, userId) {
   const links = await ctx.memoryEntityCollection.query(import_watermelondb11.Q.where("user_id", userId)).fetch();
   if (links.length === 0) return;
   await ctx.database.write(async () => {
+    await assertCanWrite(ctx);
     await ctx.database.batch(...links.map((l) => l.prepareDestroyPermanently()));
   });
 }
@@ -12594,6 +12603,7 @@ async function backfillMemoryEntityUserIdsOp(ctx, vaultMemoryCollection) {
   }
   if (toUpdate.length === 0) return 0;
   await ctx.database.write(async () => {
+    await assertCanWrite(ctx);
     await ctx.database.batch(
       ...toUpdate.map(({ link, userId }) => link.prepareUpdate((r) => r._setRaw("user_id", userId)))
     );
@@ -14998,6 +15008,11 @@ function visibilityConditions(requested) {
 function isKinded(record2) {
   return record2.kind !== null && record2.kind !== void 0;
 }
+async function assertCanWrite2(ctx) {
+  if (ctx.canWrite && !await ctx.canWrite()) {
+    throw new Error("Memory source is no longer eligible");
+  }
+}
 function assertValidKindLevel(kind, level) {
   const hasKind = kind !== null && kind !== void 0;
   if (hasKind && !MEMORY_KINDS.includes(kind)) {
@@ -15178,8 +15193,7 @@ async function createVaultMemoryOp(ctx, opts) {
     ctx.embeddedWalletSigner
   ) : opts.content;
   const created = await ctx.database.write(async () => {
-    if (ctx.canWrite && !await ctx.canWrite())
-      throw new Error("Memory source is no longer eligible");
+    await assertCanWrite2(ctx);
     return ctx.vaultMemoryCollection.create(
       (record2) => populateNewVaultMemory(record2, ctx, opts, encryptedContent, encryptedKindValue)
     );
@@ -15198,8 +15212,7 @@ async function createSupersedingMemoryOp(ctx, opts, targetId) {
   ) : opts.content;
   let createdRecord = null;
   await ctx.database.write(async () => {
-    if (ctx.canWrite && !await ctx.canWrite())
-      throw new Error("Memory source is no longer eligible");
+    await assertCanWrite2(ctx);
     let target;
     try {
       target = await ctx.vaultMemoryCollection.find(targetId);
@@ -15291,8 +15304,7 @@ async function createVaultMemoriesBatchOp(ctx, optionsArray) {
     })
   );
   const created = await ctx.database.write(async () => {
-    if (ctx.canWrite && !await ctx.canWrite())
-      throw new Error("Memory source is no longer eligible");
+    await assertCanWrite2(ctx);
     const prepared = optionsArray.map(
       (opts, i) => ctx.vaultMemoryCollection.prepareCreate(
         (record2) => populateNewVaultMemory(record2, ctx, opts, encryptedContents[i], encryptedKindValues[i])
@@ -15597,8 +15609,7 @@ async function updateVaultMemoryOp(ctx, id, opts) {
     const record2 = probe;
     const originalUpdatedAt = record2.updatedAt.getTime();
     await ctx.database.write(async () => {
-      if (ctx.canWrite && !await ctx.canWrite())
-        throw new Error("Memory source is no longer eligible");
+      await assertCanWrite2(ctx);
       if (record2.isDeleted || record2.supersededBy || !isOwnedByCtxUser(ctx, record2) || opts.freeFormOnly && isKinded(record2)) {
         stale = true;
         return;
@@ -15709,6 +15720,7 @@ async function setMemoryEntitiesOp(ctx, memoryId, entities) {
   let stale = false;
   const originalUpdatedAt = record2.updatedAt.getTime();
   await ctx.database.write(async (writer) => {
+    await assertCanWrite2(ctx);
     if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) {
       stale = true;
       return;
@@ -15750,6 +15762,7 @@ async function clearMemoryTopicsOverrideOp(ctx, memoryId, options) {
   const originalUpdatedAt = record2.updatedAt.getTime();
   let cleared = false;
   await ctx.database.write(async () => {
+    await assertCanWrite2(ctx);
     if (options?.unlessTopicsRecorded && parseTopics(record2.topics) !== null) return;
     cleared = true;
     await record2.update((r) => {
@@ -15773,6 +15786,7 @@ async function setMemoryVisibilityOp(ctx, id, opts) {
   if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) return null;
   let stale = false;
   await ctx.database.write(async () => {
+    await assertCanWrite2(ctx);
     if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) {
       stale = true;
       return;
@@ -15801,6 +15815,7 @@ async function deleteVaultMemoryOp(ctx, id) {
     if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) return false;
     let stale = false;
     await ctx.database.write(async () => {
+      await assertCanWrite2(ctx);
       if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) {
         stale = true;
         return;
@@ -15838,8 +15853,7 @@ async function supersedeVaultMemoryOp(ctx, id, supersededById) {
     }
     let stale = false;
     await ctx.database.write(async () => {
-      if (ctx.canWrite && !await ctx.canWrite())
-        throw new Error("Memory source is no longer eligible");
+      await assertCanWrite2(ctx);
       if (record2.isDeleted || record2.supersededBy || !isOwnedByCtxUser(ctx, record2)) {
         stale = true;
         return;
@@ -16001,6 +16015,7 @@ async function stampTopicsExtractedAtOp(ctx, memoryIds, extractedAt, version = T
   for (let i = 0; i < uniqueIds.length; i += CHUNK) {
     const chunkIds = uniqueIds.slice(i, i + CHUNK);
     await ctx.database.write(async () => {
+      await assertCanWrite2(ctx);
       const records = [];
       for (const id of chunkIds) {
         try {
@@ -16034,6 +16049,7 @@ async function relinkMemoryTopicsOp(ctx, memoryIds) {
   for (const id of Array.from(new Set(memoryIds))) {
     try {
       await ctx.database.write(async (writer) => {
+        await assertCanWrite2(ctx);
         let record2;
         try {
           record2 = await ctx.vaultMemoryCollection.find(id);
@@ -16064,6 +16080,7 @@ async function backfillMemoryTopicsOp(ctx, memoryIds) {
   for (let i = 0; i < uniqueIds.length; i += CHUNK) {
     const chunkIds = uniqueIds.slice(i, i + CHUNK);
     await ctx.database.write(async () => {
+      await assertCanWrite2(ctx);
       const writes = [];
       for (const id of chunkIds) {
         let record2;
@@ -16096,6 +16113,7 @@ async function deleteAllVaultMemoriesForUserOp(ctx, userId) {
   const records = await ctx.vaultMemoryCollection.query(import_watermelondb23.Q.where("user_id", userId), import_watermelondb23.Q.where("is_deleted", false)).fetch();
   if (records.length === 0) return 0;
   await ctx.database.write(async () => {
+    await assertCanWrite2(ctx);
     const prepared = records.map(
       (record2) => record2.prepareUpdate((r) => {
         r._setRaw("is_deleted", true);
@@ -16150,6 +16168,7 @@ async function archiveVaultMemoryOp(ctx, id, opts) {
     let stale = false;
     const archivedAtValue = opts?.now ?? Date.now();
     await ctx.database.write(async () => {
+      await assertCanWrite2(ctx);
       if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2) || record2.archivedAt !== null) {
         stale = true;
         return;
@@ -16173,6 +16192,7 @@ async function restoreVaultMemoryOp(ctx, id) {
     if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) return false;
     let stale = false;
     await ctx.database.write(async () => {
+      await assertCanWrite2(ctx);
       if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) {
         stale = true;
         return;
@@ -16193,6 +16213,7 @@ async function hardDeleteDecayedOp(ctx, id, opts) {
     const now = opts.now ?? Date.now();
     let stale = false;
     await ctx.database.write(async () => {
+      await assertCanWrite2(ctx);
       const archivedAt = record2.archivedAt;
       if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2) || archivedAt === null || now - archivedAt <= opts.hardDeleteWindowMs) {
         stale = true;
@@ -16232,6 +16253,7 @@ async function updateVaultMemoryEmbeddingOp(ctx, id, embedding2, embeddingModel,
     }
     let written = false;
     await ctx.database.write(async () => {
+      await assertCanWrite2(ctx);
       if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) return;
       const originalUpdatedAt = record2.updatedAt.getTime();
       if (originalUpdatedAt !== readUpdatedAt || record2._getRaw("content") !== readStoredContent)
@@ -20228,6 +20250,13 @@ function restoreCandidates(candidates, redactor, ownNames) {
   ).map((c) => c.candidate);
 }
 async function extractAndRetain(messages, retainCtx, options) {
+  const { memoryStore, signal } = options;
+  if (memoryStore === null) throw new Error("Memory store is not ready");
+  if (memoryStore && options.folderId !== void 0 && options.folderId !== null)
+    throw new Error("Remote memory extraction does not support folders");
+  if (memoryStore && options.extract.piiRedaction && !memoryStore.masksEmbeddingInput)
+    throw new Error("PII-redacted extraction requires a memory store that masks embedding inputs");
+  signal?.throwIfAborted();
   const minConfidence = options.minConfidence ?? DEFAULT_MIN_CONFIDENCE;
   const resolvedConsolidatePii = options.consolidateOptions?.piiRedaction ?? options.extract.piiRedaction;
   const consolidateOptions = options.consolidateOptions !== void 0 ? {
@@ -20261,6 +20290,7 @@ async function extractAndRetain(messages, retainCtx, options) {
     }
   });
   const extractMs = Date.now() - tExtract;
+  signal?.throwIfAborted();
   const filtered = candidates.filter((c) => c.confidence >= minConfidence);
   const log = getLogger();
   const screened = screenCandidatesForInjection(filtered);
@@ -20308,16 +20338,33 @@ async function extractAndRetain(messages, retainCtx, options) {
   const results = [];
   const quarantinedInfo = [];
   let failedWrites = 0;
+  let auditRows;
   const tRetain = Date.now();
   for (const { candidate, isQuarantined, reason, signature } of toRetain) {
     try {
+      signal?.throwIfAborted();
       if (isQuarantined) {
-        const existingId = await findQuarantinedDuplicateOp(
-          retainCtx.vaultCtx,
-          candidate.content,
-          candidate.sourceMessageIds,
-          { scope: options.scope ?? "private", folderId: options.folderId ?? null }
-        ).catch(() => null);
+        let existingId;
+        if (memoryStore) {
+          auditRows ?? (auditRows = memoryStore.list({
+            scopes: [options.scope ?? "private"],
+            includeArchived: true,
+            includeQuarantined: true,
+            includeSuperseded: true
+          }));
+          const sourceKey = [...new Set(candidate.sourceMessageIds)].sort().join("\0");
+          const normalize = (value) => value.normalize("NFKC").trim().replace(/\s+/g, " ").toLowerCase();
+          existingId = (await auditRows).find(
+            (row) => row.trustTier === "quarantined" && row.scope === (options.scope ?? "private") && [...new Set(row.sourceChunkIds ?? [])].sort().join("\0") === sourceKey && normalize(row.content) === normalize(candidate.content)
+          )?.uniqueId ?? null;
+        } else {
+          existingId = await findQuarantinedDuplicateOp(
+            retainCtx.vaultCtx,
+            candidate.content,
+            candidate.sourceMessageIds,
+            { scope: options.scope ?? "private", folderId: options.folderId ?? null }
+          ).catch(() => null);
+        }
         if (existingId) {
           quarantinedInfo.push({
             candidate,
@@ -20328,18 +20375,26 @@ async function extractAndRetain(messages, retainCtx, options) {
           continue;
         }
       }
-      const result = await retain(candidate.content, retainCtx, {
+      const retainOptions = {
         source: "auto-extracted",
         sourceChunkIds: candidate.sourceMessageIds,
         respectTombstones: true,
         ...options.scope !== void 0 && { scope: options.scope },
-        ...options.folderId !== void 0 && { folderId: options.folderId },
         ...consolidateOptions !== void 0 && { consolidateOptions },
         ...candidate.eventTime !== null && { eventTime: candidate.eventTime },
         factType: candidate.type,
         ...isQuarantined && { trustTier: "quarantined", enableAutoMerge: false }
+      };
+      const result = memoryStore ? await memoryStore.retain(candidate.content, {
+        ...retainOptions,
+        canWrite: retainCtx.vaultCtx.canWrite,
+        signal
+      }) : await retain(candidate.content, retainCtx, {
+        ...retainOptions,
+        ...options.folderId !== void 0 && { folderId: options.folderId }
       });
       if (isQuarantined) {
+        auditRows = void 0;
         const info = {
           candidate,
           memoryId: result.memoryId,
@@ -20358,9 +20413,16 @@ async function extractAndRetain(messages, retainCtx, options) {
       }
       succeededCandidates.push(candidate);
       results.push(result);
-      if (result.action !== "suppressed" && options.entityCtx && candidate.entities.length > 0) {
+      if (result.action !== "suppressed" && candidate.entities.length > 0) {
         try {
-          if (!await isMemoryTopicsUserManaged(options.entityCtx, result.memoryId)) {
+          signal?.throwIfAborted();
+          if (memoryStore) {
+            await memoryStore.addTopics(result.memoryId, candidate.entities, {
+              unlessUserManaged: true,
+              canWrite: retainCtx.vaultCtx.canWrite,
+              signal
+            });
+          } else if (options.entityCtx && !await isMemoryTopicsUserManaged(options.entityCtx, result.memoryId)) {
             await linkMemoryEntitiesOp(options.entityCtx, result.memoryId, candidate.entities, {
               unlessTopicsUserManaged: true
             });
@@ -20610,7 +20672,7 @@ function createAutoExtractor(options) {
   };
   const consolidateOptions = options.consolidate ? { ...options.consolidate, ...subPassAuth(options.consolidate.baseUrl) } : void 0;
   const injectionClassifierOptions = options.injectionClassifier ? { ...options.injectionClassifier, ...subPassAuth(options.injectionClassifier.baseUrl) } : void 0;
-  if (options.retainCtx.vaultCtx.entityCtx && !options.entityCtx) {
+  if (!options.memoryStore && options.retainCtx.vaultCtx.entityCtx && !options.entityCtx) {
     getLogger().warn(
       "[memory/extract] retainCtx.vaultCtx.entityCtx is set but extractor was created without `entityCtx` \u2014 W5 graph lane will receive no writes"
     );
@@ -20655,6 +20717,8 @@ function createAutoExtractor(options) {
       try {
         const { candidates, results, failedCount, outcome: outcome2, failure, funnel, timings, model } = await extractAndRetain(window2, retainCtx, {
           extract,
+          memoryStore: options.memoryStore,
+          signal: options.signal,
           ...options.minConfidence !== void 0 && { minConfidence: options.minConfidence },
           ...options.entityCtx !== void 0 && { entityCtx: options.entityCtx },
           ...options.scope !== void 0 && { scope: options.scope },
@@ -22786,6 +22850,7 @@ function createLocalMemoryStore(options) {
     database,
     entityCollection: database.get("entity"),
     memoryEntityCollection: database.get("memory_entity"),
+    canWrite: options.canWrite,
     ...userId !== void 0 && { userId },
     ...options.allowUnscopedRows !== void 0 && {
       allowUnscopedRows: options.allowUnscopedRows
@@ -22797,10 +22862,21 @@ function createLocalMemoryStore(options) {
     walletAddress: options.walletAddress,
     signMessage: options.signMessage,
     embeddedWalletSigner: options.embeddedWalletSigner,
+    canWrite: options.canWrite,
     ...userId !== void 0 && { userId },
     ...options.singleTenant !== void 0 && { singleTenant: options.singleTenant },
     entityCtx
   };
+  const assertWrite = async (writeOptions) => {
+    writeOptions?.signal?.throwIfAborted();
+    if (writeOptions?.canWrite && !await writeOptions.canWrite()) {
+      throw new Error("Memory source is no longer eligible");
+    }
+    if (options.canWrite && !await options.canWrite()) {
+      throw new Error("Memory source is no longer eligible");
+    }
+    writeOptions?.signal?.throwIfAborted();
+  };
   const vaultCache = options.vaultCache ?? createVaultEmbeddingCache();
   const ownedBy = userId !== void 0 ? [import_watermelondb32.Q.where("user_id", userId)] : [];
   const linksOwnedBy = userId === void 0 ? [] : options.allowUnscopedRows ? [import_watermelondb32.Q.or(import_watermelondb32.Q.where("user_id", userId), import_watermelondb32.Q.where("user_id", null))] : [import_watermelondb32.Q.where("user_id", userId)];
@@ -22912,9 +22988,25 @@ function createLocalMemoryStore(options) {
     archive: (id) => archiveVaultMemoryOp(vaultCtx, id),
     restore: (id) => restoreVaultMemoryOp(vaultCtx, id),
     setTopics: (memoryId, topics) => setMemoryEntitiesOp(vaultCtx, memoryId, topics),
-    addTopics: (memoryId, topics) => database.write(async (writer) => {
+    addTopics: (memoryId, topics, writeOptions) => database.write(async (writer) => {
+      await assertWrite(writeOptions);
       const owned = await vaultCtx.vaultMemoryCollection.query(import_watermelondb32.Q.where("id", memoryId), import_watermelondb32.Q.where("is_deleted", false), ...ownedBy).fetchCount();
-      return owned > 0 ? writer.callWriter(() => linkMemoryEntitiesOp(entityCtx, memoryId, topics)) : [];
+      return owned > 0 ? writer.callWriter(
+        () => linkMemoryEntitiesOp(
+          {
+            ...entityCtx,
+            canWrite: async () => {
+              await assertWrite(writeOptions);
+              return true;
+            }
+          },
+          memoryId,
+          topics,
+          {
+            unlessTopicsUserManaged: writeOptions?.unlessUserManaged
+          }
+        )
+      ) : [];
     }),
     setVisibility: (id, visibility, visibilityOptions) => setMemoryVisibilityOp(vaultCtx, id, { visibility, ...visibilityOptions }),
     recall: (query, recallOptions) => recall(
@@ -22924,7 +23016,17 @@ function createLocalMemoryStore(options) {
     ),
     retain: (content, retainOptions) => retain(
       content,
-      { vaultCtx, embeddingOptions: options.embeddingOptions, vaultCache },
+      {
+        vaultCtx: {
+          ...vaultCtx,
+          canWrite: async () => {
+            await assertWrite(retainOptions);
+            return true;
+          }
+        },
+        embeddingOptions: options.embeddingOptions,
+        vaultCache
+      },
       retainOptions
     ),
     factSource: {
@@ -23579,7 +23681,14 @@ function stored(row) {
 function createRemoteMemoryPipeline(options) {
   const { persistence, embeddingOptions } = options;
   const model = embeddingOptions.model ?? DEFAULT_API_EMBEDDING_MODEL;
-  const operation = (mode, queryOptions = embeddingOptions) => {
+  const operation = (mode, queryOptions = embeddingOptions, writeOptions) => {
+    const signal = writeOptions?.signal;
+    const assertWrite = async () => {
+      signal?.throwIfAborted();
+      if (writeOptions?.canWrite && !await writeOptions.canWrite())
+        throw new Error("Memory source is no longer eligible");
+      signal?.throwIfAborted();
+    };
     const rejectUndecryptable = (failed) => {
       if (!failed.length) return;
       if (mode === "retain")
@@ -23597,7 +23706,7 @@ function createRemoteMemoryPipeline(options) {
       return items.map((item) => stored(item.memory));
     };
     const get = async (id) => {
-      const snapshot = snapshots.get(id) ?? await persistence.get(id);
+      const snapshot = snapshots.get(id) ?? await (signal ? persistence.get(id, signal) : persistence.get(id));
       if (!snapshot || snapshot.memory.is_deleted || snapshot.memory.superseded_by) return null;
       snapshots.set(id, snapshot);
       return stored(snapshot.memory);
@@ -23647,7 +23756,7 @@ function createRemoteMemoryPipeline(options) {
         if (forced.size < 100 && temporal[i] !== void 0) forced.add(temporal[i]);
       }
       const forceIds = [...forced];
-      const windowOptions = (i, signal) => ({
+      const windowOptions = (i, signal2) => ({
         limit: Math.min(100, Math.max((search.limit ?? 8) * 3, 30)),
         force_ids: i === 0 ? forceIds : [],
         ...search.scopes && { scopes: search.scopes },
@@ -23655,13 +23764,15 @@ function createRemoteMemoryPipeline(options) {
         ...search.memoryIds !== void 0 && { memory_ids: search.memoryIds },
         include_archived: search.includeArchived,
         embedding_model: model,
-        ...signal && { signal }
+        ...signal2 && { signal: signal2 }
       });
       const vectors = [queryEmbedding, ...facetEmbeddings];
       let windows;
       if (mode === "retain") {
         windows = await Promise.all(
-          vectors.map((embedding2, i) => persistence.candidateSet(embedding2, windowOptions(i)))
+          vectors.map(
+            (embedding2, i) => persistence.candidateSet(embedding2, windowOptions(i, signal))
+          )
         );
       } else {
         const deadline = new AbortController();
@@ -23749,12 +23860,15 @@ function createRemoteMemoryPipeline(options) {
         twin_opt_in: false
       };
     };
-    const write = async (memory, snapshot) => remember([await persistence.put(memory, snapshot)])[0];
+    const write = async (memory, snapshot) => {
+      await assertWrite();
+      return remember([await persistence.put(memory, snapshot, signal)])[0];
+    };
     const port = {
       prepare,
       get,
       getFresh: async (id) => {
-        const current = await persistence.get(id);
+        const current = await (signal ? persistence.get(id, signal) : persistence.get(id));
         return current && !current.memory.is_deleted && !current.memory.superseded_by ? stored(current.memory) : null;
       },
       tombstones: async (embedding2, embeddingModel, scope, folderId) => {
@@ -23765,7 +23879,8 @@ function createRemoteMemoryPipeline(options) {
           embedding_model: embeddingModel,
           strict_model: true,
           include_deleted: true,
-          deleted_only: true
+          deleted_only: true,
+          signal
         });
         rejectUndecryptable(window2.failed);
         return remember(window2.items);
@@ -23821,14 +23936,18 @@ function createRemoteMemoryPipeline(options) {
         if (!target || !newer || id === successor) return false;
         const old = snapshots.get(id);
         const next = snapshots.get(successor);
+        await assertWrite();
         remember(
-          await persistence.putMany([
-            {
-              memory: { ...old.memory, superseded_by: successor, superseded_at: Date.now() },
-              expectedVersion: old
-            },
-            { memory: next.memory, expectedVersion: next }
-          ])
+          await persistence.putMany(
+            [
+              {
+                memory: { ...old.memory, superseded_by: successor, superseded_at: Date.now() },
+                expectedVersion: old
+              },
+              { memory: next.memory, expectedVersion: next }
+            ],
+            signal
+          )
         );
         return true;
       },
@@ -23837,18 +23956,22 @@ function createRemoteMemoryPipeline(options) {
         if (!target) return { created: null, retired: false };
         const snapshot = snapshots.get(targetId);
         const successor = createRow(input);
+        await assertWrite();
         const rows = remember(
-          await persistence.putMany([
-            { memory: successor, expectedVersion: 0 },
-            {
-              memory: {
-                ...snapshot.memory,
-                superseded_by: successor.memory_id,
-                superseded_at: Date.now()
-              },
-              expectedVersion: snapshot
-            }
-          ])
+          await persistence.putMany(
+            [
+              { memory: successor, expectedVersion: 0 },
+              {
+                memory: {
+                  ...snapshot.memory,
+                  superseded_by: successor.memory_id,
+                  superseded_at: Date.now()
+                },
+                expectedVersion: snapshot
+              }
+            ],
+            signal
+          )
         );
         return { created: rows[0], retired: true };
       }
@@ -23883,7 +24006,7 @@ function createRemoteMemoryPipeline(options) {
     factSource,
     recall: async (query, recallOptions = {}) => recall(query, { embeddingOptions, factSource }, { ...recallOptions, types: ["fact"] }),
     retain: async (content, retainOptions) => {
-      const { port } = operation("retain");
+      const { port } = operation("retain", embeddingOptions, retainOptions);
       return retainWithPersistence(
         content,
         {
@@ -24545,16 +24668,21 @@ function createRemoteMemoryStore(options) {
     const record2 = await persistence.get(id);
     return record2 && !record2.memory.is_deleted ? record2 : null;
   };
-  const mutateLocked = async (id, change, edit) => {
-    const record2 = await live(id);
+  const mutateLocked = async (id, change, edit, writeOptions) => {
+    writeOptions?.signal?.throwIfAborted();
+    const record2 = writeOptions?.signal ? await persistence.get(id, writeOptions.signal) : await live(id);
     if (!record2) return null;
+    if (record2.memory.is_deleted) return null;
+    if (writeOptions?.canWrite && !await writeOptions.canWrite())
+      throw new Error("Memory source is no longer eligible");
+    writeOptions?.signal?.throwIfAborted();
     const next = edit(structuredClone(record2.memory));
     if (!next) return null;
-    const saved = await persistence.put(next, record2);
+    const saved = writeOptions?.signal ? await persistence.put(next, record2, writeOptions.signal) : await persistence.put(next, record2);
     notify(typeof change === "function" ? change(record2.memory) : change, [saved]);
     return saved;
   };
-  const mutate = (id, change, edit) => serialized(id, () => mutateLocked(id, change, edit));
+  const mutate = (id, change, edit, writeOptions) => serialized(id, () => mutateLocked(id, change, edit, writeOptions));
   const serializedAll = (ids, task) => [...new Set(ids)].sort().reduceRight((inner, id) => () => serialized(id, inner), task)();
   const mutateMany = async (ids, change, edit) => {
     const saved = /* @__PURE__ */ new Map();
@@ -25067,13 +25195,21 @@ function createRemoteMemoryStore(options) {
         }))
       );
     },
-    addTopics: async (memoryId, topics) => {
+    addTopics: async (memoryId, topics, writeOptions) => {
       const added = await withKnownKinds(topicInputs(topics, "auto"));
-      const saved = await mutate(memoryId, "edit", (memory) => ({
-        ...memory,
-        topics: serializeTopics(mergeTopics(parseTopics(memory.topics) ?? [], added)),
-        topics_updated_at: Date.now()
-      }));
+      const saved = await mutate(
+        memoryId,
+        "edit",
+        (memory) => {
+          if (writeOptions?.unlessUserManaged && memory.topics_user_managed) return null;
+          return {
+            ...memory,
+            topics: serializeTopics(mergeTopics(parseTopics(memory.topics) ?? [], added)),
+            topics_updated_at: Date.now()
+          };
+        },
+        writeOptions
+      );
       if (!saved) return [];
       const now = /* @__PURE__ */ new Date();
       return mergeTopics([], added).map(
@@ -25926,6 +26062,7 @@ function createDurableAutoExtractor(options) {
   };
   const folderId = options.folderId ?? null;
   let disposed = false;
+  let activeBatch = null;
   let running = false;
   let wakeRequested = false;
   let timer;
@@ -25962,14 +26099,18 @@ function createDurableAutoExtractor(options) {
     }, delay);
   }
   async function extractBatch(messages, conversationId, ids, jobScope, jobFolderId) {
+    if (disposed) throw new Error("Extraction session was disposed");
     let watchdog;
     let cancelled = false;
+    const controller = new AbortController();
+    activeBatch = controller;
     const model = options.modelForScope?.(jobScope) ?? options.extract.model;
     try {
       return await Promise.race([
         new Promise((resolve, reject) => {
           const worker = createAutoExtractor({
             ...options,
+            signal: controller.signal,
             retainCtx: {
               ...options.retainCtx,
               vaultCtx: {
@@ -25998,6 +26139,8 @@ function createDurableAutoExtractor(options) {
       ]);
     } finally {
       cancelled = true;
+      controller.abort();
+      if (activeBatch === controller) activeBatch = null;
       if (watchdog !== void 0) clearTimeout(watchdog);
     }
   }
@@ -26009,6 +26152,7 @@ function createDurableAutoExtractor(options) {
     for (const message of loaded)
       if (message && message.messageId > 0) sequences.set(message.uniqueId, message.messageId);
     await database.write(async () => {
+      if (disposed) return;
       const current = idsOf(job);
       const acknowledged = ids.filter((id) => current.includes(id));
       if (!acknowledged.length) return;
@@ -26181,6 +26325,7 @@ function createDurableAutoExtractor(options) {
               jobScope,
               jobFolderId
             );
+            if (disposed) throw new Error("Extraction session was disposed");
             options.onTurnComplete?.(result);
             return result;
           };
@@ -26217,6 +26362,7 @@ function createDurableAutoExtractor(options) {
           );
           scheduleAfterSuccess = true;
         } catch (error) {
+          if (disposed) break;
           attempts.set(job.id, attempted + 1);
           retry = true;
           reportError(error, conversationId);
@@ -26239,6 +26385,14 @@ function createDurableAutoExtractor(options) {
         schedule(retry ? options.retryDelayMs ?? 3e4 : 0);
     }
   }
+  function dispose() {
+    disposed = true;
+    activeBatch?.abort(options.signal?.reason);
+    if (timer !== void 0) clearTimeout(timer);
+    options.signal?.removeEventListener("abort", dispose);
+  }
+  if (options.signal?.aborted) dispose();
+  else options.signal?.addEventListener("abort", dispose, { once: true });
   schedule(0);
   return {
     processTurn(messages, conversationId) {
@@ -26318,10 +26472,7 @@ function createDurableAutoExtractor(options) {
       return true;
     },
     isProcessing: () => running,
-    dispose() {
-      disposed = true;
-      if (timer !== void 0) clearTimeout(timer);
-    }
+    dispose
   };
 }
 
@@ -30817,7 +30968,7 @@ async function requestICloudSignIn() {
   }
   return container.whenUserSignsIn();
 }
-async function uploadFileToICloud(filename, content) {
+async function uploadFileToICloud(filename, content, backupRevision) {
   const container = await getContainer();
   const database = container.privateCloudDatabase;
   const recordName = `backup_${filename.replace(/[^a-zA-Z0-9]/g, "_")}`;
@@ -30830,7 +30981,8 @@ async function uploadFileToICloud(filename, content) {
       filename: { value: filename },
       data: { value: base64Data },
       size: { value: content.size },
-      contentType: { value: content.type || "application/json" }
+      contentType: { value: content.type || "application/json" },
+      ...backupRevision ? { backupRevision: { value: backupRevision } } : {}
     }
   };
   const response = await database.saveRecords(record2);
@@ -30842,7 +30994,8 @@ async function uploadFileToICloud(filename, content) {
     recordName: savedRecord.recordName,
     filename,
     modifiedAt: new Date(savedRecord.modified?.timestamp ?? Date.now()),
-    size: content.size
+    size: content.size,
+    backupRevision: savedRecord.fields.backupRevision?.value
   };
 }
 async function listICloudFiles() {
@@ -30863,6 +31016,7 @@ async function listICloudFiles() {
     recordName: record2.recordName,
     filename: record2.fields.filename?.value ?? "",
     modifiedAt: new Date(record2.modified?.timestamp ?? Date.now()),
+    backupRevision: record2.fields.backupRevision?.value,
     size: typeof record2.fields.data?.value === "object" && record2.fields.data?.value !== null ? record2.fields.data.value.size : 0
   }));
   return files.sort((a, b) => b.modifiedAt.getTime() - a.modifiedAt.getTime());
@@ -30916,35 +31070,53 @@ async function findICloudFile(filename) {
     recordName: record2.recordName,
     filename: record2.fields.filename?.value ?? "",
     modifiedAt: new Date(record2.modified?.timestamp ?? Date.now()),
+    backupRevision: record2.fields.backupRevision?.value,
     size: typeof record2.fields.data?.value === "object" && record2.fields.data?.value !== null ? record2.fields.data.value.size : 0
   };
 }
 
 // src/lib/backup/icloud/backup.ts
 var isAuthError = (err) => err instanceof Error && (err.message.includes("AUTHENTICATION") || err.message.includes("NOT_AUTHENTICATED") || err.message.includes("sign in"));
+var UNREVISIONED_COLUMNS = /* @__PURE__ */ new Set([
+  "updated_at",
+  "vector",
+  "embedding_model",
+  "chunks",
+  "origin"
+]);
+async function getBackupRevision(database, conversationId) {
+  const serialized = await database.read(async () => {
+    const { Q: Q20 } = await import("@nozbe/watermelondb");
+    const tables = await Promise.all(
+      ["conversations", "history"].map(
+        (table) => database.get(table).query(Q20.where("conversation_id", conversationId), Q20.sortBy("id", Q20.asc)).unsafeFetchRaw()
+      )
+    );
+    return JSON.stringify(
+      tables.map(
+        (rows) => rows.map(
+          (row) => Object.entries(row).filter(([key]) => !key.startsWith("_") && !UNREVISIONED_COLUMNS.has(key)).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0)
+        )
+      )
+    );
+  });
+  const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(serialized));
+  return "v1:" + Array.from(new Uint8Array(digest), (byte) => byte.toString(16).padStart(2, "0")).join("");
+}
 async function pushConversationToICloud(database, conversationId, userAddress, deps, _retried = false) {
   try {
     await deps.requestEncryptionKey(userAddress);
     const filename = `${conversationId}.json`;
     const existingFile = await findICloudFile(filename);
-    if (existingFile) {
-      const { Q: Q20 } = await import("@nozbe/watermelondb");
-      const conversationsCollection = database.get("conversations");
-      const records = await conversationsCollection.query(Q20.where("conversation_id", conversationId)).fetch();
-      if (records.length > 0) {
-        const conversation = conversationToStoredRaw(records[0]);
-        const localUpdated = conversation.updatedAt.getTime();
-        const remoteModified = existingFile.modifiedAt.getTime();
-        if (localUpdated <= remoteModified) {
-          return "skipped";
-        }
-      }
+    const backupRevision = await getBackupRevision(database, conversationId);
+    if (existingFile?.backupRevision === backupRevision) {
+      return "skipped";
     }
     const exportResult = await deps.exportConversation(conversationId, userAddress);
     if (!exportResult.success || !exportResult.blob) {
       return "failed";
     }
-    await uploadFileToICloud(filename, exportResult.blob);
+    await uploadFileToICloud(filename, exportResult.blob, backupRevision);
     return "uploaded";
   } catch (err) {
     if (isAuthError(err) && !_retried) {
@@ -32592,6 +32764,7 @@ var CONVERSATION_REDACTOR_LIMIT = 50;
 var NO_CONVERSATION_KEY = "__no_conversation__";
 var NO_STORE_FOLDERS = "Folders are not supported with a memoryStore";
 var NO_STORE_MASK = "piiRedaction needs a memoryStore built with embeddingOptions.maskInput";
+var MEMORY_STORE_NOT_READY = "Memory store is not ready";
 var conversationRedactors = /* @__PURE__ */ new Map();
 function getConversationRedactor(conversationId, nerDetector) {
   const key = conversationId ?? NO_CONVERSATION_KEY;
@@ -32682,7 +32855,7 @@ function useChatStorage(options) {
     () => ({ getToken, baseUrl, model: embeddingModel, maskInput: maskEmbeddingInput }),
     [getToken, baseUrl, embeddingModel, maskEmbeddingInput]
   );
-  const storeMaskMissing = memoryStore !== void 0 && maskEmbeddingInput !== void 0 && !memoryStore.masksEmbeddingInput;
+  const storeMaskMissing = memoryStore !== void 0 && memoryStore !== null && maskEmbeddingInput !== void 0 && !memoryStore.masksEmbeddingInput;
   const blobManagerRef = (0, import_react6.useRef)(new BlobUrlManager());
   (0, import_react6.useEffect)(() => {
     const manager = blobManagerRef.current;
@@ -32959,6 +33132,7 @@ function useChatStorage(options) {
   );
   const retainVaultMemory = (0, import_react6.useCallback)(
     async (input) => {
+      if (memoryStore === null) throw new Error(MEMORY_STORE_NOT_READY);
       if (memoryStore) {
         if (storeMaskMissing) throw new Error(NO_STORE_MASK);
         if (input.folderId !== void 0) throw new Error(NO_STORE_FOLDERS);
@@ -32990,6 +33164,7 @@ function useChatStorage(options) {
   );
   const createMemoryVaultTool2 = (0, import_react6.useCallback)(
     (options2) => {
+      if (memoryStore === null) throw new Error(MEMORY_STORE_NOT_READY);
       if (storeMaskMissing) throw new Error(NO_STORE_MASK);
       const embOpts = getToken ? vaultEmbeddingOptions : void 0;
       return createMemoryVaultTool(
@@ -33011,6 +33186,7 @@ function useChatStorage(options) {
   );
   const getVaultMemories = (0, import_react6.useCallback)(
     (options2) => {
+      if (memoryStore === null) return Promise.resolve([]);
       if (!memoryStore) return getAllVaultMemoriesOp(vaultCtx, options2);
       const { folderId, levels, kinds, ...listOptions } = options2 ?? {};
       if (folderId !== void 0) throw new Error(NO_STORE_FOLDERS);
@@ -33022,6 +33198,7 @@ function useChatStorage(options) {
   );
   const createVaultMemory = (0, import_react6.useCallback)(
     async (content, scope) => {
+      if (memoryStore === null) throw new Error(MEMORY_STORE_NOT_READY);
       if (storeMaskMissing) throw new Error(NO_STORE_MASK);
       if (memoryStore) return memoryStore.create({ content, scope });
       const result = await createVaultMemoryOp(vaultCtx, { content, scope });
@@ -33043,6 +33220,7 @@ function useChatStorage(options) {
   );
   const updateVaultMemory = (0, import_react6.useCallback)(
     async (id, content, scope) => {
+      if (memoryStore === null) throw new Error(MEMORY_STORE_NOT_READY);
       if (storeMaskMissing) throw new Error(NO_STORE_MASK);
       if (memoryStore) return memoryStore.update(id, { content, scope });
       const existing = await getVaultMemoryOp(vaultCtx, id);
@@ -33068,6 +33246,7 @@ function useChatStorage(options) {
   );
   const deleteVaultMemory = (0, import_react6.useCallback)(
     async (id) => {
+      if (memoryStore === null) throw new Error(MEMORY_STORE_NOT_READY);
       if (memoryStore) return memoryStore.delete(id);
       const existing = await getVaultMemoryOp(vaultCtx, id);
       const result = await deleteVaultMemoryOp(vaultCtx, id);
@@ -33081,7 +33260,7 @@ function useChatStorage(options) {
   const chunkVectorCacheRef = (0, import_react6.useRef)(createChunkVectorCache());
   const clientToolEmbeddingsCacheRef = (0, import_react6.useRef)(/* @__PURE__ */ new Map());
   (0, import_react6.useEffect)(() => {
-    if (!getToken || memoryStore) return;
+    if (!getToken || memoryStore !== void 0) return;
     void (async () => {
       try {
         await preEmbedVaultMemories(vaultCtx, vaultEmbeddingOptions, vaultEmbeddingCache);
@@ -33097,6 +33276,7 @@ function useChatStorage(options) {
   }, [vaultEmbeddingCache]);
   const createMemoryVaultSearchTool2 = (0, import_react6.useCallback)(
     (searchOptions) => {
+      if (memoryStore === null) throw new Error(MEMORY_STORE_NOT_READY);
       if (!getToken && !memoryStore) {
         throw new Error("getToken is required for memory vault search tool");
       }
@@ -33112,6 +33292,7 @@ function useChatStorage(options) {
   );
   const createRecallTool2 = (0, import_react6.useCallback)(
     (toolOptions, callbacks) => {
+      if (memoryStore === null) throw new Error(MEMORY_STORE_NOT_READY);
       if (!getToken && !memoryStore) {
         throw new Error("getToken is required for recall tool");
       }
@@ -33151,6 +33332,7 @@ function useChatStorage(options) {
   );
   const searchVaultMemoriesFn = (0, import_react6.useCallback)(
     async (query, searchOptions) => {
+      if (memoryStore === null) return [];
       if (storeMaskMissing) throw new Error(NO_STORE_MASK);
       if (memoryStore) return (await memoryStore.factSource.search(query, searchOptions)).results;
       if (!getToken) return [];
@@ -33166,7 +33348,7 @@ function useChatStorage(options) {
   );
   const recallFn = (0, import_react6.useCallback)(
     async (query, options2) => {
-      if (!getToken && !memoryStore) {
+      if (memoryStore === null || !getToken && !memoryStore) {
         return {
           memories: [],
           usedBudget: options2?.budget ?? "low",