@anuma/sdk 8.0.0 → 8.0.2

package/dist/expo/index.mjs

@@ -458,7 +458,7 @@ ${appendix}` : appendix;
 }
 
 // src/lib/db/chat/operations.ts
-import { Q } from "@nozbe/watermelondb";
+import { Q as Q2 } from "@nozbe/watermelondb";
 import { v7 as uuidv72 } from "uuid";
 
 // src/react/useEncryption.ts
@@ -1666,6 +1666,118 @@ async function assembleDecryptedMessage(message, address) {
   return result;
 }
 
+// src/lib/db/chat/toolCallEventIndex.ts
+import { Q } from "@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(
+      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(
+      Q.where("conversation_id", conversationId),
+      Q.where("tool_call_events", Q.notEq(null)),
+      Q.where("tool_call_events", Q.notIn(["", "[]"])),
+      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
 import { v7 as uuidv7 } from "uuid";
 
@@ -2058,7 +2170,7 @@ async function createConversationOp(ctx, opts, defaultTitle = "New Conversation"
   );
 }
 async function getConversationOp(ctx, id) {
-  const results = await ctx.conversationsCollection.query(Q.where("conversation_id", id), Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(Q2.where("conversation_id", id), Q2.where("is_deleted", false)).fetch();
   return results.length > 0 ? await conversationToStored(
     results[0],
     ctx.walletAddress,
@@ -2067,7 +2179,7 @@ async function getConversationOp(ctx, id) {
   ) : null;
 }
 async function getConversationsOp(ctx) {
-  const results = await ctx.conversationsCollection.query(Q.where("is_deleted", false), Q.sortBy("created_at", Q.desc)).unsafeFetchRaw();
+  const results = await ctx.conversationsCollection.query(Q2.where("is_deleted", false), Q2.sortBy("created_at", Q2.desc)).unsafeFetchRaw();
   return Promise.all(
     results.map(
       (raw) => conversationRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
@@ -2088,33 +2200,33 @@ function conversationRawToLazyStored(raw) {
   };
 }
 async function getConversationsLazyOp(ctx) {
-  const results = await ctx.conversationsCollection.query(Q.where("is_deleted", false), Q.sortBy("created_at", Q.desc)).unsafeFetchRaw();
+  const results = await ctx.conversationsCollection.query(Q2.where("is_deleted", false), Q2.sortBy("created_at", Q2.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 = [Q.where("is_deleted", false)];
+  const clauses = [Q2.where("is_deleted", false)];
   if (options?.before !== void 0) {
     clauses.push(
-      exclude.size > 0 ? Q.where("created_at", Q.lte(options.before)) : Q.where("created_at", Q.lt(options.before))
+      exclude.size > 0 ? Q2.where("created_at", Q2.lte(options.before)) : Q2.where("created_at", Q2.lt(options.before))
     );
   }
-  const fetched = await ctx.conversationsCollection.query(...clauses, Q.sortBy("created_at", Q.desc), Q.take(limit + exclude.size)).unsafeFetchRaw();
+  const fetched = await ctx.conversationsCollection.query(...clauses, Q2.sortBy("created_at", Q2.desc), Q2.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(
-    Q.where("project_id", projectId === null ? "" : projectId),
-    Q.where("is_deleted", false),
-    Q.sortBy("created_at", Q.desc)
+    Q2.where("project_id", projectId === null ? "" : projectId),
+    Q2.where("is_deleted", false),
+    Q2.sortBy("created_at", Q2.desc)
   ).unsafeFetchRaw();
   return results.map(conversationRawToLazyStored);
 }
 async function updateConversationTitleOp(ctx, id, title) {
-  const results = await ctx.conversationsCollection.query(Q.where("conversation_id", id), Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(Q2.where("conversation_id", id), Q2.where("is_deleted", false)).fetch();
   if (results.length > 0) {
     const encryptedOpts = ctx.walletAddress && ctx.signMessage ? await encryptConversationFields(
       { title },
@@ -2133,13 +2245,13 @@ async function updateConversationTitleOp(ctx, id, title) {
   return false;
 }
 async function deleteConversationOp(ctx, id) {
-  const results = await ctx.conversationsCollection.query(Q.where("conversation_id", id), Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(Q2.where("conversation_id", id), Q2.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(Q.where("conversation_id", id)).fetch() : [];
+      const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(Q2.where("conversation_id", id)).fetch() : [];
       for (const job of jobs) await job.destroyPermanently();
     });
     return true;
@@ -2147,7 +2259,7 @@ async function deleteConversationOp(ctx, id) {
   return false;
 }
 async function updateConversationPinnedOp(ctx, id, pinned) {
-  const results = await ctx.conversationsCollection.query(Q.where("conversation_id", id), Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(Q2.where("conversation_id", id), Q2.where("is_deleted", false)).fetch();
   if (results.length > 0) {
     await ctx.database.write(async () => {
       await results[0].update((conv) => {
@@ -2159,7 +2271,7 @@ async function updateConversationPinnedOp(ctx, id, pinned) {
   return false;
 }
 async function getMessagesOp(ctx, convId, opts) {
-  const fetched = await ctx.messagesCollection.query(Q.where("conversation_id", convId), Q.sortBy("message_id", Q.asc)).unsafeFetchRaw();
+  const fetched = await ctx.messagesCollection.query(Q2.where("conversation_id", convId), Q2.sortBy("message_id", Q2.asc)).unsafeFetchRaw();
   const results = opts?.rawFilter ? fetched.filter(opts.rawFilter) : fetched;
   return Promise.all(
     results.map(
@@ -2168,19 +2280,19 @@ async function getMessagesOp(ctx, convId, opts) {
   );
 }
 async function getMessageCountOp(ctx, convId) {
-  return await ctx.messagesCollection.query(Q.where("conversation_id", convId)).fetchCount();
+  return await ctx.messagesCollection.query(Q2.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 = [Q.where("conversation_id", convId)];
+  const clauses = [Q2.where("conversation_id", convId)];
   if (opts.beforeMessageId !== void 0) {
     clauses.push(
-      exclude.size > 0 ? Q.where("message_id", Q.lte(opts.beforeMessageId)) : Q.where("message_id", Q.lt(opts.beforeMessageId))
+      exclude.size > 0 ? Q2.where("message_id", Q2.lte(opts.beforeMessageId)) : Q2.where("message_id", Q2.lt(opts.beforeMessageId))
     );
   }
-  const fetched = await ctx.messagesCollection.query(...clauses, Q.sortBy("message_id", Q.desc), Q.take(limit + exclude.size)).unsafeFetchRaw();
+  const fetched = await ctx.messagesCollection.query(...clauses, Q2.sortBy("message_id", Q2.desc), Q2.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(
@@ -2192,7 +2304,7 @@ async function getMessagesPageOp(ctx, convId, opts) {
   );
 }
 async function getMessageSkeletonsOp(ctx, convId) {
-  const results = await ctx.messagesCollection.query(Q.where("conversation_id", convId), Q.sortBy("message_id", Q.asc)).unsafeFetchRaw();
+  const results = await ctx.messagesCollection.query(Q2.where("conversation_id", convId), Q2.sortBy("message_id", Q2.asc)).unsafeFetchRaw();
   const roleById = /* @__PURE__ */ new Map();
   for (const raw of results) {
     roleById.set(raw.id, raw.role);
@@ -2237,32 +2349,12 @@ async function getMessageSkeletonsOp(ctx, convId) {
   return skeletons;
 }
 async function getToolCallEventIdsOp(ctx, convId) {
-  const results = await ctx.messagesCollection.query(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(Q.where("conversation_id", convId)).fetch();
-    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(Q.where("conversation_id", convId)).fetch() : [];
+    const messages = await ctx.messagesCollection.query(Q2.where("conversation_id", convId)).fetch();
+    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(Q2.where("conversation_id", convId)).fetch() : [];
     for (const job of jobs) {
       await job.update((row) => {
         row._setRaw("message_ids", "[]");
@@ -2287,7 +2379,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(Q.where("conversation_id", message.conversationId)).fetch() : [];
+    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(Q2.where("conversation_id", message.conversationId)).fetch() : [];
     for (const job of jobs) {
       const ids = JSON.parse(String(job._getRaw("message_ids")));
       await job.update((row) => {
@@ -2360,9 +2452,9 @@ async function createMessageOp(ctx, opts) {
     }
   }
   const newest = await ctx.messagesCollection.query(
-    Q.where("conversation_id", opts.conversationId),
-    Q.sortBy("message_id", Q.desc),
-    Q.take(1)
+    Q2.where("conversation_id", opts.conversationId),
+    Q2.sortBy("message_id", Q2.desc),
+    Q2.take(1)
   ).fetch();
   const messageId = (newest[0]?.messageId ?? 0) + 1;
   const encryptedOpts = await encryptMessageOptsIfNeeded(ctx, opts);
@@ -2376,7 +2468,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(Q.where("id", opts.uniqueId)).fetch();
+  const results = await ctx.messagesCollection.query(Q2.where("id", opts.uniqueId)).fetch();
   const existing = results.length > 0 ? results[0] : null;
   if (!existing) {
     return createMessageOp(ctx, opts);
@@ -2484,13 +2576,13 @@ async function decryptMessageEmbeddingFields(raw, walletAddress) {
 async function sealLegacyMessageEmbeddingsOp(ctx) {
   if (!ctx.walletAddress) return 0;
   const candidateIds = await ctx.messagesCollection.query(
-    Q.where("content", Q.like("enc:%")),
-    Q.or(
+    Q2.where("content", Q2.like("enc:%")),
+    Q2.or(
       ...["vector", "chunks"].map(
-        (column) => Q.and(
-          Q.where(column, Q.notEq(null)),
-          Q.where(column, Q.notEq("")),
-          Q.where(column, Q.notLike("enc:%"))
+        (column) => Q2.and(
+          Q2.where(column, Q2.notEq(null)),
+          Q2.where(column, Q2.notEq("")),
+          Q2.where(column, Q2.notLike("enc:%"))
         )
       )
     )
@@ -2500,7 +2592,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(Q.where("id", Q.oneOf(pageIds))).fetch();
+      const pageMessages = await ctx.messagesCollection.query(Q2.where("id", Q2.oneOf(pageIds))).fetch();
       for (const message of pageMessages) {
         if (!isEncrypted(message.content)) continue;
         const content = await decryptFieldDetailed(message.content, ctx.walletAddress);
@@ -2581,15 +2673,15 @@ function chunksWithoutText(raw) {
   });
 }
 async function stripLegacyChunkTextOp(ctx) {
-  const candidateIds = await ctx.messagesCollection.query(Q.where("chunks", Q.like(`%${Q.sanitizeLikeString('"text":')}%`))).fetchIds();
+  const candidateIds = await ctx.messagesCollection.query(Q2.where("chunks", Q2.like(`%${Q2.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(Q.where("id", Q.oneOf(pageIds))).unsafeFetchRaw();
+    const rows = await ctx.messagesCollection.query(Q2.where("id", Q2.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(Q.where("id", Q.oneOf(changedIds))).fetch();
+      const messages = await ctx.messagesCollection.query(Q2.where("id", Q2.oneOf(changedIds))).fetch();
       const updates = messages.flatMap((message) => {
         const raw = message._raw;
         const chunks3 = chunksWithoutText(raw.chunks);
@@ -2636,13 +2728,13 @@ async function encryptToolCallEventsOp(ctx) {
     return 0;
   }
   const candidateIds = await ctx.messagesCollection.query(
-    Q.where("tool_call_events", Q.notEq(null)),
-    Q.where("tool_call_events", Q.notIn(["", "[]"]))
+    Q2.where("tool_call_events", Q2.notEq(null)),
+    Q2.where("tool_call_events", Q2.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(Q.where("id", Q.oneOf(pageIds))).unsafeFetchRaw();
+    const rows = await ctx.messagesCollection.query(Q2.where("id", Q2.oneOf(pageIds))).unsafeFetchRaw();
     const repairs = /* @__PURE__ */ new Map();
     for (const row of rows) {
       const column = await encryptedToolCallEventsColumn(
@@ -2655,12 +2747,12 @@ async function encryptToolCallEventsOp(ctx) {
     }
     if (repairs.size === 0) continue;
     await ctx.database.write(async () => {
-      const messages = (await ctx.messagesCollection.query(Q.where("id", Q.oneOf([...repairs.keys()]))).fetch()).filter(
+      const messages = (await ctx.messagesCollection.query(Q2.where("id", Q2.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(Q.where("conversation_id", Q.oneOf(conversationIds))).fetch();
+      const conversations = await ctx.conversationsCollection.query(Q2.where("conversation_id", Q2.oneOf(conversationIds))).fetch();
       await ctx.database.batch(
         ...messages.map(
           (message) => message.prepareUpdate((msg) => {
@@ -2687,7 +2779,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(Q.where("content", Q.like(pattern)), Q.take(1)).unsafeFetchRaw();
+  const [row] = await ctx.messagesCollection.query(Q2.where("content", Q2.like(pattern)), Q2.take(1)).unsafeFetchRaw();
   return row ? String(row.content) : null;
 }
 async function updateMessageErrorOp(ctx, uniqueId, error) {
@@ -2800,7 +2892,7 @@ function toChunkCandidateKey(raw) {
 }
 async function fetchRowsByIds(ctx, ids) {
   if (ids.length === 0) return [];
-  return await ctx.messagesCollection.query(Q.where("id", Q.oneOf(ids))).unsafeFetchRaw();
+  return await ctx.messagesCollection.query(Q2.where("id", Q2.oneOf(ids))).unsafeFetchRaw();
 }
 async function projectedChunkRowSource(ctx, filter) {
   const clauses = [
@@ -2818,7 +2910,7 @@ async function projectedChunkRowSource(ctx, filter) {
     args.push(filter.excludeConversationId);
   }
   const keyRows = await ctx.messagesCollection.query(
-    Q.unsafeSqlQuery(
+    Q2.unsafeSqlQuery(
       `select "id", "conversation_id", "updated_at", "embedding_model" from "history" where ${clauses.join(" and ")}`,
       args
     )
@@ -2828,7 +2920,7 @@ async function projectedChunkRowSource(ctx, filter) {
     loadVectorRows: async (ids) => {
       if (ids.length === 0) return [];
       return await ctx.messagesCollection.query(
-        Q.unsafeSqlQuery(
+        Q2.unsafeSqlQuery(
           `select "id", "updated_at", "chunks", "vector" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
           ids
         )
@@ -2838,11 +2930,11 @@ async function projectedChunkRowSource(ctx, filter) {
   };
 }
 async function fullScanChunkRowSource(ctx, filter) {
-  const activeConversations = await ctx.conversationsCollection.query(Q.where("is_deleted", false)).fetch();
+  const activeConversations = await ctx.conversationsCollection.query(Q2.where("is_deleted", false)).fetch();
   const activeConversationIds = new Set(
     activeConversations.map((c) => String(c._getRaw("conversation_id")))
   );
-  const queryConditions = filter.conversationId !== void 0 ? [Q.where("conversation_id", filter.conversationId)] : [];
+  const queryConditions = filter.conversationId !== void 0 ? [Q2.where("conversation_id", filter.conversationId)] : [];
   const rows = await ctx.messagesCollection.query(...queryConditions).unsafeFetchRaw();
   const rowsById = /* @__PURE__ */ new Map();
   for (const row of rows) {
@@ -9671,7 +9763,7 @@ var chatStorageMigrations = schemaMigrations({
 });
 
 // src/lib/db/chat/summaryOperations.ts
-import { Q as Q2 } from "@nozbe/watermelondb";
+import { Q as Q3 } from "@nozbe/watermelondb";
 function createSummaryContext(database) {
   return {
     database,
@@ -9690,14 +9782,14 @@ function modelToStored(record2) {
   };
 }
 async function getConversationSummaryOp(ctx, conversationId) {
-  const results = await ctx.summariesCollection.query(Q2.where("conversation_id", conversationId)).fetch();
+  const results = await ctx.summariesCollection.query(Q3.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(Q2.where("conversation_id", conversationId)).fetch();
+    const existing = await ctx.summariesCollection.query(Q3.where("conversation_id", conversationId)).fetch();
     if (existing.length > 0) {
       record2 = await existing[0].update((rec) => {
         rec.summary = summary;
@@ -9717,7 +9809,7 @@ async function upsertConversationSummaryOp(ctx, conversationId, summary, summari
 }
 async function deleteConversationSummaryOp(ctx, conversationId) {
   await ctx.database.write(async () => {
-    const existing = await ctx.summariesCollection.query(Q2.where("conversation_id", conversationId)).fetch();
+    const existing = await ctx.summariesCollection.query(Q3.where("conversation_id", conversationId)).fetch();
     for (const record2 of existing) {
       await record2.destroyPermanently();
     }
@@ -9772,7 +9864,7 @@ __decorateClass([
 ], ConversationMemory.prototype, "createdAt", 2);
 
 // src/lib/db/conversationMemory/operations.ts
-import { Q as Q3 } from "@nozbe/watermelondb";
+import { Q as Q4 } from "@nozbe/watermelondb";
 var MAX_PER_CONVERSATION = 200;
 function conversationMemoryToStored(row) {
   return {
@@ -9787,7 +9879,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(Q3.where("conversation_id", conversationId), Q3.sortBy("created_at", Q3.asc)).fetch();
+    const existing = await ctx.conversationMemoryCollection.query(Q4.where("conversation_id", conversationId), Q4.sortBy("created_at", Q4.asc)).fetch();
     const seen = new Set(existing.map((r) => r.memoryId));
     const batchSeen = /* @__PURE__ */ new Set();
     const deduped = [];
@@ -9817,13 +9909,13 @@ async function addConversationMemoriesOp(ctx, conversationId, items) {
 }
 async function getConversationMemoriesOp(ctx, conversationId) {
   if (!conversationId) return [];
-  const rows = await ctx.conversationMemoryCollection.query(Q3.where("conversation_id", conversationId), Q3.sortBy("created_at", Q3.asc)).fetch();
+  const rows = await ctx.conversationMemoryCollection.query(Q4.where("conversation_id", conversationId), Q4.sortBy("created_at", Q4.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(Q3.where("conversation_id", conversationId)).fetch();
+    const rows = await ctx.conversationMemoryCollection.query(Q4.where("conversation_id", conversationId)).fetch();
     if (rows.length === 0) return;
     await ctx.database.batch(...rows.map((r) => r.prepareDestroyPermanently()));
   });
@@ -11237,10 +11329,10 @@ var DatabaseManager = class {
 };
 
 // src/lib/db/memoryVault/operations.ts
-import { Q as Q5 } from "@nozbe/watermelondb";
+import { Q as Q6 } from "@nozbe/watermelondb";
 
 // src/lib/db/entities/operations.ts
-import { Q as Q4 } from "@nozbe/watermelondb";
+import { Q as Q5 } from "@nozbe/watermelondb";
 
 // src/lib/db/memoryVault/types.ts
 var MEMORY_KINDS = [
@@ -11333,7 +11425,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(Q4.where("canonical_name", Q4.oneOf(unique))).fetch();
+  const existing = await ctx.entityCollection.query(Q5.where("canonical_name", Q5.oneOf(unique))).fetch();
   const existingNames = new Set(existing.map((e) => e.canonicalName));
   const kindBackfills = existing.filter((e) => {
     const incoming = kindByName.get(e.canonicalName);
@@ -11363,7 +11455,7 @@ function prepareKindBackfills(backfills) {
 }
 async function findVaultRowInWrite(ctx, memoryId) {
   try {
-    const rows = await ctx.database.get("memory_vault").query(Q4.where("id", memoryId)).fetch();
+    const rows = await ctx.database.get("memory_vault").query(Q5.where("id", memoryId)).fetch();
     return rows[0] ?? null;
   } catch {
     return null;
@@ -11465,7 +11557,7 @@ async function linkMemoryEntitiesOp(ctx, memoryId, entityInputs, options) {
       return;
     }
     if (entities.length === 0) return;
-    const existingLinks = await ctx.memoryEntityCollection.query(Q4.where("memory_id", memoryId)).fetch();
+    const existingLinks = await ctx.memoryEntityCollection.query(Q5.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);
@@ -11501,7 +11593,7 @@ async function linkMemoryEntitiesOp(ctx, memoryId, entityInputs, options) {
 }
 async function resolveEntitiesByIds(ctx, entityIds) {
   if (entityIds.length === 0) return [];
-  const rows = await ctx.entityCollection.query(Q4.where("id", Q4.oneOf(Array.from(entityIds)))).fetch();
+  const rows = await ctx.entityCollection.query(Q5.where("id", Q5.oneOf(Array.from(entityIds)))).fetch();
   return rows.map(entityToStored);
 }
 function autoLinkBlocked(row) {
@@ -11537,7 +11629,7 @@ async function replaceMemoryEntities(ctx, memoryId, entityInputs, options) {
       kindBackfills
     } = await upsertEntitiesInWrite(ctx, normalized);
     entities = Array.from(byName.values());
-    const existingLinks = await ctx.memoryEntityCollection.query(Q4.where("memory_id", memoryId)).fetch();
+    const existingLinks = await ctx.memoryEntityCollection.query(Q5.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));
@@ -11573,17 +11665,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(Q4.where("entity_id", Q4.oneOf(candidateIds))).fetch();
+  const links = await ctx.memoryEntityCollection.query(Q5.where("entity_id", Q5.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(Q4.where("id", Q4.oneOf(orphanIds))).fetch();
+  return await ctx.entityCollection.query(Q5.where("id", Q5.oneOf(orphanIds))).fetch();
 }
 async function unlinkMemoryEntitiesOp(ctx, memoryIds) {
   if (memoryIds.length === 0) return;
-  const links = await ctx.memoryEntityCollection.query(Q4.where("memory_id", Q4.oneOf(Array.from(memoryIds)))).fetch();
+  const links = await ctx.memoryEntityCollection.query(Q5.where("memory_id", Q5.oneOf(Array.from(memoryIds)))).fetch();
   if (links.length === 0) return;
   await ctx.database.write(async () => {
     await assertCanWrite(ctx);
@@ -11592,7 +11684,7 @@ async function unlinkMemoryEntitiesOp(ctx, memoryIds) {
 }
 async function unlinkAllMemoryEntitiesForUserOp(ctx, userId) {
   if (!userId) return;
-  const links = await ctx.memoryEntityCollection.query(Q4.where("user_id", userId)).fetch();
+  const links = await ctx.memoryEntityCollection.query(Q5.where("user_id", userId)).fetch();
   if (links.length === 0) return;
   await ctx.database.write(async () => {
     await assertCanWrite(ctx);
@@ -11602,15 +11694,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(Q4.where("canonical_name", Q4.oneOf(unique))).fetch();
+  const entityRows = await ctx.entityCollection.query(Q5.where("canonical_name", Q5.oneOf(unique))).fetch();
   if (entityRows.length === 0) return /* @__PURE__ */ new Map();
   const entityIdToName = new Map(entityRows.map((e) => [e.id, e.canonicalName]));
-  const linkConditions = [Q4.where("entity_id", Q4.oneOf(entityRows.map((e) => e.id)))];
+  const linkConditions = [Q5.where("entity_id", Q5.oneOf(entityRows.map((e) => e.id)))];
   if (ctx.userId !== void 0) {
     if (ctx.allowUnscopedRows) {
-      linkConditions.push(Q4.or(Q4.where("user_id", ctx.userId), Q4.where("user_id", null)));
+      linkConditions.push(Q5.or(Q5.where("user_id", ctx.userId), Q5.where("user_id", null)));
     } else {
-      linkConditions.push(Q4.where("user_id", ctx.userId));
+      linkConditions.push(Q5.where("user_id", ctx.userId));
     }
   }
   const links = await ctx.memoryEntityCollection.query(...linkConditions).fetch();
@@ -11631,18 +11723,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 = [Q4.where("memory_id", Q4.oneOf(unique))];
+  const linkConditions = [Q5.where("memory_id", Q5.oneOf(unique))];
   if (ctx.userId !== void 0) {
     if (ctx.allowUnscopedRows) {
-      linkConditions.push(Q4.or(Q4.where("user_id", ctx.userId), Q4.where("user_id", null)));
+      linkConditions.push(Q5.or(Q5.where("user_id", ctx.userId), Q5.where("user_id", null)));
     } else {
-      linkConditions.push(Q4.where("user_id", ctx.userId));
+      linkConditions.push(Q5.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(Q4.where("id", Q4.oneOf(entityIds))).fetch();
+  const entityRows = await ctx.entityCollection.query(Q5.where("id", Q5.oneOf(entityIds))).fetch();
   const entityIdToName = new Map(entityRows.map((e) => [e.id, e.canonicalName]));
   const out = /* @__PURE__ */ new Map();
   for (const link of links) {
@@ -11706,11 +11798,11 @@ var NON_PRIVATE_VISIBILITIES = ["public"];
 function visibilityConditions(requested) {
   if (!requested?.length) return [];
   if (!requested.includes("private")) {
-    return [Q5.where("visibility", Q5.oneOf([...requested]))];
+    return [Q6.where("visibility", Q6.oneOf([...requested]))];
   }
   const excluded = NON_PRIVATE_VISIBILITIES.filter((v) => !requested.includes(v));
   if (excluded.length === 0) return [];
-  return [Q5.or(Q5.where("visibility", null), Q5.where("visibility", Q5.notIn(excluded)))];
+  return [Q6.or(Q6.where("visibility", null), Q6.where("visibility", Q6.notIn(excluded)))];
 }
 function isKinded(record2) {
   return record2.kind !== null && record2.kind !== void 0;
@@ -11751,17 +11843,17 @@ function levelConditions(requested) {
   const published = ["shared", "public"];
   const wantsMatching = requested.includes("matching");
   const wantsPrivate = requested.includes("private");
-  const unresolved = Q5.or(Q5.where("level", null), Q5.where("level", Q5.notIn([...MEMORY_LEVELS])));
-  const byLevel = Q5.where("level", Q5.oneOf([...requested]));
-  if (wantsMatching && wantsPrivate) return [Q5.or(byLevel, unresolved)];
+  const unresolved = Q6.or(Q6.where("level", null), Q6.where("level", Q6.notIn([...MEMORY_LEVELS])));
+  const byLevel = Q6.where("level", Q6.oneOf([...requested]));
+  if (wantsMatching && wantsPrivate) return [Q6.or(byLevel, unresolved)];
   if (wantsMatching) {
-    return [Q5.or(byLevel, Q5.and(unresolved, Q5.where("scope", Q5.oneOf(published))))];
+    return [Q6.or(byLevel, Q6.and(unresolved, Q6.where("scope", Q6.oneOf(published))))];
   }
   if (wantsPrivate) {
     return [
-      Q5.or(
+      Q6.or(
         byLevel,
-        Q5.and(unresolved, Q5.or(Q5.where("scope", null), Q5.where("scope", Q5.notIn(published))))
+        Q6.and(unresolved, Q6.or(Q6.where("scope", null), Q6.where("scope", Q6.notIn(published))))
       )
     ];
   }
@@ -11772,13 +11864,13 @@ function isOwnedByCtxUser(ctx, record2) {
 }
 function baseVaultConditions(ctx, options) {
   return [
-    ...options?.memoryIds !== void 0 ? [Q5.where("id", Q5.oneOf(options.memoryIds))] : [],
-    ...options?.includeDeleted ? [] : [Q5.where("is_deleted", false)],
-    ...options?.includeArchived ? [] : [Q5.where("archived_at", Q5.eq(null))],
-    ...options?.includeQuarantined ? [] : [Q5.where("trust_tier", Q5.notEq("quarantined"))],
-    ...options?.includeSuperseded ? [] : [Q5.where("superseded_by", null)],
-    ...ctx.userId !== void 0 ? [Q5.where("user_id", ctx.userId)] : [],
-    ...options?.since ? [Q5.where("updated_at", Q5.gt(options.since.getTime()))] : []
+    ...options?.memoryIds !== void 0 ? [Q6.where("id", Q6.oneOf(options.memoryIds))] : [],
+    ...options?.includeDeleted ? [] : [Q6.where("is_deleted", false)],
+    ...options?.includeArchived ? [] : [Q6.where("archived_at", Q6.eq(null))],
+    ...options?.includeQuarantined ? [] : [Q6.where("trust_tier", Q6.notEq("quarantined"))],
+    ...options?.includeSuperseded ? [] : [Q6.where("superseded_by", null)],
+    ...ctx.userId !== void 0 ? [Q6.where("user_id", ctx.userId)] : [],
+    ...options?.since ? [Q6.where("updated_at", Q6.gt(options.since.getTime()))] : []
   ];
 }
 var KNOWN_TRUST_TIERS = /* @__PURE__ */ new Set(["quarantined", "trusted"]);
@@ -11948,11 +12040,11 @@ async function createSupersedingMemoryOp(ctx, opts, targetId) {
 async function getMemoriesByEventTimeOp(ctx, windowStart, windowEnd) {
   const records = await ctx.vaultMemoryCollection.query(
     ...baseVaultConditions(ctx),
-    Q5.where("event_time_start", Q5.notEq(null)),
-    Q5.where("event_time_start", Q5.lte(windowEnd)),
-    Q5.or(
-      Q5.where("event_time_start", Q5.gte(windowStart)),
-      Q5.where("event_time_kind", Q5.oneOf(["range", "ongoing"]))
+    Q6.where("event_time_start", Q6.notEq(null)),
+    Q6.where("event_time_start", Q6.lte(windowEnd)),
+    Q6.or(
+      Q6.where("event_time_start", Q6.gte(windowStart)),
+      Q6.where("event_time_kind", Q6.oneOf(["range", "ongoing"]))
     )
   ).fetch();
   const out = [];
@@ -12108,18 +12200,18 @@ async function getAllVaultMemoriesOp(ctx, options) {
 function vaultListConditions(ctx, options) {
   return [
     ...baseVaultConditions(ctx, options),
-    ...options?.scopes?.length ? [Q5.where("scope", Q5.oneOf(options.scopes))] : [],
+    ...options?.scopes?.length ? [Q6.where("scope", Q6.oneOf(options.scopes))] : [],
     ...visibilityConditions(options?.visibility),
     ...levelConditions(options?.levels),
-    ...options?.kinds?.length ? [Q5.where("kind", Q5.oneOf(options.kinds))] : [],
-    ...options?.folderId !== void 0 ? [Q5.where("folder_id", options.folderId)] : [],
-    ...options?.factTypes?.length ? [Q5.where("fact_type", Q5.oneOf(options.factTypes))] : []
+    ...options?.kinds?.length ? [Q6.where("kind", Q6.oneOf(options.kinds))] : [],
+    ...options?.folderId !== void 0 ? [Q6.where("folder_id", options.folderId)] : [],
+    ...options?.factTypes?.length ? [Q6.where("fact_type", Q6.oneOf(options.factTypes))] : []
   ];
 }
 function vaultListOrder(options) {
   return [
-    Q5.sortBy(options?.since ? "updated_at" : "created_at", Q5.desc),
-    ...options?.limit !== null && options?.limit !== void 0 && options.limit > 0 ? [Q5.take(options.limit)] : []
+    Q6.sortBy(options?.since ? "updated_at" : "created_at", Q6.desc),
+    ...options?.limit !== null && options?.limit !== void 0 && options.limit > 0 ? [Q6.take(options.limit)] : []
   ];
 }
 async function getAllVaultMemoryRowsOp(ctx) {
@@ -12158,10 +12250,10 @@ function vaultMemoryRawToRankable(raw) {
 async function getVaultRankingProjectionsOp(ctx, options) {
   const conditions = [
     ...baseVaultConditions(ctx, options),
-    ...options?.scopes?.length ? [Q5.where("scope", Q5.oneOf(options.scopes))] : [],
-    ...options?.folderId !== void 0 ? [Q5.where("folder_id", options.folderId)] : [],
-    Q5.sortBy(options?.since ? "updated_at" : "created_at", Q5.desc),
-    ...options?.limit !== null && options?.limit !== void 0 && options.limit > 0 ? [Q5.take(options.limit)] : []
+    ...options?.scopes?.length ? [Q6.where("scope", Q6.oneOf(options.scopes))] : [],
+    ...options?.folderId !== void 0 ? [Q6.where("folder_id", options.folderId)] : [],
+    Q6.sortBy(options?.since ? "updated_at" : "created_at", Q6.desc),
+    ...options?.limit !== null && options?.limit !== void 0 && options.limit > 0 ? [Q6.take(options.limit)] : []
   ];
   const results = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
   return results.map(vaultMemoryRawToRankable);
@@ -12212,7 +12304,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(Q5.unsafeSqlQuery(sql, args)).unsafeFetchRaw();
+    const rows = await ctx.vaultMemoryCollection.query(Q6.unsafeSqlQuery(sql, args)).unsafeFetchRaw();
     return rows.map(mapRaw);
   } catch (err) {
     getLogger().debug(
@@ -12223,9 +12315,9 @@ async function getVaultCandidateKeysOp(ctx, options) {
         memoryIds: options?.memoryIds,
         ...options?.includeArchived !== void 0 && { includeArchived: options.includeArchived }
       }),
-      ...options?.scopes?.length ? [Q5.where("scope", Q5.oneOf(options.scopes))] : [],
-      ...options?.folderId !== void 0 ? [Q5.where("folder_id", options.folderId)] : [],
-      ...options?.factTypes?.length ? [Q5.where("fact_type", Q5.oneOf(options.factTypes))] : []
+      ...options?.scopes?.length ? [Q6.where("scope", Q6.oneOf(options.scopes))] : [],
+      ...options?.folderId !== void 0 ? [Q6.where("folder_id", options.folderId)] : [],
+      ...options?.factTypes?.length ? [Q6.where("fact_type", Q6.oneOf(options.factTypes))] : []
     ];
     const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
     return rows.map(mapRaw);
@@ -12243,7 +12335,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(Q5.unsafeSqlQuery(sql, [...base.args, ...ids])).unsafeFetchRaw();
+    const rows = await ctx.vaultMemoryCollection.query(Q6.unsafeSqlQuery(sql, [...base.args, ...ids])).unsafeFetchRaw();
     return rows.map(mapRaw);
   } catch (err) {
     getLogger().debug(
@@ -12255,7 +12347,7 @@ async function getVaultEmbeddingsByIdsOp(ctx, ids, options) {
           includeArchived: options.includeArchived
         }
       }),
-      Q5.where("id", Q5.oneOf(ids))
+      Q6.where("id", Q6.oneOf(ids))
     ).unsafeFetchRaw();
     return rows.map(mapRaw);
   }
@@ -12266,7 +12358,7 @@ async function getVaultMemoriesByIdsOp(ctx, ids, options) {
     ...baseVaultConditions(ctx, {
       ...options?.includeArchived !== void 0 && { includeArchived: options.includeArchived }
     }),
-    Q5.where("id", Q5.oneOf(ids))
+    Q6.where("id", Q6.oneOf(ids))
   ];
   const results = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
   return mapInBatches(
@@ -12291,7 +12383,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), Q5.where("id", Q5.oneOf(ids))).unsafeFetchRaw();
+  const rows = await ctx.vaultMemoryCollection.query(...baseVaultConditions(ctx), Q6.where("id", Q6.oneOf(ids))).unsafeFetchRaw();
   return new Set(rows.map((r) => r.id));
 }
 async function updateVaultMemoryOp(ctx, id, opts) {
@@ -12440,7 +12532,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(Q5.where("memory_id", memoryId)).fetch();
+    const existing = await entityCtx.memoryEntityCollection.query(Q6.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(
@@ -12581,9 +12673,9 @@ async function supersedeVaultMemoryOp(ctx, id, supersededById) {
 }
 async function getUnfiledVaultMemoriesOp(ctx) {
   const conditions = [
-    Q5.where("folder_id", null),
+    Q6.where("folder_id", null),
     ...baseVaultConditions(ctx),
-    Q5.sortBy("created_at", Q5.desc)
+    Q6.sortBy("created_at", Q6.desc)
   ];
   const results = await ctx.vaultMemoryCollection.query(...conditions).fetch();
   return mapInBatches(
@@ -12597,7 +12689,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(Q5.where("memory_id", Q5.oneOf(memoryIds.slice(i, i + CHUNK)))).unsafeFetchRaw();
+    const links = await entityCtx.memoryEntityCollection.query(Q6.where("memory_id", Q6.oneOf(memoryIds.slice(i, i + CHUNK)))).unsafeFetchRaw();
     for (const link of links) {
       const memoryId = String(link.memory_id);
       const entityId = String(link.entity_id);
@@ -12613,7 +12705,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(Q5.where("id", Q5.oneOf(entityIds.slice(i, i + CHUNK)))).unsafeFetchRaw();
+    const entities = await entityCtx.entityCollection.query(Q6.where("id", Q6.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);
     }
@@ -12642,7 +12734,7 @@ async function getMemoriesNeedingTopicExtractionOp(ctx, options) {
   if (!entityCtx) {
     throw new Error("getMemoriesNeedingTopicExtractionOp requires ctx.entityCtx");
   }
-  const conditions = [...baseVaultConditions(ctx), Q5.sortBy("created_at", Q5.desc)];
+  const conditions = [...baseVaultConditions(ctx), Q6.sortBy("created_at", Q6.desc)];
   const rows = await ctx.vaultMemoryCollection.query(...conditions).unsafeFetchRaw();
   const linkedNames = await linkedEntityNamesByMemory(
     entityCtx,
@@ -12798,10 +12890,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(Q5.where("memory_id", id)).unsafeFetchRaw();
+        const links = await entityCtx.memoryEntityCollection.query(Q6.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(Q5.where("id", Q5.oneOf(entityIds))).fetch();
+        const entities = await entityCtx.entityCollection.query(Q6.where("id", Q6.oneOf(entityIds))).fetch();
         if (entities.length === 0) continue;
         const source = record2.topicsUserManaged ? "user" : "auto";
         const write = await resolveMemoryTopicsWrite(entityCtx, id, entities, [], source);
@@ -12817,7 +12909,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(Q5.where("user_id", userId), Q5.where("is_deleted", false)).fetch();
+  const records = await ctx.vaultMemoryCollection.query(Q6.where("user_id", userId), Q6.where("is_deleted", false)).fetch();
   if (records.length === 0) return 0;
   await ctx.database.write(async () => {
     await assertCanWrite2(ctx);
@@ -12854,7 +12946,7 @@ async function getDecayCandidatesRawOp(ctx) {
   assertVaultScopeForSweep(ctx);
   const results = await ctx.vaultMemoryCollection.query(
     ...baseVaultConditions(ctx, { includeArchived: true, includeQuarantined: true }),
-    Q5.where("kind", null)
+    Q6.where("kind", null)
   ).unsafeFetchRaw();
   return results.map((raw) => ({
     uniqueId: raw.id,
@@ -12984,11 +13076,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(
-    Q5.where("trust_tier", "quarantined"),
-    Q5.where("is_deleted", false),
-    Q5.where("scope", where.scope),
-    Q5.where("folder_id", where.folderId),
-    ...ctx.userId !== void 0 ? [Q5.where("user_id", ctx.userId)] : []
+    Q6.where("trust_tier", "quarantined"),
+    Q6.where("is_deleted", false),
+    Q6.where("scope", where.scope),
+    Q6.where("folder_id", where.folderId),
+    ...ctx.userId !== void 0 ? [Q6.where("user_id", ctx.userId)] : []
   ).unsafeFetchRaw();
   for (const raw of rows) {
     let ids;
@@ -13483,7 +13575,7 @@ var WalletPoller = class {
 };
 
 // src/lib/db/vaultFolders/operations.ts
-import { Q as Q6 } from "@nozbe/watermelondb";
+import { Q as Q7 } from "@nozbe/watermelondb";
 function folderToStored(folder) {
   return {
     uniqueId: folder.id,
@@ -13508,7 +13600,7 @@ async function createVaultFolderOp(ctx, opts) {
   return folderToStored(created);
 }
 async function getAllVaultFoldersOp(ctx) {
-  const results = await ctx.vaultFolderCollection.query(Q6.where("is_deleted", false), Q6.sortBy("created_at", Q6.desc)).fetch();
+  const results = await ctx.vaultFolderCollection.query(Q7.where("is_deleted", false), Q7.sortBy("created_at", Q7.desc)).fetch();
   return results.map(folderToStored);
 }
 async function updateVaultFolderOp(ctx, id, opts) {
@@ -13517,7 +13609,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(Q6.where("folder_id", id), Q6.where("is_deleted", false)).fetch() : [];
+      const memories = scopeChanged ? await ctx.vaultMemoryCollection.query(Q7.where("folder_id", id), Q7.where("is_deleted", false)).fetch() : [];
       const updates = [];
       updates.push(
         record2.prepareUpdate((r) => {
@@ -13546,7 +13638,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(Q6.where("folder_id", id), Q6.where("is_deleted", false)).fetch();
+      const memories = await ctx.vaultMemoryCollection.query(Q7.where("folder_id", id), Q7.where("is_deleted", false)).fetch();
       const preparedMemories = memories.map(
         (memory) => memory.prepareUpdate((r) => {
           r._setRaw("folder_id", null);
@@ -13617,7 +13709,7 @@ async function updateVaultFolderContextOp(ctx, id, context) {
   }
 }
 async function getVaultFolderMemoryCountOp(ctx, folderId) {
-  return await ctx.vaultMemoryCollection.query(Q6.where("folder_id", folderId), Q6.where("is_deleted", false)).fetchCount();
+  return await ctx.vaultMemoryCollection.query(Q7.where("folder_id", folderId), Q7.where("is_deleted", false)).fetchCount();
 }
 
 // src/lib/db/vaultFolders/defaults.ts
@@ -13660,7 +13752,7 @@ async function _ensureDefaultFoldersImpl(ctx) {
 }
 
 // src/lib/memory/autoExtract.ts
-import { Q as Q7 } from "@nozbe/watermelondb";
+import { Q as Q8 } from "@nozbe/watermelondb";
 
 // src/lib/memory/entitySalience.ts
 var GENERIC_ENTITY_NAMES = /* @__PURE__ */ new Set([
@@ -16368,7 +16460,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(Q7.where("id", memoryId)).fetch();
+    const rows = await ctx.database.get(VaultMemory.table).query(Q8.where("id", memoryId)).fetch();
     return rows[0]?.topicsUserManaged === true;
   } catch {
     return true;
@@ -18913,7 +19005,7 @@ function parseAnswer(body, base, parseSchema) {
 }
 
 // src/lib/memory/store/local.ts
-import { Q as Q8 } from "@nozbe/watermelondb";
+import { Q as Q9 } from "@nozbe/watermelondb";
 
 // src/lib/memory/topicExtract.ts
 var TOPIC_EXTRACTION_BATCH_SIZE = 10;
@@ -19192,8 +19284,8 @@ function createLocalMemoryStore(options) {
     writeOptions?.signal?.throwIfAborted();
   };
   const vaultCache = options.vaultCache ?? createVaultEmbeddingCache();
-  const ownedBy = userId !== void 0 ? [Q8.where("user_id", userId)] : [];
-  const linksOwnedBy = userId === void 0 ? [] : options.allowUnscopedRows ? [Q8.or(Q8.where("user_id", userId), Q8.where("user_id", null))] : [Q8.where("user_id", userId)];
+  const ownedBy = userId !== void 0 ? [Q9.where("user_id", userId)] : [];
+  const linksOwnedBy = userId === void 0 ? [] : options.allowUnscopedRows ? [Q9.or(Q9.where("user_id", userId), Q9.where("user_id", null))] : [Q9.where("user_id", userId)];
   const watchedColumns = [
     "content",
     "scope",
@@ -19238,7 +19330,7 @@ function createLocalMemoryStore(options) {
     list: (listOptions) => getAllVaultMemoriesOp(vaultCtx, listOptions),
     get: (id) => getVaultMemoryOp(vaultCtx, id),
     listArchived: async () => {
-      const ids = await vaultCtx.vaultMemoryCollection.query(Q8.where("is_deleted", false), Q8.where("archived_at", Q8.notEq(null)), ...ownedBy).fetchIds();
+      const ids = await vaultCtx.vaultMemoryCollection.query(Q9.where("is_deleted", false), Q9.where("archived_at", Q9.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));
@@ -19254,7 +19346,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(Q8.where("id", Q8.oneOf([...members.keys()]))).unsafeFetchRaw() : [];
+      const entities = userId === void 0 ? await entityCtx.entityCollection.query().unsafeFetchRaw() : members.size ? await entityCtx.entityCollection.query(Q9.where("id", Q9.oneOf([...members.keys()]))).unsafeFetchRaw() : [];
       const byName = /* @__PURE__ */ new Map();
       for (const entity of entities) {
         const name = String(entity.canonical_name);
@@ -19304,7 +19396,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(Q8.where("id", memoryId), Q8.where("is_deleted", false), ...ownedBy).fetchCount();
+      const owned = await vaultCtx.vaultMemoryCollection.query(Q9.where("id", memoryId), Q9.where("is_deleted", false), ...ownedBy).fetchCount();
       return owned > 0 ? writer.callWriter(
         () => linkMemoryEntitiesOp(
           {
@@ -19376,7 +19468,7 @@ function createLocalMemoryStore(options) {
           else onChange();
         };
       };
-      const memories = subscribeOptions?.includeDeleted ? vaultCtx.vaultMemoryCollection.query(...ownedBy).observe() : vaultCtx.vaultMemoryCollection.query(Q8.where("is_deleted", false), ...ownedBy).observeWithColumns(
+      const memories = subscribeOptions?.includeDeleted ? vaultCtx.vaultMemoryCollection.query(...ownedBy).observe() : vaultCtx.vaultMemoryCollection.query(Q9.where("is_deleted", false), ...ownedBy).observeWithColumns(
         subscribeOptions?.embeddings ? [...watchedColumns, "embedding", "embedding_model"] : watchedColumns
       );
       const subscriptions = [memories.subscribe(afterFirst())];
@@ -22435,7 +22527,7 @@ async function assembleMemoryContext(options) {
 }
 
 // src/lib/memory/durableExtraction.ts
-import { Q as Q9 } from "@nozbe/watermelondb";
+import { Q as Q10 } from "@nozbe/watermelondb";
 var MAX_JOBS_PER_PASS = 3;
 var MAX_ATTEMPTS = 3;
 var MAX_FAILED_SESSIONS = 3;
@@ -22606,7 +22698,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(Q9.where("conversation_id", conversationId), Q9.where("is_deleted", false)).fetchCount() > 0 && await storage.messagesCollection.query(Q9.where("conversation_id", conversationId), Q9.where("id", Q9.oneOf(ids))).fetchCount() === ids.length;
+    return await storage.conversationsCollection.query(Q10.where("conversation_id", conversationId), Q10.where("is_deleted", false)).fetchCount() > 0 && await storage.messagesCollection.query(Q10.where("conversation_id", conversationId), Q10.where("id", Q10.oneOf(ids))).fetchCount() === ids.length;
   }
   function schedule(delay) {
     if (disposed) return;
@@ -22780,7 +22872,7 @@ function createDurableAutoExtractor(options) {
     let sourceWaiting = false;
     try {
       await writes;
-      const pending = await jobs.query(Q9.where("owner_key", owner), Q9.where("message_ids", Q9.notEq("[]"))).fetch();
+      const pending = await jobs.query(Q10.where("owner_key", owner), Q10.where("message_ids", Q10.notEq("[]"))).fetch();
       storeFailures = 0;
       let processed = 0;
       for (const job of pending) {
@@ -22812,7 +22904,7 @@ function createDurableAutoExtractor(options) {
         let ids = [];
         let loaded = [];
         try {
-          const present = source ? sourceStatus === "ready" : await storage.conversationsCollection.query(Q9.where("conversation_id", conversationId), Q9.where("is_deleted", false)).fetchCount() > 0;
+          const present = source ? sourceStatus === "ready" : await storage.conversationsCollection.query(Q10.where("conversation_id", conversationId), Q10.where("is_deleted", false)).fetchCount() > 0;
           if (!present) {
             await database.write(() => job.destroyPermanently());
             continue;
@@ -22980,7 +23072,7 @@ function createDurableAutoExtractor(options) {
       const scope = currentScope();
       writes = writes.then(
         () => database.write(async () => {
-          const existing = await jobs.query(Q9.where("owner_key", owner), Q9.where("conversation_id", conversationId)).fetch();
+          const existing = await jobs.query(Q10.where("owner_key", owner), Q10.where("conversation_id", conversationId)).fetch();
           const job = existing.find(
             (candidate) => candidate._getRaw("scope") === scope && (candidate._getRaw("folder_id") ?? null) === folderId
           );
@@ -22993,8 +23085,8 @@ function createDurableAutoExtractor(options) {
           if (watermarks.length) {
             const misplaced = new Set(
               await storage.messagesCollection.query(
-                Q9.where("id", Q9.oneOf(watermarks)),
-                Q9.where("conversation_id", Q9.notEq(conversationId))
+                Q10.where("id", Q10.oneOf(watermarks)),
+                Q10.where("conversation_id", Q10.notEq(conversationId))
               ).fetchIds()
             );
             for (const prior of existing)
@@ -23004,7 +23096,7 @@ function createDurableAutoExtractor(options) {
                   r._setRaw("watermark_seq", null);
                 });
           }
-          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(Q9.where("id", Q9.oneOf(ids))).fetch();
+          const rows = fromSourceConversation ? [] : await storage.messagesCollection.query(Q10.where("id", Q10.oneOf(ids))).fetch();
           const foreignRows = new Set(
             rows.filter((row) => row._getRaw("conversation_id") !== conversationId).map((row) => row.id)
           );
@@ -26047,7 +26139,7 @@ async function cleanupConversationSummary(database, conversationId) {
 }
 
 // src/lib/db/media/operations.ts
-import { Q as Q10 } from "@nozbe/watermelondb";
+import { Q as Q11 } from "@nozbe/watermelondb";
 
 // src/lib/storage/opfs.ts
 function isOPFSSupported() {
@@ -26238,7 +26330,7 @@ async function createMediaBatchOp(ctx, optionsArray) {
       })
     );
   });
-  const results = await mediaCollection.query(Q10.where("media_id", Q10.oneOf(mediaIds))).fetch();
+  const results = await mediaCollection.query(Q11.where("media_id", Q11.oneOf(mediaIds))).fetch();
   return Promise.all(
     results.map(
       (m) => mediaToStored(m, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
@@ -26248,7 +26340,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(Q10.where("conversation_id", conversationId), Q10.where("is_deleted", false)).fetch();
+  const results = await mediaCollection.query(Q11.where("conversation_id", conversationId), Q11.where("is_deleted", false)).fetch();
   if (results.length === 0) {
     return 0;
   }
@@ -26501,6 +26593,8 @@ function useChatStorage(options) {
       embeddedWalletSigner
     ]
   );
+  const storageCtxRef = useRef4(storageCtx);
+  storageCtxRef.current = storageCtx;
   const vaultMemoryCollection = useMemo(
     () => database.get("memory_vault"),
     [database]
@@ -26604,24 +26698,12 @@ function useChatStorage(options) {
     refreshQueueStatus();
     return queueManager.onQueueChange(walletAddress, refreshQueueStatus);
   }, [walletAddress, refreshQueueStatus]);
-  useEffect4(() => {
-    if (!walletAddress || !enableQueue || !autoFlushOnKeyAvailable || !signMessage) return;
-    return onKeyAvailable(walletAddress, () => {
-      flushQueue().catch((err) => {
-        getLogger().warn("[useChatStorage] Auto-flush failed:", err);
-      });
-    });
-  }, [walletAddress, enableQueue, autoFlushOnKeyAvailable, signMessage, flushQueue]);
   useEffect4(() => {
     if (!getWalletAddress || walletAddress) return;
     const poller = new WalletPoller();
     return poller.startPolling(getWalletAddress, () => {
     });
   }, [getWalletAddress, walletAddress]);
-  const isEncryptionReady = useCallback4(() => {
-    if (!walletAddress || !signMessage) return true;
-    return hasEncryptionKey(walletAddress);
-  }, [walletAddress, signMessage]);
   const pendingOpsRef = useRef4([]);
   const syntheticConvIdsRef = useRef4(/* @__PURE__ */ new Set());
   useEffect4(() => {
@@ -26634,34 +26716,49 @@ function useChatStorage(options) {
     pendingOpsRef.current = [];
     refreshQueueStatus();
   }, [walletAddress, enableQueue, refreshQueueStatus]);
+  useEffect4(() => {
+    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 = useCallback4(
     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 = useCallback4(
     async (message, mask = maskForEmbedding) => {
@@ -26935,7 +27032,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) {
@@ -26944,7 +27041,7 @@ function useChatStorage(options) {
       setCurrentConversationId(result.conversationId);
       return result;
     },
-    [storageCtx, defaultConversationTitle, writeOrQueue]
+    [defaultConversationTitle, writeOrQueue]
   );
   const getConversation = useCallback4(
     async (id) => {
@@ -26960,24 +27057,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 = useCallback4(
     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 = useCallback4(
     async (id) => {
@@ -27195,7 +27292,7 @@ function useChatStorage(options) {
       const { result } = await writeOrQueue(
         "createMessage",
         rowOpts,
-        () => upsertMessageOp(storageCtx, rowOpts),
+        (currentStorageCtx) => upsertMessageOp(currentStorageCtx, rowOpts),
         () => makeSyntheticStoredMessage(rowOpts),
         ctx.userMessageQueueId ? [ctx.userMessageQueueId] : []
       );
@@ -27657,7 +27754,7 @@ function useChatStorage(options) {
         const userMsgResult = await writeOrQueue(
           "createMessage",
           userMsgOpts,
-          () => createMessageOp(storageCtx, userMsgOpts),
+          (ctx) => createMessageOp(ctx, userMsgOpts),
           () => makeSyntheticStoredMessage(userMsgOpts)
         );
         storedUserMessage = userMsgResult.result;
@@ -28006,7 +28103,7 @@ function useChatStorage(options) {
         const assistantMsgResult = await writeOrQueue(
           "createMessage",
           assistantMsgOpts,
-          () => createMessageOp(storageCtx, assistantMsgOpts),
+          (ctx) => createMessageOp(ctx, assistantMsgOpts),
           () => makeSyntheticStoredMessage(assistantMsgOpts),
           userMsgQueueId ? [userMsgQueueId] : []
         );
@@ -28038,7 +28135,7 @@ function useChatStorage(options) {
           const toolResultsWrite = await writeOrQueue(
             "createMessage",
             toolResultsOpts,
-            () => createMessageOp(storageCtx, toolResultsOpts),
+            (ctx) => createMessageOp(ctx, toolResultsOpts),
             () => makeSyntheticStoredMessage(toolResultsOpts),
             assistantMsgQueueId ? [assistantMsgQueueId] : []
           );
@@ -28081,7 +28178,6 @@ function useChatStorage(options) {
       walletAddress,
       signMessage,
       embeddedWalletSigner,
-      isEncryptionReady,
       enableQueue,
       getWalletAddress,
       refreshQueueStatus,