@vellumai/assistant 0.6.0 → 0.6.2

package/src/memory/conversation-directories.ts

@@ -26,6 +26,45 @@ export function getConversationDirName(
   return `${getConversationDirTimestamp(createdAtMs)}_${id}`;
 }
 
+/**
+ * Parse a canonical conversation directory name (`<ISO-with-dashes>_<id>`)
+ * back into its components. Returns null for names that don't match the
+ * canonical format — callers should treat null as "skip this entry"
+ * rather than as an error.
+ *
+ * Inverse of {@link getConversationDirName}. Does NOT parse the legacy
+ * `<id>_<ISO-with-dashes>` format.
+ */
+export function parseConversationDirName(
+  name: string,
+): { conversationId: string; createdAtMs: number } | null {
+  // Canonical format: YYYY-MM-DDTHH-MM-SS.sssZ_<uuid>
+  // The timestamp portion has 4 hyphens (date + time-component separators)
+  // and ends in `Z`. Anchor the regex to enforce that.
+  const match = name.match(
+    /^(\d{4}-\d{2}-\d{2})T(\d{2})-(\d{2})-(\d{2}\.\d{1,9}Z)_(.+)$/,
+  );
+  if (!match) return null;
+  const [, datePart, hh, mm, ssAndMs, conversationId] = match;
+  const iso = `${datePart}T${hh}:${mm}:${ssAndMs}`;
+  const ms = Date.parse(iso);
+  if (Number.isNaN(ms)) return null;
+  if (!conversationId) return null;
+  // Reject conversation IDs that are path-traversal-shaped or contain
+  // path separators. These are never valid conversation IDs and would
+  // be a defense-in-depth concern if parsed.conversationId is later used
+  // to construct filesystem paths.
+  if (
+    conversationId === "." ||
+    conversationId === ".." ||
+    conversationId.includes("/") ||
+    conversationId.includes("\\")
+  ) {
+    return null;
+  }
+  return { conversationId, createdAtMs: ms };
+}
+
 /**
  * Return the absolute path to a conversation's timestamp-first disk-view
  * directory.

package/src/memory/conversation-group-migration.ts

@@ -57,15 +57,45 @@ export function ensureGroupMigration(): void {
     }
   }
 
-  // 3. Seed system groups (three: pinned, scheduled, background)
+  // 3. Seed system groups (four: pinned, scheduled, background, all)
+  const now = Math.floor(Date.now() / 1000);
   rawExec(`
-    INSERT OR IGNORE INTO conversation_groups (id, name, sort_position, is_system_group)
+    INSERT OR IGNORE INTO conversation_groups (id, name, sort_position, is_system_group, created_at, updated_at)
     VALUES
-      ('system:pinned', 'Pinned', 0, TRUE),
-      ('system:scheduled', 'Scheduled', 1, TRUE),
-      ('system:background', 'Background', 2, TRUE)
+      ('system:pinned', 'Pinned', 0, TRUE, ${now}, ${now}),
+      ('system:scheduled', 'Scheduled', 1, TRUE, ${now}, ${now}),
+      ('system:background', 'Background', 2, TRUE, ${now}, ${now}),
+      ('system:all', 'Recents', 3, TRUE, ${now}, ${now})
   `);
 
+  // One-time migration: move system:all to sortPosition 3 (from 999999).
+  // Bump custom groups at position 3+ up by 1 to make room. Wrapped in a
+  // transaction so a crash between the shift and the sentinel can't cause
+  // repeated drift on restart.
+  const sortShiftDone = rawGet<{ id: string }>(
+    "SELECT id FROM conversation_groups WHERE id = '_sort_shift_complete'",
+  );
+  if (!sortShiftDone) {
+    try {
+      rawExec("BEGIN");
+      rawRun(
+        "UPDATE conversation_groups SET sort_position = sort_position + 1 WHERE is_system_group = 0 AND sort_position >= 3",
+      );
+      rawRun(
+        "UPDATE conversation_groups SET sort_position = 3 WHERE id = 'system:all' AND sort_position != 3",
+      );
+      rawRun(
+        `INSERT OR IGNORE INTO conversation_groups (id, name, sort_position, is_system_group, created_at, updated_at)
+         VALUES ('_sort_shift_complete', '_sort_shift_complete', -1, TRUE, ${now}, ${now})`,
+      );
+      rawExec("COMMIT");
+    } catch (err) {
+      rawExec("ROLLBACK");
+      log.error({ err }, "Sort-position shift transaction failed, rolled back");
+      throw err;
+    }
+  }
+
   // 4. One-time backfill (guard: persistent marker prevents re-running on restart)
   //
   // The backfill sets group_id on existing conversations based on their attributes.
@@ -118,7 +148,7 @@ export function ensureGroupMigration(): void {
       // Step B: Scheduled -> system:scheduled (schedule/reminder source or has schedule_job_id)
       rawExec(`
         UPDATE conversations SET group_id = 'system:scheduled'
-        WHERE (source IN ('schedule', 'reminder') OR schedule_job_id IS NOT NULL)
+        WHERE (source IN ('schedule', 'reminder') OR schedule_job_id IS NOT NULL OR conversation_type = 'scheduled')
         AND group_id IS NULL
       `);
 
@@ -153,5 +183,35 @@ export function ensureGroupMigration(): void {
     }
   }
 
+  // 5. One-time backfill: assign all ungrouped conversations to system:all
+  //
+  // Separate from the initial backfill above because system:all is added later.
+  // Uses its own sentinel so it runs exactly once, even on existing installations
+  // where the original backfill already completed.
+  const allBackfillDone = rawGet<{ id: string }>(
+    "SELECT id FROM conversation_groups WHERE id = '_backfill_all_complete'",
+  );
+
+  if (!allBackfillDone) {
+    try {
+      rawExec("BEGIN");
+
+      rawExec(`
+        UPDATE conversations SET group_id = 'system:all' WHERE group_id IS NULL
+      `);
+
+      rawExec(`
+        INSERT OR IGNORE INTO conversation_groups (id, name, sort_position, is_system_group)
+        VALUES ('_backfill_all_complete', '_backfill_all_complete', -1, TRUE)
+      `);
+
+      rawExec("COMMIT");
+    } catch (err) {
+      rawExec("ROLLBACK");
+      log.error({ err }, "system:all backfill transaction failed, rolled back");
+      throw err;
+    }
+  }
+
   migrated = true;
 }

package/src/memory/conversation-queries.ts

@@ -14,7 +14,22 @@ const log = getLogger("conversation-store");
  * Build an FTS5 MATCH query string from natural text by extracting tokens.
  * Used for messages_fts full-text search over conversation content.
  */
-export function buildFtsMatchQuery(text: string): string | null {
+export function buildFtsMatchQuery(
+  text: string,
+  opts?: { allowFts5Syntax?: boolean },
+): string | null {
+  // If the query already contains FTS5 operators, pass it through directly
+  // so callers (e.g. the archive recall tool) can use exact-phrase, AND, OR,
+  // NOT, NEAR syntax. Only enabled when the caller explicitly opts in —
+  // user-facing search should always go through normal tokenization to avoid
+  // FTS5 boolean semantics leaking into sidebar/global search.
+  if (
+    opts?.allowFts5Syntax &&
+    /\bAND\b|\bOR\b|\bNOT\b|\bNEAR\s*\(|"[^"]+"/.test(text)
+  ) {
+    return text.trim();
+  }
+
   const tokens = text
     .toLowerCase()
     .split(/[^a-z0-9_]+/g)
@@ -22,7 +37,8 @@ export function buildFtsMatchQuery(text: string): string | null {
     .filter((token) => token.length >= 2);
   if (tokens.length === 0) return null;
   const unique = [...new Set(tokens)].slice(0, 24);
-  return unique.map((token) => `"${token.replace(/"/g, '""')}"`).join(" OR ");
+  // Space-separated quoted tokens are implicit AND in FTS5.
+  return unique.map((token) => `"${token.replace(/"/g, '""')}"`).join(" ");
 }
 
 export function listConversations(
@@ -34,23 +50,49 @@ export function listConversations(
   ensureGroupMigration();
   const db = getDb();
   const where = backgroundOnly
-    ? sql`${conversations.conversationType} = 'background'`
-    : sql`${conversations.conversationType} NOT IN ('background', 'private')`;
+    ? sql`${conversations.conversationType} IN ('background', 'scheduled') AND (${conversations.source} IS NULL OR ${conversations.source} != 'subagent')`
+    : sql`${conversations.conversationType} NOT IN ('background', 'private', 'scheduled')`;
   const query = db
     .select()
     .from(conversations)
     .where(where)
-    .orderBy(desc(conversations.updatedAt))
+    .orderBy(
+      desc(
+        sql`COALESCE(${conversations.lastMessageAt}, ${conversations.updatedAt})`,
+      ),
+    )
     .limit(limit ?? 100)
     .offset(offset);
   return query.all().map(parseConversation);
 }
 
+export function listPinnedConversations(): ConversationRow[] {
+  ensureDisplayOrderMigration();
+  ensureGroupMigration();
+  const db = getDb();
+  const query = db
+    .select()
+    .from(conversations)
+    .where(
+      and(
+        sql`${conversations.conversationType} NOT IN ('background', 'private', 'scheduled')`,
+        sql`is_pinned = 1`,
+      ),
+    )
+    .orderBy(
+      sql`COALESCE(display_order, 999999) ASC`,
+      desc(
+        sql`COALESCE(${conversations.lastMessageAt}, ${conversations.updatedAt})`,
+      ),
+    );
+  return query.all().map(parseConversation);
+}
+
 export function countConversations(backgroundOnly = false): number {
   const db = getDb();
   const where = backgroundOnly
-    ? sql`${conversations.conversationType} = 'background'`
-    : sql`${conversations.conversationType} NOT IN ('background', 'private')`;
+    ? sql`${conversations.conversationType} IN ('background', 'scheduled') AND (${conversations.source} IS NULL OR ${conversations.source} != 'subagent')`
+    : sql`${conversations.conversationType} NOT IN ('background', 'private', 'scheduled')`;
   const [{ total }] = db
     .select({ total: count() })
     .from(conversations)
@@ -65,9 +107,13 @@ export function getLatestConversation(): ConversationRow | null {
     .select()
     .from(conversations)
     .where(
-      sql`${conversations.conversationType} NOT IN ('background', 'private')`,
+      sql`${conversations.conversationType} NOT IN ('background', 'private', 'scheduled')`,
+    )
+    .orderBy(
+      desc(
+        sql`COALESCE(${conversations.lastMessageAt}, ${conversations.updatedAt})`,
+      ),
     )
-    .orderBy(desc(conversations.updatedAt))
     .limit(1)
     .get();
   return row ? parseConversation(row) : null;
@@ -172,7 +218,7 @@ export function searchConversations(
         FROM messages_fts f
         JOIN messages m ON m.id = f.message_id
         JOIN conversations c ON c.id = m.conversation_id
-        WHERE messages_fts MATCH ? AND c.conversation_type NOT IN ('background', 'private')
+        WHERE messages_fts MATCH ? AND c.conversation_type NOT IN ('background', 'private', 'scheduled')
         LIMIT 1000
       `,
         ftsMatch,
@@ -197,7 +243,7 @@ export function searchConversations(
       SELECT DISTINCT m.conversation_id
       FROM messages m
       JOIN conversations c ON c.id = m.conversation_id
-      WHERE m.content LIKE ? ESCAPE '\\' AND c.conversation_type NOT IN ('background', 'private')
+      WHERE m.content LIKE ? ESCAPE '\\' AND c.conversation_type NOT IN ('background', 'private', 'scheduled')
       LIMIT 1000
     `,
       likePattern,
@@ -211,7 +257,7 @@ export function searchConversations(
     .from(conversations)
     .where(
       and(
-        sql`${conversations.conversationType} NOT IN ('background', 'private')`,
+        sql`${conversations.conversationType} NOT IN ('background', 'private', 'scheduled')`,
         sql`${conversations.title} LIKE ${titlePattern} ESCAPE '\\'`,
       ),
     )

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

@@ -34,6 +34,7 @@ export type TitleOrigin =
   | "subagent"
   | "sequence"
   | "heartbeat"
+  | "filing"
   | "local"
   | "task_submit"
   | "misc";