@anuma/sdk 9.1.1 → 9.1.3

package/dist/expo/index.cjs

@@ -2326,6 +2326,7 @@ async function getEncryptionKey(address, version = "v3") {
   if (cachedKey) {
     return cachedKey;
   }
+  const startEpoch = sessionEpoch;
   const keyHex = getStoredKeyByVersion(address, version);
   if (!keyHex) {
     throw new EncryptionKeyMissingError(address, version);
@@ -2338,6 +2339,9 @@ async function getEncryptionKey(address, version = "v3") {
     false,
     ["encrypt", "decrypt"]
   );
+  if (sessionEpoch !== startEpoch || getStoredKeyByVersion(address, version) !== keyHex) {
+    throw new EncryptionKeyMissingError(address, version);
+  }
   cryptoKeyCache.set(cacheKey, cryptoKey);
   return cryptoKey;
 }
@@ -14817,9 +14821,10 @@ async function getVaultRankingProjectionsOp(ctx, options) {
 }
 function baseVaultSql(ctx, options) {
   const clauses = [
+    `"_status" is not 'deleted'`,
     '"is_deleted" = 0',
     ...options?.includeArchived ? [] : ['"archived_at" is null'],
-    `"trust_tier" is not 'quarantined'`,
+    ...options?.includeQuarantined ? [] : [`"trust_tier" is not 'quarantined'`],
     '"superseded_by" is null'
   ];
   const args = [];
@@ -15305,8 +15310,17 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   if (!entityCtx) {
     throw new Error("getMemoriesNeedingTopicExtractionOp requires ctx.entityCtx");
   }
-  const conditions = [...baseVaultConditions(ctx), import_watermelondb21.Q.sortBy("created_at", import_watermelondb21.Q.desc)];
-  const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
+  let rows;
+  try {
+    const base = baseVaultSql(ctx);
+    const sql = `select "id", "topics", "topics_user_managed", "topics_extracted_at", "topics_extracted_version", "updated_at" from "memory_vault" where ${base.sql} order by "created_at" desc`;
+    rows = await ctx.vaultMemoryCollection.query(import_watermelondb21.Q.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: topic sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), import_watermelondb21.Q.sortBy("created_at", import_watermelondb21.Q.desc)).unsafeFetchRaw();
+  }
   const linkedNames = await linkedEntityNamesByMemory(
     entityCtx,
     rows.map((r) => r.id)
@@ -15365,10 +15379,19 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   }
   const orderedPendingRaw = [...stampedPendingRaw, ...pendingRaw];
   const limitedPendingRaw = cap !== void 0 ? orderedPendingRaw.slice(0, cap) : orderedPendingRaw;
-  const pending = await mapInBatches(
-    limitedPendingRaw,
-    (raw) => vaultMemoryRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
-  );
+  const pending = [];
+  for (let i = 0; i < limitedPendingRaw.length; i += 500) {
+    const chunk = limitedPendingRaw.slice(i, i + 500);
+    const memories = await getVaultMemoriesByIdsOp(
+      ctx,
+      chunk.map((raw) => raw.id)
+    );
+    const byId = new Map(memories.map((memory) => [memory.uniqueId, memory]));
+    for (const raw of chunk) {
+      const memory = byId.get(raw.id);
+      if (memory) pending.push(memory);
+    }
+  }
   const applyCap = (ids) => cap !== void 0 ? ids.slice(0, cap) : ids;
   return {
     pending,
@@ -15515,10 +15538,20 @@ function assertVaultScopeForSweep(ctx) {
 }
 async function getDecayCandidatesRawOp(ctx) {
   assertVaultScopeForSweep(ctx);
-  const results = await ctx.vaultMemoryCollection.query(
-    ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
-    import_watermelondb21.Q.where("kind", null)
-  ).unsafeFetchRaw();
+  let results;
+  try {
+    const base = baseVaultSql(ctx, { includeArchived: true, includeQuarantined: true });
+    const sql = `select "id", "fact_type", "event_time_end", "event_time_kind", "updated_at", "last_observed_at", "archived_at", "source", "trust_tier" from "memory_vault" where ${base.sql} and "kind" is null`;
+    results = await ctx.vaultMemoryCollection.query(import_watermelondb21.Q.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: decay sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    results = await ctx.vaultMemoryCollection.query(
+      ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
+      import_watermelondb21.Q.where("kind", null)
+    ).unsafeFetchRaw();
+  }
   return results.map((raw) => ({
     uniqueId: raw.id,
     factType: raw.fact_type ?? null,
@@ -24986,6 +25019,18 @@ async function assembleMemoryContext(options) {
 
 // src/lib/memory/durableExtraction.ts
 var import_watermelondb25 = require("@nozbe/watermelondb");
+async function messagePositions(storage, ids) {
+  try {
+    return await storage.messagesCollection.query(
+      import_watermelondb25.Q.unsafeSqlQuery(
+        `select "id", "conversation_id", "message_id" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
+        ids
+      )
+    ).unsafeFetchRaw();
+  } catch {
+    return await storage.messagesCollection.query(import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).unsafeFetchRaw();
+  }
+}
 var MAX_JOBS_PER_PASS = 3;
 var MAX_ATTEMPTS = 3;
 var MAX_FAILED_SESSIONS = 3;
@@ -25554,9 +25599,9 @@ function createDurableAutoExtractor(options) {
                   r._setRaw("watermark_seq", null);
                 });
           }
-          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).fetch();
+          const rows = fromSourceConversation ? [] : await messagePositions(storage, ids);
           const foreignRows = new Set(
-            rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
+            rows.filter((row) => row.conversation_id !== conversationId).map((row) => row.id)
           );
           const sequences = /* @__PURE__ */ new Map();
           if (fromSourceConversation) {
@@ -25566,7 +25611,7 @@ function createDurableAutoExtractor(options) {
           }
           for (const row of rows) {
             if (foreignRows.has(row.id)) continue;
-            const sequence = Number(row._getRaw("message_id"));
+            const sequence = Number(row.message_id);
             if (Number.isFinite(sequence) && sequence > 0) sequences.set(row.id, sequence);
           }
           let boundary = -1;

package/dist/expo/index.d.mts

@@ -6090,20 +6090,7 @@ interface DecayCandidateRaw {
      * not egress poison content — see the decay sweeper's `isBorderline`). */
     trustTier: string | null;
 }
-/**
- * Decay sweep candidate scan (PR2). Selects the plaintext columns
- * `classifyDecay` (in `memory/decay`) needs via
- * `unsafeFetchRaw` — NO Model per row (dodges the never-evicted RecordCache /
- * web Pile-2 OOM history) and NO `content` read / decrypt (zero-knowledge).
- *
- * Includes archived AND quarantined rows (so archived→delete transitions and
- * aged quarantined rows are seen) but excludes hard-deleted rows — the
- * `baseVaultConditions` default keeps `is_deleted = false`. Excludes kinded
- * (profile) memories, which never decay.
- *
- * Refuses to run on an unscoped multi-tenant context (see
- * {@link assertVaultScopeForSweep}).
- */
+/** Return the projected plaintext fields for the decay sweep within the required vault scope. */
 declare function getDecayCandidatesRawOp(ctx: VaultMemoryOperationsContext): Promise<DecayCandidateRaw[]>;
 /**
  * Archive a memory (decay soft state, PR2) — set `archived_at`. An archived row

package/dist/expo/index.d.ts

@@ -6090,20 +6090,7 @@ interface DecayCandidateRaw {
      * not egress poison content — see the decay sweeper's `isBorderline`). */
     trustTier: string | null;
 }
-/**
- * Decay sweep candidate scan (PR2). Selects the plaintext columns
- * `classifyDecay` (in `memory/decay`) needs via
- * `unsafeFetchRaw` — NO Model per row (dodges the never-evicted RecordCache /
- * web Pile-2 OOM history) and NO `content` read / decrypt (zero-knowledge).
- *
- * Includes archived AND quarantined rows (so archived→delete transitions and
- * aged quarantined rows are seen) but excludes hard-deleted rows — the
- * `baseVaultConditions` default keeps `is_deleted = false`. Excludes kinded
- * (profile) memories, which never decay.
- *
- * Refuses to run on an unscoped multi-tenant context (see
- * {@link assertVaultScopeForSweep}).
- */
+/** Return the projected plaintext fields for the decay sweep within the required vault scope. */
 declare function getDecayCandidatesRawOp(ctx: VaultMemoryOperationsContext): Promise<DecayCandidateRaw[]>;
 /**
  * Archive a memory (decay soft state, PR2) — set `archived_at`. An archived row

package/dist/expo/index.mjs

@@ -729,6 +729,7 @@ async function getEncryptionKey(address, version = "v3") {
   if (cachedKey) {
     return cachedKey;
   }
+  const startEpoch = sessionEpoch;
   const keyHex = getStoredKeyByVersion(address, version);
   if (!keyHex) {
     throw new EncryptionKeyMissingError(address, version);
@@ -741,6 +742,9 @@ async function getEncryptionKey(address, version = "v3") {
     false,
     ["encrypt", "decrypt"]
   );
+  if (sessionEpoch !== startEpoch || getStoredKeyByVersion(address, version) !== keyHex) {
+    throw new EncryptionKeyMissingError(address, version);
+  }
   cryptoKeyCache.set(cacheKey, cryptoKey);
   return cryptoKey;
 }
@@ -13191,9 +13195,10 @@ async function getVaultRankingProjectionsOp(ctx, options) {
 }
 function baseVaultSql(ctx, options) {
   const clauses = [
+    `"_status" is not 'deleted'`,
     '"is_deleted" = 0',
     ...options?.includeArchived ? [] : ['"archived_at" is null'],
-    `"trust_tier" is not 'quarantined'`,
+    ...options?.includeQuarantined ? [] : [`"trust_tier" is not 'quarantined'`],
     '"superseded_by" is null'
   ];
   const args = [];
@@ -13679,8 +13684,17 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   if (!entityCtx) {
     throw new Error("getMemoriesNeedingTopicExtractionOp requires ctx.entityCtx");
   }
-  const conditions = [...baseVaultConditions(ctx), Q6.sortBy("created_at", Q6.desc)];
-  const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
+  let rows;
+  try {
+    const base = baseVaultSql(ctx);
+    const sql = `select "id", "topics", "topics_user_managed", "topics_extracted_at", "topics_extracted_version", "updated_at" from "memory_vault" where ${base.sql} order by "created_at" desc`;
+    rows = await ctx.vaultMemoryCollection.query(Q6.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: topic sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), Q6.sortBy("created_at", Q6.desc)).unsafeFetchRaw();
+  }
   const linkedNames = await linkedEntityNamesByMemory(
     entityCtx,
     rows.map((r) => r.id)
@@ -13739,10 +13753,19 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   }
   const orderedPendingRaw = [...stampedPendingRaw, ...pendingRaw];
   const limitedPendingRaw = cap !== void 0 ? orderedPendingRaw.slice(0, cap) : orderedPendingRaw;
-  const pending = await mapInBatches(
-    limitedPendingRaw,
-    (raw) => vaultMemoryRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
-  );
+  const pending = [];
+  for (let i = 0; i < limitedPendingRaw.length; i += 500) {
+    const chunk = limitedPendingRaw.slice(i, i + 500);
+    const memories = await getVaultMemoriesByIdsOp(
+      ctx,
+      chunk.map((raw) => raw.id)
+    );
+    const byId = new Map(memories.map((memory) => [memory.uniqueId, memory]));
+    for (const raw of chunk) {
+      const memory = byId.get(raw.id);
+      if (memory) pending.push(memory);
+    }
+  }
   const applyCap = (ids) => cap !== void 0 ? ids.slice(0, cap) : ids;
   return {
     pending,
@@ -13889,10 +13912,20 @@ function assertVaultScopeForSweep(ctx) {
 }
 async function getDecayCandidatesRawOp(ctx) {
   assertVaultScopeForSweep(ctx);
-  const results = await ctx.vaultMemoryCollection.query(
-    ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
-    Q6.where("kind", null)
-  ).unsafeFetchRaw();
+  let results;
+  try {
+    const base = baseVaultSql(ctx, { includeArchived: true, includeQuarantined: true });
+    const sql = `select "id", "fact_type", "event_time_end", "event_time_kind", "updated_at", "last_observed_at", "archived_at", "source", "trust_tier" from "memory_vault" where ${base.sql} and "kind" is null`;
+    results = await ctx.vaultMemoryCollection.query(Q6.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: decay sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    results = await ctx.vaultMemoryCollection.query(
+      ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
+      Q6.where("kind", null)
+    ).unsafeFetchRaw();
+  }
   return results.map((raw) => ({
     uniqueId: raw.id,
     factType: raw.fact_type ?? null,
@@ -23308,6 +23341,18 @@ async function assembleMemoryContext(options) {
 
 // src/lib/memory/durableExtraction.ts
 import { Q as Q10 } from "@nozbe/watermelondb";
+async function messagePositions(storage, ids) {
+  try {
+    return await storage.messagesCollection.query(
+      Q10.unsafeSqlQuery(
+        `select "id", "conversation_id", "message_id" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
+        ids
+      )
+    ).unsafeFetchRaw();
+  } catch {
+    return await storage.messagesCollection.query(Q10.where("id", Q10.oneOf(ids))).unsafeFetchRaw();
+  }
+}
 var MAX_JOBS_PER_PASS = 3;
 var MAX_ATTEMPTS = 3;
 var MAX_FAILED_SESSIONS = 3;
@@ -23876,9 +23921,9 @@ function createDurableAutoExtractor(options) {
                   r._setRaw("watermark_seq", null);
                 });
           }
-          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(Q10.where("id", Q10.oneOf(ids))).fetch();
+          const rows = fromSourceConversation ? [] : await messagePositions(storage, ids);
           const foreignRows = new Set(
-            rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
+            rows.filter((row) => row.conversation_id !== conversationId).map((row) => row.id)
           );
           const sequences = /* @__PURE__ */ new Map();
           if (fromSourceConversation) {
@@ -23888,7 +23933,7 @@ function createDurableAutoExtractor(options) {
           }
           for (const row of rows) {
             if (foreignRows.has(row.id)) continue;
-            const sequence = Number(row._getRaw("message_id"));
+            const sequence = Number(row.message_id);
             if (Number.isFinite(sequence) && sequence > 0) sequences.set(row.id, sequence);
           }
           let boundary = -1;

package/dist/index.cjs

@@ -1404,6 +1404,7 @@ var EncryptionKeyMissingError = class extends Error {
   }
 };
 var encryptionKeyStore = /* @__PURE__ */ new Map();
+var sessionEpoch = 0;
 var cryptoKeyCache = /* @__PURE__ */ new Map();
 var clearAllEncryptionStateCallbacks = /* @__PURE__ */ new Set();
 function onClearAllEncryptionState(callback) {
@@ -1455,6 +1456,7 @@ async function getEncryptionKey(address, version = "v3") {
   if (cachedKey) {
     return cachedKey;
   }
+  const startEpoch = sessionEpoch;
   const keyHex = getStoredKeyByVersion(address, version);
   if (!keyHex) {
     throw new EncryptionKeyMissingError(address, version);
@@ -1467,6 +1469,9 @@ async function getEncryptionKey(address, version = "v3") {
     false,
     ["encrypt", "decrypt"]
   );
+  if (sessionEpoch !== startEpoch || getStoredKeyByVersion(address, version) !== keyHex) {
+    throw new EncryptionKeyMissingError(address, version);
+  }
   cryptoKeyCache.set(cacheKey, cryptoKey);
   return cryptoKey;
 }
@@ -2159,7 +2164,7 @@ async function createRemoteChatStore(options) {
 var LRU_CAPACITY = 256;
 var titleCache = /* @__PURE__ */ new Map();
 var pendingDecrypts = /* @__PURE__ */ new Map();
-var sessionEpoch = 0;
+var sessionEpoch2 = 0;
 function buildCacheKey(address, encryptedTitle) {
   return `${address}:${encryptedTitle}`;
 }
@@ -2178,7 +2183,7 @@ function insertWithEviction(key, value) {
 function clearLazyTitleCache() {
   titleCache.clear();
   pendingDecrypts.clear();
-  sessionEpoch += 1;
+  sessionEpoch2 += 1;
 }
 onClearAllEncryptionState(clearLazyTitleCache);
 async function decryptConversationTitle(encryptedTitle, address) {
@@ -2200,13 +2205,13 @@ async function decryptConversationTitle(encryptedTitle, address) {
   }
   const inFlight = pendingDecrypts.get(cacheKey);
   if (inFlight) return inFlight;
-  const epochAtStart = sessionEpoch;
+  const epochAtStart = sessionEpoch2;
   const promise = (async () => {
     const plaintext = await decryptField(encryptedTitle, address);
     if (isEncrypted(plaintext)) {
       throw new Error("decryptConversationTitle: decryption failed (returned ciphertext)");
     }
-    if (sessionEpoch === epochAtStart) {
+    if (sessionEpoch2 === epochAtStart) {
       insertWithEviction(cacheKey, plaintext);
     }
     return plaintext;

package/dist/index.mjs

@@ -1201,6 +1201,7 @@ var EncryptionKeyMissingError = class extends Error {
   }
 };
 var encryptionKeyStore = /* @__PURE__ */ new Map();
+var sessionEpoch = 0;
 var cryptoKeyCache = /* @__PURE__ */ new Map();
 var clearAllEncryptionStateCallbacks = /* @__PURE__ */ new Set();
 function onClearAllEncryptionState(callback) {
@@ -1252,6 +1253,7 @@ async function getEncryptionKey(address, version = "v3") {
   if (cachedKey) {
     return cachedKey;
   }
+  const startEpoch = sessionEpoch;
   const keyHex = getStoredKeyByVersion(address, version);
   if (!keyHex) {
     throw new EncryptionKeyMissingError(address, version);
@@ -1264,6 +1266,9 @@ async function getEncryptionKey(address, version = "v3") {
     false,
     ["encrypt", "decrypt"]
   );
+  if (sessionEpoch !== startEpoch || getStoredKeyByVersion(address, version) !== keyHex) {
+    throw new EncryptionKeyMissingError(address, version);
+  }
   cryptoKeyCache.set(cacheKey, cryptoKey);
   return cryptoKey;
 }
@@ -1956,7 +1961,7 @@ async function createRemoteChatStore(options) {
 var LRU_CAPACITY = 256;
 var titleCache = /* @__PURE__ */ new Map();
 var pendingDecrypts = /* @__PURE__ */ new Map();
-var sessionEpoch = 0;
+var sessionEpoch2 = 0;
 function buildCacheKey(address, encryptedTitle) {
   return `${address}:${encryptedTitle}`;
 }
@@ -1975,7 +1980,7 @@ function insertWithEviction(key, value) {
 function clearLazyTitleCache() {
   titleCache.clear();
   pendingDecrypts.clear();
-  sessionEpoch += 1;
+  sessionEpoch2 += 1;
 }
 onClearAllEncryptionState(clearLazyTitleCache);
 async function decryptConversationTitle(encryptedTitle, address) {
@@ -1997,13 +2002,13 @@ async function decryptConversationTitle(encryptedTitle, address) {
   }
   const inFlight = pendingDecrypts.get(cacheKey);
   if (inFlight) return inFlight;
-  const epochAtStart = sessionEpoch;
+  const epochAtStart = sessionEpoch2;
   const promise = (async () => {
     const plaintext = await decryptField(encryptedTitle, address);
     if (isEncrypted(plaintext)) {
       throw new Error("decryptConversationTitle: decryption failed (returned ciphertext)");
     }
-    if (sessionEpoch === epochAtStart) {
+    if (sessionEpoch2 === epochAtStart) {
       insertWithEviction(cacheKey, plaintext);
     }
     return plaintext;

package/dist/react/index.cjs

@@ -2093,6 +2093,7 @@ async function getEncryptionKey(address, version = "v3") {
   if (cachedKey) {
     return cachedKey;
   }
+  const startEpoch = sessionEpoch;
   const keyHex = getStoredKeyByVersion(address, version);
   if (!keyHex) {
     throw new EncryptionKeyMissingError(address, version);
@@ -2105,6 +2106,9 @@ async function getEncryptionKey(address, version = "v3") {
     false,
     ["encrypt", "decrypt"]
   );
+  if (sessionEpoch !== startEpoch || getStoredKeyByVersion(address, version) !== keyHex) {
+    throw new EncryptionKeyMissingError(address, version);
+  }
   cryptoKeyCache.set(cacheKey, cryptoKey);
   return cryptoKey;
 }
@@ -16634,9 +16638,10 @@ async function getVaultRankingProjectionsOp(ctx, options) {
 }
 function baseVaultSql(ctx, options) {
   const clauses = [
+    `"_status" is not 'deleted'`,
     '"is_deleted" = 0',
     ...options?.includeArchived ? [] : ['"archived_at" is null'],
-    `"trust_tier" is not 'quarantined'`,
+    ...options?.includeQuarantined ? [] : [`"trust_tier" is not 'quarantined'`],
     '"superseded_by" is null'
   ];
   const args = [];
@@ -17122,8 +17127,17 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   if (!entityCtx) {
     throw new Error("getMemoriesNeedingTopicExtractionOp requires ctx.entityCtx");
   }
-  const conditions = [...baseVaultConditions(ctx), import_watermelondb24.Q.sortBy("created_at", import_watermelondb24.Q.desc)];
-  const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
+  let rows;
+  try {
+    const base = baseVaultSql(ctx);
+    const sql = `select "id", "topics", "topics_user_managed", "topics_extracted_at", "topics_extracted_version", "updated_at" from "memory_vault" where ${base.sql} order by "created_at" desc`;
+    rows = await ctx.vaultMemoryCollection.query(import_watermelondb24.Q.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: topic sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), import_watermelondb24.Q.sortBy("created_at", import_watermelondb24.Q.desc)).unsafeFetchRaw();
+  }
   const linkedNames = await linkedEntityNamesByMemory(
     entityCtx,
     rows.map((r) => r.id)
@@ -17182,10 +17196,19 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   }
   const orderedPendingRaw = [...stampedPendingRaw, ...pendingRaw];
   const limitedPendingRaw = cap !== void 0 ? orderedPendingRaw.slice(0, cap) : orderedPendingRaw;
-  const pending = await mapInBatches(
-    limitedPendingRaw,
-    (raw) => vaultMemoryRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
-  );
+  const pending = [];
+  for (let i = 0; i < limitedPendingRaw.length; i += 500) {
+    const chunk = limitedPendingRaw.slice(i, i + 500);
+    const memories = await getVaultMemoriesByIdsOp(
+      ctx,
+      chunk.map((raw) => raw.id)
+    );
+    const byId = new Map(memories.map((memory) => [memory.uniqueId, memory]));
+    for (const raw of chunk) {
+      const memory = byId.get(raw.id);
+      if (memory) pending.push(memory);
+    }
+  }
   const applyCap = (ids) => cap !== void 0 ? ids.slice(0, cap) : ids;
   return {
     pending,
@@ -17332,10 +17355,20 @@ function assertVaultScopeForSweep(ctx) {
 }
 async function getDecayCandidatesRawOp(ctx) {
   assertVaultScopeForSweep(ctx);
-  const results = await ctx.vaultMemoryCollection.query(
-    ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
-    import_watermelondb24.Q.where("kind", null)
-  ).unsafeFetchRaw();
+  let results;
+  try {
+    const base = baseVaultSql(ctx, { includeArchived: true, includeQuarantined: true });
+    const sql = `select "id", "fact_type", "event_time_end", "event_time_kind", "updated_at", "last_observed_at", "archived_at", "source", "trust_tier" from "memory_vault" where ${base.sql} and "kind" is null`;
+    results = await ctx.vaultMemoryCollection.query(import_watermelondb24.Q.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: decay sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    results = await ctx.vaultMemoryCollection.query(
+      ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
+      import_watermelondb24.Q.where("kind", null)
+    ).unsafeFetchRaw();
+  }
   return results.map((raw) => ({
     uniqueId: raw.id,
     factType: raw.fact_type ?? null,
@@ -27299,6 +27332,18 @@ async function assembleMemoryContext(options) {
 
 // src/lib/memory/durableExtraction.ts
 var import_watermelondb34 = require("@nozbe/watermelondb");
+async function messagePositions(storage, ids) {
+  try {
+    return await storage.messagesCollection.query(
+      import_watermelondb34.Q.unsafeSqlQuery(
+        `select "id", "conversation_id", "message_id" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
+        ids
+      )
+    ).unsafeFetchRaw();
+  } catch {
+    return await storage.messagesCollection.query(import_watermelondb34.Q.where("id", import_watermelondb34.Q.oneOf(ids))).unsafeFetchRaw();
+  }
+}
 var MAX_JOBS_PER_PASS = 3;
 var MAX_ATTEMPTS = 3;
 var MAX_FAILED_SESSIONS = 3;
@@ -27867,9 +27912,9 @@ function createDurableAutoExtractor(options) {
                   r._setRaw("watermark_seq", null);
                 });
           }
-          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(import_watermelondb34.Q.where("id", import_watermelondb34.Q.oneOf(ids))).fetch();
+          const rows = fromSourceConversation ? [] : await messagePositions(storage, ids);
           const foreignRows = new Set(
-            rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
+            rows.filter((row) => row.conversation_id !== conversationId).map((row) => row.id)
           );
           const sequences = /* @__PURE__ */ new Map();
           if (fromSourceConversation) {
@@ -27879,7 +27924,7 @@ function createDurableAutoExtractor(options) {
           }
           for (const row of rows) {
             if (foreignRows.has(row.id)) continue;
-            const sequence = Number(row._getRaw("message_id"));
+            const sequence = Number(row.message_id);
             if (Number.isFinite(sequence) && sequence > 0) sequences.set(row.id, sequence);
           }
           let boundary = -1;

package/dist/react/index.d.mts

@@ -6695,20 +6695,7 @@ interface DecayCandidateRaw {
      * not egress poison content — see the decay sweeper's `isBorderline`). */
     trustTier: string | null;
 }
-/**
- * Decay sweep candidate scan (PR2). Selects the plaintext columns
- * `classifyDecay` (in `memory/decay`) needs via
- * `unsafeFetchRaw` — NO Model per row (dodges the never-evicted RecordCache /
- * web Pile-2 OOM history) and NO `content` read / decrypt (zero-knowledge).
- *
- * Includes archived AND quarantined rows (so archived→delete transitions and
- * aged quarantined rows are seen) but excludes hard-deleted rows — the
- * `baseVaultConditions` default keeps `is_deleted = false`. Excludes kinded
- * (profile) memories, which never decay.
- *
- * Refuses to run on an unscoped multi-tenant context (see
- * {@link assertVaultScopeForSweep}).
- */
+/** Return the projected plaintext fields for the decay sweep within the required vault scope. */
 declare function getDecayCandidatesRawOp(ctx: VaultMemoryOperationsContext): Promise<DecayCandidateRaw[]>;
 /**
  * Archive a memory (decay soft state, PR2) — set `archived_at`. An archived row

package/dist/react/index.d.ts

@@ -6695,20 +6695,7 @@ interface DecayCandidateRaw {
      * not egress poison content — see the decay sweeper's `isBorderline`). */
     trustTier: string | null;
 }
-/**
- * Decay sweep candidate scan (PR2). Selects the plaintext columns
- * `classifyDecay` (in `memory/decay`) needs via
- * `unsafeFetchRaw` — NO Model per row (dodges the never-evicted RecordCache /
- * web Pile-2 OOM history) and NO `content` read / decrypt (zero-knowledge).
- *
- * Includes archived AND quarantined rows (so archived→delete transitions and
- * aged quarantined rows are seen) but excludes hard-deleted rows — the
- * `baseVaultConditions` default keeps `is_deleted = false`. Excludes kinded
- * (profile) memories, which never decay.
- *
- * Refuses to run on an unscoped multi-tenant context (see
- * {@link assertVaultScopeForSweep}).
- */
+/** Return the projected plaintext fields for the decay sweep within the required vault scope. */
 declare function getDecayCandidatesRawOp(ctx: VaultMemoryOperationsContext): Promise<DecayCandidateRaw[]>;
 /**
  * Archive a memory (decay soft state, PR2) — set `archived_at`. An archived row

package/dist/react/index.mjs

@@ -295,6 +295,7 @@ async function getEncryptionKey(address, version = "v3") {
   if (cachedKey) {
     return cachedKey;
   }
+  const startEpoch = sessionEpoch;
   const keyHex = getStoredKeyByVersion(address, version);
   if (!keyHex) {
     throw new EncryptionKeyMissingError(address, version);
@@ -307,6 +308,9 @@ async function getEncryptionKey(address, version = "v3") {
     false,
     ["encrypt", "decrypt"]
   );
+  if (sessionEpoch !== startEpoch || getStoredKeyByVersion(address, version) !== keyHex) {
+    throw new EncryptionKeyMissingError(address, version);
+  }
   cryptoKeyCache.set(cacheKey, cryptoKey);
   return cryptoKey;
 }
@@ -14803,9 +14807,10 @@ async function getVaultRankingProjectionsOp(ctx, options) {
 }
 function baseVaultSql(ctx, options) {
   const clauses = [
+    `"_status" is not 'deleted'`,
     '"is_deleted" = 0',
     ...options?.includeArchived ? [] : ['"archived_at" is null'],
-    `"trust_tier" is not 'quarantined'`,
+    ...options?.includeQuarantined ? [] : [`"trust_tier" is not 'quarantined'`],
     '"superseded_by" is null'
   ];
   const args = [];
@@ -15291,8 +15296,17 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   if (!entityCtx) {
     throw new Error("getMemoriesNeedingTopicExtractionOp requires ctx.entityCtx");
   }
-  const conditions = [...baseVaultConditions(ctx), Q9.sortBy("created_at", Q9.desc)];
-  const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
+  let rows;
+  try {
+    const base = baseVaultSql(ctx);
+    const sql = `select "id", "topics", "topics_user_managed", "topics_extracted_at", "topics_extracted_version", "updated_at" from "memory_vault" where ${base.sql} order by "created_at" desc`;
+    rows = await ctx.vaultMemoryCollection.query(Q9.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: topic sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), Q9.sortBy("created_at", Q9.desc)).unsafeFetchRaw();
+  }
   const linkedNames = await linkedEntityNamesByMemory(
     entityCtx,
     rows.map((r) => r.id)
@@ -15351,10 +15365,19 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   }
   const orderedPendingRaw = [...stampedPendingRaw, ...pendingRaw];
   const limitedPendingRaw = cap !== void 0 ? orderedPendingRaw.slice(0, cap) : orderedPendingRaw;
-  const pending = await mapInBatches(
-    limitedPendingRaw,
-    (raw) => vaultMemoryRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
-  );
+  const pending = [];
+  for (let i = 0; i < limitedPendingRaw.length; i += 500) {
+    const chunk = limitedPendingRaw.slice(i, i + 500);
+    const memories = await getVaultMemoriesByIdsOp(
+      ctx,
+      chunk.map((raw) => raw.id)
+    );
+    const byId = new Map(memories.map((memory) => [memory.uniqueId, memory]));
+    for (const raw of chunk) {
+      const memory = byId.get(raw.id);
+      if (memory) pending.push(memory);
+    }
+  }
   const applyCap = (ids) => cap !== void 0 ? ids.slice(0, cap) : ids;
   return {
     pending,
@@ -15501,10 +15524,20 @@ function assertVaultScopeForSweep(ctx) {
 }
 async function getDecayCandidatesRawOp(ctx) {
   assertVaultScopeForSweep(ctx);
-  const results = await ctx.vaultMemoryCollection.query(
-    ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
-    Q9.where("kind", null)
-  ).unsafeFetchRaw();
+  let results;
+  try {
+    const base = baseVaultSql(ctx, { includeArchived: true, includeQuarantined: true });
+    const sql = `select "id", "fact_type", "event_time_end", "event_time_kind", "updated_at", "last_observed_at", "archived_at", "source", "trust_tier" from "memory_vault" where ${base.sql} and "kind" is null`;
+    results = await ctx.vaultMemoryCollection.query(Q9.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: decay sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    results = await ctx.vaultMemoryCollection.query(
+      ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
+      Q9.where("kind", null)
+    ).unsafeFetchRaw();
+  }
   return results.map((raw) => ({
     uniqueId: raw.id,
     factType: raw.fact_type ?? null,
@@ -25413,6 +25446,18 @@ async function assembleMemoryContext(options) {
 
 // src/lib/memory/durableExtraction.ts
 import { Q as Q17 } from "@nozbe/watermelondb";
+async function messagePositions(storage, ids) {
+  try {
+    return await storage.messagesCollection.query(
+      Q17.unsafeSqlQuery(
+        `select "id", "conversation_id", "message_id" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
+        ids
+      )
+    ).unsafeFetchRaw();
+  } catch {
+    return await storage.messagesCollection.query(Q17.where("id", Q17.oneOf(ids))).unsafeFetchRaw();
+  }
+}
 var MAX_JOBS_PER_PASS = 3;
 var MAX_ATTEMPTS = 3;
 var MAX_FAILED_SESSIONS = 3;
@@ -25981,9 +26026,9 @@ function createDurableAutoExtractor(options) {
                   r._setRaw("watermark_seq", null);
                 });
           }
-          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(Q17.where("id", Q17.oneOf(ids))).fetch();
+          const rows = fromSourceConversation ? [] : await messagePositions(storage, ids);
           const foreignRows = new Set(
-            rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
+            rows.filter((row) => row.conversation_id !== conversationId).map((row) => row.id)
           );
           const sequences = /* @__PURE__ */ new Map();
           if (fromSourceConversation) {
@@ -25993,7 +26038,7 @@ function createDurableAutoExtractor(options) {
           }
           for (const row of rows) {
             if (foreignRows.has(row.id)) continue;
-            const sequence = Number(row._getRaw("message_id"));
+            const sequence = Number(row.message_id);
             if (Number.isFinite(sequence) && sequence > 0) sequences.set(row.id, sequence);
           }
           let boundary = -1;

package/dist/server/index.cjs

@@ -17078,6 +17078,7 @@ async function getEncryptionKey(address, version = "v3") {
   if (cachedKey) {
     return cachedKey;
   }
+  const startEpoch = sessionEpoch;
   const keyHex = getStoredKeyByVersion(address, version);
   if (!keyHex) {
     throw new EncryptionKeyMissingError(address, version);
@@ -17090,6 +17091,9 @@ async function getEncryptionKey(address, version = "v3") {
     false,
     ["encrypt", "decrypt"]
   );
+  if (sessionEpoch !== startEpoch || getStoredKeyByVersion(address, version) !== keyHex) {
+    throw new EncryptionKeyMissingError(address, version);
+  }
   cryptoKeyCache.set(cacheKey, cryptoKey);
   return cryptoKey;
 }
@@ -28918,9 +28922,10 @@ async function getVaultRankingProjectionsOp(ctx, options) {
 }
 function baseVaultSql(ctx, options) {
   const clauses = [
+    `"_status" is not 'deleted'`,
     '"is_deleted" = 0',
     ...options?.includeArchived ? [] : ['"archived_at" is null'],
-    `"trust_tier" is not 'quarantined'`,
+    ...options?.includeQuarantined ? [] : [`"trust_tier" is not 'quarantined'`],
     '"superseded_by" is null'
   ];
   const args = [];
@@ -29406,8 +29411,17 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   if (!entityCtx) {
     throw new Error("getMemoriesNeedingTopicExtractionOp requires ctx.entityCtx");
   }
-  const conditions = [...baseVaultConditions(ctx), import_watermelondb19.Q.sortBy("created_at", import_watermelondb19.Q.desc)];
-  const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
+  let rows;
+  try {
+    const base = baseVaultSql(ctx);
+    const sql = `select "id", "topics", "topics_user_managed", "topics_extracted_at", "topics_extracted_version", "updated_at" from "memory_vault" where ${base.sql} order by "created_at" desc`;
+    rows = await ctx.vaultMemoryCollection.query(import_watermelondb19.Q.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: topic sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), import_watermelondb19.Q.sortBy("created_at", import_watermelondb19.Q.desc)).unsafeFetchRaw();
+  }
   const linkedNames = await linkedEntityNamesByMemory(
     entityCtx,
     rows.map((r) => r.id)
@@ -29466,10 +29480,19 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   }
   const orderedPendingRaw = [...stampedPendingRaw, ...pendingRaw];
   const limitedPendingRaw = cap !== void 0 ? orderedPendingRaw.slice(0, cap) : orderedPendingRaw;
-  const pending = await mapInBatches(
-    limitedPendingRaw,
-    (raw) => vaultMemoryRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
-  );
+  const pending = [];
+  for (let i = 0; i < limitedPendingRaw.length; i += 500) {
+    const chunk = limitedPendingRaw.slice(i, i + 500);
+    const memories = await getVaultMemoriesByIdsOp(
+      ctx,
+      chunk.map((raw) => raw.id)
+    );
+    const byId = new Map(memories.map((memory) => [memory.uniqueId, memory]));
+    for (const raw of chunk) {
+      const memory = byId.get(raw.id);
+      if (memory) pending.push(memory);
+    }
+  }
   const applyCap = (ids) => cap !== void 0 ? ids.slice(0, cap) : ids;
   return {
     pending,
@@ -29616,10 +29639,20 @@ function assertVaultScopeForSweep(ctx) {
 }
 async function getDecayCandidatesRawOp(ctx) {
   assertVaultScopeForSweep(ctx);
-  const results = await ctx.vaultMemoryCollection.query(
-    ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
-    import_watermelondb19.Q.where("kind", null)
-  ).unsafeFetchRaw();
+  let results;
+  try {
+    const base = baseVaultSql(ctx, { includeArchived: true, includeQuarantined: true });
+    const sql = `select "id", "fact_type", "event_time_end", "event_time_kind", "updated_at", "last_observed_at", "archived_at", "source", "trust_tier" from "memory_vault" where ${base.sql} and "kind" is null`;
+    results = await ctx.vaultMemoryCollection.query(import_watermelondb19.Q.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: decay sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    results = await ctx.vaultMemoryCollection.query(
+      ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
+      import_watermelondb19.Q.where("kind", null)
+    ).unsafeFetchRaw();
+  }
   return results.map((raw) => ({
     uniqueId: raw.id,
     factType: raw.fact_type ?? null,
@@ -37112,6 +37145,18 @@ async function assembleMemoryContext(options) {
 
 // src/lib/memory/durableExtraction.ts
 var import_watermelondb25 = __toESM(require_watermelondb());
+async function messagePositions(storage, ids) {
+  try {
+    return await storage.messagesCollection.query(
+      import_watermelondb25.Q.unsafeSqlQuery(
+        `select "id", "conversation_id", "message_id" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
+        ids
+      )
+    ).unsafeFetchRaw();
+  } catch {
+    return await storage.messagesCollection.query(import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).unsafeFetchRaw();
+  }
+}
 var MAX_JOBS_PER_PASS = 3;
 var MAX_ATTEMPTS = 3;
 var MAX_FAILED_SESSIONS = 3;
@@ -37680,9 +37725,9 @@ function createDurableAutoExtractor(options) {
                   r._setRaw("watermark_seq", null);
                 });
           }
-          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).fetch();
+          const rows = fromSourceConversation ? [] : await messagePositions(storage, ids);
           const foreignRows = new Set(
-            rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
+            rows.filter((row) => row.conversation_id !== conversationId).map((row) => row.id)
           );
           const sequences = /* @__PURE__ */ new Map();
           if (fromSourceConversation) {
@@ -37692,7 +37737,7 @@ function createDurableAutoExtractor(options) {
           }
           for (const row of rows) {
             if (foreignRows.has(row.id)) continue;
-            const sequence = Number(row._getRaw("message_id"));
+            const sequence = Number(row.message_id);
             if (Number.isFinite(sequence) && sequence > 0) sequences.set(row.id, sequence);
           }
           let boundary = -1;

package/dist/server/index.d.mts

@@ -5666,20 +5666,7 @@ interface DecayCandidateRaw {
      * not egress poison content — see the decay sweeper's `isBorderline`). */
     trustTier: string | null;
 }
-/**
- * Decay sweep candidate scan (PR2). Selects the plaintext columns
- * `classifyDecay` (in `memory/decay`) needs via
- * `unsafeFetchRaw` — NO Model per row (dodges the never-evicted RecordCache /
- * web Pile-2 OOM history) and NO `content` read / decrypt (zero-knowledge).
- *
- * Includes archived AND quarantined rows (so archived→delete transitions and
- * aged quarantined rows are seen) but excludes hard-deleted rows — the
- * `baseVaultConditions` default keeps `is_deleted = false`. Excludes kinded
- * (profile) memories, which never decay.
- *
- * Refuses to run on an unscoped multi-tenant context (see
- * {@link assertVaultScopeForSweep}).
- */
+/** Return the projected plaintext fields for the decay sweep within the required vault scope. */
 declare function getDecayCandidatesRawOp(ctx: VaultMemoryOperationsContext): Promise<DecayCandidateRaw[]>;
 /**
  * Archive a memory (decay soft state, PR2) — set `archived_at`. An archived row

package/dist/server/index.d.ts

@@ -5666,20 +5666,7 @@ interface DecayCandidateRaw {
      * not egress poison content — see the decay sweeper's `isBorderline`). */
     trustTier: string | null;
 }
-/**
- * Decay sweep candidate scan (PR2). Selects the plaintext columns
- * `classifyDecay` (in `memory/decay`) needs via
- * `unsafeFetchRaw` — NO Model per row (dodges the never-evicted RecordCache /
- * web Pile-2 OOM history) and NO `content` read / decrypt (zero-knowledge).
- *
- * Includes archived AND quarantined rows (so archived→delete transitions and
- * aged quarantined rows are seen) but excludes hard-deleted rows — the
- * `baseVaultConditions` default keeps `is_deleted = false`. Excludes kinded
- * (profile) memories, which never decay.
- *
- * Refuses to run on an unscoped multi-tenant context (see
- * {@link assertVaultScopeForSweep}).
- */
+/** Return the projected plaintext fields for the decay sweep within the required vault scope. */
 declare function getDecayCandidatesRawOp(ctx: VaultMemoryOperationsContext): Promise<DecayCandidateRaw[]>;
 /**
  * Archive a memory (decay soft state, PR2) — set `archived_at`. An archived row

package/dist/server/index.mjs

@@ -15407,6 +15407,7 @@ async function getEncryptionKey(address, version = "v3") {
   if (cachedKey) {
     return cachedKey;
   }
+  const startEpoch = sessionEpoch;
   const keyHex = getStoredKeyByVersion(address, version);
   if (!keyHex) {
     throw new EncryptionKeyMissingError(address, version);
@@ -15419,6 +15420,9 @@ async function getEncryptionKey(address, version = "v3") {
     false,
     ["encrypt", "decrypt"]
   );
+  if (sessionEpoch !== startEpoch || getStoredKeyByVersion(address, version) !== keyHex) {
+    throw new EncryptionKeyMissingError(address, version);
+  }
   cryptoKeyCache.set(cacheKey, cryptoKey);
   return cryptoKey;
 }
@@ -27209,9 +27213,10 @@ async function getVaultRankingProjectionsOp(ctx, options) {
 }
 function baseVaultSql(ctx, options) {
   const clauses = [
+    `"_status" is not 'deleted'`,
     '"is_deleted" = 0',
     ...options?.includeArchived ? [] : ['"archived_at" is null'],
-    `"trust_tier" is not 'quarantined'`,
+    ...options?.includeQuarantined ? [] : [`"trust_tier" is not 'quarantined'`],
     '"superseded_by" is null'
   ];
   const args = [];
@@ -27697,8 +27702,17 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   if (!entityCtx) {
     throw new Error("getMemoriesNeedingTopicExtractionOp requires ctx.entityCtx");
   }
-  const conditions = [...baseVaultConditions(ctx), import_watermelondb19.Q.sortBy("created_at", import_watermelondb19.Q.desc)];
-  const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
+  let rows;
+  try {
+    const base = baseVaultSql(ctx);
+    const sql = `select "id", "topics", "topics_user_managed", "topics_extracted_at", "topics_extracted_version", "updated_at" from "memory_vault" where ${base.sql} order by "created_at" desc`;
+    rows = await ctx.vaultMemoryCollection.query(import_watermelondb19.Q.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: topic sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), import_watermelondb19.Q.sortBy("created_at", import_watermelondb19.Q.desc)).unsafeFetchRaw();
+  }
   const linkedNames = await linkedEntityNamesByMemory(
     entityCtx,
     rows.map((r) => r.id)
@@ -27757,10 +27771,19 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   }
   const orderedPendingRaw = [...stampedPendingRaw, ...pendingRaw];
   const limitedPendingRaw = cap !== void 0 ? orderedPendingRaw.slice(0, cap) : orderedPendingRaw;
-  const pending = await mapInBatches(
-    limitedPendingRaw,
-    (raw) => vaultMemoryRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
-  );
+  const pending = [];
+  for (let i = 0; i < limitedPendingRaw.length; i += 500) {
+    const chunk = limitedPendingRaw.slice(i, i + 500);
+    const memories = await getVaultMemoriesByIdsOp(
+      ctx,
+      chunk.map((raw) => raw.id)
+    );
+    const byId = new Map(memories.map((memory) => [memory.uniqueId, memory]));
+    for (const raw of chunk) {
+      const memory = byId.get(raw.id);
+      if (memory) pending.push(memory);
+    }
+  }
   const applyCap = (ids) => cap !== void 0 ? ids.slice(0, cap) : ids;
   return {
     pending,
@@ -27907,10 +27930,20 @@ function assertVaultScopeForSweep(ctx) {
 }
 async function getDecayCandidatesRawOp(ctx) {
   assertVaultScopeForSweep(ctx);
-  const results = await ctx.vaultMemoryCollection.query(
-    ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
-    import_watermelondb19.Q.where("kind", null)
-  ).unsafeFetchRaw();
+  let results;
+  try {
+    const base = baseVaultSql(ctx, { includeArchived: true, includeQuarantined: true });
+    const sql = `select "id", "fact_type", "event_time_end", "event_time_kind", "updated_at", "last_observed_at", "archived_at", "source", "trust_tier" from "memory_vault" where ${base.sql} and "kind" is null`;
+    results = await ctx.vaultMemoryCollection.query(import_watermelondb19.Q.unsafeSqlQuery(sql, base.args)).unsafeFetchRaw();
+  } catch (err) {
+    getLogger().debug(
+      "memoryVault: decay sweep SQL unavailable; use the adapter query: " + (err instanceof Error ? err.message : String(err))
+    );
+    results = await ctx.vaultMemoryCollection.query(
+      ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
+      import_watermelondb19.Q.where("kind", null)
+    ).unsafeFetchRaw();
+  }
   return results.map((raw) => ({
     uniqueId: raw.id,
     factType: raw.fact_type ?? null,
@@ -35359,6 +35392,18 @@ async function assembleMemoryContext(options) {
 
 // src/lib/memory/durableExtraction.ts
 var import_watermelondb25 = __toESM(require_watermelondb());
+async function messagePositions(storage, ids) {
+  try {
+    return await storage.messagesCollection.query(
+      import_watermelondb25.Q.unsafeSqlQuery(
+        `select "id", "conversation_id", "message_id" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
+        ids
+      )
+    ).unsafeFetchRaw();
+  } catch {
+    return await storage.messagesCollection.query(import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).unsafeFetchRaw();
+  }
+}
 var MAX_JOBS_PER_PASS = 3;
 var MAX_ATTEMPTS = 3;
 var MAX_FAILED_SESSIONS = 3;
@@ -35927,9 +35972,9 @@ function createDurableAutoExtractor(options) {
                   r._setRaw("watermark_seq", null);
                 });
           }
-          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).fetch();
+          const rows = fromSourceConversation ? [] : await messagePositions(storage, ids);
           const foreignRows = new Set(
-            rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
+            rows.filter((row) => row.conversation_id !== conversationId).map((row) => row.id)
           );
           const sequences = /* @__PURE__ */ new Map();
           if (fromSourceConversation) {
@@ -35939,7 +35984,7 @@ function createDurableAutoExtractor(options) {
           }
           for (const row of rows) {
             if (foreignRows.has(row.id)) continue;
-            const sequence = Number(row._getRaw("message_id"));
+            const sequence = Number(row.message_id);
             if (Number.isFinite(sequence) && sequence > 0) sequences.set(row.id, sequence);
           }
           let boundary = -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anuma/sdk",
-  "version": "9.1.1",
+  "version": "9.1.3",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",