@vellumai/assistant 0.12.1 → 0.12.2-staging.2

package/src/plugins/defaults/memory/__tests__/memory-retrospective-trigger-check.test.ts

@@ -12,6 +12,8 @@ mock.module("../memory-retrospective-enqueue.js", () => ({
   },
 }));
 
+import { eq } from "drizzle-orm";
+
 import type { AssistantConfig } from "../../../../config/types.js";
 import { createConversation } from "../../../../persistence/conversation-crud.js";
 import {
@@ -307,3 +309,64 @@ describe("maybeEnqueueRetrospective — kind-aware accounting", () => {
     ]);
   });
 });
+
+// ---------------------------------------------------------------------------
+// maybeEnqueueRetrospective: the cursor survives a regenerated reply.
+//
+// The cursor normally lands on the latest assistant reply, and a regenerate
+// deletes exactly that row. With its `createdAt` persisted the cursor still
+// bounds the count, so the conversation keeps getting retrospectives.
+// ---------------------------------------------------------------------------
+
+describe("maybeEnqueueRetrospective: cursor survives a regenerated reply", () => {
+  beforeEach(() => {
+    resetTables();
+    enqueueCalls = [];
+  });
+
+  test("a regenerate that deletes the cursor's row does not stall the conversation", async () => {
+    const conv = createConversation("conv");
+    insertMessage(conv.id, { createdAt: 1_000 });
+    const reply = insertMessage(conv.id, {
+      role: "assistant",
+      createdAt: 2_000,
+    });
+    await upsertRetrospectiveState({
+      conversationId: conv.id,
+      lastProcessedMessageId: reply,
+      lastProcessedCreatedAt: 2_000,
+      lastRunAt: Date.now() - 24 * 60 * 60_000,
+    });
+    // Regenerate: the retry route discards the latest assistant turn, then
+    // a fresh reply and the next user message land.
+    getDb().delete(messages).where(eq(messages.id, reply)).run();
+    insertMessage(conv.id, { role: "assistant", createdAt: 3_000 });
+    insertMessage(conv.id, { createdAt: 4_000 });
+
+    maybeEnqueueRetrospective(conv.id, makeConfig());
+
+    expect(enqueueCalls).toEqual([
+      { conversationId: conv.id, trigger: "interval" },
+    ]);
+  });
+
+  test("a cursor written without a timestamp still goes quiet once its row is gone", async () => {
+    const conv = createConversation("conv");
+    insertMessage(conv.id, { createdAt: 1_000 });
+    const reply = insertMessage(conv.id, {
+      role: "assistant",
+      createdAt: 2_000,
+    });
+    await upsertRetrospectiveState({
+      conversationId: conv.id,
+      lastProcessedMessageId: reply,
+      lastRunAt: Date.now() - 24 * 60 * 60_000,
+    });
+    getDb().delete(messages).where(eq(messages.id, reply)).run();
+    insertMessage(conv.id, { createdAt: 4_000 });
+
+    maybeEnqueueRetrospective(conv.id, makeConfig());
+
+    expect(enqueueCalls).toEqual([]);
+  });
+});

package/src/plugins/defaults/memory/__tests__/shutdown-hook.test.ts

@@ -14,6 +14,10 @@ mock.module("../worker-control.js", () => ({
   },
 }));
 
+mock.module("../skill-md-mtime-poll.js", () => ({
+  stopWorkspaceSkillMdMtimePoll: () => {},
+}));
+
 const memoryShutdown = (await import("../hooks/shutdown.js")).default;
 
 describe("memory shutdown hook", () => {

package/src/plugins/defaults/memory/context-search/agent-runner.ts

@@ -7,6 +7,7 @@ import type {
 import { getConfiguredProvider } from "@vellumai/plugin-api";
 
 import { redactSecrets } from "../../../../security/secret-scanner.js";
+import { safeStringSlice } from "../host-utils.js";
 import {
   buildRecallAgentPromptBundle,
   FINISH_RECALL_TOOL_DEFINITION,
@@ -862,9 +863,9 @@ function compactText(text: string, maxChars: number): string {
     return compacted;
   }
   if (maxChars <= 3) {
-    return compacted.slice(0, maxChars);
+    return safeStringSlice(compacted, 0, maxChars);
   }
-  return `${compacted.slice(0, maxChars - 3).trimEnd()}...`;
+  return `${safeStringSlice(compacted, 0, maxChars - 3).trimEnd()}...`;
 }
 
 function dedupeEvidenceById(

package/src/plugins/defaults/memory/context-search/format.ts

@@ -1,3 +1,4 @@
+import { safeStringSlice } from "../host-utils.js";
 import type {
   DeterministicRecallSearchResult,
   DeterministicRecallSourceNote,
@@ -139,9 +140,9 @@ function compactText(text: string, maxChars: number): string {
     return compacted;
   }
   if (maxChars <= 3) {
-    return compacted.slice(0, maxChars);
+    return safeStringSlice(compacted, 0, maxChars);
   }
-  return `${compacted.slice(0, maxChars - 3).trimEnd()}...`;
+  return `${safeStringSlice(compacted, 0, maxChars - 3).trimEnd()}...`;
 }
 
 function dedupeStrings(values: readonly string[]): string[] {

package/src/plugins/defaults/memory/context-search/sources/memory-v2.ts

@@ -27,6 +27,7 @@ import { readdir, readFile, realpath, stat } from "node:fs/promises";
 import { extname, join } from "node:path";
 
 import { embedWithRetry } from "../../../../../persistence/embeddings/embed.js";
+import { safeStringSlice } from "../../host-utils.js";
 import { getLogger } from "../../logging.js";
 import { isPathInsideRoot } from "../../path-containment.js";
 import { getEdgeIndex } from "../../substrate/edge-index.js";
@@ -518,9 +519,11 @@ function buildLexicalExcerpt(
   if (focusedLine.length <= MEMORY_V2_LEXICAL_EXCERPT_MAX_CHARS) {
     return focusedLine;
   }
-  return `${focusedLine
-    .slice(0, MEMORY_V2_LEXICAL_EXCERPT_MAX_CHARS - 3)
-    .trimEnd()}...`;
+  return `${safeStringSlice(
+    focusedLine,
+    0,
+    MEMORY_V2_LEXICAL_EXCERPT_MAX_CHARS - 3,
+  ).trimEnd()}...`;
 }
 
 function toLexicalEvidence(match: MemoryV2LexicalMatch): RecallEvidence {

package/src/plugins/defaults/memory/context-search/sources/workspace.ts

@@ -1,6 +1,7 @@
 import { readdir, readFile, realpath, stat } from "node:fs/promises";
 import { extname, isAbsolute, join, relative, sep } from "node:path";
 
+import { safeStringSlice } from "../../host-utils.js";
 import { isPathInsideRoot } from "../../path-containment.js";
 import type {
   RecallEvidence,
@@ -924,7 +925,7 @@ function buildExcerpt(lines: readonly string[], lineIndex: number): string {
     return focusedLine;
   }
 
-  return `${focusedLine.slice(0, EXCERPT_MAX_CHARS - 3).trimEnd()}...`;
+  return `${safeStringSlice(focusedLine, 0, EXCERPT_MAX_CHARS - 3).trimEnd()}...`;
 }
 
 function buildSectionExcerpt(
@@ -942,7 +943,7 @@ function buildSectionExcerpt(
     return excerpt;
   }
 
-  return `${excerpt.slice(0, SECTION_EXCERPT_MAX_CHARS - 3).trimEnd()}...`;
+  return `${safeStringSlice(excerpt, 0, SECTION_EXCERPT_MAX_CHARS - 3).trimEnd()}...`;
 }
 
 function buildStructuredJsonExcerpt(contents: string): string {

package/src/plugins/defaults/memory/graph/capability-seed.ts

@@ -16,6 +16,7 @@ import {
   loadSkillCatalog,
   type SkillSummary,
 } from "../../../../config/skills.js";
+import { loadWorkspaceMcpConfig } from "../../../../mcp/workspace-mcp-config.js";
 import {
   enqueueMemoryJob,
   upsertEmbedGraphNodeJob,
@@ -25,6 +26,7 @@ import {
   getCachedCatalogSync,
   getCatalog,
 } from "../../../../skills/catalog-cache.js";
+import { safeStringSlice } from "../host-utils.js";
 import { getLogger } from "../logging.js";
 import { memoryDbOrNull } from "../memory-db.js";
 import type { SkillCapabilityInput } from "../substrate/skill-content.js";
@@ -131,12 +133,9 @@ export function seedSkillGraphNodes(): void {
       const input = fromSkillSummary(summary);
 
       if (summary.id === "mcp-setup") {
-        const servers = config.mcp?.servers;
-        if (servers) {
-          const names = Object.keys(servers);
-          if (names.length > 0) {
-            input.description += ` Configured: ${names.join(", ")}`;
-          }
+        const names = Object.keys(loadWorkspaceMcpConfig().servers);
+        if (names.length > 0) {
+          input.description += ` Configured: ${names.join(", ")}`;
         }
       }
 
@@ -247,7 +246,7 @@ function buildSkillContent(input: SkillCapabilityInput): string {
     content += ` Avoid when: ${input.avoidWhen.join("; ")}.`;
   }
   if (content.length > 500) {
-    content = content.slice(0, 500);
+    content = safeStringSlice(content, 0, 500);
   }
   return content;
 }

package/src/plugins/defaults/memory/hooks/init.ts

@@ -17,6 +17,7 @@ import type { HookFunction, InitContext } from "@vellumai/plugin-api";
 import { getConfig } from "../../../../config/loader.js";
 import { registerMemoryPluginJobHandlers } from "../job-handler-registration.js";
 import { getLogger } from "../logging.js";
+import { backfillRetrospectiveCursorTimestamps } from "../memory-retrospective-cursor-backfill.js";
 import { runMemoryStartup } from "../startup.js";
 import { ensureMemoryV3PluginSchema } from "../v3/plugin-schema.js";
 
@@ -30,6 +31,15 @@ const init: HookFunction<InitContext> = async () => {
   // against an empty table and failed as an unknown type.
   registerMemoryPluginJobHandlers();
 
+  // Retrospective cursors written before the timestamp column existed can
+  // only be completed while their message rows still exist, so start the
+  // fill at boot, ahead of any client regenerating a reply. Detached and
+  // fail-open like the rest of memory startup; the memory worker runs the
+  // same idempotent pass as a second chance.
+  void backfillRetrospectiveCursorTimestamps().catch((err) =>
+    log.warn({ err }, "Retrospective cursor timestamp backfill failed"),
+  );
+
   // The memory-v3 plugin-owned schema on the memory connection
   // (`v3/plugin-schema.ts`): the pools and injected-sections tables and the
   // selection log's `section_key` column, ensured idempotently on every

package/src/plugins/defaults/memory/hooks/message-deleted.ts

@@ -0,0 +1,21 @@
+/**
+ * Default `memory` message-deleted hook.
+ *
+ * Stamps the conversation's retrospective cursor with the deleted row's
+ * `createdAt` when the cursor points at that row and was written without a
+ * timestamp (by a build before the column existed). The cursor usually sits
+ * on the latest assistant reply, which is exactly the row a regenerate
+ * deletes, and once the row is gone only the timestamp can place it.
+ */
+
+import type { HookFunction, MessageDeletedContext } from "@vellumai/plugin-api";
+
+import { preserveRetrospectiveCursorTimestamps } from "../memory-retrospective-cursor-preserve.js";
+
+const messageDeleted: HookFunction<MessageDeletedContext> = async (ctx) => {
+  await preserveRetrospectiveCursorTimestamps(ctx.conversationId, [
+    { id: ctx.messageId, createdAt: ctx.createdAt },
+  ]);
+};
+
+export default messageDeleted;

package/src/plugins/defaults/memory/hooks/shutdown.ts

@@ -9,9 +9,11 @@
 
 import type { HookFunction, ShutdownContext } from "@vellumai/plugin-api";
 
+import { stopWorkspaceSkillMdMtimePoll } from "../skill-md-mtime-poll.js";
 import { stopMemoryWorkerProcess } from "../worker-control.js";
 
 const shutdown: HookFunction<ShutdownContext> = async () => {
+  stopWorkspaceSkillMdMtimePoll();
   stopMemoryWorkerProcess();
 };
 

package/src/plugins/defaults/memory/host-utils.ts

@@ -25,6 +25,7 @@ import type { SqliteRetryOptions } from "../../../util/sqlite-retry.js";
 import * as hostSqliteRetry from "../../../util/sqlite-retry.js";
 import * as hostStripCommentLines from "../../../util/strip-comment-lines.js";
 import * as hostTruncate from "../../../util/truncate.js";
+import * as hostUnicode from "../../../util/unicode.js";
 import * as hostWorkerCompute from "../../../util/worker-compute.js";
 import * as hostWorkerMemory from "../../../util/worker-memory.js";
 
@@ -76,6 +77,15 @@ export function truncate(str: string, maxLen: number, suffix?: string): string {
     : hostTruncate.truncate(str, maxLen, suffix);
 }
 
+/** `String.prototype.slice` that never cuts a UTF-16 surrogate pair in half. */
+export function safeStringSlice(
+  str: string,
+  start?: number,
+  end?: number,
+): string {
+  return hostUnicode.safeStringSlice(str, start, end);
+}
+
 export function workerMemoryEnv(): Record<string, string | undefined> {
   return hostWorkerMemory.workerMemoryEnv();
 }

package/src/plugins/defaults/memory/jobs-worker.ts

@@ -62,6 +62,7 @@ import {
 import { isJobQueueResolution, type JobHandler } from "../../types.js";
 import { sweepOrphanConversationMemoryTables } from "./conversation-memory-orphan-sweep.js";
 import { getLogger } from "./logging.js";
+import { backfillRetrospectiveCursorTimestamps } from "./memory-retrospective-cursor-backfill.js";
 import { sweepOrphanMemoryRetrospectiveConversations } from "./memory-retrospective-startup-cleanup.js";
 import { getWorkspaceDir } from "./paths.js";
 // SUBSTRATE (v2+v3) — feeds `enqueueSubstrateMaintenanceJobs`.
@@ -259,6 +260,18 @@ export function startMemoryJobsWorkerLoop(): MemoryJobsWorker {
     );
   });
 
+  // Second chance for the cursor timestamp backfill the daemon's memory init
+  // hook starts at boot: rows written before the column existed get their
+  // `createdAt` so a later deletion of the row they point at (a regenerated
+  // reply) cannot stall the conversation's retrospectives. Idempotent,
+  // detached, and best-effort, same as the sweeps.
+  void backfillRetrospectiveCursorTimestamps().catch((err: unknown) => {
+    log.warn(
+      { err },
+      "Retrospective cursor timestamp backfill failed; continuing worker startup",
+    );
+  });
+
   // Also catch up on relocated conversation-keyed tables orphaned while the
   // plugin was disabled: with memory off, the conversation-deleted hook never
   // fired, so deletes during that window left rows behind (the pre-Wave-2 main

package/src/plugins/defaults/memory/memory-retrospective-accounting.ts

@@ -31,7 +31,7 @@
 // accounting; once newer real messages arrive it is copied into the next
 // run's fork as inert prefix context.
 
-import { and, eq, gt, like, or } from "drizzle-orm";
+import { and, eq, like, or } from "drizzle-orm";
 
 import {
   countMessagesAfter,
@@ -43,6 +43,11 @@ import {
   SIGHT_FRAME_ATTACHMENT_IDS_KEY,
 } from "../../../persistence/conversation-types.js";
 import { getDb } from "../../../persistence/db-connection.js";
+import {
+  messagesAfterBoundFilter,
+  type MessagesAfterRef,
+  resolveMessagesAfterBound,
+} from "../../../persistence/message-cursor.js";
 import { messages } from "../../../persistence/schema/index.js";
 import { SKILL_CARD_MESSAGE_KIND } from "./memory-retrospective-constants.js";
 
@@ -98,9 +103,9 @@ export function isSkillCardMessage(row: { metadata: string | null }): boolean {
  */
 export function getRetrospectiveMessagesAfter(
   conversationId: string,
-  afterMessageId: string | null,
+  after: MessagesAfterRef,
 ): MessageRow[] {
-  const rows = getMessagesAfter(conversationId, afterMessageId);
+  const rows = getMessagesAfter(conversationId, after);
   const firstUnfinalized = rows.findIndex((row) => row.finalized !== 1);
   const bounded =
     firstUnfinalized === -1 ? rows : rows.slice(0, firstUnfinalized);
@@ -116,13 +121,13 @@ export function getRetrospectiveMessagesAfter(
  */
 export function countRetrospectiveMessagesAfter(
   conversationId: string,
-  afterMessageId: string | null,
+  after: MessagesAfterRef,
 ): number {
-  const total = countMessagesAfter(conversationId, afterMessageId);
+  const total = countMessagesAfter(conversationId, after);
   if (total === 0) {
     return 0;
   }
-  const excluded = countExcludedMessagesAfter(conversationId, afterMessageId);
+  const excluded = countExcludedMessagesAfter(conversationId, after);
   return Math.max(0, total - excluded);
 }
 
@@ -167,7 +172,8 @@ export function messagesHaveUserActivity(
  * a non-tool_result block. Powers the `memory.retrospective.requireUserActivity`
  * enqueue gate, so only user rows are loaded. Cursor semantics mirror
  * `countMessagesAfter`: a null/`""` reference scans the whole conversation,
- * and a vanished reference means no new work.
+ * a cursor whose row is gone falls back to the timestamp it carries, and a
+ * bare id whose row is gone means no new work.
  *
  * Operates on the raw `content` column: rows that do not parse to a block
  * array (file-backed `{ ref }` rows, legacy plain strings) count as
@@ -177,37 +183,15 @@ export function messagesHaveUserActivity(
  */
 export function hasQualifyingUserMessageAfter(
   conversationId: string,
-  afterMessageId: string | null,
+  after: MessagesAfterRef,
 ): boolean {
-  const cursorId =
-    afterMessageId === null || afterMessageId === "" ? null : afterMessageId;
-  const db = getDb();
-
-  let ref: { createdAt: number } | undefined;
-  if (cursorId !== null) {
-    ref = db
-      .select({ createdAt: messages.createdAt })
-      .from(messages)
-      .where(eq(messages.id, cursorId))
-      .get();
-    if (!ref) {
-      return false;
-    }
+  const start = resolveMessagesAfterBound(after);
+  if (start.kind === "vanished") {
+    return false;
   }
-
   const afterCursor =
-    cursorId !== null && ref
-      ? [
-          or(
-            gt(messages.createdAt, ref.createdAt),
-            and(
-              eq(messages.createdAt, ref.createdAt),
-              gt(messages.id, cursorId),
-            ),
-          ),
-        ]
-      : [];
-  const rows = db
+    start.kind === "after" ? [messagesAfterBoundFilter(start.bound)] : [];
+  const rows = getDb()
     .select({ content: messages.content, metadata: messages.metadata })
     .from(messages)
     .where(
@@ -248,18 +232,14 @@ function rawUserContentCarriesActivity(raw: string | null): boolean {
  * — at most one per successful retrospective run); each candidate is then
  * JSON-verified by {@link isSkillCardMessage} so an incidental substring
  * match in unrelated metadata can never exclude a real message from
- * accounting. The cursor comparison mirrors `countMessagesAfter`'s
- * tie-breaker semantics, including the null/`""` "count everything" cases
- * and the vanished-reference "no new work" case.
+ * accounting. The cursor resolves exactly as `countMessagesAfter`'s does,
+ * including the null/`""` "count everything" cases and the vanished-reference
+ * "no new work" case.
  */
 function countExcludedMessagesAfter(
   conversationId: string,
-  afterMessageId: string | null,
+  after: MessagesAfterRef,
 ): number {
-  // The `""` sentinel (failure-only state rows) counts everything, matching
-  // `countMessagesAfter`.
-  const cursorId =
-    afterMessageId === null || afterMessageId === "" ? null : afterMessageId;
   const db = getDb();
   const candidates = db
     .select({
@@ -282,18 +262,11 @@ function countExcludedMessagesAfter(
     return 0;
   }
 
-  let ref: { createdAt: number } | undefined;
-  if (cursorId !== null) {
-    ref = db
-      .select({ createdAt: messages.createdAt })
-      .from(messages)
-      .where(eq(messages.id, cursorId))
-      .get();
-    // Vanished reference: `countMessagesAfter` reported 0, so there is
-    // nothing to subtract from.
-    if (!ref) {
-      return 0;
-    }
+  const start = resolveMessagesAfterBound(after);
+  // Vanished reference: `countMessagesAfter` reported 0, so there is nothing
+  // to subtract from.
+  if (start.kind === "vanished") {
+    return 0;
   }
 
   let count = 0;
@@ -301,11 +274,12 @@ function countExcludedMessagesAfter(
     if (!isExcludedFromRetrospectiveAccounting(row)) {
       continue;
     }
-    if (cursorId !== null && ref) {
-      const after =
-        row.createdAt > ref.createdAt ||
-        (row.createdAt === ref.createdAt && row.id > cursorId);
-      if (!after) {
+    if (start.kind === "after") {
+      const { createdAt, id } = start.bound;
+      const isAfter =
+        row.createdAt > createdAt ||
+        (row.createdAt === createdAt && row.id > id);
+      if (!isAfter) {
         continue;
       }
     }

package/src/plugins/defaults/memory/memory-retrospective-cursor-backfill.ts

@@ -0,0 +1,126 @@
+// ---------------------------------------------------------------------------
+// Memory retrospective: cursor timestamp backfill.
+// ---------------------------------------------------------------------------
+//
+// State rows written before `last_processed_created_at` existed carry an
+// id-only cursor, which stops bounding reads the moment its row is deleted
+// (see `memory-retrospective-state.ts`). This pass copies `createdAt` from
+// each such row's message while the message still exists. Rows whose message
+// is already gone stay NULL: nothing remains to recover, and they are counted
+// so the stall is visible in the log. Runs detached at daemon init (ahead of
+// any client regenerating a reply) and again at memory-worker startup;
+// idempotent, keyset-paginated by conversation id, and yielding between pages.
+
+import { and, asc, eq, gt, isNull, ne } from "drizzle-orm";
+
+import { messageCreatedAtByIds } from "../../../persistence/message-reads.js";
+import { memoryRetrospectiveState } from "../../../persistence/schema/index.js";
+import { withSqliteRetry } from "./host-utils.js";
+import { getLogger } from "./logging.js";
+import { memoryDbOrNull } from "./memory-db.js";
+import { ensureRetrospectiveCursorColumn } from "./memory-retrospective-state.js";
+
+const log = getLogger("memory-retrospective-cursor-backfill");
+
+const DEFAULT_PAGE_SIZE = 500;
+
+export interface CursorBackfillResult {
+  /** Rows with a cursor id but no timestamp. */
+  scanned: number;
+  /** Rows whose message still exists and received its `createdAt`. */
+  backfilled: number;
+  /** Rows whose cursor message no longer exists; left NULL. */
+  unrecoverable: number;
+}
+
+/**
+ * Fill `last_processed_created_at` on every state row that has a cursor id
+ * but no timestamp. Best-effort: a missing memory connection or column is a
+ * no-op, and a row the job rewrites mid-pass is skipped by the update's
+ * `IS NULL` guard rather than stomped. Pages by conversation id so a large
+ * backlog never materializes at once or holds the event loop.
+ */
+export async function backfillRetrospectiveCursorTimestamps(opts?: {
+  pageSize?: number;
+}): Promise<CursorBackfillResult> {
+  const pageSize = opts?.pageSize ?? DEFAULT_PAGE_SIZE;
+  const result: CursorBackfillResult = {
+    scanned: 0,
+    backfilled: 0,
+    unrecoverable: 0,
+  };
+  const context = "backfillRetrospectiveCursorTimestamps";
+  const mdb = memoryDbOrNull(context);
+  if (!mdb || !ensureRetrospectiveCursorColumn(context)) {
+    return result;
+  }
+
+  let afterConversationId = "";
+  for (;;) {
+    const page = mdb
+      .select({
+        conversationId: memoryRetrospectiveState.conversationId,
+        messageId: memoryRetrospectiveState.lastProcessedMessageId,
+      })
+      .from(memoryRetrospectiveState)
+      .where(
+        and(
+          isNull(memoryRetrospectiveState.lastProcessedCreatedAt),
+          ne(memoryRetrospectiveState.lastProcessedMessageId, ""),
+          gt(memoryRetrospectiveState.conversationId, afterConversationId),
+        ),
+      )
+      .orderBy(asc(memoryRetrospectiveState.conversationId))
+      .limit(pageSize)
+      .all();
+    if (page.length === 0) {
+      break;
+    }
+    afterConversationId = page[page.length - 1]!.conversationId;
+    result.scanned += page.length;
+
+    const createdAtById = messageCreatedAtByIds(
+      page.map((row) => row.messageId),
+    );
+    const recoverable = page.flatMap((row) => {
+      const createdAt = createdAtById.get(row.messageId);
+      return createdAt === undefined ? [] : [{ ...row, createdAt }];
+    });
+    result.unrecoverable += page.length - recoverable.length;
+
+    if (recoverable.length > 0) {
+      await withSqliteRetry(
+        () => {
+          mdb.transaction((tx) => {
+            for (const row of recoverable) {
+              tx.update(memoryRetrospectiveState)
+                .set({ lastProcessedCreatedAt: row.createdAt })
+                .where(
+                  and(
+                    eq(
+                      memoryRetrospectiveState.conversationId,
+                      row.conversationId,
+                    ),
+                    eq(
+                      memoryRetrospectiveState.lastProcessedMessageId,
+                      row.messageId,
+                    ),
+                    isNull(memoryRetrospectiveState.lastProcessedCreatedAt),
+                  ),
+                )
+                .run();
+            }
+          });
+        },
+        { op: context, context: { afterConversationId } },
+      );
+      result.backfilled += recoverable.length;
+    }
+    await Bun.sleep(0);
+  }
+
+  if (result.backfilled > 0 || result.unrecoverable > 0) {
+    log.info(result, "Retrospective cursor timestamps backfilled");
+  }
+  return result;
+}