@anuma/sdk 8.0.0 → 8.0.2

package/dist/expo/index.cjs

@@ -2048,7 +2048,7 @@ ${appendix}` : appendix;
 }
 
 // src/lib/db/chat/operations.ts
-var import_watermelondb2 = require("@nozbe/watermelondb");
+var import_watermelondb3 = require("@nozbe/watermelondb");
 var import_uuid2 = require("uuid");
 
 // src/react/useEncryption.ts
@@ -3263,6 +3263,118 @@ async function assembleDecryptedMessage(message, address) {
   return result;
 }
 
+// src/lib/db/chat/toolCallEventIndex.ts
+var import_watermelondb2 = require("@nozbe/watermelondb");
+function parseEventIds(value) {
+  const ids = /* @__PURE__ */ new Set();
+  let events;
+  try {
+    events = typeof value === "string" ? JSON.parse(value) : value;
+  } catch {
+    return ids;
+  }
+  if (!Array.isArray(events)) return ids;
+  for (const event of events) {
+    if (!event || typeof event !== "object") continue;
+    const id = event.id;
+    if (typeof id === "string" && id) ids.add(id);
+  }
+  return ids;
+}
+async function fetchEventRows(collection, conversationId) {
+  try {
+    return await collection.query(
+      import_watermelondb2.Q.unsafeSqlQuery(
+        `select "id", "tool_call_events" from "history" where "conversation_id" = ? and "_status" != 'deleted' and "tool_call_events" is not null and "tool_call_events" not in ('', '[]')`,
+        [conversationId]
+      )
+    ).unsafeFetchRaw();
+  } catch (error) {
+    if (!(error instanceof Error) || !/unsafeSqlQuery.*not supported/.test(error.message)) {
+      throw error;
+    }
+    return await collection.query(
+      import_watermelondb2.Q.where("conversation_id", conversationId),
+      import_watermelondb2.Q.where("tool_call_events", import_watermelondb2.Q.notEq(null)),
+      import_watermelondb2.Q.where("tool_call_events", import_watermelondb2.Q.notIn(["", "[]"])),
+      import_watermelondb2.Q.unsafeLokiTransform(
+        (rows) => rows.map(({ id, tool_call_events }) => ({ id, tool_call_events }))
+      )
+    ).unsafeFetchRaw();
+  }
+}
+var ToolCallEventIndex = class {
+  constructor(collection) {
+    this.collection = collection;
+    this.conversations = /* @__PURE__ */ new Map();
+    this.messages = /* @__PURE__ */ new Map();
+    this.pending = /* @__PURE__ */ new Map();
+    this.resetCount = collection.database._resetCount;
+    collection.experimentalSubscribe((changes) => {
+      for (const { record: record2, type } of changes) {
+        this.replace(
+          record2.id,
+          type === "destroyed" ? void 0 : record2.conversationId,
+          type === "destroyed" ? void 0 : record2._getRaw("tool_call_events")
+        );
+      }
+    });
+  }
+  replace(messageId, conversationId, value) {
+    const previous = this.messages.get(messageId);
+    if (previous) {
+      const counts2 = this.conversations.get(previous.conversationId);
+      for (const id of previous.ids) {
+        const count2 = counts2.get(id) - 1;
+        if (count2 === 0) counts2.delete(id);
+        else counts2.set(id, count2);
+      }
+      this.messages.delete(messageId);
+    }
+    const counts = conversationId === void 0 ? void 0 : this.conversations.get(conversationId);
+    if (!counts || conversationId === void 0) return;
+    const ids = parseEventIds(value);
+    if (ids.size === 0) return;
+    this.messages.set(messageId, { conversationId, ids });
+    for (const id of ids) counts.set(id, (counts.get(id) ?? 0) + 1);
+  }
+  async get(conversationId) {
+    if (this.resetCount !== this.collection.database._resetCount) {
+      this.conversations.clear();
+      this.messages.clear();
+      this.pending.clear();
+      this.resetCount = this.collection.database._resetCount;
+    }
+    if (!this.conversations.has(conversationId)) {
+      let pending = this.pending.get(conversationId);
+      if (!pending) {
+        pending = this.collection.database.read(async () => {
+          const rows = await fetchEventRows(this.collection, conversationId);
+          this.conversations.set(conversationId, /* @__PURE__ */ new Map());
+          for (const row of rows)
+            this.replace(String(row.id), conversationId, row.tool_call_events);
+        });
+        this.pending.set(conversationId, pending);
+      }
+      try {
+        await pending;
+      } finally {
+        this.pending.delete(conversationId);
+      }
+    }
+    return new Set(this.conversations.get(conversationId).keys());
+  }
+};
+var indexes = /* @__PURE__ */ new WeakMap();
+function getToolCallEventIds(collection, conversationId) {
+  let index = indexes.get(collection);
+  if (!index) {
+    index = new ToolCallEventIndex(collection);
+    indexes.set(collection, index);
+  }
+  return index.get(conversationId);
+}
+
 // src/lib/db/chat/types.ts
 var import_uuid = require("uuid");
 
@@ -3655,7 +3767,7 @@ async function createConversationOp(ctx, opts, defaultTitle = "New Conversation"
   );
 }
 async function getConversationOp(ctx, id) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb2.Q.where("conversation_id", id), import_watermelondb2.Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", id), import_watermelondb3.Q.where("is_deleted", false)).fetch();
   return results.length > 0 ? await conversationToStored(
     results[0],
     ctx.walletAddress,
@@ -3664,7 +3776,7 @@ async function getConversationOp(ctx, id) {
   ) : null;
 }
 async function getConversationsOp(ctx) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb2.Q.where("is_deleted", false), import_watermelondb2.Q.sortBy("created_at", import_watermelondb2.Q.desc)).unsafeFetchRaw();
+  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("is_deleted", false), import_watermelondb3.Q.sortBy("created_at", import_watermelondb3.Q.desc)).unsafeFetchRaw();
   return Promise.all(
     results.map(
       (raw) => conversationRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
@@ -3685,33 +3797,33 @@ function conversationRawToLazyStored(raw) {
   };
 }
 async function getConversationsLazyOp(ctx) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb2.Q.where("is_deleted", false), import_watermelondb2.Q.sortBy("created_at", import_watermelondb2.Q.desc)).unsafeFetchRaw();
+  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("is_deleted", false), import_watermelondb3.Q.sortBy("created_at", import_watermelondb3.Q.desc)).unsafeFetchRaw();
   return results.map(conversationRawToLazyStored);
 }
 async function getConversationsPageOp(ctx, options) {
   const limit = Math.floor(options?.limit ?? 200);
   if (!Number.isFinite(limit) || limit < 1) return [];
   const exclude = new Set(options?.boundaryExcludeUniqueIds ?? []);
-  const clauses = [import_watermelondb2.Q.where("is_deleted", false)];
+  const clauses = [import_watermelondb3.Q.where("is_deleted", false)];
   if (options?.before !== void 0) {
     clauses.push(
-      exclude.size > 0 ? import_watermelondb2.Q.where("created_at", import_watermelondb2.Q.lte(options.before)) : import_watermelondb2.Q.where("created_at", import_watermelondb2.Q.lt(options.before))
+      exclude.size > 0 ? import_watermelondb3.Q.where("created_at", import_watermelondb3.Q.lte(options.before)) : import_watermelondb3.Q.where("created_at", import_watermelondb3.Q.lt(options.before))
     );
   }
-  const fetched = await ctx.conversationsCollection.query(...clauses, import_watermelondb2.Q.sortBy("created_at", import_watermelondb2.Q.desc), import_watermelondb2.Q.take(limit + exclude.size)).unsafeFetchRaw();
+  const fetched = await ctx.conversationsCollection.query(...clauses, import_watermelondb3.Q.sortBy("created_at", import_watermelondb3.Q.desc), import_watermelondb3.Q.take(limit + exclude.size)).unsafeFetchRaw();
   const results = exclude.size > 0 ? fetched.filter((raw) => !exclude.has(raw.id)) : fetched;
   return results.slice(0, limit).map(conversationRawToLazyStored);
 }
 async function getConversationsByProjectLazyOp(ctx, projectId) {
   const results = await ctx.conversationsCollection.query(
-    import_watermelondb2.Q.where("project_id", projectId === null ? "" : projectId),
-    import_watermelondb2.Q.where("is_deleted", false),
-    import_watermelondb2.Q.sortBy("created_at", import_watermelondb2.Q.desc)
+    import_watermelondb3.Q.where("project_id", projectId === null ? "" : projectId),
+    import_watermelondb3.Q.where("is_deleted", false),
+    import_watermelondb3.Q.sortBy("created_at", import_watermelondb3.Q.desc)
   ).unsafeFetchRaw();
   return results.map(conversationRawToLazyStored);
 }
 async function updateConversationTitleOp(ctx, id, title) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb2.Q.where("conversation_id", id), import_watermelondb2.Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", id), import_watermelondb3.Q.where("is_deleted", false)).fetch();
   if (results.length > 0) {
     const encryptedOpts = ctx.walletAddress && ctx.signMessage ? await encryptConversationFields(
       { title },
@@ -3730,13 +3842,13 @@ async function updateConversationTitleOp(ctx, id, title) {
   return false;
 }
 async function deleteConversationOp(ctx, id) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb2.Q.where("conversation_id", id), import_watermelondb2.Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", id), import_watermelondb3.Q.where("is_deleted", false)).fetch();
   if (results.length > 0) {
     await ctx.database.write(async () => {
       await results[0].update((conv) => {
         conv._setRaw("is_deleted", true);
       });
-      const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb2.Q.where("conversation_id", id)).fetch() : [];
+      const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb3.Q.where("conversation_id", id)).fetch() : [];
       for (const job of jobs) await job.destroyPermanently();
     });
     return true;
@@ -3744,7 +3856,7 @@ async function deleteConversationOp(ctx, id) {
   return false;
 }
 async function updateConversationPinnedOp(ctx, id, pinned) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb2.Q.where("conversation_id", id), import_watermelondb2.Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", id), import_watermelondb3.Q.where("is_deleted", false)).fetch();
   if (results.length > 0) {
     await ctx.database.write(async () => {
       await results[0].update((conv) => {
@@ -3756,7 +3868,7 @@ async function updateConversationPinnedOp(ctx, id, pinned) {
   return false;
 }
 async function getMessagesOp(ctx, convId, opts) {
-  const fetched = await ctx.messagesCollection.query(import_watermelondb2.Q.where("conversation_id", convId), import_watermelondb2.Q.sortBy("message_id", import_watermelondb2.Q.asc)).unsafeFetchRaw();
+  const fetched = await ctx.messagesCollection.query(import_watermelondb3.Q.where("conversation_id", convId), import_watermelondb3.Q.sortBy("message_id", import_watermelondb3.Q.asc)).unsafeFetchRaw();
   const results = opts?.rawFilter ? fetched.filter(opts.rawFilter) : fetched;
   return Promise.all(
     results.map(
@@ -3765,19 +3877,19 @@ async function getMessagesOp(ctx, convId, opts) {
   );
 }
 async function getMessageCountOp(ctx, convId) {
-  return await ctx.messagesCollection.query(import_watermelondb2.Q.where("conversation_id", convId)).fetchCount();
+  return await ctx.messagesCollection.query(import_watermelondb3.Q.where("conversation_id", convId)).fetchCount();
 }
 async function getMessagesPageOp(ctx, convId, opts) {
   const limit = Math.floor(opts.limit);
   if (!Number.isFinite(limit) || limit < 1) return [];
   const exclude = new Set(opts.boundaryExcludeUniqueIds ?? []);
-  const clauses = [import_watermelondb2.Q.where("conversation_id", convId)];
+  const clauses = [import_watermelondb3.Q.where("conversation_id", convId)];
   if (opts.beforeMessageId !== void 0) {
     clauses.push(
-      exclude.size > 0 ? import_watermelondb2.Q.where("message_id", import_watermelondb2.Q.lte(opts.beforeMessageId)) : import_watermelondb2.Q.where("message_id", import_watermelondb2.Q.lt(opts.beforeMessageId))
+      exclude.size > 0 ? import_watermelondb3.Q.where("message_id", import_watermelondb3.Q.lte(opts.beforeMessageId)) : import_watermelondb3.Q.where("message_id", import_watermelondb3.Q.lt(opts.beforeMessageId))
     );
   }
-  const fetched = await ctx.messagesCollection.query(...clauses, import_watermelondb2.Q.sortBy("message_id", import_watermelondb2.Q.desc), import_watermelondb2.Q.take(limit + exclude.size)).unsafeFetchRaw();
+  const fetched = await ctx.messagesCollection.query(...clauses, import_watermelondb3.Q.sortBy("message_id", import_watermelondb3.Q.desc), import_watermelondb3.Q.take(limit + exclude.size)).unsafeFetchRaw();
   const results = (exclude.size > 0 ? fetched.filter((raw) => !exclude.has(raw.id)) : fetched).slice(0, limit);
   results.reverse();
   return Promise.all(
@@ -3789,7 +3901,7 @@ async function getMessagesPageOp(ctx, convId, opts) {
   );
 }
 async function getMessageSkeletonsOp(ctx, convId) {
-  const results = await ctx.messagesCollection.query(import_watermelondb2.Q.where("conversation_id", convId), import_watermelondb2.Q.sortBy("message_id", import_watermelondb2.Q.asc)).unsafeFetchRaw();
+  const results = await ctx.messagesCollection.query(import_watermelondb3.Q.where("conversation_id", convId), import_watermelondb3.Q.sortBy("message_id", import_watermelondb3.Q.asc)).unsafeFetchRaw();
   const roleById = /* @__PURE__ */ new Map();
   for (const raw of results) {
     roleById.set(raw.id, raw.role);
@@ -3834,32 +3946,12 @@ async function getMessageSkeletonsOp(ctx, convId) {
   return skeletons;
 }
 async function getToolCallEventIdsOp(ctx, convId) {
-  const results = await ctx.messagesCollection.query(import_watermelondb2.Q.where("conversation_id", convId)).unsafeFetchRaw();
-  const ids = /* @__PURE__ */ new Set();
-  for (const raw of results) {
-    const value = raw.tool_call_events;
-    if (!value) continue;
-    let events;
-    if (typeof value === "string") {
-      try {
-        events = JSON.parse(value);
-      } catch {
-        continue;
-      }
-    } else if (Array.isArray(value)) {
-      events = value;
-    }
-    if (!Array.isArray(events)) continue;
-    for (const evt of events) {
-      if (evt && evt.id) ids.add(evt.id);
-    }
-  }
-  return ids;
+  return getToolCallEventIds(ctx.messagesCollection, convId);
 }
 async function clearMessagesOp(ctx, convId) {
   await ctx.database.write(async () => {
-    const messages = await ctx.messagesCollection.query(import_watermelondb2.Q.where("conversation_id", convId)).fetch();
-    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb2.Q.where("conversation_id", convId)).fetch() : [];
+    const messages = await ctx.messagesCollection.query(import_watermelondb3.Q.where("conversation_id", convId)).fetch();
+    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb3.Q.where("conversation_id", convId)).fetch() : [];
     for (const job of jobs) {
       await job.update((row) => {
         row._setRaw("message_ids", "[]");
@@ -3884,7 +3976,7 @@ async function deleteMessageOp(ctx, uniqueId) {
     return null;
   }
   await ctx.database.write(async () => {
-    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb2.Q.where("conversation_id", message.conversationId)).fetch() : [];
+    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb3.Q.where("conversation_id", message.conversationId)).fetch() : [];
     for (const job of jobs) {
       const ids = JSON.parse(String(job._getRaw("message_ids")));
       await job.update((row) => {
@@ -3957,9 +4049,9 @@ async function createMessageOp(ctx, opts) {
     }
   }
   const newest = await ctx.messagesCollection.query(
-    import_watermelondb2.Q.where("conversation_id", opts.conversationId),
-    import_watermelondb2.Q.sortBy("message_id", import_watermelondb2.Q.desc),
-    import_watermelondb2.Q.take(1)
+    import_watermelondb3.Q.where("conversation_id", opts.conversationId),
+    import_watermelondb3.Q.sortBy("message_id", import_watermelondb3.Q.desc),
+    import_watermelondb3.Q.take(1)
   ).fetch();
   const messageId = (newest[0]?.messageId ?? 0) + 1;
   const encryptedOpts = await encryptMessageOptsIfNeeded(ctx, opts);
@@ -3973,7 +4065,7 @@ async function createMessageOp(ctx, opts) {
   return messageToStored(created, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner);
 }
 async function upsertMessageOp(ctx, opts) {
-  const results = await ctx.messagesCollection.query(import_watermelondb2.Q.where("id", opts.uniqueId)).fetch();
+  const results = await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", opts.uniqueId)).fetch();
   const existing = results.length > 0 ? results[0] : null;
   if (!existing) {
     return createMessageOp(ctx, opts);
@@ -4081,13 +4173,13 @@ async function decryptMessageEmbeddingFields(raw, walletAddress) {
 async function sealLegacyMessageEmbeddingsOp(ctx) {
   if (!ctx.walletAddress) return 0;
   const candidateIds = await ctx.messagesCollection.query(
-    import_watermelondb2.Q.where("content", import_watermelondb2.Q.like("enc:%")),
-    import_watermelondb2.Q.or(
+    import_watermelondb3.Q.where("content", import_watermelondb3.Q.like("enc:%")),
+    import_watermelondb3.Q.or(
       ...["vector", "chunks"].map(
-        (column) => import_watermelondb2.Q.and(
-          import_watermelondb2.Q.where(column, import_watermelondb2.Q.notEq(null)),
-          import_watermelondb2.Q.where(column, import_watermelondb2.Q.notEq("")),
-          import_watermelondb2.Q.where(column, import_watermelondb2.Q.notLike("enc:%"))
+        (column) => import_watermelondb3.Q.and(
+          import_watermelondb3.Q.where(column, import_watermelondb3.Q.notEq(null)),
+          import_watermelondb3.Q.where(column, import_watermelondb3.Q.notEq("")),
+          import_watermelondb3.Q.where(column, import_watermelondb3.Q.notLike("enc:%"))
         )
       )
     )
@@ -4097,7 +4189,7 @@ async function sealLegacyMessageEmbeddingsOp(ctx) {
   for (let start = 0; start < candidateIds.length; start += 50) {
     const pageIds = candidateIds.slice(start, start + 50);
     await ctx.database.write(async () => {
-      const pageMessages = await ctx.messagesCollection.query(import_watermelondb2.Q.where("id", import_watermelondb2.Q.oneOf(pageIds))).fetch();
+      const pageMessages = await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(pageIds))).fetch();
       for (const message of pageMessages) {
         if (!isEncrypted(message.content)) continue;
         const content = await decryptFieldDetailed(message.content, ctx.walletAddress);
@@ -4178,15 +4270,15 @@ function chunksWithoutText(raw) {
   });
 }
 async function stripLegacyChunkTextOp(ctx) {
-  const candidateIds = await ctx.messagesCollection.query(import_watermelondb2.Q.where("chunks", import_watermelondb2.Q.like(`%${import_watermelondb2.Q.sanitizeLikeString('"text":')}%`))).fetchIds();
+  const candidateIds = await ctx.messagesCollection.query(import_watermelondb3.Q.where("chunks", import_watermelondb3.Q.like(`%${import_watermelondb3.Q.sanitizeLikeString('"text":')}%`))).fetchIds();
   let stripped = 0;
   for (let start = 0; start < candidateIds.length; start += RAW_REPAIR_PAGE_SIZE) {
     const pageIds = candidateIds.slice(start, start + RAW_REPAIR_PAGE_SIZE);
-    const rows = await ctx.messagesCollection.query(import_watermelondb2.Q.where("id", import_watermelondb2.Q.oneOf(pageIds))).unsafeFetchRaw();
+    const rows = await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(pageIds))).unsafeFetchRaw();
     const changedIds = rows.filter((row) => chunksWithoutText(row.chunks) !== null).map((row) => String(row.id));
     if (changedIds.length === 0) continue;
     await ctx.database.write(async () => {
-      const messages = await ctx.messagesCollection.query(import_watermelondb2.Q.where("id", import_watermelondb2.Q.oneOf(changedIds))).fetch();
+      const messages = await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(changedIds))).fetch();
       const updates = messages.flatMap((message) => {
         const raw = message._raw;
         const chunks3 = chunksWithoutText(raw.chunks);
@@ -4233,13 +4325,13 @@ async function encryptToolCallEventsOp(ctx) {
     return 0;
   }
   const candidateIds = await ctx.messagesCollection.query(
-    import_watermelondb2.Q.where("tool_call_events", import_watermelondb2.Q.notEq(null)),
-    import_watermelondb2.Q.where("tool_call_events", import_watermelondb2.Q.notIn(["", "[]"]))
+    import_watermelondb3.Q.where("tool_call_events", import_watermelondb3.Q.notEq(null)),
+    import_watermelondb3.Q.where("tool_call_events", import_watermelondb3.Q.notIn(["", "[]"]))
   ).fetchIds();
   let encrypted = 0;
   for (let start = 0; start < candidateIds.length; start += RAW_REPAIR_PAGE_SIZE) {
     const pageIds = candidateIds.slice(start, start + RAW_REPAIR_PAGE_SIZE);
-    const rows = await ctx.messagesCollection.query(import_watermelondb2.Q.where("id", import_watermelondb2.Q.oneOf(pageIds))).unsafeFetchRaw();
+    const rows = await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(pageIds))).unsafeFetchRaw();
     const repairs = /* @__PURE__ */ new Map();
     for (const row of rows) {
       const column = await encryptedToolCallEventsColumn(
@@ -4252,12 +4344,12 @@ async function encryptToolCallEventsOp(ctx) {
     }
     if (repairs.size === 0) continue;
     await ctx.database.write(async () => {
-      const messages = (await ctx.messagesCollection.query(import_watermelondb2.Q.where("id", import_watermelondb2.Q.oneOf([...repairs.keys()]))).fetch()).filter(
+      const messages = (await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf([...repairs.keys()]))).fetch()).filter(
         (message) => message._raw.tool_call_events === repairs.get(message.id)?.raw
       );
       if (messages.length === 0) return;
       const conversationIds = [...new Set(messages.map((message) => message.conversationId))];
-      const conversations = await ctx.conversationsCollection.query(import_watermelondb2.Q.where("conversation_id", import_watermelondb2.Q.oneOf(conversationIds))).fetch();
+      const conversations = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", import_watermelondb3.Q.oneOf(conversationIds))).fetch();
       await ctx.database.batch(
         ...messages.map(
           (message) => message.prepareUpdate((msg) => {
@@ -4284,7 +4376,7 @@ async function savedKeyOpensExistingData(ctx, address, signMessage, embeddedWall
   return refreshEncryptionKeyIfMatches(address, v2Probe, signMessage, embeddedWalletSigner);
 }
 async function findEncryptedContent(ctx, pattern) {
-  const [row] = await ctx.messagesCollection.query(import_watermelondb2.Q.where("content", import_watermelondb2.Q.like(pattern)), import_watermelondb2.Q.take(1)).unsafeFetchRaw();
+  const [row] = await ctx.messagesCollection.query(import_watermelondb3.Q.where("content", import_watermelondb3.Q.like(pattern)), import_watermelondb3.Q.take(1)).unsafeFetchRaw();
   return row ? String(row.content) : null;
 }
 async function updateMessageErrorOp(ctx, uniqueId, error) {
@@ -4397,7 +4489,7 @@ function toChunkCandidateKey(raw) {
 }
 async function fetchRowsByIds(ctx, ids) {
   if (ids.length === 0) return [];
-  return await ctx.messagesCollection.query(import_watermelondb2.Q.where("id", import_watermelondb2.Q.oneOf(ids))).unsafeFetchRaw();
+  return await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(ids))).unsafeFetchRaw();
 }
 async function projectedChunkRowSource(ctx, filter) {
   const clauses = [
@@ -4415,7 +4507,7 @@ async function projectedChunkRowSource(ctx, filter) {
     args.push(filter.excludeConversationId);
   }
   const keyRows = await ctx.messagesCollection.query(
-    import_watermelondb2.Q.unsafeSqlQuery(
+    import_watermelondb3.Q.unsafeSqlQuery(
       `select "id", "conversation_id", "updated_at", "embedding_model" from "history" where ${clauses.join(" and ")}`,
       args
     )
@@ -4425,7 +4517,7 @@ async function projectedChunkRowSource(ctx, filter) {
     loadVectorRows: async (ids) => {
       if (ids.length === 0) return [];
       return await ctx.messagesCollection.query(
-        import_watermelondb2.Q.unsafeSqlQuery(
+        import_watermelondb3.Q.unsafeSqlQuery(
           `select "id", "updated_at", "chunks", "vector" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
           ids
         )
@@ -4435,11 +4527,11 @@ async function projectedChunkRowSource(ctx, filter) {
   };
 }
 async function fullScanChunkRowSource(ctx, filter) {
-  const activeConversations = await ctx.conversationsCollection.query(import_watermelondb2.Q.where("is_deleted", false)).fetch();
+  const activeConversations = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("is_deleted", false)).fetch();
   const activeConversationIds = new Set(
     activeConversations.map((c) => String(c._getRaw("conversation_id")))
   );
-  const queryConditions = filter.conversationId !== void 0 ? [import_watermelondb2.Q.where("conversation_id", filter.conversationId)] : [];
+  const queryConditions = filter.conversationId !== void 0 ? [import_watermelondb3.Q.where("conversation_id", filter.conversationId)] : [];
   const rows = await ctx.messagesCollection.query(...queryConditions).unsafeFetchRaw();
   const rowsById = /* @__PURE__ */ new Map();
   for (const row of rows) {
@@ -11054,9 +11146,9 @@ async function decryptConversationTitle(encryptedTitle, address) {
 }
 
 // src/lib/db/chat/models.ts
-var import_watermelondb3 = require("@nozbe/watermelondb");
+var import_watermelondb4 = require("@nozbe/watermelondb");
 var import_decorators = require("@nozbe/watermelondb/decorators");
-var Message = class extends import_watermelondb3.Model {
+var Message = class extends import_watermelondb4.Model {
 };
 Message.table = "history";
 Message.associations = {
@@ -11135,7 +11227,7 @@ __decorateClass([
 __decorateClass([
   (0, import_decorators.text)("origin")
 ], Message.prototype, "origin", 2);
-var Conversation = class extends import_watermelondb3.Model {
+var Conversation = class extends import_watermelondb4.Model {
 };
 Conversation.table = "conversations";
 Conversation.associations = {
@@ -11163,7 +11255,7 @@ __decorateClass([
 __decorateClass([
   (0, import_decorators.date)("pinned_at")
 ], Conversation.prototype, "pinnedAt", 2);
-var ConversationSummary = class extends import_watermelondb3.Model {
+var ConversationSummary = class extends import_watermelondb4.Model {
 };
 ConversationSummary.table = "conversation_summaries";
 ConversationSummary.associations = {
@@ -11189,12 +11281,12 @@ __decorateClass([
 ], ConversationSummary.prototype, "updatedAt", 2);
 
 // src/lib/db/chat/schema.ts
-var import_watermelondb4 = require("@nozbe/watermelondb");
+var import_watermelondb5 = require("@nozbe/watermelondb");
 var import_migrations = require("@nozbe/watermelondb/Schema/migrations");
-var chatStorageSchema = (0, import_watermelondb4.appSchema)({
+var chatStorageSchema = (0, import_watermelondb5.appSchema)({
   version: 7,
   tables: [
-    (0, import_watermelondb4.tableSchema)({
+    (0, import_watermelondb5.tableSchema)({
       name: "history",
       columns: [
         { name: "message_id", type: "number" },
@@ -11218,7 +11310,7 @@ var chatStorageSchema = (0, import_watermelondb4.appSchema)({
         { name: "thinking", type: "string", isOptional: true }
       ]
     }),
-    (0, import_watermelondb4.tableSchema)({
+    (0, import_watermelondb5.tableSchema)({
       name: "conversations",
       columns: [
         { name: "conversation_id", type: "string", isIndexed: true },
@@ -11290,7 +11382,7 @@ var chatStorageMigrations = (0, import_migrations.schemaMigrations)({
 });
 
 // src/lib/db/chat/summaryOperations.ts
-var import_watermelondb5 = require("@nozbe/watermelondb");
+var import_watermelondb6 = require("@nozbe/watermelondb");
 function createSummaryContext(database) {
   return {
     database,
@@ -11309,14 +11401,14 @@ function modelToStored(record2) {
   };
 }
 async function getConversationSummaryOp(ctx, conversationId) {
-  const results = await ctx.summariesCollection.query(import_watermelondb5.Q.where("conversation_id", conversationId)).fetch();
+  const results = await ctx.summariesCollection.query(import_watermelondb6.Q.where("conversation_id", conversationId)).fetch();
   if (results.length === 0) return null;
   return modelToStored(results[0]);
 }
 async function upsertConversationSummaryOp(ctx, conversationId, summary, summarizedUpTo, tokenCount) {
   let record2;
   await ctx.database.write(async () => {
-    const existing = await ctx.summariesCollection.query(import_watermelondb5.Q.where("conversation_id", conversationId)).fetch();
+    const existing = await ctx.summariesCollection.query(import_watermelondb6.Q.where("conversation_id", conversationId)).fetch();
     if (existing.length > 0) {
       record2 = await existing[0].update((rec) => {
         rec.summary = summary;
@@ -11336,7 +11428,7 @@ async function upsertConversationSummaryOp(ctx, conversationId, summary, summari
 }
 async function deleteConversationSummaryOp(ctx, conversationId) {
   await ctx.database.write(async () => {
-    const existing = await ctx.summariesCollection.query(import_watermelondb5.Q.where("conversation_id", conversationId)).fetch();
+    const existing = await ctx.summariesCollection.query(import_watermelondb6.Q.where("conversation_id", conversationId)).fetch();
     for (const record2 of existing) {
       await record2.destroyPermanently();
     }
@@ -11370,9 +11462,9 @@ function maskScopedEmbeddingCache(cache, masked) {
 }
 
 // src/lib/db/conversationMemory/models.ts
-var import_watermelondb6 = require("@nozbe/watermelondb");
+var import_watermelondb7 = require("@nozbe/watermelondb");
 var import_decorators2 = require("@nozbe/watermelondb/decorators");
-var ConversationMemory = class extends import_watermelondb6.Model {
+var ConversationMemory = class extends import_watermelondb7.Model {
 };
 ConversationMemory.table = "conversation_memory";
 ConversationMemory.associations = {};
@@ -11391,7 +11483,7 @@ __decorateClass([
 ], ConversationMemory.prototype, "createdAt", 2);
 
 // src/lib/db/conversationMemory/operations.ts
-var import_watermelondb7 = require("@nozbe/watermelondb");
+var import_watermelondb8 = require("@nozbe/watermelondb");
 var MAX_PER_CONVERSATION = 200;
 function conversationMemoryToStored(row) {
   return {
@@ -11406,7 +11498,7 @@ async function addConversationMemoriesOp(ctx, conversationId, items) {
   if (!conversationId || items.length === 0) return;
   const now = Date.now();
   await ctx.database.write(async () => {
-    const existing = await ctx.conversationMemoryCollection.query(import_watermelondb7.Q.where("conversation_id", conversationId), import_watermelondb7.Q.sortBy("created_at", import_watermelondb7.Q.asc)).fetch();
+    const existing = await ctx.conversationMemoryCollection.query(import_watermelondb8.Q.where("conversation_id", conversationId), import_watermelondb8.Q.sortBy("created_at", import_watermelondb8.Q.asc)).fetch();
     const seen = new Set(existing.map((r) => r.memoryId));
     const batchSeen = /* @__PURE__ */ new Set();
     const deduped = [];
@@ -11436,13 +11528,13 @@ async function addConversationMemoriesOp(ctx, conversationId, items) {
 }
 async function getConversationMemoriesOp(ctx, conversationId) {
   if (!conversationId) return [];
-  const rows = await ctx.conversationMemoryCollection.query(import_watermelondb7.Q.where("conversation_id", conversationId), import_watermelondb7.Q.sortBy("created_at", import_watermelondb7.Q.asc)).fetch();
+  const rows = await ctx.conversationMemoryCollection.query(import_watermelondb8.Q.where("conversation_id", conversationId), import_watermelondb8.Q.sortBy("created_at", import_watermelondb8.Q.asc)).fetch();
   return rows.map(conversationMemoryToStored);
 }
 async function clearConversationMemoriesOp(ctx, conversationId) {
   if (!conversationId) return;
   await ctx.database.write(async () => {
-    const rows = await ctx.conversationMemoryCollection.query(import_watermelondb7.Q.where("conversation_id", conversationId)).fetch();
+    const rows = await ctx.conversationMemoryCollection.query(import_watermelondb8.Q.where("conversation_id", conversationId)).fetch();
     if (rows.length === 0) return;
     await ctx.database.batch(...rows.map((r) => r.prepareDestroyPermanently()));
   });
@@ -11505,16 +11597,16 @@ function parseTopics(value) {
 }
 
 // src/lib/db/manager.ts
-var import_watermelondb18 = require("@nozbe/watermelondb");
+var import_watermelondb19 = require("@nozbe/watermelondb");
 
 // src/lib/db/schema.ts
-var import_watermelondb17 = require("@nozbe/watermelondb");
+var import_watermelondb18 = require("@nozbe/watermelondb");
 var import_migrations2 = require("@nozbe/watermelondb/Schema/migrations");
 
 // src/lib/db/appFiles/models.ts
-var import_watermelondb8 = require("@nozbe/watermelondb");
+var import_watermelondb9 = require("@nozbe/watermelondb");
 var import_decorators3 = require("@nozbe/watermelondb/decorators");
-var AppFile = class extends import_watermelondb8.Model {
+var AppFile = class extends import_watermelondb9.Model {
 };
 AppFile.table = "app_files";
 AppFile.associations = {};
@@ -11536,9 +11628,9 @@ __decorateClass([
 ], AppFile.prototype, "updatedAt", 2);
 
 // src/lib/db/entities/models.ts
-var import_watermelondb9 = require("@nozbe/watermelondb");
+var import_watermelondb10 = require("@nozbe/watermelondb");
 var import_decorators4 = require("@nozbe/watermelondb/decorators");
-var Entity = class extends import_watermelondb9.Model {
+var Entity = class extends import_watermelondb10.Model {
 };
 Entity.table = "entity";
 __decorateClass([
@@ -11554,7 +11646,7 @@ __decorateClass([
 __decorateClass([
   (0, import_decorators4.date)("updated_at")
 ], Entity.prototype, "updatedAt", 2);
-var MemoryEntity = class extends import_watermelondb9.Model {
+var MemoryEntity = class extends import_watermelondb10.Model {
 };
 MemoryEntity.table = "memory_entity";
 __decorateClass([
@@ -11572,9 +11664,9 @@ __decorateClass([
 ], MemoryEntity.prototype, "createdAt", 2);
 
 // src/lib/db/media/models.ts
-var import_watermelondb10 = require("@nozbe/watermelondb");
+var import_watermelondb11 = require("@nozbe/watermelondb");
 var import_decorators5 = require("@nozbe/watermelondb/decorators");
-var Media = class extends import_watermelondb10.Model {
+var Media = class extends import_watermelondb11.Model {
 };
 Media.table = "media";
 Media.associations = {
@@ -11635,9 +11727,9 @@ __decorateClass([
 ], Media.prototype, "isDeleted", 2);
 
 // src/lib/db/memoryVault/models.ts
-var import_watermelondb11 = require("@nozbe/watermelondb");
+var import_watermelondb12 = require("@nozbe/watermelondb");
 var import_decorators6 = require("@nozbe/watermelondb/decorators");
-var VaultMemory = class extends import_watermelondb11.Model {
+var VaultMemory = class extends import_watermelondb12.Model {
 };
 VaultMemory.table = "memory_vault";
 __decorateClass([
@@ -11745,9 +11837,9 @@ __decorateClass([
 ], VaultMemory.prototype, "isDeleted", 2);
 
 // src/lib/db/project/models.ts
-var import_watermelondb12 = require("@nozbe/watermelondb");
+var import_watermelondb13 = require("@nozbe/watermelondb");
 var import_decorators7 = require("@nozbe/watermelondb/decorators");
-var Project = class extends import_watermelondb12.Model {
+var Project = class extends import_watermelondb13.Model {
 };
 Project.table = "projects";
 Project.associations = {
@@ -11770,10 +11862,10 @@ __decorateClass([
 ], Project.prototype, "isDeleted", 2);
 
 // src/lib/db/savedTools/models.ts
-var import_watermelondb13 = require("@nozbe/watermelondb");
+var import_watermelondb14 = require("@nozbe/watermelondb");
 var import_decorators8 = require("@nozbe/watermelondb/decorators");
 var sanitizeParameters = (raw) => raw ?? {};
-var SavedTool = class extends import_watermelondb13.Model {
+var SavedTool = class extends import_watermelondb14.Model {
 };
 SavedTool.table = "saved_tools";
 SavedTool.associations = {};
@@ -11807,9 +11899,9 @@ __decorateClass([
 ], SavedTool.prototype, "isDeleted", 2);
 
 // src/lib/db/settings/models.ts
-var import_watermelondb14 = require("@nozbe/watermelondb");
+var import_watermelondb15 = require("@nozbe/watermelondb");
 var import_decorators9 = require("@nozbe/watermelondb/decorators");
-var ModelPreference = class extends import_watermelondb14.Model {
+var ModelPreference = class extends import_watermelondb15.Model {
 };
 ModelPreference.table = "modelPreferences";
 __decorateClass([
@@ -11820,9 +11912,9 @@ __decorateClass([
 ], ModelPreference.prototype, "models", 2);
 
 // src/lib/db/userPreferences/models.ts
-var import_watermelondb15 = require("@nozbe/watermelondb");
+var import_watermelondb16 = require("@nozbe/watermelondb");
 var import_decorators10 = require("@nozbe/watermelondb/decorators");
-var UserPreference = class extends import_watermelondb15.Model {
+var UserPreference = class extends import_watermelondb16.Model {
 };
 UserPreference.table = "userPreferences";
 __decorateClass([
@@ -11851,9 +11943,9 @@ __decorateClass([
 ], UserPreference.prototype, "updatedAt", 2);
 
 // src/lib/db/vaultFolders/models.ts
-var import_watermelondb16 = require("@nozbe/watermelondb");
+var import_watermelondb17 = require("@nozbe/watermelondb");
 var import_decorators11 = require("@nozbe/watermelondb/decorators");
-var VaultFolder = class extends import_watermelondb16.Model {
+var VaultFolder = class extends import_watermelondb17.Model {
 };
 VaultFolder.table = "vault_folders";
 __decorateClass([
@@ -11881,10 +11973,10 @@ __decorateClass([
 
 // src/lib/db/schema.ts
 var SDK_SCHEMA_VERSION = 48;
-var sdkSchema = (0, import_watermelondb17.appSchema)({
+var sdkSchema = (0, import_watermelondb18.appSchema)({
   version: SDK_SCHEMA_VERSION,
   tables: [
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "memory_extraction_jobs",
       columns: [
         { name: "owner_key", type: "string", isIndexed: true },
@@ -11899,7 +11991,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "failed_at", type: "number", isOptional: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "history",
       columns: [
         { name: "message_id", type: "number" },
@@ -11928,7 +12020,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "origin", type: "string", isOptional: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "conversations",
       columns: [
         { name: "conversation_id", type: "string", isIndexed: true },
@@ -11940,7 +12032,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "pinned_at", type: "number", isOptional: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "projects",
       columns: [
         { name: "project_id", type: "string", isIndexed: true },
@@ -11950,14 +12042,14 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "is_deleted", type: "boolean", isIndexed: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "modelPreferences",
       columns: [
         { name: "wallet_address", type: "string", isIndexed: true },
         { name: "models", type: "string", isOptional: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "userPreferences",
       columns: [
         { name: "wallet_address", type: "string", isIndexed: true },
@@ -11970,7 +12062,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "updated_at", type: "number" }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "memory_vault",
       columns: [
         { name: "content", type: "string" },
@@ -12009,7 +12101,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "geohash", type: "string", isOptional: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "entity",
       columns: [
         { name: "canonical_name", type: "string", isIndexed: true },
@@ -12018,7 +12110,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "updated_at", type: "number" }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "memory_entity",
       columns: [
         { name: "memory_id", type: "string", isIndexed: true },
@@ -12027,7 +12119,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "created_at", type: "number" }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "vault_folders",
       columns: [
         { name: "name", type: "string" },
@@ -12039,7 +12131,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "context", type: "string", isOptional: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "conversation_summaries",
       columns: [
         { name: "conversation_id", type: "string", isIndexed: true },
@@ -12050,7 +12142,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "updated_at", type: "number" }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "media",
       columns: [
         { name: "media_id", type: "string", isIndexed: true },
@@ -12072,7 +12164,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "is_deleted", type: "boolean", isIndexed: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "app_files",
       columns: [
         { name: "conversation_id", type: "string", isIndexed: true },
@@ -12082,7 +12174,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "updated_at", type: "number" }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "saved_tools",
       columns: [
         { name: "name", type: "string" },
@@ -12096,7 +12188,7 @@ var sdkSchema = (0, import_watermelondb17.appSchema)({
         { name: "is_deleted", type: "boolean", isIndexed: true }
       ]
     }),
-    (0, import_watermelondb17.tableSchema)({
+    (0, import_watermelondb18.tableSchema)({
       name: "conversation_memory",
       columns: [
         { name: "conversation_id", type: "string", isIndexed: true },
@@ -12772,7 +12864,7 @@ var DatabaseManager = class {
       walletAddress
     });
     const adapter = this.createAdapter(dbName, sdkSchema, sdkMigrations);
-    const database = new import_watermelondb18.Database({
+    const database = new import_watermelondb19.Database({
       adapter,
       modelClasses: sdkModelClasses
     });
@@ -12851,11 +12943,11 @@ var DatabaseManager = class {
 };
 
 // src/lib/db/memoryVault/operations.ts
-var import_watermelondb20 = require("@nozbe/watermelondb");
+var import_watermelondb21 = require("@nozbe/watermelondb");
 init_logger();
 
 // src/lib/db/entities/operations.ts
-var import_watermelondb19 = require("@nozbe/watermelondb");
+var import_watermelondb20 = require("@nozbe/watermelondb");
 
 // src/lib/db/memoryVault/types.ts
 var MEMORY_KINDS = [
@@ -12948,7 +13040,7 @@ async function upsertEntitiesInWrite(ctx, entities) {
   const unique = Array.from(kindByName.keys());
   const out = /* @__PURE__ */ new Map();
   if (unique.length === 0) return { entities: out, operations: [], kindBackfills: [] };
-  const existing = await ctx.entityCollection.query(import_watermelondb19.Q.where("canonical_name", import_watermelondb19.Q.oneOf(unique))).fetch();
+  const existing = await ctx.entityCollection.query(import_watermelondb20.Q.where("canonical_name", import_watermelondb20.Q.oneOf(unique))).fetch();
   const existingNames = new Set(existing.map((e) => e.canonicalName));
   const kindBackfills = existing.filter((e) => {
     const incoming = kindByName.get(e.canonicalName);
@@ -12978,7 +13070,7 @@ function prepareKindBackfills(backfills) {
 }
 async function findVaultRowInWrite(ctx, memoryId) {
   try {
-    const rows = await ctx.database.get("memory_vault").query(import_watermelondb19.Q.where("id", memoryId)).fetch();
+    const rows = await ctx.database.get("memory_vault").query(import_watermelondb20.Q.where("id", memoryId)).fetch();
     return rows[0] ?? null;
   } catch {
     return null;
@@ -13080,7 +13172,7 @@ async function linkMemoryEntitiesOp(ctx, memoryId, entityInputs, options) {
       return;
     }
     if (entities.length === 0) return;
-    const existingLinks = await ctx.memoryEntityCollection.query(import_watermelondb19.Q.where("memory_id", memoryId)).fetch();
+    const existingLinks = await ctx.memoryEntityCollection.query(import_watermelondb20.Q.where("memory_id", memoryId)).fetch();
     const existingEntityIds = new Set(existingLinks.map((l) => String(l.entityId)));
     const toCreate = entities.filter((e) => !existingEntityIds.has(e.uniqueId));
     const keptIds = entities.map((e) => e.uniqueId);
@@ -13116,7 +13208,7 @@ async function linkMemoryEntitiesOp(ctx, memoryId, entityInputs, options) {
 }
 async function resolveEntitiesByIds(ctx, entityIds) {
   if (entityIds.length === 0) return [];
-  const rows = await ctx.entityCollection.query(import_watermelondb19.Q.where("id", import_watermelondb19.Q.oneOf(Array.from(entityIds)))).fetch();
+  const rows = await ctx.entityCollection.query(import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(Array.from(entityIds)))).fetch();
   return rows.map(entityToStored);
 }
 function autoLinkBlocked(row) {
@@ -13152,7 +13244,7 @@ async function replaceMemoryEntities(ctx, memoryId, entityInputs, options) {
       kindBackfills
     } = await upsertEntitiesInWrite(ctx, normalized);
     entities = Array.from(byName.values());
-    const existingLinks = await ctx.memoryEntityCollection.query(import_watermelondb19.Q.where("memory_id", memoryId)).fetch();
+    const existingLinks = await ctx.memoryEntityCollection.query(import_watermelondb20.Q.where("memory_id", memoryId)).fetch();
     const keep = new Set(entities.map((e) => e.uniqueId));
     const existingEntityIds = new Set(existingLinks.map((l) => String(l.entityId)));
     const toCreate = entities.filter((e) => !existingEntityIds.has(e.uniqueId));
@@ -13188,17 +13280,17 @@ async function replaceMemoryEntities(ctx, memoryId, entityInputs, options) {
 async function findOrphanedEntities(ctx, memoryId, toDestroy) {
   const candidateIds = [...new Set(toDestroy.map((l) => String(l.entityId)))];
   if (candidateIds.length === 0) return [];
-  const links = await ctx.memoryEntityCollection.query(import_watermelondb19.Q.where("entity_id", import_watermelondb19.Q.oneOf(candidateIds))).fetch();
+  const links = await ctx.memoryEntityCollection.query(import_watermelondb20.Q.where("entity_id", import_watermelondb20.Q.oneOf(candidateIds))).fetch();
   const stillLinked = new Set(
     links.filter((l) => String(l.memoryId) !== memoryId).map((l) => String(l.entityId))
   );
   const orphanIds = candidateIds.filter((id) => !stillLinked.has(id));
   if (orphanIds.length === 0) return [];
-  return await ctx.entityCollection.query(import_watermelondb19.Q.where("id", import_watermelondb19.Q.oneOf(orphanIds))).fetch();
+  return await ctx.entityCollection.query(import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(orphanIds))).fetch();
 }
 async function unlinkMemoryEntitiesOp(ctx, memoryIds) {
   if (memoryIds.length === 0) return;
-  const links = await ctx.memoryEntityCollection.query(import_watermelondb19.Q.where("memory_id", import_watermelondb19.Q.oneOf(Array.from(memoryIds)))).fetch();
+  const links = await ctx.memoryEntityCollection.query(import_watermelondb20.Q.where("memory_id", import_watermelondb20.Q.oneOf(Array.from(memoryIds)))).fetch();
   if (links.length === 0) return;
   await ctx.database.write(async () => {
     await assertCanWrite(ctx);
@@ -13207,7 +13299,7 @@ async function unlinkMemoryEntitiesOp(ctx, memoryIds) {
 }
 async function unlinkAllMemoryEntitiesForUserOp(ctx, userId) {
   if (!userId) return;
-  const links = await ctx.memoryEntityCollection.query(import_watermelondb19.Q.where("user_id", userId)).fetch();
+  const links = await ctx.memoryEntityCollection.query(import_watermelondb20.Q.where("user_id", userId)).fetch();
   if (links.length === 0) return;
   await ctx.database.write(async () => {
     await assertCanWrite(ctx);
@@ -13217,15 +13309,15 @@ async function unlinkAllMemoryEntitiesForUserOp(ctx, userId) {
 async function getMemoriesByEntityNamesOp(ctx, entityNames) {
   const unique = Array.from(new Set(entityNames.map(normalizeEntityName).filter((n) => n.length > 0)));
   if (unique.length === 0) return /* @__PURE__ */ new Map();
-  const entityRows = await ctx.entityCollection.query(import_watermelondb19.Q.where("canonical_name", import_watermelondb19.Q.oneOf(unique))).fetch();
+  const entityRows = await ctx.entityCollection.query(import_watermelondb20.Q.where("canonical_name", import_watermelondb20.Q.oneOf(unique))).fetch();
   if (entityRows.length === 0) return /* @__PURE__ */ new Map();
   const entityIdToName = new Map(entityRows.map((e) => [e.id, e.canonicalName]));
-  const linkConditions = [import_watermelondb19.Q.where("entity_id", import_watermelondb19.Q.oneOf(entityRows.map((e) => e.id)))];
+  const linkConditions = [import_watermelondb20.Q.where("entity_id", import_watermelondb20.Q.oneOf(entityRows.map((e) => e.id)))];
   if (ctx.userId !== void 0) {
     if (ctx.allowUnscopedRows) {
-      linkConditions.push(import_watermelondb19.Q.or(import_watermelondb19.Q.where("user_id", ctx.userId), import_watermelondb19.Q.where("user_id", null)));
+      linkConditions.push(import_watermelondb20.Q.or(import_watermelondb20.Q.where("user_id", ctx.userId), import_watermelondb20.Q.where("user_id", null)));
     } else {
-      linkConditions.push(import_watermelondb19.Q.where("user_id", ctx.userId));
+      linkConditions.push(import_watermelondb20.Q.where("user_id", ctx.userId));
     }
   }
   const links = await ctx.memoryEntityCollection.query(...linkConditions).fetch();
@@ -13246,18 +13338,18 @@ async function getMemoriesByEntityNamesOp(ctx, entityNames) {
 async function getEntitiesByMemoryIdsOp(ctx, memoryIds) {
   const unique = Array.from(new Set(memoryIds.filter((id) => id.length > 0)));
   if (unique.length === 0) return /* @__PURE__ */ new Map();
-  const linkConditions = [import_watermelondb19.Q.where("memory_id", import_watermelondb19.Q.oneOf(unique))];
+  const linkConditions = [import_watermelondb20.Q.where("memory_id", import_watermelondb20.Q.oneOf(unique))];
   if (ctx.userId !== void 0) {
     if (ctx.allowUnscopedRows) {
-      linkConditions.push(import_watermelondb19.Q.or(import_watermelondb19.Q.where("user_id", ctx.userId), import_watermelondb19.Q.where("user_id", null)));
+      linkConditions.push(import_watermelondb20.Q.or(import_watermelondb20.Q.where("user_id", ctx.userId), import_watermelondb20.Q.where("user_id", null)));
     } else {
-      linkConditions.push(import_watermelondb19.Q.where("user_id", ctx.userId));
+      linkConditions.push(import_watermelondb20.Q.where("user_id", ctx.userId));
     }
   }
   const links = await ctx.memoryEntityCollection.query(...linkConditions).fetch();
   if (links.length === 0) return /* @__PURE__ */ new Map();
   const entityIds = Array.from(new Set(links.map((l) => String(l.entityId))));
-  const entityRows = await ctx.entityCollection.query(import_watermelondb19.Q.where("id", import_watermelondb19.Q.oneOf(entityIds))).fetch();
+  const entityRows = await ctx.entityCollection.query(import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(entityIds))).fetch();
   const entityIdToName = new Map(entityRows.map((e) => [e.id, e.canonicalName]));
   const out = /* @__PURE__ */ new Map();
   for (const link of links) {
@@ -13322,11 +13414,11 @@ var NON_PRIVATE_VISIBILITIES = ["public"];
 function visibilityConditions(requested) {
   if (!requested?.length) return [];
   if (!requested.includes("private")) {
-    return [import_watermelondb20.Q.where("visibility", import_watermelondb20.Q.oneOf([...requested]))];
+    return [import_watermelondb21.Q.where("visibility", import_watermelondb21.Q.oneOf([...requested]))];
   }
   const excluded = NON_PRIVATE_VISIBILITIES.filter((v) => !requested.includes(v));
   if (excluded.length === 0) return [];
-  return [import_watermelondb20.Q.or(import_watermelondb20.Q.where("visibility", null), import_watermelondb20.Q.where("visibility", import_watermelondb20.Q.notIn(excluded)))];
+  return [import_watermelondb21.Q.or(import_watermelondb21.Q.where("visibility", null), import_watermelondb21.Q.where("visibility", import_watermelondb21.Q.notIn(excluded)))];
 }
 function isKinded(record2) {
   return record2.kind !== null && record2.kind !== void 0;
@@ -13367,17 +13459,17 @@ function levelConditions(requested) {
   const published = ["shared", "public"];
   const wantsMatching = requested.includes("matching");
   const wantsPrivate = requested.includes("private");
-  const unresolved = import_watermelondb20.Q.or(import_watermelondb20.Q.where("level", null), import_watermelondb20.Q.where("level", import_watermelondb20.Q.notIn([...MEMORY_LEVELS])));
-  const byLevel = import_watermelondb20.Q.where("level", import_watermelondb20.Q.oneOf([...requested]));
-  if (wantsMatching && wantsPrivate) return [import_watermelondb20.Q.or(byLevel, unresolved)];
+  const unresolved = import_watermelondb21.Q.or(import_watermelondb21.Q.where("level", null), import_watermelondb21.Q.where("level", import_watermelondb21.Q.notIn([...MEMORY_LEVELS])));
+  const byLevel = import_watermelondb21.Q.where("level", import_watermelondb21.Q.oneOf([...requested]));
+  if (wantsMatching && wantsPrivate) return [import_watermelondb21.Q.or(byLevel, unresolved)];
   if (wantsMatching) {
-    return [import_watermelondb20.Q.or(byLevel, import_watermelondb20.Q.and(unresolved, import_watermelondb20.Q.where("scope", import_watermelondb20.Q.oneOf(published))))];
+    return [import_watermelondb21.Q.or(byLevel, import_watermelondb21.Q.and(unresolved, import_watermelondb21.Q.where("scope", import_watermelondb21.Q.oneOf(published))))];
   }
   if (wantsPrivate) {
     return [
-      import_watermelondb20.Q.or(
+      import_watermelondb21.Q.or(
         byLevel,
-        import_watermelondb20.Q.and(unresolved, import_watermelondb20.Q.or(import_watermelondb20.Q.where("scope", null), import_watermelondb20.Q.where("scope", import_watermelondb20.Q.notIn(published))))
+        import_watermelondb21.Q.and(unresolved, import_watermelondb21.Q.or(import_watermelondb21.Q.where("scope", null), import_watermelondb21.Q.where("scope", import_watermelondb21.Q.notIn(published))))
       )
     ];
   }
@@ -13388,13 +13480,13 @@ function isOwnedByCtxUser(ctx, record2) {
 }
 function baseVaultConditions(ctx, options) {
   return [
-    ...options?.memoryIds !== void 0 ? [import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(options.memoryIds))] : [],
-    ...options?.includeDeleted ? [] : [import_watermelondb20.Q.where("is_deleted", false)],
-    ...options?.includeArchived ? [] : [import_watermelondb20.Q.where("archived_at", import_watermelondb20.Q.eq(null))],
-    ...options?.includeQuarantined ? [] : [import_watermelondb20.Q.where("trust_tier", import_watermelondb20.Q.notEq("quarantined"))],
-    ...options?.includeSuperseded ? [] : [import_watermelondb20.Q.where("superseded_by", null)],
-    ...ctx.userId !== void 0 ? [import_watermelondb20.Q.where("user_id", ctx.userId)] : [],
-    ...options?.since ? [import_watermelondb20.Q.where("updated_at", import_watermelondb20.Q.gt(options.since.getTime()))] : []
+    ...options?.memoryIds !== void 0 ? [import_watermelondb21.Q.where("id", import_watermelondb21.Q.oneOf(options.memoryIds))] : [],
+    ...options?.includeDeleted ? [] : [import_watermelondb21.Q.where("is_deleted", false)],
+    ...options?.includeArchived ? [] : [import_watermelondb21.Q.where("archived_at", import_watermelondb21.Q.eq(null))],
+    ...options?.includeQuarantined ? [] : [import_watermelondb21.Q.where("trust_tier", import_watermelondb21.Q.notEq("quarantined"))],
+    ...options?.includeSuperseded ? [] : [import_watermelondb21.Q.where("superseded_by", null)],
+    ...ctx.userId !== void 0 ? [import_watermelondb21.Q.where("user_id", ctx.userId)] : [],
+    ...options?.since ? [import_watermelondb21.Q.where("updated_at", import_watermelondb21.Q.gt(options.since.getTime()))] : []
   ];
 }
 var KNOWN_TRUST_TIERS = /* @__PURE__ */ new Set(["quarantined", "trusted"]);
@@ -13564,11 +13656,11 @@ async function createSupersedingMemoryOp(ctx, opts, targetId) {
 async function getMemoriesByEventTimeOp(ctx, windowStart, windowEnd) {
   const records = await ctx.vaultMemoryCollection.query(
     ...baseVaultConditions(ctx),
-    import_watermelondb20.Q.where("event_time_start", import_watermelondb20.Q.notEq(null)),
-    import_watermelondb20.Q.where("event_time_start", import_watermelondb20.Q.lte(windowEnd)),
-    import_watermelondb20.Q.or(
-      import_watermelondb20.Q.where("event_time_start", import_watermelondb20.Q.gte(windowStart)),
-      import_watermelondb20.Q.where("event_time_kind", import_watermelondb20.Q.oneOf(["range", "ongoing"]))
+    import_watermelondb21.Q.where("event_time_start", import_watermelondb21.Q.notEq(null)),
+    import_watermelondb21.Q.where("event_time_start", import_watermelondb21.Q.lte(windowEnd)),
+    import_watermelondb21.Q.or(
+      import_watermelondb21.Q.where("event_time_start", import_watermelondb21.Q.gte(windowStart)),
+      import_watermelondb21.Q.where("event_time_kind", import_watermelondb21.Q.oneOf(["range", "ongoing"]))
     )
   ).fetch();
   const out = [];
@@ -13724,18 +13816,18 @@ async function getAllVaultMemoriesOp(ctx, options) {
 function vaultListConditions(ctx, options) {
   return [
     ...baseVaultConditions(ctx, options),
-    ...options?.scopes?.length ? [import_watermelondb20.Q.where("scope", import_watermelondb20.Q.oneOf(options.scopes))] : [],
+    ...options?.scopes?.length ? [import_watermelondb21.Q.where("scope", import_watermelondb21.Q.oneOf(options.scopes))] : [],
     ...visibilityConditions(options?.visibility),
     ...levelConditions(options?.levels),
-    ...options?.kinds?.length ? [import_watermelondb20.Q.where("kind", import_watermelondb20.Q.oneOf(options.kinds))] : [],
-    ...options?.folderId !== void 0 ? [import_watermelondb20.Q.where("folder_id", options.folderId)] : [],
-    ...options?.factTypes?.length ? [import_watermelondb20.Q.where("fact_type", import_watermelondb20.Q.oneOf(options.factTypes))] : []
+    ...options?.kinds?.length ? [import_watermelondb21.Q.where("kind", import_watermelondb21.Q.oneOf(options.kinds))] : [],
+    ...options?.folderId !== void 0 ? [import_watermelondb21.Q.where("folder_id", options.folderId)] : [],
+    ...options?.factTypes?.length ? [import_watermelondb21.Q.where("fact_type", import_watermelondb21.Q.oneOf(options.factTypes))] : []
   ];
 }
 function vaultListOrder(options) {
   return [
-    import_watermelondb20.Q.sortBy(options?.since ? "updated_at" : "created_at", import_watermelondb20.Q.desc),
-    ...options?.limit !== null && options?.limit !== void 0 && options.limit > 0 ? [import_watermelondb20.Q.take(options.limit)] : []
+    import_watermelondb21.Q.sortBy(options?.since ? "updated_at" : "created_at", import_watermelondb21.Q.desc),
+    ...options?.limit !== null && options?.limit !== void 0 && options.limit > 0 ? [import_watermelondb21.Q.take(options.limit)] : []
   ];
 }
 async function getAllVaultMemoryRowsOp(ctx) {
@@ -13774,10 +13866,10 @@ function vaultMemoryRawToRankable(raw) {
 async function getVaultRankingProjectionsOp(ctx, options) {
   const conditions = [
     ...baseVaultConditions(ctx, options),
-    ...options?.scopes?.length ? [import_watermelondb20.Q.where("scope", import_watermelondb20.Q.oneOf(options.scopes))] : [],
-    ...options?.folderId !== void 0 ? [import_watermelondb20.Q.where("folder_id", options.folderId)] : [],
-    import_watermelondb20.Q.sortBy(options?.since ? "updated_at" : "created_at", import_watermelondb20.Q.desc),
-    ...options?.limit !== null && options?.limit !== void 0 && options.limit > 0 ? [import_watermelondb20.Q.take(options.limit)] : []
+    ...options?.scopes?.length ? [import_watermelondb21.Q.where("scope", import_watermelondb21.Q.oneOf(options.scopes))] : [],
+    ...options?.folderId !== void 0 ? [import_watermelondb21.Q.where("folder_id", options.folderId)] : [],
+    import_watermelondb21.Q.sortBy(options?.since ? "updated_at" : "created_at", import_watermelondb21.Q.desc),
+    ...options?.limit !== null && options?.limit !== void 0 && options.limit > 0 ? [import_watermelondb21.Q.take(options.limit)] : []
   ];
   const results = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
   return results.map(vaultMemoryRawToRankable);
@@ -13828,7 +13920,7 @@ async function getVaultCandidateKeysOp(ctx, options) {
       args.push(...options.factTypes);
     }
     const sql = `select "id", "scope", "folder_id", "embedding_model", "updated_at" from "memory_vault" where ${clauses.join(" and ")}`;
-    const rows = await ctx.vaultMemoryCollection.query(import_watermelondb20.Q.unsafeSqlQuery(sql, args)).unsafeFetchRaw();
+    const rows = await ctx.vaultMemoryCollection.query(import_watermelondb21.Q.unsafeSqlQuery(sql, args)).unsafeFetchRaw();
     return rows.map(mapRaw);
   } catch (err) {
     getLogger().debug(
@@ -13839,9 +13931,9 @@ async function getVaultCandidateKeysOp(ctx, options) {
         memoryIds: options?.memoryIds,
         ...options?.includeArchived !== void 0 && { includeArchived: options.includeArchived }
       }),
-      ...options?.scopes?.length ? [import_watermelondb20.Q.where("scope", import_watermelondb20.Q.oneOf(options.scopes))] : [],
-      ...options?.folderId !== void 0 ? [import_watermelondb20.Q.where("folder_id", options.folderId)] : [],
-      ...options?.factTypes?.length ? [import_watermelondb20.Q.where("fact_type", import_watermelondb20.Q.oneOf(options.factTypes))] : []
+      ...options?.scopes?.length ? [import_watermelondb21.Q.where("scope", import_watermelondb21.Q.oneOf(options.scopes))] : [],
+      ...options?.folderId !== void 0 ? [import_watermelondb21.Q.where("folder_id", options.folderId)] : [],
+      ...options?.factTypes?.length ? [import_watermelondb21.Q.where("fact_type", import_watermelondb21.Q.oneOf(options.factTypes))] : []
     ];
     const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
     return rows.map(mapRaw);
@@ -13859,7 +13951,7 @@ async function getVaultEmbeddingsByIdsOp(ctx, ids, options) {
       ...options?.includeArchived !== void 0 && { includeArchived: options.includeArchived }
     });
     const sql = `select "id", "embedding", "embedding_model" from "memory_vault" where ${base.sql} and "id" in (${ids.map(() => "?").join(",")})`;
-    const rows = await ctx.vaultMemoryCollection.query(import_watermelondb20.Q.unsafeSqlQuery(sql, [...base.args, ...ids])).unsafeFetchRaw();
+    const rows = await ctx.vaultMemoryCollection.query(import_watermelondb21.Q.unsafeSqlQuery(sql, [...base.args, ...ids])).unsafeFetchRaw();
     return rows.map(mapRaw);
   } catch (err) {
     getLogger().debug(
@@ -13871,7 +13963,7 @@ async function getVaultEmbeddingsByIdsOp(ctx, ids, options) {
           includeArchived: options.includeArchived
         }
       }),
-      import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(ids))
+      import_watermelondb21.Q.where("id", import_watermelondb21.Q.oneOf(ids))
     ).unsafeFetchRaw();
     return rows.map(mapRaw);
   }
@@ -13882,7 +13974,7 @@ async function getVaultMemoriesByIdsOp(ctx, ids, options) {
     ...baseVaultConditions(ctx, {
       ...options?.includeArchived !== void 0 && { includeArchived: options.includeArchived }
     }),
-    import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(ids))
+    import_watermelondb21.Q.where("id", import_watermelondb21.Q.oneOf(ids))
   ];
   const results = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
   return mapInBatches(
@@ -13907,7 +13999,7 @@ async function countActiveVaultMemoriesOp(ctx) {
 }
 async function getActiveVaultMemoryIdsOp(ctx, ids) {
   if (ids.length === 0) return /* @__PURE__ */ new Set();
-  const rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(ids))).unsafeFetchRaw();
+  const rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), import_watermelondb21.Q.where("id", import_watermelondb21.Q.oneOf(ids))).unsafeFetchRaw();
   return new Set(rows.map((r) => r.id));
 }
 async function updateVaultMemoryOp(ctx, id, opts) {
@@ -14056,7 +14148,7 @@ async function setMemoryEntitiesOp(ctx, memoryId, entities) {
       () => linkMemoryEntitiesOp(entityCtx, memoryId, entities, { topicsSource: "user" })
     ) : [];
     const keep = new Set(linked.map((e) => e.uniqueId));
-    const existing = await entityCtx.memoryEntityCollection.query(import_watermelondb20.Q.where("memory_id", memoryId)).fetch();
+    const existing = await entityCtx.memoryEntityCollection.query(import_watermelondb21.Q.where("memory_id", memoryId)).fetch();
     const staleLinks = existing.filter((l) => !keep.has(String(l.entityId)));
     if (staleLinks.length === 0 && entities.length > 0) return;
     const topicsWrite = await resolveMemoryTopicsWrite(
@@ -14197,9 +14289,9 @@ async function supersedeVaultMemoryOp(ctx, id, supersededById) {
 }
 async function getUnfiledVaultMemoriesOp(ctx) {
   const conditions = [
-    import_watermelondb20.Q.where("folder_id", null),
+    import_watermelondb21.Q.where("folder_id", null),
     ...baseVaultConditions(ctx),
-    import_watermelondb20.Q.sortBy("created_at", import_watermelondb20.Q.desc)
+    import_watermelondb21.Q.sortBy("created_at", import_watermelondb21.Q.desc)
   ];
   const results = await ctx.vaultMemoryCollection.query(...conditions).fetch();
   return mapInBatches(
@@ -14213,7 +14305,7 @@ async function linkedEntityNamesByMemory(entityCtx, memoryIds) {
   const entityIdByMemory = /* @__PURE__ */ new Map();
   const allEntityIds = /* @__PURE__ */ new Set();
   for (let i = 0; i < memoryIds.length; i += CHUNK) {
-    const links = await entityCtx.memoryEntityCollection.query(import_watermelondb20.Q.where("memory_id", import_watermelondb20.Q.oneOf(memoryIds.slice(i, i + CHUNK)))).unsafeFetchRaw();
+    const links = await entityCtx.memoryEntityCollection.query(import_watermelondb21.Q.where("memory_id", import_watermelondb21.Q.oneOf(memoryIds.slice(i, i + CHUNK)))).unsafeFetchRaw();
     for (const link of links) {
       const memoryId = String(link.memory_id);
       const entityId = String(link.entity_id);
@@ -14229,7 +14321,7 @@ async function linkedEntityNamesByMemory(entityCtx, memoryIds) {
   const entityIds = Array.from(allEntityIds);
   const nameById = /* @__PURE__ */ new Map();
   for (let i = 0; i < entityIds.length; i += CHUNK) {
-    const entities = await entityCtx.entityCollection.query(import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(entityIds.slice(i, i + CHUNK)))).unsafeFetchRaw();
+    const entities = await entityCtx.entityCollection.query(import_watermelondb21.Q.where("id", import_watermelondb21.Q.oneOf(entityIds.slice(i, i + CHUNK)))).unsafeFetchRaw();
     for (const e of entities) {
       if (typeof e.canonical_name === "string") nameById.set(String(e.id), e.canonical_name);
     }
@@ -14258,7 +14350,7 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   if (!entityCtx) {
     throw new Error("getMemoriesNeedingTopicExtractionOp requires ctx.entityCtx");
   }
-  const conditions = [...baseVaultConditions(ctx), import_watermelondb20.Q.sortBy("created_at", import_watermelondb20.Q.desc)];
+  const conditions = [...baseVaultConditions(ctx), import_watermelondb21.Q.sortBy("created_at", import_watermelondb21.Q.desc)];
   const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
   const linkedNames = await linkedEntityNamesByMemory(
     entityCtx,
@@ -14414,10 +14506,10 @@ async function backfillMemoryTopicsOp(ctx, memoryIds) {
         }
         if (record2.isDeleted || !isOwnedByCtxUser(ctx, record2)) continue;
         if (parseTopics(record2.topics) !== null) continue;
-        const links = await entityCtx.memoryEntityCollection.query(import_watermelondb20.Q.where("memory_id", id)).unsafeFetchRaw();
+        const links = await entityCtx.memoryEntityCollection.query(import_watermelondb21.Q.where("memory_id", id)).unsafeFetchRaw();
         const entityIds = links.map((l) => String(l.entity_id));
         if (entityIds.length === 0) continue;
-        const entities = await entityCtx.entityCollection.query(import_watermelondb20.Q.where("id", import_watermelondb20.Q.oneOf(entityIds))).fetch();
+        const entities = await entityCtx.entityCollection.query(import_watermelondb21.Q.where("id", import_watermelondb21.Q.oneOf(entityIds))).fetch();
         if (entities.length === 0) continue;
         const source = record2.topicsUserManaged ? "user" : "auto";
         const write = await resolveMemoryTopicsWrite(entityCtx, id, entities, [], source);
@@ -14433,7 +14525,7 @@ async function backfillMemoryTopicsOp(ctx, memoryIds) {
 }
 async function deleteAllVaultMemoriesForUserOp(ctx, userId) {
   if (ctx.userId !== void 0 && ctx.userId !== userId) return 0;
-  const records = await ctx.vaultMemoryCollection.query(import_watermelondb20.Q.where("user_id", userId), import_watermelondb20.Q.where("is_deleted", false)).fetch();
+  const records = await ctx.vaultMemoryCollection.query(import_watermelondb21.Q.where("user_id", userId), import_watermelondb21.Q.where("is_deleted", false)).fetch();
   if (records.length === 0) return 0;
   await ctx.database.write(async () => {
     await assertCanWrite2(ctx);
@@ -14470,7 +14562,7 @@ async function getDecayCandidatesRawOp(ctx) {
   assertVaultScopeForSweep(ctx);
   const results = await ctx.vaultMemoryCollection.query(
     ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
-    import_watermelondb20.Q.where("kind", null)
+    import_watermelondb21.Q.where("kind", null)
   ).unsafeFetchRaw();
   return results.map((raw) => ({
     uniqueId: raw.id,
@@ -14600,11 +14692,11 @@ async function findQuarantinedDuplicateOp(ctx, content, sourceIds2, where) {
   const wanted = [...new Set(sourceIds2)].sort().join("\0");
   const target = normalizeForDedupe(content);
   const rows = await ctx.vaultMemoryCollection.query(
-    import_watermelondb20.Q.where("trust_tier", "quarantined"),
-    import_watermelondb20.Q.where("is_deleted", false),
-    import_watermelondb20.Q.where("scope", where.scope),
-    import_watermelondb20.Q.where("folder_id", where.folderId),
-    ...ctx.userId !== void 0 ? [import_watermelondb20.Q.where("user_id", ctx.userId)] : []
+    import_watermelondb21.Q.where("trust_tier", "quarantined"),
+    import_watermelondb21.Q.where("is_deleted", false),
+    import_watermelondb21.Q.where("scope", where.scope),
+    import_watermelondb21.Q.where("folder_id", where.folderId),
+    ...ctx.userId !== void 0 ? [import_watermelondb21.Q.where("user_id", ctx.userId)] : []
   ).unsafeFetchRaw();
   for (const raw of rows) {
     let ids;
@@ -15101,7 +15193,7 @@ var WalletPoller = class {
 };
 
 // src/lib/db/vaultFolders/operations.ts
-var import_watermelondb21 = require("@nozbe/watermelondb");
+var import_watermelondb22 = require("@nozbe/watermelondb");
 function folderToStored(folder) {
   return {
     uniqueId: folder.id,
@@ -15126,7 +15218,7 @@ async function createVaultFolderOp(ctx, opts) {
   return folderToStored(created);
 }
 async function getAllVaultFoldersOp(ctx) {
-  const results = await ctx.vaultFolderCollection.query(import_watermelondb21.Q.where("is_deleted", false), import_watermelondb21.Q.sortBy("created_at", import_watermelondb21.Q.desc)).fetch();
+  const results = await ctx.vaultFolderCollection.query(import_watermelondb22.Q.where("is_deleted", false), import_watermelondb22.Q.sortBy("created_at", import_watermelondb22.Q.desc)).fetch();
   return results.map(folderToStored);
 }
 async function updateVaultFolderOp(ctx, id, opts) {
@@ -15135,7 +15227,7 @@ async function updateVaultFolderOp(ctx, id, opts) {
     if (record2.isDeleted) return null;
     const scopeChanged = opts.scope !== void 0 && opts.scope !== record2.scope;
     const updated = await ctx.database.write(async () => {
-      const memories = scopeChanged ? await ctx.vaultMemoryCollection.query(import_watermelondb21.Q.where("folder_id", id), import_watermelondb21.Q.where("is_deleted", false)).fetch() : [];
+      const memories = scopeChanged ? await ctx.vaultMemoryCollection.query(import_watermelondb22.Q.where("folder_id", id), import_watermelondb22.Q.where("is_deleted", false)).fetch() : [];
       const updates = [];
       updates.push(
         record2.prepareUpdate((r) => {
@@ -15164,7 +15256,7 @@ async function deleteVaultFolderOp(ctx, id) {
     const record2 = await ctx.vaultFolderCollection.find(id);
     if (record2.isDeleted) return false;
     await ctx.database.write(async () => {
-      const memories = await ctx.vaultMemoryCollection.query(import_watermelondb21.Q.where("folder_id", id), import_watermelondb21.Q.where("is_deleted", false)).fetch();
+      const memories = await ctx.vaultMemoryCollection.query(import_watermelondb22.Q.where("folder_id", id), import_watermelondb22.Q.where("is_deleted", false)).fetch();
       const preparedMemories = memories.map(
         (memory) => memory.prepareUpdate((r) => {
           r._setRaw("folder_id", null);
@@ -15235,7 +15327,7 @@ async function updateVaultFolderContextOp(ctx, id, context) {
   }
 }
 async function getVaultFolderMemoryCountOp(ctx, folderId) {
-  return await ctx.vaultMemoryCollection.query(import_watermelondb21.Q.where("folder_id", folderId), import_watermelondb21.Q.where("is_deleted", false)).fetchCount();
+  return await ctx.vaultMemoryCollection.query(import_watermelondb22.Q.where("folder_id", folderId), import_watermelondb22.Q.where("is_deleted", false)).fetchCount();
 }
 
 // src/lib/db/vaultFolders/defaults.ts
@@ -15281,7 +15373,7 @@ async function _ensureDefaultFoldersImpl(ctx) {
 init_logger();
 
 // src/lib/memory/autoExtract.ts
-var import_watermelondb22 = require("@nozbe/watermelondb");
+var import_watermelondb23 = require("@nozbe/watermelondb");
 init_logger();
 init_redactor();
 
@@ -18008,7 +18100,7 @@ async function assertMergeTargetGoneOrThrow(ctx, targetId) {
 // src/lib/memory/autoExtract.ts
 async function isMemoryTopicsUserManaged(ctx, memoryId) {
   try {
-    const rows = await ctx.database.get(VaultMemory.table).query(import_watermelondb22.Q.where("id", memoryId)).fetch();
+    const rows = await ctx.database.get(VaultMemory.table).query(import_watermelondb23.Q.where("id", memoryId)).fetch();
     return rows[0]?.topicsUserManaged === true;
   } catch {
     return true;
@@ -20570,7 +20662,7 @@ function parseAnswer(body, base, parseSchema) {
 }
 
 // src/lib/memory/store/local.ts
-var import_watermelondb23 = require("@nozbe/watermelondb");
+var import_watermelondb24 = require("@nozbe/watermelondb");
 init_logger();
 
 // src/lib/memory/topicExtract.ts
@@ -20853,8 +20945,8 @@ function createLocalMemoryStore(options) {
     writeOptions?.signal?.throwIfAborted();
   };
   const vaultCache = options.vaultCache ?? createVaultEmbeddingCache();
-  const ownedBy = userId !== void 0 ? [import_watermelondb23.Q.where("user_id", userId)] : [];
-  const linksOwnedBy = userId === void 0 ? [] : options.allowUnscopedRows ? [import_watermelondb23.Q.or(import_watermelondb23.Q.where("user_id", userId), import_watermelondb23.Q.where("user_id", null))] : [import_watermelondb23.Q.where("user_id", userId)];
+  const ownedBy = userId !== void 0 ? [import_watermelondb24.Q.where("user_id", userId)] : [];
+  const linksOwnedBy = userId === void 0 ? [] : options.allowUnscopedRows ? [import_watermelondb24.Q.or(import_watermelondb24.Q.where("user_id", userId), import_watermelondb24.Q.where("user_id", null))] : [import_watermelondb24.Q.where("user_id", userId)];
   const watchedColumns = [
     "content",
     "scope",
@@ -20899,7 +20991,7 @@ function createLocalMemoryStore(options) {
     list: (listOptions) => getAllVaultMemoriesOp(vaultCtx, listOptions),
     get: (id) => getVaultMemoryOp(vaultCtx, id),
     listArchived: async () => {
-      const ids = await vaultCtx.vaultMemoryCollection.query(import_watermelondb23.Q.where("is_deleted", false), import_watermelondb23.Q.where("archived_at", import_watermelondb23.Q.notEq(null)), ...ownedBy).fetchIds();
+      const ids = await vaultCtx.vaultMemoryCollection.query(import_watermelondb24.Q.where("is_deleted", false), import_watermelondb24.Q.where("archived_at", import_watermelondb24.Q.notEq(null)), ...ownedBy).fetchIds();
       if (ids.length === 0) return [];
       const rows = await getAllVaultMemoriesOp(vaultCtx, { memoryIds: ids, includeArchived: true });
       return rows.sort((a, b) => (b.archivedAt ?? 0) - (a.archivedAt ?? 0));
@@ -20915,7 +21007,7 @@ function createLocalMemoryStore(options) {
         set.add(String(link.memory_id));
         members.set(entityId, set);
       }
-      const entities = userId === void 0 ? await entityCtx.entityCollection.query().unsafeFetchRaw() : members.size ? await entityCtx.entityCollection.query(import_watermelondb23.Q.where("id", import_watermelondb23.Q.oneOf([...members.keys()]))).unsafeFetchRaw() : [];
+      const entities = userId === void 0 ? await entityCtx.entityCollection.query().unsafeFetchRaw() : members.size ? await entityCtx.entityCollection.query(import_watermelondb24.Q.where("id", import_watermelondb24.Q.oneOf([...members.keys()]))).unsafeFetchRaw() : [];
       const byName = /* @__PURE__ */ new Map();
       for (const entity of entities) {
         const name = String(entity.canonical_name);
@@ -20965,7 +21057,7 @@ function createLocalMemoryStore(options) {
     setTopics: (memoryId, topics) => setMemoryEntitiesOp(vaultCtx, memoryId, topics),
     addTopics: (memoryId, topics, writeOptions) => database.write(async (writer) => {
       await assertWrite(writeOptions);
-      const owned = await vaultCtx.vaultMemoryCollection.query(import_watermelondb23.Q.where("id", memoryId), import_watermelondb23.Q.where("is_deleted", false), ...ownedBy).fetchCount();
+      const owned = await vaultCtx.vaultMemoryCollection.query(import_watermelondb24.Q.where("id", memoryId), import_watermelondb24.Q.where("is_deleted", false), ...ownedBy).fetchCount();
       return owned > 0 ? writer.callWriter(
         () => linkMemoryEntitiesOp(
           {
@@ -21037,7 +21129,7 @@ function createLocalMemoryStore(options) {
           else onChange();
         };
       };
-      const memories = subscribeOptions?.includeDeleted ? vaultCtx.vaultMemoryCollection.query(...ownedBy).observe() : vaultCtx.vaultMemoryCollection.query(import_watermelondb23.Q.where("is_deleted", false), ...ownedBy).observeWithColumns(
+      const memories = subscribeOptions?.includeDeleted ? vaultCtx.vaultMemoryCollection.query(...ownedBy).observe() : vaultCtx.vaultMemoryCollection.query(import_watermelondb24.Q.where("is_deleted", false), ...ownedBy).observeWithColumns(
         subscribeOptions?.embeddings ? [...watchedColumns, "embedding", "embedding_model"] : watchedColumns
       );
       const subscriptions = [memories.subscribe(afterFirst())];
@@ -24104,7 +24196,7 @@ async function assembleMemoryContext(options) {
 }
 
 // src/lib/memory/durableExtraction.ts
-var import_watermelondb24 = require("@nozbe/watermelondb");
+var import_watermelondb25 = require("@nozbe/watermelondb");
 var MAX_JOBS_PER_PASS = 3;
 var MAX_ATTEMPTS = 3;
 var MAX_FAILED_SESSIONS = 3;
@@ -24275,7 +24367,7 @@ function createDurableAutoExtractor(options) {
     const source = options.messageSource?.(conversationId);
     if (source)
       return await fromSource(source.status(conversationId)) === "ready" && (await loadFromSource(source, conversationId, ids)).every(Boolean);
-    return await storage.conversationsCollection.query(import_watermelondb24.Q.where("conversation_id", conversationId), import_watermelondb24.Q.where("is_deleted", false)).fetchCount() > 0 && await storage.messagesCollection.query(import_watermelondb24.Q.where("conversation_id", conversationId), import_watermelondb24.Q.where("id", import_watermelondb24.Q.oneOf(ids))).fetchCount() === ids.length;
+    return await storage.conversationsCollection.query(import_watermelondb25.Q.where("conversation_id", conversationId), import_watermelondb25.Q.where("is_deleted", false)).fetchCount() > 0 && await storage.messagesCollection.query(import_watermelondb25.Q.where("conversation_id", conversationId), import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).fetchCount() === ids.length;
   }
   function schedule(delay) {
     if (disposed) return;
@@ -24449,7 +24541,7 @@ function createDurableAutoExtractor(options) {
     let sourceWaiting = false;
     try {
       await writes;
-      const pending = await jobs.query(import_watermelondb24.Q.where("owner_key", owner), import_watermelondb24.Q.where("message_ids", import_watermelondb24.Q.notEq("[]"))).fetch();
+      const pending = await jobs.query(import_watermelondb25.Q.where("owner_key", owner), import_watermelondb25.Q.where("message_ids", import_watermelondb25.Q.notEq("[]"))).fetch();
       storeFailures = 0;
       let processed = 0;
       for (const job of pending) {
@@ -24481,7 +24573,7 @@ function createDurableAutoExtractor(options) {
         let ids = [];
         let loaded = [];
         try {
-          const present = source ? sourceStatus === "ready" : await storage.conversationsCollection.query(import_watermelondb24.Q.where("conversation_id", conversationId), import_watermelondb24.Q.where("is_deleted", false)).fetchCount() > 0;
+          const present = source ? sourceStatus === "ready" : await storage.conversationsCollection.query(import_watermelondb25.Q.where("conversation_id", conversationId), import_watermelondb25.Q.where("is_deleted", false)).fetchCount() > 0;
           if (!present) {
             await database.write(() => job.destroyPermanently());
             continue;
@@ -24649,7 +24741,7 @@ function createDurableAutoExtractor(options) {
       const scope = currentScope();
       writes = writes.then(
         () => database.write(async () => {
-          const existing = await jobs.query(import_watermelondb24.Q.where("owner_key", owner), import_watermelondb24.Q.where("conversation_id", conversationId)).fetch();
+          const existing = await jobs.query(import_watermelondb25.Q.where("owner_key", owner), import_watermelondb25.Q.where("conversation_id", conversationId)).fetch();
           const job = existing.find(
             (candidate) => candidate._getRaw("scope") === scope && (candidate._getRaw("folder_id") ?? null) === folderId
           );
@@ -24662,8 +24754,8 @@ function createDurableAutoExtractor(options) {
           if (watermarks.length) {
             const misplaced = new Set(
               await storage.messagesCollection.query(
-                import_watermelondb24.Q.where("id", import_watermelondb24.Q.oneOf(watermarks)),
-                import_watermelondb24.Q.where("conversation_id", import_watermelondb24.Q.notEq(conversationId))
+                import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(watermarks)),
+                import_watermelondb25.Q.where("conversation_id", import_watermelondb25.Q.notEq(conversationId))
               ).fetchIds()
             );
             for (const prior of existing)
@@ -24673,7 +24765,7 @@ function createDurableAutoExtractor(options) {
                   r._setRaw("watermark_seq", null);
                 });
           }
-          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(import_watermelondb24.Q.where("id", import_watermelondb24.Q.oneOf(ids))).fetch();
+          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(import_watermelondb25.Q.where("id", import_watermelondb25.Q.oneOf(ids))).fetch();
           const foreignRows = new Set(
             rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
           );
@@ -27734,7 +27826,7 @@ async function cleanupConversationSummary(database, conversationId) {
 }
 
 // src/lib/db/media/operations.ts
-var import_watermelondb25 = require("@nozbe/watermelondb");
+var import_watermelondb26 = require("@nozbe/watermelondb");
 
 // src/lib/storage/opfs.ts
 function isOPFSSupported() {
@@ -27926,7 +28018,7 @@ async function createMediaBatchOp(ctx, optionsArray) {
       })
     );
   });
-  const results = await mediaCollection.query(import_watermelondb25.Q.where("media_id", import_watermelondb25.Q.oneOf(mediaIds))).fetch();
+  const results = await mediaCollection.query(import_watermelondb26.Q.where("media_id", import_watermelondb26.Q.oneOf(mediaIds))).fetch();
   return Promise.all(
     results.map(
       (m) => mediaToStored(m, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
@@ -27936,7 +28028,7 @@ async function createMediaBatchOp(ctx, optionsArray) {
 var IMAGE_VIDEO_MIMES = VIDEO_EXTENSIONS.map((ext) => `image/${ext}`);
 async function deleteMediaByConversationOp(ctx, conversationId) {
   const mediaCollection = ctx.database.get("media");
-  const results = await mediaCollection.query(import_watermelondb25.Q.where("conversation_id", conversationId), import_watermelondb25.Q.where("is_deleted", false)).fetch();
+  const results = await mediaCollection.query(import_watermelondb26.Q.where("conversation_id", conversationId), import_watermelondb26.Q.where("is_deleted", false)).fetch();
   if (results.length === 0) {
     return 0;
   }
@@ -28193,6 +28285,8 @@ function useChatStorage(options) {
       embeddedWalletSigner
     ]
   );
+  const storageCtxRef = (0, import_react5.useRef)(storageCtx);
+  storageCtxRef.current = storageCtx;
   const vaultMemoryCollection = (0, import_react5.useMemo)(
     () => database.get("memory_vault"),
     [database]
@@ -28296,24 +28390,12 @@ function useChatStorage(options) {
     refreshQueueStatus();
     return queueManager.onQueueChange(walletAddress, refreshQueueStatus);
   }, [walletAddress, refreshQueueStatus]);
-  (0, import_react5.useEffect)(() => {
-    if (!walletAddress || !enableQueue || !autoFlushOnKeyAvailable || !signMessage) return;
-    return onKeyAvailable(walletAddress, () => {
-      flushQueue().catch((err) => {
-        getLogger().warn("[useChatStorage] Auto-flush failed:", err);
-      });
-    });
-  }, [walletAddress, enableQueue, autoFlushOnKeyAvailable, signMessage, flushQueue]);
   (0, import_react5.useEffect)(() => {
     if (!getWalletAddress || walletAddress) return;
     const poller = new WalletPoller();
     return poller.startPolling(getWalletAddress, () => {
     });
   }, [getWalletAddress, walletAddress]);
-  const isEncryptionReady = (0, import_react5.useCallback)(() => {
-    if (!walletAddress || !signMessage) return true;
-    return hasEncryptionKey(walletAddress);
-  }, [walletAddress, signMessage]);
   const pendingOpsRef = (0, import_react5.useRef)([]);
   const syntheticConvIdsRef = (0, import_react5.useRef)(/* @__PURE__ */ new Set());
   (0, import_react5.useEffect)(() => {
@@ -28326,34 +28408,49 @@ function useChatStorage(options) {
     pendingOpsRef.current = [];
     refreshQueueStatus();
   }, [walletAddress, enableQueue, refreshQueueStatus]);
+  (0, import_react5.useEffect)(() => {
+    if (!walletAddress || !enableQueue || !autoFlushOnKeyAvailable || !signMessage) return;
+    return onKeyAvailable(walletAddress, () => {
+      flushQueue().catch((err) => {
+        getLogger().warn("[useChatStorage] Auto-flush failed:", err);
+      });
+    });
+  }, [walletAddress, enableQueue, autoFlushOnKeyAvailable, signMessage, flushQueue]);
   const writeOrQueue = (0, import_react5.useCallback)(
     async (opType, payload, directWrite, makeSynthetic, dependencies = []) => {
-      if (isEncryptionReady()) {
-        const result2 = await directWrite();
+      const currentStorageCtx = storageCtx.walletAddress ? storageCtx : storageCtxRef.current;
+      const currentWalletAddress = currentStorageCtx.walletAddress;
+      if (enableQueue && signMessage && !currentWalletAddress && getWalletAddress) {
+        pendingOpsRef.current.push({ type: opType, payload, dependencies });
+        return { result: makeSynthetic(), queued: true };
+      }
+      if (!currentWalletAddress || !currentStorageCtx.signMessage || hasEncryptionKey(currentWalletAddress)) {
+        const result2 = await directWrite(currentStorageCtx);
         return { result: result2, queued: false };
       }
       if (!enableQueue) {
-        const result2 = await directWrite();
+        const result2 = await directWrite(currentStorageCtx);
         return { result: result2, queued: false };
       }
-      if (!walletAddress && getWalletAddress) {
-        pendingOpsRef.current.push({ type: opType, payload, dependencies });
-        return { result: makeSynthetic(), queued: true };
-      }
-      if (walletAddress) {
-        const queueId = queueManager.queueOperation(walletAddress, opType, payload, dependencies);
+      if (currentWalletAddress) {
+        const queueId = queueManager.queueOperation(
+          currentWalletAddress,
+          opType,
+          payload,
+          dependencies
+        );
         if (queueId === null) {
           getLogger().warn("[useChatStorage] Queue full, falling back to direct write");
-          const result2 = await directWrite();
+          const result2 = await directWrite(currentStorageCtx);
           return { result: result2, queued: false };
         }
-        refreshQueueStatus();
+        setQueueStatus(queueManager.getStatus(currentWalletAddress));
         return { result: makeSynthetic(), queued: true, queueId };
       }
-      const result = await directWrite();
+      const result = await directWrite(currentStorageCtx);
       return { result, queued: false };
     },
-    [isEncryptionReady, enableQueue, walletAddress, getWalletAddress, refreshQueueStatus]
+    [storageCtx, enableQueue, signMessage, getWalletAddress]
   );
   const embedMessageAsync = (0, import_react5.useCallback)(
     async (message, mask = maskForEmbedding) => {
@@ -28627,7 +28724,7 @@ function useChatStorage(options) {
       const { result, queued } = await writeOrQueue(
         "createConversation",
         conversationOpts,
-        () => createConversationOp(storageCtx, conversationOpts, defaultConversationTitle),
+        (ctx) => createConversationOp(ctx, conversationOpts, defaultConversationTitle),
         () => makeSyntheticStoredConversation(conversationOpts, defaultConversationTitle)
       );
       if (queued) {
@@ -28636,7 +28733,7 @@ function useChatStorage(options) {
       setCurrentConversationId(result.conversationId);
       return result;
     },
-    [storageCtx, defaultConversationTitle, writeOrQueue]
+    [defaultConversationTitle, writeOrQueue]
   );
   const getConversation = (0, import_react5.useCallback)(
     async (id) => {
@@ -28652,24 +28749,24 @@ function useChatStorage(options) {
       const { result } = await writeOrQueue(
         "updateConversationTitle",
         { conversationId: id, title },
-        () => updateConversationTitleOp(storageCtx, id, title),
+        (ctx) => updateConversationTitleOp(ctx, id, title),
         () => true
       );
       return result;
     },
-    [storageCtx, writeOrQueue]
+    [writeOrQueue]
   );
   const updateConversationPinned = (0, import_react5.useCallback)(
     async (id, pinned) => {
       const { result } = await writeOrQueue(
         "updateConversationPinned",
         { conversationId: id, pinned },
-        () => updateConversationPinnedOp(storageCtx, id, pinned),
+        (ctx) => updateConversationPinnedOp(ctx, id, pinned),
         () => true
       );
       return result;
     },
-    [storageCtx, writeOrQueue]
+    [writeOrQueue]
   );
   const deleteConversation = (0, import_react5.useCallback)(
     async (id) => {
@@ -28887,7 +28984,7 @@ function useChatStorage(options) {
       const { result } = await writeOrQueue(
         "createMessage",
         rowOpts,
-        () => upsertMessageOp(storageCtx, rowOpts),
+        (currentStorageCtx) => upsertMessageOp(currentStorageCtx, rowOpts),
         () => makeSyntheticStoredMessage(rowOpts),
         ctx.userMessageQueueId ? [ctx.userMessageQueueId] : []
       );
@@ -29349,7 +29446,7 @@ function useChatStorage(options) {
         const userMsgResult = await writeOrQueue(
           "createMessage",
           userMsgOpts,
-          () => createMessageOp(storageCtx, userMsgOpts),
+          (ctx) => createMessageOp(ctx, userMsgOpts),
           () => makeSyntheticStoredMessage(userMsgOpts)
         );
         storedUserMessage = userMsgResult.result;
@@ -29698,7 +29795,7 @@ function useChatStorage(options) {
         const assistantMsgResult = await writeOrQueue(
           "createMessage",
           assistantMsgOpts,
-          () => createMessageOp(storageCtx, assistantMsgOpts),
+          (ctx) => createMessageOp(ctx, assistantMsgOpts),
           () => makeSyntheticStoredMessage(assistantMsgOpts),
           userMsgQueueId ? [userMsgQueueId] : []
         );
@@ -29730,7 +29827,7 @@ function useChatStorage(options) {
           const toolResultsWrite = await writeOrQueue(
             "createMessage",
             toolResultsOpts,
-            () => createMessageOp(storageCtx, toolResultsOpts),
+            (ctx) => createMessageOp(ctx, toolResultsOpts),
             () => makeSyntheticStoredMessage(toolResultsOpts),
             assistantMsgQueueId ? [assistantMsgQueueId] : []
           );
@@ -29773,7 +29870,6 @@ function useChatStorage(options) {
       walletAddress,
       signMessage,
       embeddedWalletSigner,
-      isEncryptionReady,
       enableQueue,
       getWalletAddress,
       refreshQueueStatus,