vellum 0.2.1 → 0.2.2

package/src/memory/attachments-store.ts

@@ -5,18 +5,18 @@
  * data. Provides upload, delete, and message-linkage operations.
  */
 
-import { eq, and } from 'drizzle-orm';
+import { eq } from 'drizzle-orm';
 import { v4 as uuid } from 'uuid';
 import { getDb } from './db.js';
 import { attachments, messageAttachments } from './schema.js';
 
 export interface StoredAttachment {
   id: string;
-  assistantId: string;
   originalFilename: string;
   mimeType: string;
   sizeBytes: number;
   kind: string;
+  thumbnailBase64: string | null;
   createdAt: number;
 }
 
@@ -152,7 +152,6 @@ function computeContentHash(dataBase64: string): string {
 }
 
 export function uploadAttachment(
-  assistantId: string,
   filename: string,
   mimeType: string,
   dataBase64: string,
@@ -173,25 +172,20 @@ export function uploadAttachment(
   const db = getDb();
   const contentHash = computeContentHash(dataBase64);
 
-  // Dedup: if an attachment with the same content already exists for this
-  // assistant, return it instead of storing a duplicate.
+  // Dedup: if an attachment with the same content already exists, return it
+  // instead of storing a duplicate.
   const existing = db
     .select({
       id: attachments.id,
-      assistantId: attachments.assistantId,
       originalFilename: attachments.originalFilename,
       mimeType: attachments.mimeType,
       sizeBytes: attachments.sizeBytes,
       kind: attachments.kind,
+      thumbnailBase64: attachments.thumbnailBase64,
       createdAt: attachments.createdAt,
     })
     .from(attachments)
-    .where(
-      and(
-        eq(attachments.assistantId, assistantId),
-        eq(attachments.contentHash, contentHash),
-      ),
-    )
+    .where(eq(attachments.contentHash, contentHash))
     .get();
 
   if (existing) {
@@ -203,7 +197,7 @@ export function uploadAttachment(
 
   const record = {
     id: uuid(),
-    assistantId,
+    assistantId: 'self',
     originalFilename: filename,
     mimeType,
     sizeBytes,
@@ -217,28 +211,34 @@ export function uploadAttachment(
 
   return {
     id: record.id,
-    assistantId,
     originalFilename: filename,
     mimeType,
     sizeBytes,
     kind,
+    thumbnailBase64: null,
     createdAt: now,
   };
 }
 
+/**
+ * Update the thumbnail for an existing attachment.
+ */
+export function setAttachmentThumbnail(attachmentId: string, thumbnailBase64: string): void {
+  const db = getDb();
+  db.update(attachments)
+    .set({ thumbnailBase64 })
+    .where(eq(attachments.id, attachmentId))
+    .run();
+}
+
 export type DeleteAttachmentResult = 'deleted' | 'not_found' | 'still_referenced';
 
-export function deleteAttachment(assistantId: string, attachmentId: string): DeleteAttachmentResult {
+export function deleteAttachment(attachmentId: string): DeleteAttachmentResult {
   const db = getDb();
   const existing = db
     .select({ id: attachments.id })
     .from(attachments)
-    .where(
-      and(
-        eq(attachments.id, attachmentId),
-        eq(attachments.assistantId, assistantId),
-      ),
-    )
+    .where(eq(attachments.id, attachmentId))
     .get();
 
   if (!existing) return 'not_found';
@@ -263,7 +263,6 @@ export function deleteAttachment(assistantId: string, attachmentId: string): Del
 }
 
 export function getAttachmentsByIds(
-  assistantId: string,
   ids: string[],
 ): Array<StoredAttachment & { dataBase64: string }> {
   if (ids.length === 0) return [];
@@ -273,21 +272,16 @@ export function getAttachmentsByIds(
     const row = db
       .select()
       .from(attachments)
-      .where(
-        and(
-          eq(attachments.id, id),
-          eq(attachments.assistantId, assistantId),
-        ),
-      )
+      .where(eq(attachments.id, id))
       .get();
     if (row) {
       results.push({
         id: row.id,
-        assistantId: row.assistantId,
         originalFilename: row.originalFilename,
         mimeType: row.mimeType,
         sizeBytes: row.sizeBytes,
         kind: row.kind,
+        thumbnailBase64: row.thumbnailBase64,
         dataBase64: row.dataBase64,
         createdAt: row.createdAt,
       });
@@ -318,7 +312,6 @@ export function linkAttachmentToMessage(
  */
 export function getAttachmentsForMessage(
   messageId: string,
-  assistantId: string,
 ): Array<StoredAttachment & { dataBase64: string }> {
   const db = getDb();
   const links = db
@@ -331,7 +324,7 @@ export function getAttachmentsForMessage(
   if (links.length === 0) return [];
 
   const ids = links.map((l) => l.attachmentId).filter((id): id is string => id !== null);
-  return getAttachmentsByIds(assistantId, ids);
+  return getAttachmentsByIds(ids);
 }
 
 /**
@@ -342,7 +335,6 @@ export function getAttachmentsForMessage(
  */
 export function getAttachmentMetadataForMessage(
   messageId: string,
-  assistantId: string,
 ): StoredAttachment[] {
   const db = getDb();
   const links = db
@@ -360,75 +352,28 @@ export function getAttachmentMetadataForMessage(
     const row = db
       .select({
         id: attachments.id,
-        assistantId: attachments.assistantId,
         originalFilename: attachments.originalFilename,
         mimeType: attachments.mimeType,
         sizeBytes: attachments.sizeBytes,
         kind: attachments.kind,
+        thumbnailBase64: attachments.thumbnailBase64,
         createdAt: attachments.createdAt,
       })
       .from(attachments)
-      .where(
-        and(
-          eq(attachments.id, link.attachmentId),
-          eq(attachments.assistantId, assistantId),
-        ),
-      )
-      .get();
-    if (row) results.push(row);
-  }
-  return results;
-}
-
-/**
- * Return all attachments linked to a message without assistant scoping.
- * Used by the desktop IPC history handler where tenant isolation is not needed.
- */
-export function getAttachmentsForMessageUnscoped(
-  messageId: string,
-): Array<StoredAttachment & { dataBase64: string }> {
-  const db = getDb();
-  const links = db
-    .select({ attachmentId: messageAttachments.attachmentId, position: messageAttachments.position })
-    .from(messageAttachments)
-    .where(eq(messageAttachments.messageId, messageId))
-    .orderBy(messageAttachments.position)
-    .all();
-
-  if (links.length === 0) return [];
-
-  const results: Array<StoredAttachment & { dataBase64: string }> = [];
-  for (const link of links) {
-    if (!link.attachmentId) continue;
-    const row = db
-      .select()
-      .from(attachments)
       .where(eq(attachments.id, link.attachmentId))
       .get();
-    if (row) {
-      results.push({
-        id: row.id,
-        assistantId: row.assistantId,
-        originalFilename: row.originalFilename,
-        mimeType: row.mimeType,
-        sizeBytes: row.sizeBytes,
-        kind: row.kind,
-        dataBase64: row.dataBase64,
-        createdAt: row.createdAt,
-      });
-    }
+    if (row) results.push(row);
   }
   return results;
 }
 
 /**
- * Retrieve a single attachment by ID, scoped to an assistant.
+ * Retrieve a single attachment by ID.
  */
 export function getAttachmentById(
-  assistantId: string,
   attachmentId: string,
 ): (StoredAttachment & { dataBase64: string }) | null {
-  const results = getAttachmentsByIds(assistantId, [attachmentId]);
+  const results = getAttachmentsByIds([attachmentId]);
   return results[0] ?? null;
 }
 

package/src/memory/channel-delivery-store.ts

@@ -35,10 +35,9 @@ export interface RecordInboundOptions {
 
 /**
  * Record an inbound channel event. Returns `duplicate: true` if this
- * exact (assistant, channel, chat, message) combination was already seen.
+ * exact (channel, chat, message) combination was already seen.
  */
 export function recordInbound(
-  assistantId: string,
   sourceChannel: string,
   externalChatId: string,
   externalMessageId: string,
@@ -54,7 +53,6 @@ export function recordInbound(
     .from(channelInboundEvents)
     .where(
       and(
-        eq(channelInboundEvents.assistantId, assistantId),
         eq(channelInboundEvents.sourceChannel, sourceChannel),
         eq(channelInboundEvents.externalChatId, externalChatId),
         eq(channelInboundEvents.externalMessageId, externalMessageId),
@@ -72,7 +70,7 @@ export function recordInbound(
   }
 
   const conversationKey = `${sourceChannel}:${externalChatId}`;
-  const mapping = getOrCreateConversation(assistantId, conversationKey);
+  const mapping = getOrCreateConversation(conversationKey);
   const now = Date.now();
   const eventId = uuid();
 
@@ -84,7 +82,7 @@ export function recordInbound(
     tx.insert(channelInboundEvents)
       .values({
         id: eventId,
-        assistantId,
+        assistantId: 'self',
         sourceChannel,
         externalChatId,
         externalMessageId,
@@ -122,7 +120,6 @@ export function linkMessage(eventId: string, messageId: string): void {
  * platform-level message identifier (e.g. Telegram message_id).
  */
 export function findMessageBySourceId(
-  assistantId: string,
   sourceChannel: string,
   externalChatId: string,
   sourceMessageId: string,
@@ -136,7 +133,6 @@ export function findMessageBySourceId(
     .from(channelInboundEvents)
     .where(
       and(
-        eq(channelInboundEvents.assistantId, assistantId),
         eq(channelInboundEvents.sourceChannel, sourceChannel),
         eq(channelInboundEvents.externalChatId, externalChatId),
         eq(channelInboundEvents.sourceMessageId, sourceMessageId),
@@ -153,7 +149,6 @@ export function findMessageBySourceId(
  * Acknowledge delivery of an outbound message for a channel event.
  */
 export function acknowledgeDelivery(
-  assistantId: string,
   sourceChannel: string,
   externalChatId: string,
   externalMessageId: string,
@@ -166,7 +161,6 @@ export function acknowledgeDelivery(
     .from(channelInboundEvents)
     .where(
       and(
-        eq(channelInboundEvents.assistantId, assistantId),
         eq(channelInboundEvents.sourceChannel, sourceChannel),
         eq(channelInboundEvents.externalChatId, externalChatId),
         eq(channelInboundEvents.externalMessageId, externalMessageId),
@@ -271,7 +265,6 @@ export function recordProcessingFailure(eventId: string, err: unknown): void {
 /** Fetch events eligible for automatic retry (failed + past their backoff). */
 export function getRetryableEvents(limit = 20): Array<{
   id: string;
-  assistantId: string;
   conversationId: string;
   processingAttempts: number;
   rawPayload: string | null;
@@ -281,7 +274,6 @@ export function getRetryableEvents(limit = 20): Array<{
   return db
     .select({
       id: channelInboundEvents.id,
-      assistantId: channelInboundEvents.assistantId,
       conversationId: channelInboundEvents.conversationId,
       processingAttempts: channelInboundEvents.processingAttempts,
       rawPayload: channelInboundEvents.rawPayload,
@@ -297,8 +289,8 @@ export function getRetryableEvents(limit = 20): Array<{
     .all();
 }
 
-/** Fetch dead-lettered events for an assistant. */
-export function getDeadLetterEvents(assistantId: string): Array<{
+/** Fetch dead-lettered events. */
+export function getDeadLetterEvents(): Array<{
   id: string;
   sourceChannel: string;
   externalChatId: string;
@@ -321,12 +313,7 @@ export function getDeadLetterEvents(assistantId: string): Array<{
       createdAt: channelInboundEvents.createdAt,
     })
     .from(channelInboundEvents)
-    .where(
-      and(
-        eq(channelInboundEvents.assistantId, assistantId),
-        eq(channelInboundEvents.processingStatus, 'dead_letter'),
-      ),
-    )
+    .where(eq(channelInboundEvents.processingStatus, 'dead_letter'))
     .all();
 }
 
@@ -334,7 +321,7 @@ export function getDeadLetterEvents(assistantId: string): Array<{
  * Reset dead-lettered events back to 'failed' so the sweep can retry
  * them. Resets attempt counter and sets an immediate retry_after.
  */
-export function replayDeadLetters(assistantId: string, eventIds: string[]): number {
+export function replayDeadLetters(eventIds: string[]): number {
   const db = getDb();
   const now = Date.now();
   let count = 0;
@@ -345,7 +332,6 @@ export function replayDeadLetters(assistantId: string, eventIds: string[]): numb
       .where(
         and(
           eq(channelInboundEvents.id, id),
-          eq(channelInboundEvents.assistantId, assistantId),
           eq(channelInboundEvents.processingStatus, 'dead_letter'),
         ),
       )

package/src/memory/clarification-resolver.ts

@@ -1,5 +1,6 @@
 import Anthropic from '@anthropic-ai/sdk';
 import { getConfig } from '../config/loader.js';
+import { truncate } from '../util/truncate.js';
 
 const DEFAULT_RESOLVER_MODEL = 'claude-haiku-4-5-20251001';
 const DEFAULT_RESOLVER_TIMEOUT_MS = 12_000;
@@ -85,7 +86,7 @@ export async function resolveConflictClarification(
       resolution: 'still_unclear',
       strategy: 'llm_error',
       resolvedStatement: null,
-      explanation: `Clarification resolver failed: ${message.slice(0, 300)}`,
+      explanation: `Clarification resolver failed: ${truncate(message, 300, '')}`,
     };
   }
 }
@@ -243,7 +244,7 @@ async function resolveWithLlm(
       resolution: parsed.resolution,
       strategy: 'llm',
       resolvedStatement,
-      explanation: normalize(parsed.explanation ?? 'Resolved via LLM fallback.').slice(0, 500),
+      explanation: truncate(normalize(parsed.explanation ?? 'Resolved via LLM fallback.'), 500, ''),
     };
   } catch (err) {
     clearTimeout(timer);
@@ -291,7 +292,7 @@ function buildMergedStatement(input: ClarificationResolverInput): string {
   if (normalizedUserMessage.length >= 8 && normalizedUserMessage.length <= 320) {
     return normalizedUserMessage;
   }
-  const existing = normalize(input.existingStatement).slice(0, 140);
-  const candidate = normalize(input.candidateStatement).slice(0, 140);
-  return `Merged clarification: ${existing}; ${candidate}`.slice(0, 320);
+  const existing = truncate(normalize(input.existingStatement), 140, '');
+  const candidate = truncate(normalize(input.candidateStatement), 140, '');
+  return truncate(`Merged clarification: ${existing}; ${candidate}`, 320, '');
 }

package/src/memory/contradiction-checker.ts

@@ -2,6 +2,7 @@ import Anthropic from '@anthropic-ai/sdk';
 import { eq } from 'drizzle-orm';
 import { getConfig } from '../config/loader.js';
 import { getLogger } from '../util/logger.js';
+import { truncate } from '../util/truncate.js';
 import { createOrUpdatePendingConflict } from './conflict-store.js';
 import { getDb } from './db.js';
 import { enqueueMemoryJob } from './jobs-store.js';
@@ -234,7 +235,7 @@ async function classifyRelationship(
 
   return {
     relationship,
-    explanation: String(input.explanation ?? '').slice(0, 500),
+    explanation: truncate(String(input.explanation ?? ''), 500, ''),
   };
 }
 
@@ -324,6 +325,6 @@ function escapeSqlLike(s: string): string {
 
 function buildClarificationQuestion(existingStatement: string, candidateStatement: string): string {
   const normalize = (input: string): string =>
-    input.replace(/\s+/g, ' ').trim().slice(0, 180);
+    truncate(input.replace(/\s+/g, ' ').trim(), 180, '');
   return `I have conflicting notes: "${normalize(existingStatement)}" vs "${normalize(candidateStatement)}". Which one is correct?`;
 }

package/src/memory/conversation-key-store.ts

@@ -1,49 +1,42 @@
 /**
- * Maps (assistant_id, conversation_key) pairs to internal conversation IDs.
+ * Maps conversation keys to internal conversation IDs.
  *
  * The web UI identifies conversations by an opaque `conversationKey` (e.g.
  * a user ID, a channel thread ID).  This store resolves those keys to the
- * assistant's internal conversation IDs, creating new conversations on
+ * daemon's internal conversation IDs, creating new conversations on
  * first contact.
  */
 
-import { eq, and } from 'drizzle-orm';
+import { eq } from 'drizzle-orm';
 import { v4 as uuid } from 'uuid';
 import { getDb } from './db.js';
 import { conversations, conversationKeys } from './schema.js';
 
 export interface ConversationKeyMapping {
   id: string;
-  assistantId: string;
   conversationKey: string;
   conversationId: string;
   createdAt: number;
 }
 
 /**
- * Look up the conversation ID for a given (assistantId, conversationKey).
+ * Look up the conversation ID for a given conversationKey.
  * Returns `null` if no mapping exists yet.
  */
 export function getConversationByKey(
-  assistantId: string,
   conversationKey: string,
 ): ConversationKeyMapping | null {
   const db = getDb();
   const result = db
     .select()
     .from(conversationKeys)
-    .where(
-      and(
-        eq(conversationKeys.assistantId, assistantId),
-        eq(conversationKeys.conversationKey, conversationKey),
-      ),
-    )
+    .where(eq(conversationKeys.conversationKey, conversationKey))
     .get();
   return result ?? null;
 }
 
 /**
- * Delete the conversation-key mapping for a given (assistantId, conversationKey).
+ * Delete the conversation-key mapping for a given conversationKey.
  *
  * This is a soft reset: the old conversation data remains in the database,
  * but it is no longer reachable via this key.  The next message with the
@@ -51,29 +44,22 @@ export function getConversationByKey(
  *
  */
 export function deleteConversationKey(
-  assistantId: string,
   conversationKey: string,
 ): void {
   const db = getDb();
   db.delete(conversationKeys)
-    .where(
-      and(
-        eq(conversationKeys.assistantId, assistantId),
-        eq(conversationKeys.conversationKey, conversationKey),
-      ),
-    )
+    .where(eq(conversationKeys.conversationKey, conversationKey))
     .run();
 }
 
 /**
- * Get or create a conversation for the given (assistantId, conversationKey).
+ * Get or create a conversation for the given conversationKey.
  *
  * If a mapping already exists, returns the existing conversation ID.
  * Otherwise, creates a new conversation and mapping atomically within a
  * single transaction to prevent race conditions and orphaned rows.
  */
 export function getOrCreateConversation(
-  assistantId: string,
   conversationKey: string,
 ): { conversationId: string; created: boolean } {
   const db = getDb();
@@ -82,12 +68,7 @@ export function getOrCreateConversation(
     const existing = tx
       .select()
       .from(conversationKeys)
-      .where(
-        and(
-          eq(conversationKeys.assistantId, assistantId),
-          eq(conversationKeys.conversationKey, conversationKey),
-        ),
-      )
+      .where(eq(conversationKeys.conversationKey, conversationKey))
       .get();
 
     if (existing) {
@@ -115,7 +96,7 @@ export function getOrCreateConversation(
     tx.insert(conversationKeys)
       .values({
         id: uuid(),
-        assistantId,
+        assistantId: 'self',
         conversationKey,
         conversationId,
         createdAt: now,

package/src/memory/conversation-store.ts

@@ -108,7 +108,7 @@ export function getLatestConversation() {
   return result ?? null;
 }
 
-export function addMessage(conversationId: string, role: string, content: string) {
+export function addMessage(conversationId: string, role: string, content: string, metadata?: Record<string, unknown>) {
   const db = getDb();
   const now = monotonicNow();
   const message = {
@@ -117,6 +117,7 @@ export function addMessage(conversationId: string, role: string, content: string
     role,
     content,
     createdAt: now,
+    ...(metadata ? { metadata: JSON.stringify(metadata) } : {}),
   };
   // Wrap insert + updatedAt bump in a transaction so they're atomic.
   db.transaction((tx) => {