@vellumai/assistant 0.12.0 → 0.12.1-staging.1

package/src/persistence/conversation-crud.ts

@@ -35,7 +35,10 @@ import { findConversation } from "../daemon/conversation-registry.js";
 import { conversationMetadataSyncTag } from "../daemon/message-types/sync.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
 import { clearAllConversationIds } from "../home/feed-writer.js";
-import type { ConversationDeletedInputContext } from "../hooks/types.js";
+import type {
+  ConversationDeletedInputContext,
+  MessageDeletedInputContext,
+} from "../hooks/types.js";
 import { readProviderMetadata } from "../messaging/read-provider-metadata.js";
 import { HOOKS } from "../plugin-api/constants.js";
 import { forkConversationMemory } from "../plugins/defaults/memory/fork-conversation-memory.js";
@@ -81,7 +84,6 @@ import { ensureDisplayOrderMigration } from "./conversation-display-order-migrat
 import { ensureGroupMigration } from "./conversation-group-migration.js";
 import {
   isReferentialFork,
-  type LineageBound,
   type LineageConversationRow,
   lineageMessageFilter,
   lineageMessagesAfterFilter,
@@ -121,6 +123,11 @@ import {
 } from "./job-handlers/message-lexical.js";
 import { buildLifecycleTelemetryEvent } from "./lifecycle-events-store.js";
 import { resolveMessageContentBlocks } from "./message-content-file.js";
+import {
+  loadMessageBound,
+  type MessagesAfterRef,
+  resolveMessagesAfterBound,
+} from "./message-cursor.js";
 import { mergeMessageMetadata } from "./message-metadata.js";
 import {
   rawAll,
@@ -2641,16 +2648,6 @@ function loadLineageRow(id: string): LineageConversationRow | null {
   return row ?? null;
 }
 
-/** The `(createdAt, id)` bound of a single message, or null when it is gone. */
-function loadMessageBound(messageId: string): LineageBound | null {
-  const row = getDb()
-    .select({ createdAt: messages.createdAt, id: messages.id })
-    .from(messages)
-    .where(eq(messages.id, messageId))
-    .get();
-  return row ?? null;
-}
-
 /**
  * The segments making up a conversation's logical message set. Non-forks and
  * copied forks resolve to a single unbounded segment after one row lookup, so
@@ -2972,81 +2969,67 @@ export function selectNewestSightFrameCapture(
 }
 
 /**
- * Count messages in a conversation that were created strictly after the
- * `afterMessageId` reference message. If `afterMessageId` is `null` or empty,
- * counts all messages in the conversation. If the referenced message no
- * longer exists (e.g. deleted by a separate flow), returns 0 — callers
- * decide how to react to a vanished reference, and the conservative answer
- * here is "no new work."
+ * Count messages in a conversation created strictly after the `after`
+ * reference. `null`, `""`, or a cursor with an empty id counts every message.
+ * The reference resolves through `resolveMessagesAfterBound`: a live row's
+ * `(createdAt, id)` is authoritative, a `MessageCursor` whose row has been
+ * deleted still bounds the count from the `createdAt` it carries, and a bare
+ * id whose row is gone counts 0: a caller holding only an id has no
+ * defensible starting point, and the conservative answer is "no new work."
  *
  * Used by the memory-retrospective trigger check to decide whether to fire
  * the message-count trigger without loading message bodies.
  */
 export function countMessagesAfter(
   conversationId: string,
-  afterMessageId: string | null,
+  after: MessagesAfterRef,
 ): number {
   const db = getDb();
   const segments = resolveLineage(conversationId);
-  if (afterMessageId === null || afterMessageId === "") {
-    const row = db
-      .select({ c: count() })
-      .from(messages)
-      .where(lineageMessageFilter(segments))
-      .get();
-    return row?.c ?? 0;
-  }
-  const ref = loadMessageBound(afterMessageId);
-  if (!ref) {
+  const start = resolveMessagesAfterBound(after);
+  if (start.kind === "vanished") {
     return 0;
   }
-  // Tie-breaker on `messages.id` so rows that share a millisecond timestamp
-  // with the reference are not permanently skipped. Mirrors the
-  // `(createdAt, id)` cursor pattern used by the backfill job-handler and
-  // turn-events-store.
   const row = db
     .select({ c: count() })
     .from(messages)
-    .where(lineageMessagesAfterFilter(segments, ref))
+    .where(
+      start.kind === "all"
+        ? lineageMessageFilter(segments)
+        : lineageMessagesAfterFilter(segments, start.bound),
+    )
     .get();
   return row?.c ?? 0;
 }
 
 /**
- * Return messages in a conversation created strictly after the
- * `afterMessageId` reference. If the reference is `null`/empty, returns all
- * messages. If the reference doesn't exist, returns an empty array (mirrors
- * `countMessagesAfter`'s conservative semantics). Used by the
- * memory-retrospective job handler to load the message slice it processes.
+ * Return messages in a conversation created strictly after the `after`
+ * reference, in `(createdAt, id)` order. Resolves the reference exactly as
+ * `countMessagesAfter` does, returning an empty array where that returns 0.
+ * Used by the memory-retrospective job handler to load the message slice it
+ * processes.
  */
 export function getMessagesAfter(
   conversationId: string,
-  afterMessageId: string | null,
+  after: MessagesAfterRef,
 ): MessageRow[] {
   const db = getDb();
   const segments = resolveLineage(conversationId);
-  if (afterMessageId === null || afterMessageId === "") {
-    // Secondary `asc(messages.id)` matches the non-null path's cursor
-    // ordering, so callers tracking `cutoffMessageId` across runs see a
-    // consistent ordering when multiple rows share a millisecond timestamp.
-    return db
-      .select()
-      .from(messages)
-      .where(lineageMessageFilter(segments))
-      .orderBy(asc(messages.createdAt), asc(messages.id))
-      .all()
-      .map(parseMessage);
-  }
-  const ref = loadMessageBound(afterMessageId);
-  if (!ref) {
+  const start = resolveMessagesAfterBound(after);
+  if (start.kind === "vanished") {
     return [];
   }
-  // Same `(createdAt, id)` cursor as `countMessagesAfter` — rows sharing
-  // the reference's millisecond timestamp would otherwise be skipped.
+  // Secondary `asc(messages.id)` mirrors the bound's tie-breaker, so callers
+  // tracking `cutoffMessageId` across runs see a consistent ordering when
+  // multiple rows share a millisecond timestamp.
   return db
     .select()
     .from(messages)
-    .where(lineageMessagesAfterFilter(segments, ref))
+    .where(
+      start.kind === "all"
+        ? lineageMessageFilter(segments)
+        : lineageMessagesAfterFilter(segments, start.bound),
+    )
     .orderBy(asc(messages.createdAt), asc(messages.id))
     .all()
     .map(parseMessage);
@@ -4304,12 +4287,12 @@ export function deleteLastExchange(conversationId: string): number {
 
   // Collect attachment IDs linked to the messages being deleted so we can
   // scope orphan cleanup to only those candidates (not freshly uploaded ones).
-  const messageIds = db
-    .select({ id: messages.id })
+  const deletedRows = db
+    .select({ id: messages.id, createdAt: messages.createdAt })
     .from(messages)
     .where(condition)
-    .all()
-    .map((r) => r.id);
+    .all();
+  const messageIds = deletedRows.map((r) => r.id);
   const candidateAttachmentIds =
     messageIds.length > 0
       ? db
@@ -4356,6 +4339,17 @@ export function deleteLastExchange(conversationId: string): number {
     enqueueDeleteMessageLexical(deletedMessageId);
   }
 
+  // Notify `message-deleted` hooks for each removed row, as the
+  // single-message primitive does: undo removes the same tail a regenerate
+  // does, and a hook keeping a cursor on one of these rows needs its position.
+  for (const row of deletedRows) {
+    void runHook(HOOKS.MESSAGE_DELETED, {
+      conversationId,
+      messageId: row.id,
+      createdAt: row.createdAt,
+    } satisfies MessageDeletedInputContext);
+  }
+
   return deleted;
 }
 
@@ -4594,9 +4588,13 @@ export function deleteMessageById(
     .map((r) => r.attachmentId)
     .filter((id): id is string => id !== undefined);
 
-  // Look up the conversation before the transaction so we can recalculate lastMessageAt.
+  // Look up the conversation before the transaction so we can recalculate
+  // lastMessageAt, and the row's createdAt for the `message-deleted` hook.
   const msgRow = db
-    .select({ conversationId: messages.conversationId })
+    .select({
+      conversationId: messages.conversationId,
+      createdAt: messages.createdAt,
+    })
     .from(messages)
     .where(eq(messages.id, messageId))
     .get();
@@ -4652,6 +4650,16 @@ export function deleteMessageById(
   // not go through the conversation-level purge.
   if (msgRow) {
     enqueueDeleteMessageLexical(messageId);
+
+    // Notify `message-deleted` hooks (e.g. the memory plugin stamping a
+    // retrospective cursor that sat on this row). Fire-and-forget from this
+    // synchronous primitive, like `conversation-deleted`; the context carries
+    // the row's position because the row itself is gone.
+    void runHook(HOOKS.MESSAGE_DELETED, {
+      conversationId: msgRow.conversationId,
+      messageId,
+      createdAt: msgRow.createdAt,
+    } satisfies MessageDeletedInputContext);
   }
 
   return result;

package/src/persistence/conversation-lineage.ts

@@ -227,9 +227,17 @@ export function lineageMessagesAfterFilter(
 ): SQL {
   return and(
     lineageMessageFilter(segments),
-    or(
-      gt(messages.createdAt, after.createdAt),
-      and(eq(messages.createdAt, after.createdAt), gt(messages.id, after.id)),
-    ),
+    messagesAfterBoundFilter(after),
+  ) as SQL;
+}
+
+/**
+ * Predicate for rows strictly after a `(createdAt, id)` bound, with the id
+ * tie-breaker so rows sharing the bound's millisecond keep their order.
+ */
+export function messagesAfterBoundFilter(after: LineageBound): SQL {
+  return or(
+    gt(messages.createdAt, after.createdAt),
+    and(eq(messages.createdAt, after.createdAt), gt(messages.id, after.id)),
   ) as SQL;
 }

package/src/persistence/conversation-title-placeholders.ts

@@ -0,0 +1,23 @@
+import { isMessageKey } from "../i18n/index.js";
+
+const REPLACEABLE_PATTERNS = [
+  /^Runtime:\s/,
+  /^New Conversation$/,
+  /^Untitled$/,
+  /^Untitled Conversation$/,
+  /^Generating title\.\.\.$/,
+];
+
+/**
+ * Check whether a title is a system-generated placeholder that can be
+ * replaced or omitted without discarding user-provided copy.
+ */
+export function isReplaceableTitle(title: string | null): boolean {
+  if (title == null || title.trim() === "") {
+    return true;
+  }
+  if (isMessageKey(title.trim())) {
+    return true;
+  }
+  return REPLACEABLE_PATTERNS.some((pattern) => pattern.test(title));
+}

package/src/persistence/conversation-title-service.ts

@@ -8,6 +8,7 @@
  */
 
 import { SEND_USER_MESSAGE_DELIVERED_ACK } from "../config/send-user-message-constants.js";
+import { MESSAGE_KEYS } from "../i18n/index.js";
 import {
   requestShortLabel,
   type ShortLabelTool,
@@ -24,8 +25,11 @@ import {
   type MessageRow,
   updateConversationTitle,
 } from "./conversation-crud.js";
+import { isReplaceableTitle } from "./conversation-title-placeholders.js";
 import { projectPersistedAssistantContent } from "./user-facing-content.js";
 
+export { isReplaceableTitle } from "./conversation-title-placeholders.js";
+
 const log = getLogger("conversation-title-service");
 
 // ── Types ────────────────────────────────────────────────────────────
@@ -65,8 +69,8 @@ export interface TitleContext {
 
 // ── Placeholder / loading state ──────────────────────────────────────
 
-export const GENERATING_TITLE = "Generating title...";
-const UNTITLED_FALLBACK = "Untitled Conversation";
+export const GENERATING_TITLE = MESSAGE_KEYS.CONVERSATION_TITLE_GENERATING;
+const UNTITLED_FALLBACK = MESSAGE_KEYS.CONVERSATION_TITLE_UNTITLED;
 
 // ── `conversations.isAutoTitle` values ───────────────────────────────
 //
@@ -83,28 +87,6 @@ export const AUTO_TITLE_LLM = 1;
  */
 export const AUTO_TITLE_DETERMINISTIC = 2;
 
-// ── Replaceability check ─────────────────────────────────────────────
-
-const REPLACEABLE_PATTERNS = [
-  /^Runtime:\s/,
-  /^New Conversation$/,
-  /^Untitled$/,
-  /^Untitled Conversation$/,
-  /^Generating title\.\.\.$/,
-];
-
-/**
- * Check whether a title is a system-generated placeholder that can be
- * safely overwritten by auto-generated titles. Returns `false` for
- * user-provided custom titles.
- */
-export function isReplaceableTitle(title: string | null): boolean {
-  if (title == null || title.trim() === "") {
-    return true;
-  }
-  return REPLACEABLE_PATTERNS.some((pattern) => pattern.test(title));
-}
-
 /**
  * Whether auto-generation may overwrite the conversation's current title.
  * True for placeholder/system titles and for deterministic bootstrap titles
@@ -255,7 +237,7 @@ function settleForDeterministicTitle(
  * conversation creation (e.g. 5 new chats in quick succession) fires N
  * concurrent requests that can hit provider rate limits or contend for
  * API capacity, causing later calls to time out and fall back to
- * "Untitled Conversation".
+ * the untitled catalog key.
  *
  * A serial queue ensures at most one title-generation LLM call is
  * in-flight at a time. Each call is lightweight (~1–3 s for a ≤5-word
@@ -289,7 +271,7 @@ export function queueGenerateConversationTitle(
       // Replace loading placeholder with a retryable fallback.
       try {
         const conversation = getConversation(params.conversationId);
-        if (conversation && conversation.title === GENERATING_TITLE) {
+        if (conversation && isReplaceableTitle(conversation.title)) {
           const fallback =
             deriveFallbackTitle(params.context) ?? UNTITLED_FALLBACK;
           updateConversationTitle(
@@ -424,6 +406,7 @@ function buildTitleSystemPrompt(): string {
     "- Think: what would make a scannable sidebar label?",
     "- Do NOT echo back what the user asked you to do",
     "- Do NOT respond to the conversation content",
+    "- Write the title in the same language as the conversation content",
     "- Do NOT assess feasibility or comment on capabilities",
     "- If input is sparse or references external context, extract a topic from the words that ARE present (e.g. 'so about that t-shirt...' → 'T-Shirt Discussion'). Never describe the absence, emptiness, or insufficiency of context — titles like 'Missing Context', 'Unclear Request', 'No Topic' are forbidden",
   ].join("\n");

package/src/persistence/llm-request-log-sink-clickhouse.ts

@@ -30,6 +30,7 @@
  * can never abort a turn.
  */
 import { getConfigReadOnly } from "../config/loader.js";
+import { resolvePlatformAssistantIdOrNull } from "../config/platform-identity.js";
 import type { LlmRequestLogsClickHouseConfig } from "../config/schemas/llm-request-logs.js";
 import { credentialKey } from "../security/credential-key.js";
 import { getSecureKeyAsync } from "../security/secure-keys.js";
@@ -71,7 +72,7 @@ export interface ClickHouseLlmRequestLogSinkDeps {
   resolveUrl?: () => Promise<string | null>;
   /** Override the credential read for `clickhouse:password`. */
   resolvePassword?: () => Promise<string | null>;
-  /** Override the credential read for `vellum:platform_assistant_id`. */
+  /** Override the platform assistant id (in-memory identity, then vault). */
   resolveAssistantId?: () => Promise<string | null>;
   /** Override fetch for testing. */
   fetchImpl?: ClickHouseSinkFetch;
@@ -98,8 +99,7 @@ export class ClickHouseLlmRequestLogSink implements LlmRequestLogWriter {
       deps.resolvePassword ??
       (() => readCredentialOrNull("clickhouse", "password"));
     this.resolveAssistantId =
-      deps.resolveAssistantId ??
-      (() => readCredentialOrNull("vellum", "platform_assistant_id"));
+      deps.resolveAssistantId ?? resolvePlatformAssistantIdOrNull;
     this.fetchImpl = deps.fetchImpl ?? globalThis.fetch.bind(globalThis);
   }
 

package/src/persistence/llm-request-log-source-clickhouse.ts

@@ -15,6 +15,7 @@
  * than the local source. Acceptable for the "internal use while we
  * finetune prompts" use case; revisit when mirror updates are added.
  */
+import { resolvePlatformAssistantIdOrNull } from "../config/platform-identity.js";
 import type { LlmRequestLogsClickHouseConfig } from "../config/schemas/llm-request-logs.js";
 import { credentialKey } from "../security/credential-key.js";
 import { getSecureKeyAsync } from "../security/secure-keys.js";
@@ -104,7 +105,7 @@ export interface ClickHouseLlmRequestLogSourceDeps {
   resolveUrl?: () => Promise<string | null>;
   /** Override the credential read for `clickhouse:password`. */
   resolvePassword?: () => Promise<string | null>;
-  /** Override the credential read for `vellum:platform_assistant_id`. */
+  /** Override the platform assistant id (in-memory identity, then vault). */
   resolveAssistantId?: () => Promise<string | null>;
   /** Override the turn-id resolver (default: `getAssistantMessageIdsInTurn`). */
   resolveTurnMessageIds?: (messageId: string) => string[];
@@ -138,8 +139,7 @@ export class ClickHouseLlmRequestLogSource implements LlmRequestLogSource {
       deps.resolvePassword ??
       (() => readCredentialOrNull("clickhouse", "password"));
     this.resolveAssistantId =
-      deps.resolveAssistantId ??
-      (() => readCredentialOrNull("vellum", "platform_assistant_id"));
+      deps.resolveAssistantId ?? resolvePlatformAssistantIdOrNull;
     this.resolveTurnMessageIds =
       deps.resolveTurnMessageIds ?? getAssistantMessageIdsInTurn;
     this.resolveMessage = deps.resolveMessage ?? getMessageById;

package/src/persistence/message-cursor.ts

@@ -0,0 +1,78 @@
+// ---------------------------------------------------------------------------
+// Message cursors: the "(createdAt, id) after which" reference behind the
+// messages-after reads, resilient to the referenced row being deleted.
+// ---------------------------------------------------------------------------
+//
+// A bare message id bounds a read only while its row exists. A regenerated
+// reply (the conversation retry route discards the latest assistant turn) or a
+// retried turn deletes the row, and a caller holding just the id can no longer
+// say where it sat. A `MessageCursor` carries the row's `createdAt` alongside
+// its id, so the `(createdAt, id)` bound is reconstructible from the cursor
+// alone. The live row stays authoritative whenever it exists.
+
+import { eq } from "drizzle-orm";
+
+import type { LineageBound } from "./conversation-lineage.js";
+import { getDb } from "./db-connection.js";
+import { messages } from "./schema/index.js";
+
+export { messagesAfterBoundFilter } from "./conversation-lineage.js";
+
+/**
+ * A `(createdAt, id)` message reference. `createdAt` is null when the holder
+ * never recorded it; such a cursor bounds a read only while its row exists.
+ */
+export interface MessageCursor {
+  readonly id: string;
+  readonly createdAt: number | null;
+}
+
+/**
+ * Accepted "after" references: a message id, a {@link MessageCursor}, or
+ * null. `null`, `""`, and a cursor whose id is `""` all mean "no lower bound".
+ */
+export type MessagesAfterRef = string | MessageCursor | null;
+
+/** Where a messages-after read starts. */
+export type MessagesAfterBound =
+  /** No lower bound: every row the conversation owns. */
+  | { kind: "all" }
+  /** Rows strictly after `bound` in `(createdAt, id)` order. */
+  | { kind: "after"; bound: LineageBound }
+  /**
+   * The referenced row is gone and the reference carried no timestamp, so
+   * the read has no defensible starting point. Readers return nothing.
+   */
+  | { kind: "vanished" };
+
+/** The `(createdAt, id)` bound of a single message, or null when it is gone. */
+export function loadMessageBound(messageId: string): LineageBound | null {
+  const row = getDb()
+    .select({ createdAt: messages.createdAt, id: messages.id })
+    .from(messages)
+    .where(eq(messages.id, messageId))
+    .get();
+  return row ?? null;
+}
+
+/**
+ * Resolve an "after" reference to the bound a read filters on. A live row
+ * wins; a cursor whose row is gone falls back to the `createdAt` it carries,
+ * paired with its id so same-millisecond neighbours keep their order.
+ */
+export function resolveMessagesAfterBound(
+  after: MessagesAfterRef,
+): MessagesAfterBound {
+  const id = typeof after === "string" ? after : (after?.id ?? "");
+  if (id === "") {
+    return { kind: "all" };
+  }
+  const live = loadMessageBound(id);
+  if (live) {
+    return { kind: "after", bound: live };
+  }
+  if (typeof after === "object" && after !== null && after.createdAt !== null) {
+    return { kind: "after", bound: { createdAt: after.createdAt, id } };
+  }
+  return { kind: "vanished" };
+}

package/src/persistence/message-reads.ts

@@ -190,6 +190,36 @@ export function existingMessageIds(
   );
 }
 
+/**
+ * `createdAt` of each of `messageIds` that exists as a row, keyed by id, in
+ * any state.
+ *
+ * Any-state deliberately: a row's `createdAt` is fixed at insert, so its
+ * completeness does not change the answer, and the callers (retrospective
+ * cursor bookkeeping) hold ids taken from rows they have already reviewed.
+ * An empty input returns an empty map without querying.
+ */
+export function messageCreatedAtByIds(
+  messageIds: readonly string[],
+  opts?: { db?: MessageReadHandle },
+): Map<string, number> {
+  const db = opts?.db ?? getDb();
+  const result = new Map<string, number>();
+  // Chunked so a whole-conversation id list stays under SQLite's bound
+  // parameter limit.
+  for (let offset = 0; offset < messageIds.length; offset += 500) {
+    const rows = db
+      .select({ id: messages.id, createdAt: messages.createdAt })
+      .from(messages)
+      .where(inArray(messages.id, messageIds.slice(offset, offset + 500)))
+      .all();
+    for (const row of rows) {
+      result.set(row.id, row.createdAt);
+    }
+  }
+  return result;
+}
+
 /**
  * The conversation that owns `messageId`, in any state, or null when the
  * message does not exist.

package/src/persistence/migrations/157-invite-contact-id.ts

@@ -1,4 +1,5 @@
 import { type DrizzleDb, getSqliteFrom } from "../db-connection.js";
+import { tableExists } from "./schema-introspection.js";
 
 /**
  * Add a required contact_id column to assistant_ingress_invites.
@@ -10,8 +11,16 @@ import { type DrizzleDb, getSqliteFrom } from "../db-connection.js";
  *  1. Add the column as nullable.
  *  2. Delete legacy rows that have no contact binding (NULL).
  *  3. Rebuild the table to enforce NOT NULL (SQLite cannot ALTER COLUMN).
+ *
+ * The rebuild copies whichever session-id column is live:
+ * `source_conversation_id` (after migrateRenameCreatedBySessionIdColumns)
+ * or `created_by_session_id`.
  */
 export function migrateInviteContactId(database: DrizzleDb): void {
+  if (!tableExists(database, "assistant_ingress_invites")) {
+    return;
+  }
+
   const raw = getSqliteFrom(database);
 
   const cols = (
@@ -20,25 +29,28 @@ export function migrateInviteContactId(database: DrizzleDb): void {
       notnull: number;
     }>
   ).map((c) => ({ name: c.name, notnull: c.notnull }));
+  const colNames = new Set(cols.map((c) => c.name));
 
   const col = cols.find((c) => c.name === "contact_id");
 
-  // Step 1: Add the column as nullable
   if (!col) {
     raw.exec(
       /*sql*/ `ALTER TABLE assistant_ingress_invites ADD COLUMN contact_id TEXT`,
     );
   }
 
-  // Step 2: Delete legacy rows with no contact binding
   raw.exec(
     /*sql*/ `DELETE FROM assistant_ingress_invites WHERE contact_id IS NULL OR contact_id = ''`,
   );
 
-  // Step 3: Rebuild the table with NOT NULL on contact_id
   if (col && col.notnull === 1) {
     return;
-  } // already NOT NULL
+  }
+
+  const sessionCol = colNames.has("source_conversation_id")
+    ? "source_conversation_id"
+    : "created_by_session_id";
+  const sessionSelect = colNames.has(sessionCol) ? sessionCol : "NULL";
 
   raw.exec("PRAGMA foreign_keys = OFF");
   try {
@@ -49,7 +61,7 @@ export function migrateInviteContactId(database: DrizzleDb): void {
           id TEXT PRIMARY KEY,
           source_channel TEXT NOT NULL,
           token_hash TEXT NOT NULL,
-          created_by_session_id TEXT,
+          ${sessionCol} TEXT,
           note TEXT,
           max_uses INTEGER NOT NULL DEFAULT 1 CHECK (max_uses > 0),
           use_count INTEGER NOT NULL DEFAULT 0 CHECK (use_count >= 0),
@@ -70,7 +82,7 @@ export function migrateInviteContactId(database: DrizzleDb): void {
         );
 
         INSERT INTO assistant_ingress_invites_new
-        SELECT id, source_channel, token_hash, created_by_session_id, note,
+        SELECT id, source_channel, token_hash, ${sessionSelect}, note,
                max_uses, use_count, expires_at, status,
                redeemed_by_external_user_id, redeemed_by_external_chat_id,
                redeemed_at, expected_external_user_id, voice_code_hash,