@anuma/sdk 10.0.2 → 10.0.3

package/dist/expo/index.mjs

@@ -1674,6 +1674,160 @@ async function assembleDecryptedMessage(message, address) {
   return result;
 }
 
+// src/lib/db/chat/models.ts
+import { Model as Model2 } from "@nozbe/watermelondb";
+import { date, field, json, text } from "@nozbe/watermelondb/decorators";
+var Message = class extends Model2 {
+};
+Message.table = "history";
+Message.associations = {
+  conversations: { type: "belongs_to", key: "conversation_id" },
+  media: { type: "has_many", foreignKey: "message_id" }
+};
+__decorateClass([
+  field("message_id")
+], Message.prototype, "messageId", 2);
+__decorateClass([
+  text("conversation_id")
+], Message.prototype, "conversationId", 2);
+__decorateClass([
+  text("role")
+], Message.prototype, "role", 2);
+__decorateClass([
+  text("content")
+], Message.prototype, "content", 2);
+__decorateClass([
+  text("model")
+], Message.prototype, "model", 2);
+__decorateClass([
+  text("image_model")
+], Message.prototype, "imageModel", 2);
+__decorateClass([
+  json("files", (raw) => raw)
+], Message.prototype, "files", 2);
+__decorateClass([
+  json("file_ids", (raw) => raw)
+], Message.prototype, "fileIds", 2);
+__decorateClass([
+  date("created_at")
+], Message.prototype, "createdAt", 2);
+__decorateClass([
+  date("updated_at")
+], Message.prototype, "updatedAt", 2);
+__decorateClass([
+  json("vector", (raw) => raw)
+], Message.prototype, "vector", 2);
+__decorateClass([
+  text("embedding_model")
+], Message.prototype, "embeddingModel", 2);
+__decorateClass([
+  json("chunks", (raw) => raw)
+], Message.prototype, "chunks", 2);
+__decorateClass([
+  json("usage", (raw) => raw)
+], Message.prototype, "usage", 2);
+__decorateClass([
+  json("sources", (raw) => raw)
+], Message.prototype, "sources", 2);
+__decorateClass([
+  field("response_duration")
+], Message.prototype, "responseDuration", 2);
+__decorateClass([
+  field("was_stopped")
+], Message.prototype, "wasStopped", 2);
+__decorateClass([
+  text("error")
+], Message.prototype, "error", 2);
+__decorateClass([
+  json("thought_process", (raw) => raw)
+], Message.prototype, "thoughtProcess", 2);
+__decorateClass([
+  text("thinking")
+], Message.prototype, "thinking", 2);
+__decorateClass([
+  text("parent_message_id")
+], Message.prototype, "parentMessageId", 2);
+__decorateClass([
+  text("feedback")
+], Message.prototype, "feedback", 2);
+__decorateClass([
+  json("tool_call_events", (raw) => raw)
+], Message.prototype, "toolCallEvents", 2);
+__decorateClass([
+  text("origin")
+], Message.prototype, "origin", 2);
+var Conversation = class extends Model2 {
+};
+Conversation.table = "conversations";
+Conversation.associations = {
+  history: { type: "has_many", foreignKey: "conversation_id" },
+  projects: { type: "belongs_to", key: "project_id" }
+};
+__decorateClass([
+  text("conversation_id")
+], Conversation.prototype, "conversationId", 2);
+__decorateClass([
+  text("title")
+], Conversation.prototype, "title", 2);
+__decorateClass([
+  text("project_id")
+], Conversation.prototype, "projectId", 2);
+__decorateClass([
+  date("created_at")
+], Conversation.prototype, "createdAt", 2);
+__decorateClass([
+  date("updated_at")
+], Conversation.prototype, "updatedAt", 2);
+__decorateClass([
+  field("is_deleted")
+], Conversation.prototype, "isDeleted", 2);
+__decorateClass([
+  date("pinned_at")
+], Conversation.prototype, "pinnedAt", 2);
+var ConversationSummary = class extends Model2 {
+};
+ConversationSummary.table = "conversation_summaries";
+ConversationSummary.associations = {
+  conversations: { type: "belongs_to", key: "conversation_id" }
+};
+__decorateClass([
+  text("conversation_id")
+], ConversationSummary.prototype, "conversationId", 2);
+__decorateClass([
+  text("summary")
+], ConversationSummary.prototype, "summary", 2);
+__decorateClass([
+  text("summarized_up_to")
+], ConversationSummary.prototype, "summarizedUpTo", 2);
+__decorateClass([
+  field("token_count")
+], ConversationSummary.prototype, "tokenCount", 2);
+__decorateClass([
+  date("created_at")
+], ConversationSummary.prototype, "createdAt", 2);
+__decorateClass([
+  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
 import { Q } from "@nozbe/watermelondb";
 function parseEventIds(value) {
@@ -2359,8 +2513,20 @@ 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(Q2.where("conversation_id", conversationId)).fetch();
+  for (const summary of summaries) {
+    if (changedMessageId !== void 0) {
+      const [boundary] = await ctx.messagesCollection.query(Q2.where("id", summary.summarizedUpTo), Q2.where("conversation_id", conversationId)).fetch();
+      if (boundary && changedMessageId > boundary.messageId) continue;
+    }
+    await summary.destroyPermanently();
+  }
+}
 async function clearMessagesOp(ctx, convId) {
   await ctx.database.write(async () => {
+    await invalidateConversationSummary(ctx, convId);
     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) {
@@ -2372,11 +2538,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) {
@@ -2387,6 +2554,7 @@ async function deleteMessageOp(ctx, uniqueId) {
     return null;
   }
   await ctx.database.write(async () => {
+    await invalidateConversationSummary(ctx, message.conversationId, message.messageId);
     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")));
@@ -2396,10 +2564,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;
 }
@@ -2818,6 +2987,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);
@@ -2862,6 +3039,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);
 }
@@ -4791,22 +4969,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 };
@@ -4821,7 +4999,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;
 }
@@ -10288,7 +10466,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;
@@ -10296,12 +10474,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;
@@ -10330,14 +10508,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,
@@ -10347,7 +10525,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,
@@ -10360,7 +10538,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) {
@@ -10583,7 +10761,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");
@@ -10657,12 +10835,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));
@@ -10853,141 +11031,6 @@ async function decryptConversationTitle(encryptedTitle, address) {
   }
 }
 
-// src/lib/db/chat/models.ts
-import { Model as Model2 } from "@nozbe/watermelondb";
-import { date, field, json as json2, text as text3 } from "@nozbe/watermelondb/decorators";
-var Message = class extends Model2 {
-};
-Message.table = "history";
-Message.associations = {
-  conversations: { type: "belongs_to", key: "conversation_id" },
-  media: { type: "has_many", foreignKey: "message_id" }
-};
-__decorateClass([
-  field("message_id")
-], Message.prototype, "messageId", 2);
-__decorateClass([
-  text3("conversation_id")
-], Message.prototype, "conversationId", 2);
-__decorateClass([
-  text3("role")
-], Message.prototype, "role", 2);
-__decorateClass([
-  text3("content")
-], Message.prototype, "content", 2);
-__decorateClass([
-  text3("model")
-], Message.prototype, "model", 2);
-__decorateClass([
-  text3("image_model")
-], Message.prototype, "imageModel", 2);
-__decorateClass([
-  json2("files", (raw) => raw)
-], Message.prototype, "files", 2);
-__decorateClass([
-  json2("file_ids", (raw) => raw)
-], Message.prototype, "fileIds", 2);
-__decorateClass([
-  date("created_at")
-], Message.prototype, "createdAt", 2);
-__decorateClass([
-  date("updated_at")
-], Message.prototype, "updatedAt", 2);
-__decorateClass([
-  json2("vector", (raw) => raw)
-], Message.prototype, "vector", 2);
-__decorateClass([
-  text3("embedding_model")
-], Message.prototype, "embeddingModel", 2);
-__decorateClass([
-  json2("chunks", (raw) => raw)
-], Message.prototype, "chunks", 2);
-__decorateClass([
-  json2("usage", (raw) => raw)
-], Message.prototype, "usage", 2);
-__decorateClass([
-  json2("sources", (raw) => raw)
-], Message.prototype, "sources", 2);
-__decorateClass([
-  field("response_duration")
-], Message.prototype, "responseDuration", 2);
-__decorateClass([
-  field("was_stopped")
-], Message.prototype, "wasStopped", 2);
-__decorateClass([
-  text3("error")
-], Message.prototype, "error", 2);
-__decorateClass([
-  json2("thought_process", (raw) => raw)
-], Message.prototype, "thoughtProcess", 2);
-__decorateClass([
-  text3("thinking")
-], Message.prototype, "thinking", 2);
-__decorateClass([
-  text3("parent_message_id")
-], Message.prototype, "parentMessageId", 2);
-__decorateClass([
-  text3("feedback")
-], Message.prototype, "feedback", 2);
-__decorateClass([
-  json2("tool_call_events", (raw) => raw)
-], Message.prototype, "toolCallEvents", 2);
-__decorateClass([
-  text3("origin")
-], Message.prototype, "origin", 2);
-var Conversation = class extends Model2 {
-};
-Conversation.table = "conversations";
-Conversation.associations = {
-  history: { type: "has_many", foreignKey: "conversation_id" },
-  projects: { type: "belongs_to", key: "project_id" }
-};
-__decorateClass([
-  text3("conversation_id")
-], Conversation.prototype, "conversationId", 2);
-__decorateClass([
-  text3("title")
-], Conversation.prototype, "title", 2);
-__decorateClass([
-  text3("project_id")
-], Conversation.prototype, "projectId", 2);
-__decorateClass([
-  date("created_at")
-], Conversation.prototype, "createdAt", 2);
-__decorateClass([
-  date("updated_at")
-], Conversation.prototype, "updatedAt", 2);
-__decorateClass([
-  field("is_deleted")
-], Conversation.prototype, "isDeleted", 2);
-__decorateClass([
-  date("pinned_at")
-], Conversation.prototype, "pinnedAt", 2);
-var ConversationSummary = class extends Model2 {
-};
-ConversationSummary.table = "conversation_summaries";
-ConversationSummary.associations = {
-  conversations: { type: "belongs_to", key: "conversation_id" }
-};
-__decorateClass([
-  text3("conversation_id")
-], ConversationSummary.prototype, "conversationId", 2);
-__decorateClass([
-  text3("summary")
-], ConversationSummary.prototype, "summary", 2);
-__decorateClass([
-  text3("summarized_up_to")
-], ConversationSummary.prototype, "summarizedUpTo", 2);
-__decorateClass([
-  field("token_count")
-], ConversationSummary.prototype, "tokenCount", 2);
-__decorateClass([
-  date("created_at")
-], ConversationSummary.prototype, "createdAt", 2);
-__decorateClass([
-  date("updated_at")
-], ConversationSummary.prototype, "updatedAt", 2);
-
 // src/lib/db/chat/schema.ts
 import { appSchema, tableSchema } from "@nozbe/watermelondb";
 import { addColumns, schemaMigrations } from "@nozbe/watermelondb/Schema/migrations";
@@ -27486,6 +27529,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 };
@@ -27526,7 +27576,7 @@ async function maybeSummarizeHistory(options) {
       clearTimeout(staleGuardTimerId);
     }
   }
-  const promise = doSummarizeHistory(options);
+  const promise = doSummarizeHistory(options, revision2);
   summarizationLocks.set(conversationId, promise);
   try {
     return await promise;
@@ -27540,7 +27590,7 @@ Summary to condense:
 {summary}
 
 Condensed summary:`;
-async function doSummarizeHistory(options) {
+async function doSummarizeHistory(options, revision2) {
   const {
     database,
     conversationId,
@@ -27555,7 +27605,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) {
@@ -27571,13 +27634,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,
@@ -27585,6 +27642,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"
@@ -27616,10 +27674,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
@@ -27638,6 +27695,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 };
   }