@anuma/sdk 10.0.1 → 10.0.3

package/dist/expo/index.cjs

@@ -2079,7 +2079,7 @@ ${appendix}` : appendix;
 }
 
 // src/lib/db/chat/operations.ts
-var import_watermelondb3 = require("@nozbe/watermelondb");
+var import_watermelondb4 = require("@nozbe/watermelondb");
 var import_uuid2 = require("uuid");
 
 // src/react/useEncryption.ts
@@ -3302,8 +3302,162 @@ async function assembleDecryptedMessage(message, address) {
   return result;
 }
 
-// src/lib/db/chat/toolCallEventIndex.ts
+// src/lib/db/chat/models.ts
 var import_watermelondb2 = require("@nozbe/watermelondb");
+var import_decorators = require("@nozbe/watermelondb/decorators");
+var Message = class extends import_watermelondb2.Model {
+};
+Message.table = "history";
+Message.associations = {
+  conversations: { type: "belongs_to", key: "conversation_id" },
+  media: { type: "has_many", foreignKey: "message_id" }
+};
+__decorateClass([
+  (0, import_decorators.field)("message_id")
+], Message.prototype, "messageId", 2);
+__decorateClass([
+  (0, import_decorators.text)("conversation_id")
+], Message.prototype, "conversationId", 2);
+__decorateClass([
+  (0, import_decorators.text)("role")
+], Message.prototype, "role", 2);
+__decorateClass([
+  (0, import_decorators.text)("content")
+], Message.prototype, "content", 2);
+__decorateClass([
+  (0, import_decorators.text)("model")
+], Message.prototype, "model", 2);
+__decorateClass([
+  (0, import_decorators.text)("image_model")
+], Message.prototype, "imageModel", 2);
+__decorateClass([
+  (0, import_decorators.json)("files", (raw) => raw)
+], Message.prototype, "files", 2);
+__decorateClass([
+  (0, import_decorators.json)("file_ids", (raw) => raw)
+], Message.prototype, "fileIds", 2);
+__decorateClass([
+  (0, import_decorators.date)("created_at")
+], Message.prototype, "createdAt", 2);
+__decorateClass([
+  (0, import_decorators.date)("updated_at")
+], Message.prototype, "updatedAt", 2);
+__decorateClass([
+  (0, import_decorators.json)("vector", (raw) => raw)
+], Message.prototype, "vector", 2);
+__decorateClass([
+  (0, import_decorators.text)("embedding_model")
+], Message.prototype, "embeddingModel", 2);
+__decorateClass([
+  (0, import_decorators.json)("chunks", (raw) => raw)
+], Message.prototype, "chunks", 2);
+__decorateClass([
+  (0, import_decorators.json)("usage", (raw) => raw)
+], Message.prototype, "usage", 2);
+__decorateClass([
+  (0, import_decorators.json)("sources", (raw) => raw)
+], Message.prototype, "sources", 2);
+__decorateClass([
+  (0, import_decorators.field)("response_duration")
+], Message.prototype, "responseDuration", 2);
+__decorateClass([
+  (0, import_decorators.field)("was_stopped")
+], Message.prototype, "wasStopped", 2);
+__decorateClass([
+  (0, import_decorators.text)("error")
+], Message.prototype, "error", 2);
+__decorateClass([
+  (0, import_decorators.json)("thought_process", (raw) => raw)
+], Message.prototype, "thoughtProcess", 2);
+__decorateClass([
+  (0, import_decorators.text)("thinking")
+], Message.prototype, "thinking", 2);
+__decorateClass([
+  (0, import_decorators.text)("parent_message_id")
+], Message.prototype, "parentMessageId", 2);
+__decorateClass([
+  (0, import_decorators.text)("feedback")
+], Message.prototype, "feedback", 2);
+__decorateClass([
+  (0, import_decorators.json)("tool_call_events", (raw) => raw)
+], Message.prototype, "toolCallEvents", 2);
+__decorateClass([
+  (0, import_decorators.text)("origin")
+], Message.prototype, "origin", 2);
+var Conversation = class extends import_watermelondb2.Model {
+};
+Conversation.table = "conversations";
+Conversation.associations = {
+  history: { type: "has_many", foreignKey: "conversation_id" },
+  projects: { type: "belongs_to", key: "project_id" }
+};
+__decorateClass([
+  (0, import_decorators.text)("conversation_id")
+], Conversation.prototype, "conversationId", 2);
+__decorateClass([
+  (0, import_decorators.text)("title")
+], Conversation.prototype, "title", 2);
+__decorateClass([
+  (0, import_decorators.text)("project_id")
+], Conversation.prototype, "projectId", 2);
+__decorateClass([
+  (0, import_decorators.date)("created_at")
+], Conversation.prototype, "createdAt", 2);
+__decorateClass([
+  (0, import_decorators.date)("updated_at")
+], Conversation.prototype, "updatedAt", 2);
+__decorateClass([
+  (0, import_decorators.field)("is_deleted")
+], Conversation.prototype, "isDeleted", 2);
+__decorateClass([
+  (0, import_decorators.date)("pinned_at")
+], Conversation.prototype, "pinnedAt", 2);
+var ConversationSummary = class extends import_watermelondb2.Model {
+};
+ConversationSummary.table = "conversation_summaries";
+ConversationSummary.associations = {
+  conversations: { type: "belongs_to", key: "conversation_id" }
+};
+__decorateClass([
+  (0, import_decorators.text)("conversation_id")
+], ConversationSummary.prototype, "conversationId", 2);
+__decorateClass([
+  (0, import_decorators.text)("summary")
+], ConversationSummary.prototype, "summary", 2);
+__decorateClass([
+  (0, import_decorators.text)("summarized_up_to")
+], ConversationSummary.prototype, "summarizedUpTo", 2);
+__decorateClass([
+  (0, import_decorators.field)("token_count")
+], ConversationSummary.prototype, "tokenCount", 2);
+__decorateClass([
+  (0, import_decorators.date)("created_at")
+], ConversationSummary.prototype, "createdAt", 2);
+__decorateClass([
+  (0, import_decorators.date)("updated_at")
+], ConversationSummary.prototype, "updatedAt", 2);
+
+// src/lib/db/chat/summaryRevision.ts
+var conversationRevisions = /* @__PURE__ */ new WeakMap();
+function getConversationRevision(database, conversationId) {
+  return conversationRevisions.get(database)?.get(conversationId) ?? 0;
+}
+function advanceConversationRevision(database, conversationId) {
+  let revisions = conversationRevisions.get(database);
+  if (!revisions) {
+    revisions = /* @__PURE__ */ new Map();
+    conversationRevisions.set(database, revisions);
+  }
+  revisions.set(conversationId, getConversationRevision(database, conversationId) + 1);
+}
+function assertConversationRevision(database, conversationId, revision2) {
+  if (getConversationRevision(database, conversationId) !== revision2) {
+    throw new Error("The conversation changed during summarization. Retry the request.");
+  }
+}
+
+// src/lib/db/chat/toolCallEventIndex.ts
+var import_watermelondb3 = require("@nozbe/watermelondb");
 function parseEventIds(value) {
   const ids = /* @__PURE__ */ new Set();
   let events;
@@ -3323,7 +3477,7 @@ function parseEventIds(value) {
 async function fetchEventRows(collection, conversationId) {
   try {
     return await collection.query(
-      import_watermelondb2.Q.unsafeSqlQuery(
+      import_watermelondb3.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]
       )
@@ -3333,10 +3487,10 @@ async function fetchEventRows(collection, conversationId) {
       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(
+      import_watermelondb3.Q.where("conversation_id", conversationId),
+      import_watermelondb3.Q.where("tool_call_events", import_watermelondb3.Q.notEq(null)),
+      import_watermelondb3.Q.where("tool_call_events", import_watermelondb3.Q.notIn(["", "[]"])),
+      import_watermelondb3.Q.unsafeLokiTransform(
         (rows) => rows.map(({ id: id2, tool_call_events }) => ({ id: id2, tool_call_events }))
       )
     ).unsafeFetchRaw();
@@ -3806,7 +3960,7 @@ async function createConversationOp(ctx, opts, defaultTitle = "New Conversation"
   );
 }
 async function getConversationOp(ctx, id2) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", id2), import_watermelondb3.Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(import_watermelondb4.Q.where("conversation_id", id2), import_watermelondb4.Q.where("is_deleted", false)).fetch();
   return results.length > 0 ? await conversationToStored(
     results[0],
     ctx.walletAddress,
@@ -3815,7 +3969,7 @@ async function getConversationOp(ctx, id2) {
   ) : null;
 }
 async function getConversationsOp(ctx) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("is_deleted", false), import_watermelondb3.Q.sortBy("created_at", import_watermelondb3.Q.desc)).unsafeFetchRaw();
+  const results = await ctx.conversationsCollection.query(import_watermelondb4.Q.where("is_deleted", false), import_watermelondb4.Q.sortBy("created_at", import_watermelondb4.Q.desc)).unsafeFetchRaw();
   return Promise.all(
     results.map(
       (raw) => conversationRawToStored(raw, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner)
@@ -3836,33 +3990,33 @@ function conversationRawToLazyStored(raw) {
   };
 }
 async function getConversationsLazyOp(ctx) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("is_deleted", false), import_watermelondb3.Q.sortBy("created_at", import_watermelondb3.Q.desc)).unsafeFetchRaw();
+  const results = await ctx.conversationsCollection.query(import_watermelondb4.Q.where("is_deleted", false), import_watermelondb4.Q.sortBy("created_at", import_watermelondb4.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_watermelondb3.Q.where("is_deleted", false)];
+  const clauses = [import_watermelondb4.Q.where("is_deleted", false)];
   if (options?.before !== void 0) {
     clauses.push(
-      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))
+      exclude.size > 0 ? import_watermelondb4.Q.where("created_at", import_watermelondb4.Q.lte(options.before)) : import_watermelondb4.Q.where("created_at", import_watermelondb4.Q.lt(options.before))
     );
   }
-  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 fetched = await ctx.conversationsCollection.query(...clauses, import_watermelondb4.Q.sortBy("created_at", import_watermelondb4.Q.desc), import_watermelondb4.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_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)
+    import_watermelondb4.Q.where("project_id", projectId === null ? "" : projectId),
+    import_watermelondb4.Q.where("is_deleted", false),
+    import_watermelondb4.Q.sortBy("created_at", import_watermelondb4.Q.desc)
   ).unsafeFetchRaw();
   return results.map(conversationRawToLazyStored);
 }
 async function updateConversationTitleOp(ctx, id2, title) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", id2), import_watermelondb3.Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(import_watermelondb4.Q.where("conversation_id", id2), import_watermelondb4.Q.where("is_deleted", false)).fetch();
   if (results.length > 0) {
     const encryptedOpts = ctx.walletAddress && ctx.signMessage ? await encryptConversationFields(
       { title },
@@ -3881,13 +4035,13 @@ async function updateConversationTitleOp(ctx, id2, title) {
   return false;
 }
 async function deleteConversationOp(ctx, id2) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", id2), import_watermelondb3.Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(import_watermelondb4.Q.where("conversation_id", id2), import_watermelondb4.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_watermelondb3.Q.where("conversation_id", id2)).fetch() : [];
+      const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb4.Q.where("conversation_id", id2)).fetch() : [];
       for (const job of jobs) await job.destroyPermanently();
     });
     return true;
@@ -3895,7 +4049,7 @@ async function deleteConversationOp(ctx, id2) {
   return false;
 }
 async function updateConversationPinnedOp(ctx, id2, pinned) {
-  const results = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("conversation_id", id2), import_watermelondb3.Q.where("is_deleted", false)).fetch();
+  const results = await ctx.conversationsCollection.query(import_watermelondb4.Q.where("conversation_id", id2), import_watermelondb4.Q.where("is_deleted", false)).fetch();
   if (results.length > 0) {
     await ctx.database.write(async () => {
       await results[0].update((conv) => {
@@ -3907,7 +4061,7 @@ async function updateConversationPinnedOp(ctx, id2, pinned) {
   return false;
 }
 async function getMessagesOp(ctx, convId, opts) {
-  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 fetched = await ctx.messagesCollection.query(import_watermelondb4.Q.where("conversation_id", convId), import_watermelondb4.Q.sortBy("message_id", import_watermelondb4.Q.asc)).unsafeFetchRaw();
   const results = opts?.rawFilter ? fetched.filter(opts.rawFilter) : fetched;
   return Promise.all(
     results.map(
@@ -3916,19 +4070,19 @@ async function getMessagesOp(ctx, convId, opts) {
   );
 }
 async function getMessageCountOp(ctx, convId) {
-  return await ctx.messagesCollection.query(import_watermelondb3.Q.where("conversation_id", convId)).fetchCount();
+  return await ctx.messagesCollection.query(import_watermelondb4.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_watermelondb3.Q.where("conversation_id", convId)];
+  const clauses = [import_watermelondb4.Q.where("conversation_id", convId)];
   if (opts.beforeMessageId !== void 0) {
     clauses.push(
-      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))
+      exclude.size > 0 ? import_watermelondb4.Q.where("message_id", import_watermelondb4.Q.lte(opts.beforeMessageId)) : import_watermelondb4.Q.where("message_id", import_watermelondb4.Q.lt(opts.beforeMessageId))
     );
   }
-  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 fetched = await ctx.messagesCollection.query(...clauses, import_watermelondb4.Q.sortBy("message_id", import_watermelondb4.Q.desc), import_watermelondb4.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(
@@ -3940,7 +4094,7 @@ async function getMessagesPageOp(ctx, convId, opts) {
   );
 }
 async function getMessageSkeletonsOp(ctx, convId) {
-  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 results = await ctx.messagesCollection.query(import_watermelondb4.Q.where("conversation_id", convId), import_watermelondb4.Q.sortBy("message_id", import_watermelondb4.Q.asc)).unsafeFetchRaw();
   const roleById = /* @__PURE__ */ new Map();
   for (const raw of results) {
     roleById.set(raw.id, raw.role);
@@ -3987,10 +4141,22 @@ async function getMessageSkeletonsOp(ctx, convId) {
 async function getToolCallEventIdsOp(ctx, convId) {
   return getToolCallEventIds(ctx.messagesCollection, convId);
 }
+async function invalidateConversationSummary(ctx, conversationId, changedMessageId) {
+  if (!ctx.database.schema?.tables[ConversationSummary.table]) return;
+  const summaries = await ctx.database.get(ConversationSummary.table).query(import_watermelondb4.Q.where("conversation_id", conversationId)).fetch();
+  for (const summary of summaries) {
+    if (changedMessageId !== void 0) {
+      const [boundary] = await ctx.messagesCollection.query(import_watermelondb4.Q.where("id", summary.summarizedUpTo), import_watermelondb4.Q.where("conversation_id", conversationId)).fetch();
+      if (boundary && changedMessageId > boundary.messageId) continue;
+    }
+    await summary.destroyPermanently();
+  }
+}
 async function clearMessagesOp(ctx, convId) {
   await ctx.database.write(async () => {
-    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() : [];
+    await invalidateConversationSummary(ctx, convId);
+    const messages = await ctx.messagesCollection.query(import_watermelondb4.Q.where("conversation_id", convId)).fetch();
+    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb4.Q.where("conversation_id", convId)).fetch() : [];
     for (const job of jobs) {
       await job.update((row) => {
         row._setRaw("message_ids", "[]");
@@ -4000,11 +4166,12 @@ async function clearMessagesOp(ctx, convId) {
     }
     for (const message of messages) {
       await message.update((msg) => {
-        msg._setRaw("file_ids", null);
+        if (ctx.messagesCollection.schema.columns.file_ids) msg._setRaw("file_ids", null);
         msg._setRaw("files", null);
       });
       await message.destroyPermanently();
     }
+    advanceConversationRevision(ctx.database, convId);
   });
 }
 async function deleteMessageOp(ctx, uniqueId) {
@@ -4015,7 +4182,8 @@ 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_watermelondb3.Q.where("conversation_id", message.conversationId)).fetch() : [];
+    await invalidateConversationSummary(ctx, message.conversationId, message.messageId);
+    const jobs = ctx.database.schema?.tables[ExtractionJob.table] ? await ctx.database.get(ExtractionJob.table).query(import_watermelondb4.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) => {
@@ -4024,10 +4192,11 @@ async function deleteMessageOp(ctx, uniqueId) {
       });
     }
     await message.update((msg) => {
-      msg._setRaw("file_ids", null);
+      if (ctx.messagesCollection.schema.columns.file_ids) msg._setRaw("file_ids", null);
       msg._setRaw("files", null);
     });
     await message.destroyPermanently();
+    advanceConversationRevision(ctx.database, message.conversationId);
   });
   return uniqueId;
 }
@@ -4088,9 +4257,9 @@ async function createMessageOp(ctx, opts) {
     }
   }
   const newest = await ctx.messagesCollection.query(
-    import_watermelondb3.Q.where("conversation_id", opts.conversationId),
-    import_watermelondb3.Q.sortBy("message_id", import_watermelondb3.Q.desc),
-    import_watermelondb3.Q.take(1)
+    import_watermelondb4.Q.where("conversation_id", opts.conversationId),
+    import_watermelondb4.Q.sortBy("message_id", import_watermelondb4.Q.desc),
+    import_watermelondb4.Q.take(1)
   ).fetch();
   const messageId = (newest[0]?.messageId ?? 0) + 1;
   const encryptedOpts = await encryptMessageOptsIfNeeded(ctx, opts);
@@ -4104,7 +4273,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_watermelondb3.Q.where("id", opts.uniqueId)).fetch();
+  const results = await ctx.messagesCollection.query(import_watermelondb4.Q.where("id", opts.uniqueId)).fetch();
   const existing = results.length > 0 ? results[0] : null;
   if (!existing) {
     return createMessageOp(ctx, opts);
@@ -4212,13 +4381,13 @@ async function decryptMessageEmbeddingFields(raw, walletAddress) {
 async function sealLegacyMessageEmbeddingsOp(ctx) {
   if (!ctx.walletAddress) return 0;
   const candidateIds = await ctx.messagesCollection.query(
-    import_watermelondb3.Q.where("content", import_watermelondb3.Q.like("enc:%")),
-    import_watermelondb3.Q.or(
+    import_watermelondb4.Q.where("content", import_watermelondb4.Q.like("enc:%")),
+    import_watermelondb4.Q.or(
       ...["vector", "chunks"].map(
-        (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:%"))
+        (column) => import_watermelondb4.Q.and(
+          import_watermelondb4.Q.where(column, import_watermelondb4.Q.notEq(null)),
+          import_watermelondb4.Q.where(column, import_watermelondb4.Q.notEq("")),
+          import_watermelondb4.Q.where(column, import_watermelondb4.Q.notLike("enc:%"))
         )
       )
     )
@@ -4228,7 +4397,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_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(pageIds))).fetch();
+      const pageMessages = await ctx.messagesCollection.query(import_watermelondb4.Q.where("id", import_watermelondb4.Q.oneOf(pageIds))).fetch();
       for (const message of pageMessages) {
         if (!isEncrypted(message.content)) continue;
         const content = await decryptFieldDetailed(message.content, ctx.walletAddress);
@@ -4309,15 +4478,15 @@ function chunksWithoutText(raw) {
   });
 }
 async function stripLegacyChunkTextOp(ctx) {
-  const candidateIds = await ctx.messagesCollection.query(import_watermelondb3.Q.where("chunks", import_watermelondb3.Q.like(`%${import_watermelondb3.Q.sanitizeLikeString('"text":')}%`))).fetchIds();
+  const candidateIds = await ctx.messagesCollection.query(import_watermelondb4.Q.where("chunks", import_watermelondb4.Q.like(`%${import_watermelondb4.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_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(pageIds))).unsafeFetchRaw();
+    const rows = await ctx.messagesCollection.query(import_watermelondb4.Q.where("id", import_watermelondb4.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_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(changedIds))).fetch();
+      const messages = await ctx.messagesCollection.query(import_watermelondb4.Q.where("id", import_watermelondb4.Q.oneOf(changedIds))).fetch();
       const updates = messages.flatMap((message) => {
         const raw = message._raw;
         const chunks3 = chunksWithoutText(raw.chunks);
@@ -4364,13 +4533,13 @@ async function encryptToolCallEventsOp(ctx) {
     return 0;
   }
   const candidateIds = await ctx.messagesCollection.query(
-    import_watermelondb3.Q.where("tool_call_events", import_watermelondb3.Q.notEq(null)),
-    import_watermelondb3.Q.where("tool_call_events", import_watermelondb3.Q.notIn(["", "[]"]))
+    import_watermelondb4.Q.where("tool_call_events", import_watermelondb4.Q.notEq(null)),
+    import_watermelondb4.Q.where("tool_call_events", import_watermelondb4.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_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(pageIds))).unsafeFetchRaw();
+    const rows = await ctx.messagesCollection.query(import_watermelondb4.Q.where("id", import_watermelondb4.Q.oneOf(pageIds))).unsafeFetchRaw();
     const repairs = /* @__PURE__ */ new Map();
     for (const row of rows) {
       const column = await encryptedToolCallEventsColumn(
@@ -4383,12 +4552,12 @@ async function encryptToolCallEventsOp(ctx) {
     }
     if (repairs.size === 0) continue;
     await ctx.database.write(async () => {
-      const messages = (await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf([...repairs.keys()]))).fetch()).filter(
+      const messages = (await ctx.messagesCollection.query(import_watermelondb4.Q.where("id", import_watermelondb4.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_watermelondb3.Q.where("conversation_id", import_watermelondb3.Q.oneOf(conversationIds))).fetch();
+      const conversations = await ctx.conversationsCollection.query(import_watermelondb4.Q.where("conversation_id", import_watermelondb4.Q.oneOf(conversationIds))).fetch();
       await ctx.database.batch(
         ...messages.map(
           (message) => message.prepareUpdate((msg) => {
@@ -4415,7 +4584,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_watermelondb3.Q.where("content", import_watermelondb3.Q.like(pattern)), import_watermelondb3.Q.take(1)).unsafeFetchRaw();
+  const [row] = await ctx.messagesCollection.query(import_watermelondb4.Q.where("content", import_watermelondb4.Q.like(pattern)), import_watermelondb4.Q.take(1)).unsafeFetchRaw();
   return row ? String(row.content) : null;
 }
 async function updateMessageErrorOp(ctx, uniqueId, error) {
@@ -4446,6 +4615,14 @@ async function _updateMessageOp(ctx, uniqueId, opts) {
     ctx.embeddedWalletSigner
   ) : opts;
   await ctx.database.write(async () => {
+    let contentChanged = false;
+    if (opts.content !== void 0) {
+      const originalContent = ctx.walletAddress ? await decryptField(message.content, ctx.walletAddress) : message.content;
+      contentChanged = opts.content !== originalContent;
+      if (contentChanged) {
+        await invalidateConversationSummary(ctx, message.conversationId, message.messageId);
+      }
+    }
     await message.update((msg) => {
       if (encryptedOpts.content !== void 0)
         msg._setRaw("content", encryptedOpts.content);
@@ -4490,6 +4667,7 @@ async function _updateMessageOp(ctx, uniqueId, opts) {
         msg._setRaw("tool_call_events", tceValue);
       }
     });
+    if (contentChanged) advanceConversationRevision(ctx.database, message.conversationId);
   });
   return messageToStored(message, ctx.walletAddress, ctx.signMessage, ctx.embeddedWalletSigner);
 }
@@ -4528,7 +4706,7 @@ function toChunkCandidateKey(raw) {
 }
 async function fetchRowsByIds(ctx, ids) {
   if (ids.length === 0) return [];
-  return await ctx.messagesCollection.query(import_watermelondb3.Q.where("id", import_watermelondb3.Q.oneOf(ids))).unsafeFetchRaw();
+  return await ctx.messagesCollection.query(import_watermelondb4.Q.where("id", import_watermelondb4.Q.oneOf(ids))).unsafeFetchRaw();
 }
 async function projectedChunkRowSource(ctx, filter) {
   const clauses = [
@@ -4546,7 +4724,7 @@ async function projectedChunkRowSource(ctx, filter) {
     args.push(filter.excludeConversationId);
   }
   const keyRows = await ctx.messagesCollection.query(
-    import_watermelondb3.Q.unsafeSqlQuery(
+    import_watermelondb4.Q.unsafeSqlQuery(
       `select "id", "conversation_id", "updated_at", "embedding_model" from "history" where ${clauses.join(" and ")}`,
       args
     )
@@ -4556,7 +4734,7 @@ async function projectedChunkRowSource(ctx, filter) {
     loadVectorRows: async (ids) => {
       if (ids.length === 0) return [];
       return await ctx.messagesCollection.query(
-        import_watermelondb3.Q.unsafeSqlQuery(
+        import_watermelondb4.Q.unsafeSqlQuery(
           `select "id", "updated_at", "chunks", "vector" from "history" where "_status" is not 'deleted' and "id" in (${ids.map(() => "?").join(",")})`,
           ids
         )
@@ -4566,11 +4744,11 @@ async function projectedChunkRowSource(ctx, filter) {
   };
 }
 async function fullScanChunkRowSource(ctx, filter) {
-  const activeConversations = await ctx.conversationsCollection.query(import_watermelondb3.Q.where("is_deleted", false)).fetch();
+  const activeConversations = await ctx.conversationsCollection.query(import_watermelondb4.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_watermelondb3.Q.where("conversation_id", filter.conversationId)] : [];
+  const queryConditions = filter.conversationId !== void 0 ? [import_watermelondb4.Q.where("conversation_id", filter.conversationId)] : [];
   const rows = await ctx.messagesCollection.query(...queryConditions).unsafeFetchRaw();
   const rowsById = /* @__PURE__ */ new Map();
   for (const row of rows) {
@@ -6427,22 +6605,22 @@ function toReceipt(action, argumentsJson, output) {
   const result = parseObject(output);
   return {
     kind: action.kind,
-    venueName: text(args.venue_name) ?? "",
-    day: text(args.day) ?? "",
-    time: text(args.time) ?? "",
+    venueName: text2(args.venue_name) ?? "",
+    day: text2(args.day) ?? "",
+    time: text2(args.time) ?? "",
     partySize: count(args.party_size),
-    reservationId: text(result.reservation_id) ?? text(args.reservation_id),
-    resyUrl: text(result.reservations_url),
-    feeSummary: text(result.fee_summary),
+    reservationId: text2(result.reservation_id) ?? text2(args.reservation_id),
+    resyUrl: text2(result.reservations_url),
+    feeSummary: text2(result.fee_summary),
     ...outcome(action, output, result)
   };
 }
 function outcome(action, output, result) {
   if (action.alreadyDone.test(output)) return { status: "already_done" };
-  const reason = text(result.error);
+  const reason = text2(result.error);
   if (action.kind === "booking") {
     if (BOOKING_OUTCOME_UNKNOWN.test(output)) return { status: "unknown" };
-    const held = result.success === true || text(result.reservation_id) !== void 0;
+    const held = result.success === true || text2(result.reservation_id) !== void 0;
     return held ? { status: "made" } : { status: "not_made", reason };
   }
   if (result.error_code === CANCEL_OUTCOME_UNKNOWN) return { status: "unknown", reason };
@@ -6457,7 +6635,7 @@ function parseObject(json5) {
     return {};
   }
 }
-function text(value) {
+function text2(value) {
   if (typeof value === "number") return String(value);
   return typeof value === "string" && value ? value : void 0;
 }
@@ -11942,7 +12120,7 @@ function hasControl(value) {
 function integer(value, minimum = 0) {
   return Number.isSafeInteger(value) && value >= minimum;
 }
-function json(value, ancestors = /* @__PURE__ */ new Set()) {
+function json2(value, ancestors = /* @__PURE__ */ new Set()) {
   if (value === null || typeof value === "string" || typeof value === "boolean") return true;
   if (typeof value === "number") return Number.isFinite(value);
   if (typeof value !== "object" || ancestors.has(value)) return false;
@@ -11950,12 +12128,12 @@ function json(value, ancestors = /* @__PURE__ */ new Set()) {
   if (!Array.isArray(value) && Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null)
     return false;
   ancestors.add(value);
-  const valid = Object.values(value).every((v) => json(v, ancestors));
+  const valid = Object.values(value).every((v) => json2(v, ancestors));
   ancestors.delete(value);
   return valid;
 }
 function validRecord(value) {
-  if (!object(value) || typeof value.kind !== "string" || !kinds.has(value.kind) || !id(value.id) || !integer(value.sortKey) || !integer(value.createdAt, 1) || !integer(value.updatedAt, 1) || typeof value.isDeleted !== "boolean" || !object(value.data) || !json(value.data) || Object.keys(value).some(
+  if (!object(value) || typeof value.kind !== "string" || !kinds.has(value.kind) || !id(value.id) || !integer(value.sortKey) || !integer(value.createdAt, 1) || !integer(value.updatedAt, 1) || typeof value.isDeleted !== "boolean" || !object(value.data) || !json2(value.data) || Object.keys(value).some(
     (key) => ![...metadata, "data"].includes(key)
   ))
     return false;
@@ -11984,14 +12162,14 @@ function vectorFields(write) {
     ...write.embeddingModel !== void 0 ? { embedding_model: write.embeddingModel } : {}
   };
 }
-function text2(value) {
+function text3(value) {
   return typeof value === "string";
 }
 function timestamp(value) {
   return typeof value === "string" && Number.isFinite(Date.parse(value));
 }
 function presigned(value) {
-  if (!object(value) || !text2(value.url) || !/^https:\/\//.test(value.url) || !text2(value.method) || !object(value.headers) || !Object.values(value.headers).every(text2) || !timestamp(value.expires_at))
+  if (!object(value) || !text3(value.url) || !/^https:\/\//.test(value.url) || !text3(value.method) || !object(value.headers) || !Object.values(value.headers).every(text3) || !timestamp(value.expires_at))
     invalid();
   return {
     url: value.url,
@@ -12001,7 +12179,7 @@ function presigned(value) {
   };
 }
 function attachment(value) {
-  if (!object(value) || !text2(value.attachment_id) || !attachmentIdPattern.test(value.attachment_id) || !integer(value.size_bytes, 1) || value.state !== "pending" && value.state !== "committed" || value.owner_kind !== void 0 && value.owner_kind !== "message" && value.owner_kind !== "summary" || value.owner_id !== void 0 && !id(value.owner_id) || !timestamp(value.created_at) || value.committed_at !== void 0 && !timestamp(value.committed_at))
+  if (!object(value) || !text3(value.attachment_id) || !attachmentIdPattern.test(value.attachment_id) || !integer(value.size_bytes, 1) || value.state !== "pending" && value.state !== "committed" || value.owner_kind !== void 0 && value.owner_kind !== "message" && value.owner_kind !== "summary" || value.owner_id !== void 0 && !id(value.owner_id) || !timestamp(value.created_at) || value.committed_at !== void 0 && !timestamp(value.committed_at))
     invalid();
   return {
     id: value.attachment_id,
@@ -12014,7 +12192,7 @@ function attachment(value) {
   };
 }
 function ref(value) {
-  if (!object(value) || !text2(value.kind) || !kinds.has(value.kind) || !id(value.id)) invalid();
+  if (!object(value) || !text3(value.kind) || !kinds.has(value.kind) || !id(value.id)) invalid();
   return { kind: value.kind, id: value.id };
 }
 function sameMetadata(a, b) {
@@ -12237,7 +12415,7 @@ async function createRemoteChatStore(options) {
     },
     async account(signal) {
       const value = await request("/account", {}, signal);
-      if (!object(value) || value.account_id !== accountId || !text2(value.key_id) || value.state !== "none" && value.state !== "migrating" && value.state !== "active" || !integer(value.record_count) || !integer(value.storage_bytes) || !integer(value.vector_count))
+      if (!object(value) || value.account_id !== accountId || !text3(value.key_id) || value.state !== "none" && value.state !== "migrating" && value.state !== "active" || !integer(value.record_count) || !integer(value.storage_bytes) || !integer(value.vector_count))
         invalid();
       if (value.key_id && value.key_id !== keyId)
         throw new ChatStoreError("Canonical chat key does not match", 409, "key_mismatch");
@@ -12311,12 +12489,12 @@ async function createRemoteChatStore(options) {
     },
     async changes(cursor, options2) {
       const limit = options2?.limit ?? 100;
-      if (!integer(limit, 1) || limit > 200 || cursor !== void 0 && (!text2(cursor) || cursor.length > 2048))
+      if (!integer(limit, 1) || limit > 200 || cursor !== void 0 && (!text3(cursor) || cursor.length > 2048))
         invalid();
       const params = new URLSearchParams({ account_id: String(accountId), limit: String(limit) });
       if (cursor) params.set("cursor", cursor);
       const value = await request(`/changes?${params}`, {}, options2?.signal);
-      if (!object(value) || !Array.isArray(value.items) || value.items.length > limit || value.next_cursor !== void 0 && !text2(value.next_cursor) || value.changes_cursor !== void 0 && !text2(value.changes_cursor))
+      if (!object(value) || !Array.isArray(value.items) || value.items.length > limit || value.next_cursor !== void 0 && !text3(value.next_cursor) || value.changes_cursor !== void 0 && !text3(value.changes_cursor))
         invalid();
       const items = [];
       for (const item of value.items) items.push(await decode(item));
@@ -12507,141 +12685,6 @@ async function decryptConversationTitle(encryptedTitle, address) {
   }
 }
 
-// src/lib/db/chat/models.ts
-var import_watermelondb4 = require("@nozbe/watermelondb");
-var import_decorators = require("@nozbe/watermelondb/decorators");
-var Message = class extends import_watermelondb4.Model {
-};
-Message.table = "history";
-Message.associations = {
-  conversations: { type: "belongs_to", key: "conversation_id" },
-  media: { type: "has_many", foreignKey: "message_id" }
-};
-__decorateClass([
-  (0, import_decorators.field)("message_id")
-], Message.prototype, "messageId", 2);
-__decorateClass([
-  (0, import_decorators.text)("conversation_id")
-], Message.prototype, "conversationId", 2);
-__decorateClass([
-  (0, import_decorators.text)("role")
-], Message.prototype, "role", 2);
-__decorateClass([
-  (0, import_decorators.text)("content")
-], Message.prototype, "content", 2);
-__decorateClass([
-  (0, import_decorators.text)("model")
-], Message.prototype, "model", 2);
-__decorateClass([
-  (0, import_decorators.text)("image_model")
-], Message.prototype, "imageModel", 2);
-__decorateClass([
-  (0, import_decorators.json)("files", (raw) => raw)
-], Message.prototype, "files", 2);
-__decorateClass([
-  (0, import_decorators.json)("file_ids", (raw) => raw)
-], Message.prototype, "fileIds", 2);
-__decorateClass([
-  (0, import_decorators.date)("created_at")
-], Message.prototype, "createdAt", 2);
-__decorateClass([
-  (0, import_decorators.date)("updated_at")
-], Message.prototype, "updatedAt", 2);
-__decorateClass([
-  (0, import_decorators.json)("vector", (raw) => raw)
-], Message.prototype, "vector", 2);
-__decorateClass([
-  (0, import_decorators.text)("embedding_model")
-], Message.prototype, "embeddingModel", 2);
-__decorateClass([
-  (0, import_decorators.json)("chunks", (raw) => raw)
-], Message.prototype, "chunks", 2);
-__decorateClass([
-  (0, import_decorators.json)("usage", (raw) => raw)
-], Message.prototype, "usage", 2);
-__decorateClass([
-  (0, import_decorators.json)("sources", (raw) => raw)
-], Message.prototype, "sources", 2);
-__decorateClass([
-  (0, import_decorators.field)("response_duration")
-], Message.prototype, "responseDuration", 2);
-__decorateClass([
-  (0, import_decorators.field)("was_stopped")
-], Message.prototype, "wasStopped", 2);
-__decorateClass([
-  (0, import_decorators.text)("error")
-], Message.prototype, "error", 2);
-__decorateClass([
-  (0, import_decorators.json)("thought_process", (raw) => raw)
-], Message.prototype, "thoughtProcess", 2);
-__decorateClass([
-  (0, import_decorators.text)("thinking")
-], Message.prototype, "thinking", 2);
-__decorateClass([
-  (0, import_decorators.text)("parent_message_id")
-], Message.prototype, "parentMessageId", 2);
-__decorateClass([
-  (0, import_decorators.text)("feedback")
-], Message.prototype, "feedback", 2);
-__decorateClass([
-  (0, import_decorators.json)("tool_call_events", (raw) => raw)
-], Message.prototype, "toolCallEvents", 2);
-__decorateClass([
-  (0, import_decorators.text)("origin")
-], Message.prototype, "origin", 2);
-var Conversation = class extends import_watermelondb4.Model {
-};
-Conversation.table = "conversations";
-Conversation.associations = {
-  history: { type: "has_many", foreignKey: "conversation_id" },
-  projects: { type: "belongs_to", key: "project_id" }
-};
-__decorateClass([
-  (0, import_decorators.text)("conversation_id")
-], Conversation.prototype, "conversationId", 2);
-__decorateClass([
-  (0, import_decorators.text)("title")
-], Conversation.prototype, "title", 2);
-__decorateClass([
-  (0, import_decorators.text)("project_id")
-], Conversation.prototype, "projectId", 2);
-__decorateClass([
-  (0, import_decorators.date)("created_at")
-], Conversation.prototype, "createdAt", 2);
-__decorateClass([
-  (0, import_decorators.date)("updated_at")
-], Conversation.prototype, "updatedAt", 2);
-__decorateClass([
-  (0, import_decorators.field)("is_deleted")
-], Conversation.prototype, "isDeleted", 2);
-__decorateClass([
-  (0, import_decorators.date)("pinned_at")
-], Conversation.prototype, "pinnedAt", 2);
-var ConversationSummary = class extends import_watermelondb4.Model {
-};
-ConversationSummary.table = "conversation_summaries";
-ConversationSummary.associations = {
-  conversations: { type: "belongs_to", key: "conversation_id" }
-};
-__decorateClass([
-  (0, import_decorators.text)("conversation_id")
-], ConversationSummary.prototype, "conversationId", 2);
-__decorateClass([
-  (0, import_decorators.text)("summary")
-], ConversationSummary.prototype, "summary", 2);
-__decorateClass([
-  (0, import_decorators.text)("summarized_up_to")
-], ConversationSummary.prototype, "summarizedUpTo", 2);
-__decorateClass([
-  (0, import_decorators.field)("token_count")
-], ConversationSummary.prototype, "tokenCount", 2);
-__decorateClass([
-  (0, import_decorators.date)("created_at")
-], ConversationSummary.prototype, "createdAt", 2);
-__decorateClass([
-  (0, import_decorators.date)("updated_at")
-], ConversationSummary.prototype, "updatedAt", 2);
-
 // src/lib/db/chat/schema.ts
 var import_watermelondb5 = require("@nozbe/watermelondb");
 var import_migrations = require("@nozbe/watermelondb/Schema/migrations");
@@ -29207,6 +29250,13 @@ var lastCompactionTime = /* @__PURE__ */ new Map();
 var COMPACTION_COOLDOWN_MS = 6e4;
 var MAX_SUMMARY_TOKEN_RATIO = 0.8;
 async function maybeSummarizeHistory(options) {
+  const { database, conversationId } = options;
+  const revision2 = getConversationRevision(database, conversationId);
+  const result = await summarizeHistoryAtRevision(options, revision2);
+  assertConversationRevision(database, conversationId, revision2);
+  return result;
+}
+async function summarizeHistoryAtRevision(options, revision2) {
   const { database, conversationId, messages, summarizeHistory, summaryMinWindowMessages, token } = options;
   if (!summarizeHistory) {
     return { messagesToConvert: messages, summarySystemMessage: null };
@@ -29247,7 +29297,7 @@ async function maybeSummarizeHistory(options) {
       clearTimeout(staleGuardTimerId);
     }
   }
-  const promise = doSummarizeHistory(options);
+  const promise = doSummarizeHistory(options, revision2);
   summarizationLocks.set(conversationId, promise);
   try {
     return await promise;
@@ -29261,7 +29311,7 @@ Summary to condense:
 {summary}
 
 Condensed summary:`;
-async function doSummarizeHistory(options) {
+async function doSummarizeHistory(options, revision2) {
   const {
     database,
     conversationId,
@@ -29276,7 +29326,20 @@ async function doSummarizeHistory(options) {
   } = options;
   try {
     const summaryCtx = createSummaryContext(database);
+    const persistSummary = (summary, summarizedUpTo, tokenCount) => database.write(async (writer) => {
+      assertConversationRevision(database, conversationId, revision2);
+      await writer.callWriter(
+        () => upsertConversationSummaryOp(
+          summaryCtx,
+          conversationId,
+          summary,
+          summarizedUpTo,
+          tokenCount
+        )
+      );
+    });
     let cachedSummary = await getConversationSummaryOp(summaryCtx, conversationId);
+    assertConversationRevision(database, conversationId, revision2);
     const lastCompacted = lastCompactionTime.get(conversationId) ?? 0;
     const compactionCooledDown = Date.now() - lastCompacted > COMPACTION_COOLDOWN_MS;
     if (cachedSummary && cachedSummary.tokenCount > summaryTokenThreshold * MAX_SUMMARY_TOKEN_RATIO && compactionCooledDown) {
@@ -29292,13 +29355,7 @@ async function doSummarizeHistory(options) {
         );
         const compactedSummary = redactor ? redactor.deAnonymize(rawCompacted) : rawCompacted;
         const compactedTokens = estimateTokens(compactedSummary);
-        await upsertConversationSummaryOp(
-          summaryCtx,
-          conversationId,
-          compactedSummary,
-          cachedSummary.summarizedUpTo,
-          compactedTokens
-        );
+        await persistSummary(compactedSummary, cachedSummary.summarizedUpTo, compactedTokens);
         cachedSummary = {
           ...cachedSummary,
           summary: compactedSummary,
@@ -29306,6 +29363,7 @@ async function doSummarizeHistory(options) {
         };
         lastCompactionTime.set(conversationId, Date.now());
       } catch {
+        assertConversationRevision(database, conversationId, revision2);
         lastCompactionTime.set(conversationId, Date.now());
         getLogger().warn(
           "[summarize] Summary compaction failed, proceeding with oversized summary"
@@ -29337,10 +29395,9 @@ async function doSummarizeHistory(options) {
       redactor,
       onPiiRedacted
     });
+    assertConversationRevision(database, conversationId, revision2);
     if (summarizeResult.didSummarize && summarizeResult.summary && summarizeResult.summarizedUpTo) {
-      await upsertConversationSummaryOp(
-        summaryCtx,
-        conversationId,
+      await persistSummary(
         summarizeResult.summary,
         summarizeResult.summarizedUpTo,
         summarizeResult.summaryTokenCount
@@ -29359,6 +29416,7 @@ async function doSummarizeHistory(options) {
       summarySystemMessage: summarizeResult.summary ? summaryToSystemMessage(summarizeResult.summary) : null
     };
   } catch (err) {
+    assertConversationRevision(database, conversationId, revision2);
     getLogger().warn("[summarize] Summarization failed, falling back to verbatim:", err);
     return { messagesToConvert: messages, summarySystemMessage: null };
   }